Signed-off-by: Tom Rini trini@konsulko.com --- include/configs/km/km-mpc83xx.h | 6 +++--- include/configs/kmcent2.h | 6 +++--- scripts/config_whitelist.txt | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/include/configs/km/km-mpc83xx.h b/include/configs/km/km-mpc83xx.h index 227c45f0634a..33655d144df1 100644 --- a/include/configs/km/km-mpc83xx.h +++ b/include/configs/km/km-mpc83xx.h @@ -78,13 +78,13 @@ #define CONFIG_KM_DEF_ENV "km-common=empty\0" #endif
-#ifndef CONFIG_KM_DEF_ARCH -#define CONFIG_KM_DEF_ARCH "arch=ppc_82xx\0" +#ifndef CFG_KM_DEF_ARCH +#define CFG_KM_DEF_ARCH "arch=ppc_82xx\0" #endif
#define CFG_EXTRA_ENV_SETTINGS \ CONFIG_KM_DEF_ENV \ - CONFIG_KM_DEF_ARCH \ + CFG_KM_DEF_ARCH \ "newenv=" \ "prot off " __stringify(CONFIG_ENV_ADDR) " +0x40000 && " \ "era " __stringify(CONFIG_ENV_ADDR) " +0x40000\0" \ diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h index d7d5bce15c59..870603d461af 100644 --- a/include/configs/kmcent2.h +++ b/include/configs/kmcent2.h @@ -437,13 +437,13 @@ int get_scl(void); " +" __stringify(CFG_ENV_TOTAL_SIZE) "\0"
/* ppc_82xx is the equivalent to ppc_6xx, the generic ppc toolchain */ -#ifndef CONFIG_KM_DEF_ARCH -#define CONFIG_KM_DEF_ARCH "arch=ppc_82xx\0" +#ifndef CFG_KM_DEF_ARCH +#define CFG_KM_DEF_ARCH "arch=ppc_82xx\0" #endif
#define CFG_EXTRA_ENV_SETTINGS \ CONFIG_KM_DEF_ENV \ - CONFIG_KM_DEF_ARCH \ + CFG_KM_DEF_ARCH \ CONFIG_KM_NEW_ENV \ CFG_HW_ENV_SETTINGS \ "EEprom_ivm=pca9547:70:9\0" \ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index d2683e317bd6..12edc317773f 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -70,7 +70,7 @@ CFG_IRAM_BASE CFG_IRAM_END CFG_IRAM_SIZE CFG_IRAM_TOP -CONFIG_KM_DEF_ARCH +CFG_KM_DEF_ARCH CONFIG_KM_DEF_BOOT_ARGS_CPU CONFIG_KM_DEF_ENV CONFIG_KM_DEF_ENV_BOOTARGS