Signed-off-by: Tom Rini trini@konsulko.com --- arch/powerpc/cpu/mpc85xx/cpu_init.c | 4 ++-- arch/powerpc/cpu/mpc85xx/release.S | 6 +++--- arch/powerpc/include/asm/config_mpc85xx.h | 2 +- scripts/config_whitelist.txt | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c index 562d7074ed75..e5e00c5eade9 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c @@ -659,7 +659,7 @@ int cpu_init_r(void) #ifdef CFG_SYS_LBC_LCRR fsl_lbc_t *lbc = (void __iomem *)LBC_BASE_ADDR; #endif -#if defined(CONFIG_PPC_SPINTABLE_COMPATIBLE) && defined(CONFIG_MP) +#if defined(CFG_PPC_SPINTABLE_COMPATIBLE) && defined(CONFIG_MP) extern int spin_table_compat; const char *spin; #endif @@ -725,7 +725,7 @@ int cpu_init_r(void) mtspr(SPRN_HDBCR0, (mfspr(SPRN_HDBCR0) | 0x80000000)); #endif
-#if defined(CONFIG_PPC_SPINTABLE_COMPATIBLE) && defined(CONFIG_MP) +#if defined(CFG_PPC_SPINTABLE_COMPATIBLE) && defined(CONFIG_MP) spin = env_get("spin_table_compat"); if (spin && (*spin == 'n')) spin_table_compat = 0; diff --git a/arch/powerpc/cpu/mpc85xx/release.S b/arch/powerpc/cpu/mpc85xx/release.S index 391751ce1e71..57cc4fda816c 100644 --- a/arch/powerpc/cpu/mpc85xx/release.S +++ b/arch/powerpc/cpu/mpc85xx/release.S @@ -356,7 +356,7 @@ __secondary_reset_vector: .align L1_CACHE_SHIFT .global __second_half_boot_page __second_half_boot_page: -#ifdef CONFIG_PPC_SPINTABLE_COMPATIBLE +#ifdef CFG_PPC_SPINTABLE_COMPATIBLE lis r3,(spin_table_compat - __second_half_boot_page)@h ori r3,r3,(spin_table_compat - __second_half_boot_page)@l add r3,r3,r11 /* r11 has the address of __second_half_boot_page */ @@ -404,7 +404,7 @@ __second_half_boot_page: * "spin_table_compat=no". After Linux is fixed, we can remove this macro * and related code. For now, it is enabled by default. */ -#ifdef CONFIG_PPC_SPINTABLE_COMPATIBLE +#ifdef CFG_PPC_SPINTABLE_COMPATIBLE cmpwi r14,0 beq 4f dcbf 0, r10 @@ -486,7 +486,7 @@ __second_half_boot_page: __spin_table: .space CONFIG_MAX_CPUS*ENTRY_SIZE
-#ifdef CONFIG_PPC_SPINTABLE_COMPATIBLE +#ifdef CFG_PPC_SPINTABLE_COMPATIBLE .align L1_CACHE_SHIFT .global spin_table_compat spin_table_compat: diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h index 4c19c50bda04..5491a1af2813 100644 --- a/arch/powerpc/include/asm/config_mpc85xx.h +++ b/arch/powerpc/include/asm/config_mpc85xx.h @@ -12,7 +12,7 @@ * This macro should be removed when we no longer care about backwards * compatibility with older operating systems. */ -#define CONFIG_PPC_SPINTABLE_COMPATIBLE +#define CFG_PPC_SPINTABLE_COMPATIBLE
#include <fsl_ddrc_version.h>
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 6b824bb14f39..0e792dfbec9c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -165,7 +165,7 @@ CFG_POSTBOOTMENU CFG_POWER_LTC3676_I2C_ADDR CFG_POWER_PFUZE100_I2C_ADDR CFG_POWER_PFUZE3000_I2C_ADDR -CONFIG_PPC_SPINTABLE_COMPATIBLE +CFG_PPC_SPINTABLE_COMPATIBLE CONFIG_PRAM CONFIG_PSRAM_SCFG CONFIG_QBMAN_CLK_DIV