summaryrefslogtreecommitdiff
path: root/include/configs
diff options
context:
space:
mode:
Diffstat (limited to 'include/configs')
-rw-r--r--include/configs/spear3xx_evb.h13
-rw-r--r--include/configs/spear6xx_evb.h6
2 files changed, 7 insertions, 12 deletions
diff --git a/include/configs/spear3xx_evb.h b/include/configs/spear3xx_evb.h
index 8090bc8..dd73a4d 100644
--- a/include/configs/spear3xx_evb.h
+++ b/include/configs/spear3xx_evb.h
@@ -12,22 +12,19 @@
* 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)
+#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
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