projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.denx.de/u-boot-mpc85xx
[platform/kernel/u-boot.git]
/
include
/
configs
/
spear3xx_evb.h
diff --git
a/include/configs/spear3xx_evb.h
b/include/configs/spear3xx_evb.h
index
8090bc8
..
dd73a4d
100644
(file)
--- a/
include/configs/spear3xx_evb.h
+++ b/
include/configs/spear3xx_evb.h
@@
-12,22
+12,19
@@
* High Level Configuration Options
* (easy to change)
*/
* High Level Configuration Options
* (easy to change)
*/
-#if defined(CONFIG_
spear
300)
+#if defined(CONFIG_
SPEAR
300)
#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
#endif
#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
#define CONFIG_ENV_IS_IN_NAND
#else
#define CONFIG_ENV_IS_IN_FLASH