powerpc: ppc4xx: Move CANYONLANDS/GLACIER/ARCHES to Kconfig

Move these options to Kconfig and remove them from the CONFIG files. Signed-off-by: Simon Glass <sjg@chromium.org>
2015-02-07 11:51:37 -07:00 · 2015-02-07 11:51:37 -07:00 · 6566041c0b
commit 6566041c0b
parent 0bca284b17
5 changed files with 25 additions and 3 deletions
--- a/board/amcc/canyonlands/Kconfig
+++ b/board/amcc/canyonlands/Kconfig
@ -9,4 +9,24 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "canyonlands"

+choice BOARD_TYPE
+	prompt "Select which board to build for"
+
+config CANYONLANDS
+	bool "Glacier"
+	help
+	  Select this to build for the Canyonlands 460EX board.
+
+config GLACIER
+	bool "Glacier"
+	help
+	  Select this to build for the Glacier 460GT board.
+
+config ARCHES
+	bool "Arches"
+	help
+	  Select this to build for the Arches dual 460GT board.
+
+endchoice
+
 endif
--- a/configs/arches_defconfig
+++ b/configs/arches_defconfig
@ -1,4 +1,4 @@
-CONFIG_SYS_EXTRA_OPTIONS="ARCHES"
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_CANYONLANDS=y
+CONFIG_ARCHES=y
--- a/configs/canyonlands_defconfig
+++ b/configs/canyonlands_defconfig
@ -1,4 +1,4 @@
-CONFIG_SYS_EXTRA_OPTIONS="CANYONLANDS"
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_CANYONLANDS=y
+CONFIG_CANYONLANDS=y
--- a/configs/glacier_defconfig
+++ b/configs/glacier_defconfig
@ -1,4 +1,4 @@
-CONFIG_SYS_EXTRA_OPTIONS="GLACIER"
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_CANYONLANDS=y
+CONFIG_GLACIER=y
--- a/include/configs/canyonlands.h
+++ b/include/configs/canyonlands.h
@ -11,6 +11,8 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H

+#include <linux/kconfig.h>
+
 /*-----------------------------------------------------------------------
 * High Level Configuration Options
 *----------------------------------------------------------------------*/