diff options
author | Simon Glass <sjg@chromium.org> | 2015-02-07 18:51:37 (GMT) |
---|---|---|
committer | Simon Glass <sjg@chromium.org> | 2015-02-12 17:35:30 (GMT) |
commit | 6566041c0bf9523becf5292e45a0f5c3686ebdd4 (patch) | |
tree | 3f8b62be62074cf2d62619b8161896e5f24b3457 | |
parent | 0bca284b1795942ac8fdd1646f04f49e478f0bcc (diff) | |
download | u-boot-6566041c0bf9523becf5292e45a0f5c3686ebdd4.tar.xz |
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>
-rw-r--r-- | board/amcc/canyonlands/Kconfig | 20 | ||||
-rw-r--r-- | configs/arches_defconfig | 2 | ||||
-rw-r--r-- | configs/canyonlands_defconfig | 2 | ||||
-rw-r--r-- | configs/glacier_defconfig | 2 | ||||
-rw-r--r-- | include/configs/canyonlands.h | 2 |
5 files changed, 25 insertions, 3 deletions
diff --git a/board/amcc/canyonlands/Kconfig b/board/amcc/canyonlands/Kconfig index 530a6ef..0fc6877 100644 --- 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 18d0a14..60e6ef9 100644 --- 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 09b9ab9..37a2b4d 100644 --- 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 2a66bfb..436b9f8 100644 --- 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 7b1f368..ed790cc 100644 --- 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 *----------------------------------------------------------------------*/ |