Perform a simple rename of CONFIG_KM_DEF_ARCH to CFG_KM_DEF_ARCH
Signed-off-by: Tom Rini trini@konsulko.com --- include/configs/km/km-mpc83xx.h | 6 +++--- include/configs/kmcent2.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/configs/km/km-mpc83xx.h b/include/configs/km/km-mpc83xx.h index 9edc5fb2e413..8f2a5a200562 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 18304575f403..c10a3366b0c9 100644 --- a/include/configs/kmcent2.h +++ b/include/configs/kmcent2.h @@ -435,13 +435,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" \