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>

diff --git a/board/amcc/canyonlands/Kconfig b/board/amcc/canyonlands/Kconfig
index 530a6efd60bc49316f727e4fb05c36c84c5efa40..0fc687739ca89fea45537c024a48911a6bc33c3e 100644 (file)
--- 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

diff --git a/configs/arches_defconfig b/configs/arches_defconfig
index 18d0a140da6513c1cf91d09e01d83c2306e95d09..60e6ef9098dba27e8c1b1cb3bb7adbea77843e81 100644 (file)
--- 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

diff --git a/configs/canyonlands_defconfig b/configs/canyonlands_defconfig
index 09b9ab93307e67fdcefdc5f594fcede4a1b0649a..37a2b4d79681b9fa68d0b13907e8b206e3e47094 100644 (file)
--- 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

diff --git a/configs/glacier_defconfig b/configs/glacier_defconfig
index 2a66bfb08c74f6c1f4516e7157c3288557b494c7..436b9f8d0311fa4a1ef72b922287b17c6aa9df44 100644 (file)
--- 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

diff --git a/include/configs/canyonlands.h b/include/configs/canyonlands.h
index 7b1f368375adb76e0484e89903a3eb3f29a3c1b2..ed790ccaf3a83594273d36ae86f25a5700b8584f 100644 (file)
--- 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
  *----------------------------------------------------------------------*/