Signed-off-by: Tom Rini trini@konsulko.com --- include/configs/draco.h | 2 +- include/configs/etamin.h | 2 +- include/configs/rastaban.h | 2 +- include/configs/siemens-am33x-common.h | 2 +- include/configs/thuban.h | 2 +- scripts/config_whitelist.txt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/configs/draco.h b/include/configs/draco.h index 5b0daec11a6a..ab3cf10d7793 100644 --- a/include/configs/draco.h +++ b/include/configs/draco.h @@ -35,7 +35,7 @@ "optargs=\0" \ "preboot=draco_led 0\0" \ CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \ - CONFIG_ENV_SETTINGS_V2 \ + CFG_ENV_SETTINGS_V2 \ CFG_ENV_SETTINGS_NAND_V2
#endif /* ! __CONFIG_DRACO_H */ diff --git a/include/configs/etamin.h b/include/configs/etamin.h index fea69c7eafae..9011940abe4b 100644 --- a/include/configs/etamin.h +++ b/include/configs/etamin.h @@ -145,7 +145,7 @@ "optargs=\0" \ "preboot=draco_led 0\0" \ CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \ - CONFIG_ENV_SETTINGS_V2 \ + CFG_ENV_SETTINGS_V2 \ CFG_ENV_SETTINGS_NAND_V2 #endif /* CONFIG_SPL_BUILD */ #endif /* ! __CONFIG_ETAMIN_H */ diff --git a/include/configs/rastaban.h b/include/configs/rastaban.h index f3435b2b8c6c..59d56d666242 100644 --- a/include/configs/rastaban.h +++ b/include/configs/rastaban.h @@ -45,7 +45,7 @@ "optargs=\0" \ "preboot=draco_led 0\0" \ CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \ - CONFIG_ENV_SETTINGS_V2 \ + CFG_ENV_SETTINGS_V2 \ CFG_ENV_SETTINGS_NAND_V2
#endif /* ! __CONFIG_RASTABAN_H */ diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index c54b02c5919a..2a63b36a536a 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -311,7 +311,7 @@ "bootm ${kloadaddr} - ${loadaddr}\0" \ COMMON_ENV_NAND_CMDS
-#define CONFIG_ENV_SETTINGS_V2 \ +#define CFG_ENV_SETTINGS_V2 \ COMMON_ENV_SETTINGS \ "net_args=run bootargs_defaults;" \ "mtdparts default;" \ diff --git a/include/configs/thuban.h b/include/configs/thuban.h index 960b42dffd0e..c8b27263e85e 100644 --- a/include/configs/thuban.h +++ b/include/configs/thuban.h @@ -38,7 +38,7 @@ "optargs=\0" \ "preboot=draco_led 0\0" \ CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \ - CONFIG_ENV_SETTINGS_V2 \ + CFG_ENV_SETTINGS_V2 \ CFG_ENV_SETTINGS_NAND_V2
#endif /* ! __CONFIG_THUBAN_H */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 26821890137d..831f8a99ea5c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -16,7 +16,7 @@ CFG_ENV_SETTINGS_BUTTONS_AND_LEDS CFG_ENV_SETTINGS_NAND_V1 CFG_ENV_SETTINGS_NAND_V2 CFG_ENV_SETTINGS_V1 -CONFIG_ENV_SETTINGS_V2 +CFG_ENV_SETTINGS_V2 CONFIG_ENV_SROM_BANK CONFIG_ENV_TOTAL_SIZE CONFIG_ET1100_BASE