There are a few options which use lower case. We should use upper case for all CONFIG options.
Signed-off-by: Simon Glass sjg@chromium.org ---
Changes in v3: None Changes in v2: None
arch/arm/cpu/arm926ejs/spear/timer.c | 2 +- configs/spear300_defconfig | 2 +- configs/spear300_nand_defconfig | 2 +- configs/spear300_usbtty_defconfig | 2 +- configs/spear300_usbtty_nand_defconfig | 2 +- configs/spear310_defconfig | 2 +- configs/spear310_nand_defconfig | 2 +- configs/spear310_pnor_defconfig | 2 +- configs/spear310_usbtty_defconfig | 2 +- configs/spear310_usbtty_nand_defconfig | 2 +- configs/spear310_usbtty_pnor_defconfig | 2 +- configs/spear320_defconfig | 2 +- configs/spear320_nand_defconfig | 2 +- configs/spear320_pnor_defconfig | 2 +- configs/spear320_usbtty_defconfig | 2 +- configs/spear320_usbtty_nand_defconfig | 2 +- configs/spear320_usbtty_pnor_defconfig | 2 +- configs/spear600_defconfig | 2 +- configs/spear600_nand_defconfig | 2 +- configs/spear600_usbtty_defconfig | 2 +- configs/spear600_usbtty_nand_defconfig | 2 +- configs/stv0991_defconfig | 2 +- include/configs/spear3xx_evb.h | 9 +++------ include/configs/spear6xx_evb.h | 6 ++---- 24 files changed, 27 insertions(+), 32 deletions(-)
diff --git a/arch/arm/cpu/arm926ejs/spear/timer.c b/arch/arm/cpu/arm926ejs/spear/timer.c index c88e962..89fd54f 100644 --- a/arch/arm/cpu/arm926ejs/spear/timer.c +++ b/arch/arm/cpu/arm926ejs/spear/timer.c @@ -37,7 +37,7 @@ int timer_init(void) writel(MISC_PRSC_CFG, &misc_regs_p->prsc1_clk_cfg); synth = MISC_GPT3SYNTH; #else -# error Incorrect config. Can only be spear{600|300|310|320} +# error Incorrect config. Can only be SPEAR{600|300|310|320} #endif
writel(readl(&misc_regs_p->periph_clk_cfg) | synth, diff --git a/configs/spear300_defconfig b/configs/spear300_defconfig index 2ef309c..ed45de8 100644 --- a/configs/spear300_defconfig +++ b/configs/spear300_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_TARGET_SPEAR300=y -CONFIG_SYS_EXTRA_OPTIONS="spear300" +CONFIG_SYS_EXTRA_OPTIONS="SPEAR300" CONFIG_BOOTDELAY=1 CONFIG_CMD_I2C=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/spear300_nand_defconfig b/configs/spear300_nand_defconfig index 611631e..d525455 100644 --- a/configs/spear300_nand_defconfig +++ b/configs/spear300_nand_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_TARGET_SPEAR300=y -CONFIG_SYS_EXTRA_OPTIONS="spear300,nand" +CONFIG_SYS_EXTRA_OPTIONS="SPEAR300,NAND" CONFIG_BOOTDELAY=1 CONFIG_CMD_I2C=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/spear300_usbtty_defconfig b/configs/spear300_usbtty_defconfig index 5338418..5c67aeb 100644 --- a/configs/spear300_usbtty_defconfig +++ b/configs/spear300_usbtty_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_TARGET_SPEAR300=y -CONFIG_SYS_EXTRA_OPTIONS="spear300,usbtty" +CONFIG_SYS_EXTRA_OPTIONS="SPEAR300,USBTTY" CONFIG_BOOTDELAY=-1 CONFIG_CMD_I2C=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/spear300_usbtty_nand_defconfig b/configs/spear300_usbtty_nand_defconfig index d525edf..e08a5d6 100644 --- a/configs/spear300_usbtty_nand_defconfig +++ b/configs/spear300_usbtty_nand_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_TARGET_SPEAR300=y -CONFIG_SYS_EXTRA_OPTIONS="spear300,usbtty,nand" +CONFIG_SYS_EXTRA_OPTIONS="SPEAR300,USBTTY,NAND" CONFIG_BOOTDELAY=-1 CONFIG_CMD_I2C=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/spear310_defconfig b/configs/spear310_defconfig index 3f20387..cdead20 100644 --- a/configs/spear310_defconfig +++ b/configs/spear310_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_TARGET_SPEAR310=y -CONFIG_SYS_EXTRA_OPTIONS="spear310" +CONFIG_SYS_EXTRA_OPTIONS="SPEAR310" CONFIG_BOOTDELAY=1 CONFIG_CMD_I2C=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/spear310_nand_defconfig b/configs/spear310_nand_defconfig index 2feb9cc..2ae7bf2 100644 --- a/configs/spear310_nand_defconfig +++ b/configs/spear310_nand_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_TARGET_SPEAR310=y -CONFIG_SYS_EXTRA_OPTIONS="spear310,nand" +CONFIG_SYS_EXTRA_OPTIONS="SPEAR310,NAND" CONFIG_BOOTDELAY=1 CONFIG_CMD_I2C=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/spear310_pnor_defconfig b/configs/spear310_pnor_defconfig index 4ab49d9..e0ad7dc 100644 --- a/configs/spear310_pnor_defconfig +++ b/configs/spear310_pnor_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_TARGET_SPEAR310=y -CONFIG_SYS_EXTRA_OPTIONS="spear310,FLASH_PNOR" +CONFIG_SYS_EXTRA_OPTIONS="SPEAR310,FLASH_PNOR" CONFIG_BOOTDELAY=1 CONFIG_CMD_I2C=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/spear310_usbtty_defconfig b/configs/spear310_usbtty_defconfig index 299cf6d..a690e3a 100644 --- a/configs/spear310_usbtty_defconfig +++ b/configs/spear310_usbtty_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_TARGET_SPEAR310=y -CONFIG_SYS_EXTRA_OPTIONS="spear310,usbtty" +CONFIG_SYS_EXTRA_OPTIONS="SPEAR310,USBTTY" CONFIG_BOOTDELAY=-1 CONFIG_CMD_I2C=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/spear310_usbtty_nand_defconfig b/configs/spear310_usbtty_nand_defconfig index 9ac10f2..37e5776 100644 --- a/configs/spear310_usbtty_nand_defconfig +++ b/configs/spear310_usbtty_nand_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_TARGET_SPEAR310=y -CONFIG_SYS_EXTRA_OPTIONS="spear310,usbtty,nand" +CONFIG_SYS_EXTRA_OPTIONS="SPEAR310,USBTTY,NAND" CONFIG_BOOTDELAY=-1 CONFIG_CMD_I2C=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/spear310_usbtty_pnor_defconfig b/configs/spear310_usbtty_pnor_defconfig index f582b46..3e08fd6 100644 --- a/configs/spear310_usbtty_pnor_defconfig +++ b/configs/spear310_usbtty_pnor_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_TARGET_SPEAR310=y -CONFIG_SYS_EXTRA_OPTIONS="spear310,usbtty,FLASH_PNOR" +CONFIG_SYS_EXTRA_OPTIONS="SPEAR310,USBTTY,FLASH_PNOR" CONFIG_BOOTDELAY=-1 CONFIG_CMD_I2C=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/spear320_defconfig b/configs/spear320_defconfig index 4b4f2f6..4d01d46 100644 --- a/configs/spear320_defconfig +++ b/configs/spear320_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_TARGET_SPEAR320=y -CONFIG_SYS_EXTRA_OPTIONS="spear320" +CONFIG_SYS_EXTRA_OPTIONS="SPEAR320" CONFIG_BOOTDELAY=1 CONFIG_CMD_I2C=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/spear320_nand_defconfig b/configs/spear320_nand_defconfig index 7308879..b03fab8 100644 --- a/configs/spear320_nand_defconfig +++ b/configs/spear320_nand_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_TARGET_SPEAR320=y -CONFIG_SYS_EXTRA_OPTIONS="spear320,nand" +CONFIG_SYS_EXTRA_OPTIONS="SPEAR320,NAND" CONFIG_BOOTDELAY=1 CONFIG_CMD_I2C=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/spear320_pnor_defconfig b/configs/spear320_pnor_defconfig index fdffa97..f85ae43 100644 --- a/configs/spear320_pnor_defconfig +++ b/configs/spear320_pnor_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_TARGET_SPEAR320=y -CONFIG_SYS_EXTRA_OPTIONS="spear320,FLASH_PNOR" +CONFIG_SYS_EXTRA_OPTIONS="SPEAR320,FLASH_PNOR" CONFIG_BOOTDELAY=1 CONFIG_CMD_I2C=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/spear320_usbtty_defconfig b/configs/spear320_usbtty_defconfig index ee873e9..a5fe95a 100644 --- a/configs/spear320_usbtty_defconfig +++ b/configs/spear320_usbtty_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_TARGET_SPEAR320=y -CONFIG_SYS_EXTRA_OPTIONS="spear320,usbtty" +CONFIG_SYS_EXTRA_OPTIONS="SPEAR320,USBTTY" CONFIG_BOOTDELAY=-1 CONFIG_CMD_I2C=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/spear320_usbtty_nand_defconfig b/configs/spear320_usbtty_nand_defconfig index a587470..3f6f14f 100644 --- a/configs/spear320_usbtty_nand_defconfig +++ b/configs/spear320_usbtty_nand_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_TARGET_SPEAR320=y -CONFIG_SYS_EXTRA_OPTIONS="spear320,usbtty,nand" +CONFIG_SYS_EXTRA_OPTIONS="SPEAR320,USBTTY,NAND" CONFIG_BOOTDELAY=-1 CONFIG_CMD_I2C=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/spear320_usbtty_pnor_defconfig b/configs/spear320_usbtty_pnor_defconfig index a65dc11..8831eba 100644 --- a/configs/spear320_usbtty_pnor_defconfig +++ b/configs/spear320_usbtty_pnor_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_TARGET_SPEAR320=y -CONFIG_SYS_EXTRA_OPTIONS="spear320,usbtty,FLASH_PNOR" +CONFIG_SYS_EXTRA_OPTIONS="SPEAR320,USBTTY,FLASH_PNOR" CONFIG_BOOTDELAY=-1 CONFIG_CMD_I2C=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/spear600_defconfig b/configs/spear600_defconfig index 623800c..9d23978 100644 --- a/configs/spear600_defconfig +++ b/configs/spear600_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_TARGET_SPEAR600=y -CONFIG_SYS_EXTRA_OPTIONS="spear600" +CONFIG_SYS_EXTRA_OPTIONS="SPEAR600" CONFIG_BOOTDELAY=1 CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Hit SPACE in %d seconds to stop autoboot.\n" diff --git a/configs/spear600_nand_defconfig b/configs/spear600_nand_defconfig index 8da9b34..b3df048 100644 --- a/configs/spear600_nand_defconfig +++ b/configs/spear600_nand_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_TARGET_SPEAR600=y -CONFIG_SYS_EXTRA_OPTIONS="spear600,nand" +CONFIG_SYS_EXTRA_OPTIONS="SPEAR600,NAND" CONFIG_BOOTDELAY=1 CONFIG_CMD_I2C=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/spear600_usbtty_defconfig b/configs/spear600_usbtty_defconfig index 68b11cc..4714959 100644 --- a/configs/spear600_usbtty_defconfig +++ b/configs/spear600_usbtty_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_TARGET_SPEAR600=y -CONFIG_SYS_EXTRA_OPTIONS="spear600,usbtty" +CONFIG_SYS_EXTRA_OPTIONS="SPEAR600,USBTTY" CONFIG_BOOTDELAY=-1 CONFIG_CMD_I2C=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/spear600_usbtty_nand_defconfig b/configs/spear600_usbtty_nand_defconfig index 776c611..034a089 100644 --- a/configs/spear600_usbtty_nand_defconfig +++ b/configs/spear600_usbtty_nand_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_TARGET_SPEAR600=y -CONFIG_SYS_EXTRA_OPTIONS="spear600,usbtty,nand" +CONFIG_SYS_EXTRA_OPTIONS="SPEAR600,USBTTY,NAND" CONFIG_BOOTDELAY=-1 CONFIG_CMD_I2C=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/stv0991_defconfig b/configs/stv0991_defconfig index 40ca293..4db028e 100644 --- a/configs/stv0991_defconfig +++ b/configs/stv0991_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_TARGET_STV0991=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_DEFAULT_DEVICE_TREE="stv0991" -CONFIG_SYS_EXTRA_OPTIONS="stv0991" +CONFIG_SYS_EXTRA_OPTIONS="STV0991" CONFIG_BOOTDELAY=3 CONFIG_SYS_PROMPT="STV0991> " CONFIG_AUTOBOOT_KEYED=y diff --git a/include/configs/spear3xx_evb.h b/include/configs/spear3xx_evb.h index 8090bc8..5ceaadc 100644 --- a/include/configs/spear3xx_evb.h +++ b/include/configs/spear3xx_evb.h @@ -12,15 +12,12 @@ * High Level Configuration Options * (easy to change) */ -#if defined(CONFIG_spear300) +#if defined(CONFIG_SPEAR300) #define CONFIG_SPEAR3XX -#define CONFIG_SPEAR300 -#elif defined(CONFIG_spear310) +#elif defined(CONFIG_SPEAR310) #define CONFIG_SPEAR3XX -#define CONFIG_SPEAR310 -#elif defined(CONFIG_spear320) +#elif defined(CONFIG_SPEAR320) #define CONFIG_SPEAR3XX -#define CONFIG_SPEAR320 #endif
#if defined(CONFIG_usbtty) diff --git a/include/configs/spear6xx_evb.h b/include/configs/spear6xx_evb.h index 28dddcc..7745247 100644 --- a/include/configs/spear6xx_evb.h +++ b/include/configs/spear6xx_evb.h @@ -12,13 +12,11 @@ * High Level Configuration Options * (easy to change) */ -#define CONFIG_SPEAR600 - -#if defined(CONFIG_usbtty) +#if defined(CONFIG_USBTTY) #define CONFIG_SPEAR_USBTTY #endif
-#if defined(CONFIG_nand) +#if defined(CONFIG_NAND) #define CONFIG_ENV_IS_IN_NAND #else #define CONFIG_ENV_IS_IN_FLASH