Signed-off-by: Tom Rini trini@konsulko.com --- include/configs/pxm2.h | 2 +- include/configs/rut.h | 2 +- include/configs/siemens-am33x-common.h | 2 +- scripts/config_whitelist.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h index c6a01270a54d..48f49906b84e 100644 --- a/include/configs/pxm2.h +++ b/include/configs/pxm2.h @@ -36,7 +36,7 @@ "preboot=draco_led 0\0" \ CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \ "splashpos=m,m\0" \ - CONFIG_ENV_SETTINGS_V1 \ + CFG_ENV_SETTINGS_V1 \ CFG_ENV_SETTINGS_NAND_V1 \ "mmc_dev=0\0" \ "mmc_root=/dev/mmcblk0p2 rw\0" \ diff --git a/include/configs/rut.h b/include/configs/rut.h index f51771f9ca46..b07d0c50604d 100644 --- a/include/configs/rut.h +++ b/include/configs/rut.h @@ -33,7 +33,7 @@ "nand_img_size=0x500000\0" \ "splashpos=m,m\0" \ "optargs=fixrtc --no-log consoleblank=0 \0" \ - CONFIG_ENV_SETTINGS_V1 \ + CFG_ENV_SETTINGS_V1 \ CFG_ENV_SETTINGS_NAND_V1 \ "mmc_dev=0\0" \ "mmc_root=/dev/mmcblk0p2 rw\0" \ diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index b1cd614316d4..c54b02c5919a 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -234,7 +234,7 @@ "${nand_img_size}; bootm ${kloadaddr}\0" \ COMMON_ENV_NAND_CMDS
-#define CONFIG_ENV_SETTINGS_V1 \ +#define CFG_ENV_SETTINGS_V1 \ COMMON_ENV_SETTINGS \ "net_args=run bootargs_defaults;" \ "mtdparts default;" \ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index e55368c5453c..26821890137d 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -15,7 +15,7 @@ CFG_ENV_IS_EMBEDDED CFG_ENV_SETTINGS_BUTTONS_AND_LEDS CFG_ENV_SETTINGS_NAND_V1 CFG_ENV_SETTINGS_NAND_V2 -CONFIG_ENV_SETTINGS_V1 +CFG_ENV_SETTINGS_V1 CONFIG_ENV_SETTINGS_V2 CONFIG_ENV_SROM_BANK CONFIG_ENV_TOTAL_SIZE