Rather than using CONFIG namespace for logic internal to
include/configs/astro_mcf5373l.h to select ASTRO_ID (and populate the
default environment), strip CONFIG from the various options used and
set.
Signed-off-by: Tom Rini <tr...@konsulko.com>
---
include/configs/astro_mcf5373l.h | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h
index 12488b66c30b..65c7d03efc1c 100644
--- a/include/configs/astro_mcf5373l.h
+++ b/include/configs/astro_mcf5373l.h
@@ -22,17 +22,17 @@
* set the card type to actually compile for; either of
* the possibilities listed below has to be used!
*/
-#define CONFIG_ASTRO_V532 1
+#define ASTRO_V532 1
-#if CONFIG_ASTRO_V532
+#if ASTRO_V532
#define ASTRO_ID 0xF8
-#elif CONFIG_ASTRO_V512
+#elif ASTRO_V512
#define ASTRO_ID 0xFA
-#elif CONFIG_ASTRO_TWIN7S2
+#elif ASTRO_TWIN7S2
#define ASTRO_ID 0xF9
-#elif CONFIG_ASTRO_V912
+#elif ASTRO_V912
#define ASTRO_ID 0xFC
-#elif CONFIG_ASTRO_COFDMDUOS2
+#elif ASTRO_COFDMDUOS2
#define ASTRO_ID 0xFB
#else
#error No card type defined!
@@ -144,7 +144,7 @@
#ifdef CONFIG_MONITOR_IS_IN_RAM
#define CONFIG_BOOTCOMMAND "" /* no autoboot in this case */
#else
-#if CONFIG_ASTRO_V532
+#if ASTRO_V532
#define CONFIG_BOOTCOMMAND "protect off 0x80000 0x1ffffff;run env_check;"\
"run xilinxload&&run alteraload&&bootm
0x80000;"\
"update;reset"
--
2.17.1
