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>
This commit is contained in:
Tom Rini 2021-08-19 15:16:15 -04:00
parent 0c1b10fecc
commit a3e7a3640b

View File

@ -22,17 +22,17 @@
* set the card type to actually compile for; either of * set the card type to actually compile for; either of
* the possibilities listed below has to be used! * 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 #define ASTRO_ID 0xF8
#elif CONFIG_ASTRO_V512 #elif ASTRO_V512
#define ASTRO_ID 0xFA #define ASTRO_ID 0xFA
#elif CONFIG_ASTRO_TWIN7S2 #elif ASTRO_TWIN7S2
#define ASTRO_ID 0xF9 #define ASTRO_ID 0xF9
#elif CONFIG_ASTRO_V912 #elif ASTRO_V912
#define ASTRO_ID 0xFC #define ASTRO_ID 0xFC
#elif CONFIG_ASTRO_COFDMDUOS2 #elif ASTRO_COFDMDUOS2
#define ASTRO_ID 0xFB #define ASTRO_ID 0xFB
#else #else
#error No card type defined! #error No card type defined!
@ -144,7 +144,7 @@
#ifdef CONFIG_MONITOR_IS_IN_RAM #ifdef CONFIG_MONITOR_IS_IN_RAM
#define CONFIG_BOOTCOMMAND "" /* no autoboot in this case */ #define CONFIG_BOOTCOMMAND "" /* no autoboot in this case */
#else #else
#if CONFIG_ASTRO_V532 #if ASTRO_V532
#define CONFIG_BOOTCOMMAND "protect off 0x80000 0x1ffffff;run env_check;"\ #define CONFIG_BOOTCOMMAND "protect off 0x80000 0x1ffffff;run env_check;"\
"run xilinxload&&run alteraload&&bootm 0x80000;"\ "run xilinxload&&run alteraload&&bootm 0x80000;"\
"update;reset" "update;reset"