Skip to contentSkip to conversation

astro_mcf5373l: Rework ASTRO_ID logic

PATCH In review Tom Rini 1 participant 2 messages Aug 19, 2021 – Aug 30, 2021

lore
Share & tools
lore

Tom Rini

author
#0 lore raw

PATCH 1/1 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.

---
 include/configs/astro_mcf5373l.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
include/configs/astro_mcf5373l.h +7 -7
index 12488b66c30b..65c7d03efc1c 100644
@@ -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"
Signature · 1 line
2.17.1
author
#1 lore raw
Quoted 6 lines · Tom Rini

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.

Applied to u-boot/next, thanks!

Signature · 1 line
Tom