Commit 6ef2e750 authored by Simon Glass's avatar Simon Glass Committed by Tom Rini

spear: Use upper case for CONFIG options

There are a few options which use lower case. We should use upper case for
all CONFIG options.
Signed-off-by: 's avatarSimon Glass <sjg@chromium.org>
[trini: Add usbtty/nand hunk to include/configs/spear3xx_evb.h]
Signed-off-by: 's avatarTom Rini <trini@konsulko.com>
parent d3c1f467
...@@ -37,7 +37,7 @@ int timer_init(void) ...@@ -37,7 +37,7 @@ int timer_init(void)
writel(MISC_PRSC_CFG, &misc_regs_p->prsc1_clk_cfg); writel(MISC_PRSC_CFG, &misc_regs_p->prsc1_clk_cfg);
synth = MISC_GPT3SYNTH; synth = MISC_GPT3SYNTH;
#else #else
# error Incorrect config. Can only be spear{600|300|310|320} # error Incorrect config. Can only be SPEAR{600|300|310|320}
#endif #endif
writel(readl(&misc_regs_p->periph_clk_cfg) | synth, writel(readl(&misc_regs_p->periph_clk_cfg) | synth,
......
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_TARGET_SPEAR300=y CONFIG_TARGET_SPEAR300=y
CONFIG_SYS_EXTRA_OPTIONS="spear300" CONFIG_SYS_EXTRA_OPTIONS="SPEAR300"
CONFIG_BOOTDELAY=1 CONFIG_BOOTDELAY=1
CONFIG_CMD_I2C=y CONFIG_CMD_I2C=y
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
......
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_TARGET_SPEAR300=y CONFIG_TARGET_SPEAR300=y
CONFIG_SYS_EXTRA_OPTIONS="spear300,nand" CONFIG_SYS_EXTRA_OPTIONS="SPEAR300,NAND"
CONFIG_BOOTDELAY=1 CONFIG_BOOTDELAY=1
CONFIG_CMD_I2C=y CONFIG_CMD_I2C=y
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
......
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_TARGET_SPEAR300=y CONFIG_TARGET_SPEAR300=y
CONFIG_SYS_EXTRA_OPTIONS="spear300,usbtty" CONFIG_SYS_EXTRA_OPTIONS="SPEAR300,USBTTY"
CONFIG_BOOTDELAY=-1 CONFIG_BOOTDELAY=-1
CONFIG_CMD_I2C=y CONFIG_CMD_I2C=y
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
......
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_TARGET_SPEAR300=y CONFIG_TARGET_SPEAR300=y
CONFIG_SYS_EXTRA_OPTIONS="spear300,usbtty,nand" CONFIG_SYS_EXTRA_OPTIONS="SPEAR300,USBTTY,NAND"
CONFIG_BOOTDELAY=-1 CONFIG_BOOTDELAY=-1
CONFIG_CMD_I2C=y CONFIG_CMD_I2C=y
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
......
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_TARGET_SPEAR310=y CONFIG_TARGET_SPEAR310=y
CONFIG_SYS_EXTRA_OPTIONS="spear310" CONFIG_SYS_EXTRA_OPTIONS="SPEAR310"
CONFIG_BOOTDELAY=1 CONFIG_BOOTDELAY=1
CONFIG_CMD_I2C=y CONFIG_CMD_I2C=y
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
......
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_TARGET_SPEAR310=y CONFIG_TARGET_SPEAR310=y
CONFIG_SYS_EXTRA_OPTIONS="spear310,nand" CONFIG_SYS_EXTRA_OPTIONS="SPEAR310,NAND"
CONFIG_BOOTDELAY=1 CONFIG_BOOTDELAY=1
CONFIG_CMD_I2C=y CONFIG_CMD_I2C=y
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
......
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_TARGET_SPEAR310=y CONFIG_TARGET_SPEAR310=y
CONFIG_SYS_EXTRA_OPTIONS="spear310,FLASH_PNOR" CONFIG_SYS_EXTRA_OPTIONS="SPEAR310,FLASH_PNOR"
CONFIG_BOOTDELAY=1 CONFIG_BOOTDELAY=1
CONFIG_CMD_I2C=y CONFIG_CMD_I2C=y
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
......
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_TARGET_SPEAR310=y CONFIG_TARGET_SPEAR310=y
CONFIG_SYS_EXTRA_OPTIONS="spear310,usbtty" CONFIG_SYS_EXTRA_OPTIONS="SPEAR310,USBTTY"
CONFIG_BOOTDELAY=-1 CONFIG_BOOTDELAY=-1
CONFIG_CMD_I2C=y CONFIG_CMD_I2C=y
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
......
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_TARGET_SPEAR310=y CONFIG_TARGET_SPEAR310=y
CONFIG_SYS_EXTRA_OPTIONS="spear310,usbtty,nand" CONFIG_SYS_EXTRA_OPTIONS="SPEAR310,USBTTY,NAND"
CONFIG_BOOTDELAY=-1 CONFIG_BOOTDELAY=-1
CONFIG_CMD_I2C=y CONFIG_CMD_I2C=y
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
......
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_TARGET_SPEAR310=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_BOOTDELAY=-1
CONFIG_CMD_I2C=y CONFIG_CMD_I2C=y
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
......
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_TARGET_SPEAR320=y CONFIG_TARGET_SPEAR320=y
CONFIG_SYS_EXTRA_OPTIONS="spear320" CONFIG_SYS_EXTRA_OPTIONS="SPEAR320"
CONFIG_BOOTDELAY=1 CONFIG_BOOTDELAY=1
CONFIG_CMD_I2C=y CONFIG_CMD_I2C=y
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
......
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_TARGET_SPEAR320=y CONFIG_TARGET_SPEAR320=y
CONFIG_SYS_EXTRA_OPTIONS="spear320,nand" CONFIG_SYS_EXTRA_OPTIONS="SPEAR320,NAND"
CONFIG_BOOTDELAY=1 CONFIG_BOOTDELAY=1
CONFIG_CMD_I2C=y CONFIG_CMD_I2C=y
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
......
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_TARGET_SPEAR320=y CONFIG_TARGET_SPEAR320=y
CONFIG_SYS_EXTRA_OPTIONS="spear320,FLASH_PNOR" CONFIG_SYS_EXTRA_OPTIONS="SPEAR320,FLASH_PNOR"
CONFIG_BOOTDELAY=1 CONFIG_BOOTDELAY=1
CONFIG_CMD_I2C=y CONFIG_CMD_I2C=y
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
......
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_TARGET_SPEAR320=y CONFIG_TARGET_SPEAR320=y
CONFIG_SYS_EXTRA_OPTIONS="spear320,usbtty" CONFIG_SYS_EXTRA_OPTIONS="SPEAR320,USBTTY"
CONFIG_BOOTDELAY=-1 CONFIG_BOOTDELAY=-1
CONFIG_CMD_I2C=y CONFIG_CMD_I2C=y
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
......
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_TARGET_SPEAR320=y CONFIG_TARGET_SPEAR320=y
CONFIG_SYS_EXTRA_OPTIONS="spear320,usbtty,nand" CONFIG_SYS_EXTRA_OPTIONS="SPEAR320,USBTTY,NAND"
CONFIG_BOOTDELAY=-1 CONFIG_BOOTDELAY=-1
CONFIG_CMD_I2C=y CONFIG_CMD_I2C=y
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
......
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_TARGET_SPEAR320=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_BOOTDELAY=-1
CONFIG_CMD_I2C=y CONFIG_CMD_I2C=y
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
......
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_TARGET_SPEAR600=y CONFIG_TARGET_SPEAR600=y
CONFIG_SYS_EXTRA_OPTIONS="spear600" CONFIG_SYS_EXTRA_OPTIONS="SPEAR600"
CONFIG_BOOTDELAY=1 CONFIG_BOOTDELAY=1
CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_KEYED=y
CONFIG_AUTOBOOT_PROMPT="Hit SPACE in %d seconds to stop autoboot.\n" CONFIG_AUTOBOOT_PROMPT="Hit SPACE in %d seconds to stop autoboot.\n"
......
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_TARGET_SPEAR600=y CONFIG_TARGET_SPEAR600=y
CONFIG_SYS_EXTRA_OPTIONS="spear600,nand" CONFIG_SYS_EXTRA_OPTIONS="SPEAR600,NAND"
CONFIG_BOOTDELAY=1 CONFIG_BOOTDELAY=1
CONFIG_CMD_I2C=y CONFIG_CMD_I2C=y
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
......
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_TARGET_SPEAR600=y CONFIG_TARGET_SPEAR600=y
CONFIG_SYS_EXTRA_OPTIONS="spear600,usbtty" CONFIG_SYS_EXTRA_OPTIONS="SPEAR600,USBTTY"
CONFIG_BOOTDELAY=-1 CONFIG_BOOTDELAY=-1
CONFIG_CMD_I2C=y CONFIG_CMD_I2C=y
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
......
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_TARGET_SPEAR600=y CONFIG_TARGET_SPEAR600=y
CONFIG_SYS_EXTRA_OPTIONS="spear600,usbtty,nand" CONFIG_SYS_EXTRA_OPTIONS="SPEAR600,USBTTY,NAND"
CONFIG_BOOTDELAY=-1 CONFIG_BOOTDELAY=-1
CONFIG_CMD_I2C=y CONFIG_CMD_I2C=y
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
......
...@@ -2,7 +2,7 @@ CONFIG_ARM=y ...@@ -2,7 +2,7 @@ CONFIG_ARM=y
CONFIG_TARGET_STV0991=y CONFIG_TARGET_STV0991=y
CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_DEFAULT_DEVICE_TREE="stv0991" CONFIG_DEFAULT_DEVICE_TREE="stv0991"
CONFIG_SYS_EXTRA_OPTIONS="stv0991" CONFIG_SYS_EXTRA_OPTIONS="STV0991"
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
CONFIG_SYS_PROMPT="STV0991> " CONFIG_SYS_PROMPT="STV0991> "
CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_KEYED=y
......
...@@ -12,22 +12,19 @@ ...@@ -12,22 +12,19 @@
* High Level Configuration Options * High Level Configuration Options
* (easy to change) * (easy to change)
*/ */
#if defined(CONFIG_spear300) #if defined(CONFIG_SPEAR300)
#define CONFIG_SPEAR3XX #define CONFIG_SPEAR3XX
#define CONFIG_SPEAR300 #elif defined(CONFIG_SPEAR310)
#elif defined(CONFIG_spear310)
#define CONFIG_SPEAR3XX #define CONFIG_SPEAR3XX
#define CONFIG_SPEAR310 #elif defined(CONFIG_SPEAR320)
#elif defined(CONFIG_spear320)
#define CONFIG_SPEAR3XX #define CONFIG_SPEAR3XX
#define CONFIG_SPEAR320
#endif #endif
#if defined(CONFIG_usbtty) #if defined(CONFIG_USBTTY)
#define CONFIG_SPEAR_USBTTY #define CONFIG_SPEAR_USBTTY
#endif #endif
#if defined(CONFIG_nand) #if defined(CONFIG_NAND)
#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_IS_IN_NAND
#else #else
#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_IS_IN_FLASH
......
...@@ -12,13 +12,11 @@ ...@@ -12,13 +12,11 @@
* High Level Configuration Options * High Level Configuration Options
* (easy to change) * (easy to change)
*/ */
#define CONFIG_SPEAR600 #if defined(CONFIG_USBTTY)
#if defined(CONFIG_usbtty)
#define CONFIG_SPEAR_USBTTY #define CONFIG_SPEAR_USBTTY
#endif #endif
#if defined(CONFIG_nand) #if defined(CONFIG_NAND)
#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_IS_IN_NAND
#else #else
#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_IS_IN_FLASH
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment