Commit 16e16fdde21c9255e338d2eaea339c3ca905da22
Committed by
Tom Rini
Tom Rini
1 parent
ef2b694c73
Exists in
v2017.01-smarct4x
and in
37 other branches
nomadik: kconfig: move board select menu and common settings
Becuase the board select menu in arch/arm/Kconfig is too big, move the Nomadik board select menu to nomadik/Kconfig. Move also common settings (CONFIG_SYS_CPU="arm926ejs" and CONFIG_SYS_SOC="nomadik"). Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Showing 6 changed files with 30 additions and 16 deletions Side-by-side Diff
arch/arm/Kconfig
| ... | ... | @@ -190,8 +190,8 @@ |
| 190 | 190 | config TARGET_SC_SPS_1 |
| 191 | 191 | bool "Support sc_sps_1" |
| 192 | 192 | |
| 193 | -config TARGET_NHK8815 | |
| 194 | - bool "Support nhk8815" | |
| 193 | +config ARCH_NOMADIK | |
| 194 | + bool "ST-Ericsson Nomadik" | |
| 195 | 195 | |
| 196 | 196 | config ORION5X |
| 197 | 197 | bool "Marvell Orion" |
| ... | ... | @@ -518,6 +518,8 @@ |
| 518 | 518 | |
| 519 | 519 | source "arch/arm/cpu/arm926ejs/kirkwood/Kconfig" |
| 520 | 520 | |
| 521 | +source "arch/arm/cpu/arm926ejs/nomadik/Kconfig" | |
| 522 | + | |
| 521 | 523 | source "arch/arm/cpu/armv7/omap3/Kconfig" |
| 522 | 524 | |
| 523 | 525 | source "arch/arm/cpu/armv7/omap4/Kconfig" |
| ... | ... | @@ -650,7 +652,6 @@ |
| 650 | 652 | source "board/spear/x600/Kconfig" |
| 651 | 653 | source "board/st-ericsson/snowball/Kconfig" |
| 652 | 654 | source "board/st-ericsson/u8500/Kconfig" |
| 653 | -source "board/st/nhk8815/Kconfig" | |
| 654 | 655 | source "board/sunxi/Kconfig" |
| 655 | 656 | source "board/syteco/jadecpu/Kconfig" |
| 656 | 657 | source "board/syteco/zmx25/Kconfig" |
arch/arm/cpu/arm926ejs/nomadik/Kconfig
| 1 | +if ARCH_NOMADIK | |
| 2 | + | |
| 3 | +choice | |
| 4 | + prompt "Nomadik board select" | |
| 5 | + | |
| 6 | +config NOMADIK_NHK8815 | |
| 7 | + bool "ST 8815 Nomadik Hardware Kit" | |
| 8 | + | |
| 9 | +endchoice | |
| 10 | + | |
| 11 | +config SYS_CPU | |
| 12 | + string | |
| 13 | + default "arm926ejs" | |
| 14 | + | |
| 15 | +config SYS_SOC | |
| 16 | + string | |
| 17 | + default "nomadik" | |
| 18 | + | |
| 19 | +source "board/st/nhk8815/Kconfig" | |
| 20 | + | |
| 21 | +endif |
board/st/nhk8815/Kconfig
| 1 | -if TARGET_NHK8815 | |
| 1 | +if NOMADIK_NHK8815 | |
| 2 | 2 | |
| 3 | -config SYS_CPU | |
| 4 | - string | |
| 5 | - default "arm926ejs" | |
| 6 | - | |
| 7 | 3 | config SYS_BOARD |
| 8 | 4 | string |
| 9 | 5 | default "nhk8815" |
| ... | ... | @@ -11,10 +7,6 @@ |
| 11 | 7 | config SYS_VENDOR |
| 12 | 8 | string |
| 13 | 9 | default "st" |
| 14 | - | |
| 15 | -config SYS_SOC | |
| 16 | - string | |
| 17 | - default "nomadik" | |
| 18 | 10 | |
| 19 | 11 | config SYS_CONFIG_NAME |
| 20 | 12 | string |
configs/nhk8815_defconfig
configs/nhk8815_onenand_defconfig
include/configs/nhk8815.h
| ... | ... | @@ -13,9 +13,7 @@ |
| 13 | 13 | #include <nomadik.h> |
| 14 | 14 | |
| 15 | 15 | #define CONFIG_ARM926EJS |
| 16 | -#define CONFIG_NOMADIK | |
| 17 | 16 | #define CONFIG_NOMADIK_8815 /* cpu variant */ |
| 18 | -#define CONFIG_NOMADIK_NHK8815 /* board variant */ | |
| 19 | 17 | |
| 20 | 18 | #define CONFIG_SKIP_LOWLEVEL_INIT /* we have already been loaded to RAM */ |
| 21 | 19 |