summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2021-08-19 15:16:15 -0400
committerTom Rini <trini@konsulko.com>2021-08-30 14:13:28 -0400
commita3e7a3640b70e09583d4047e0c50955a19e6d9b0 (patch)
tree12f773dc4ab1b4168c7d0416db188a8803d6a525
parent0c1b10fecc451f1c0dec740307e7d01c8209af42 (diff)
downloadu-boot-a3e7a3640b70e09583d4047e0c50955a19e6d9b0.tar.gz
astro_mcf5373l: Rework ASTRO_ID logic
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 <trini@konsulko.com>
-rw-r--r--include/configs/astro_mcf5373l.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h
index 12488b66c3..65c7d03efc 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"