Signed-off-by: Tom Rini trini@konsulko.com --- arch/powerpc/cpu/mpc85xx/speed.c | 6 +++--- arch/powerpc/include/asm/config_mpc85xx.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/powerpc/cpu/mpc85xx/speed.c b/arch/powerpc/cpu/mpc85xx/speed.c index c2e3e00f7ba8..9af40310b46f 100644 --- a/arch/powerpc/cpu/mpc85xx/speed.c +++ b/arch/powerpc/cpu/mpc85xx/speed.c @@ -249,10 +249,10 @@ void get_sys_info(sys_info_t *sys_info) #endif
#ifdef CONFIG_SYS_DPAA_QBMAN -#ifndef CONFIG_QBMAN_CLK_DIV -#define CONFIG_QBMAN_CLK_DIV 2 +#ifndef CFG_QBMAN_CLK_DIV +#define CFG_QBMAN_CLK_DIV 2 #endif - sys_info->freq_qman = sys_info->freq_systembus / CONFIG_QBMAN_CLK_DIV; + sys_info->freq_qman = sys_info->freq_systembus / CFG_QBMAN_CLK_DIV; #endif
#if defined(CONFIG_SYS_MAPLE) diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h index 5491a1af2813..0a67c76b61d6 100644 --- a/arch/powerpc/include/asm/config_mpc85xx.h +++ b/arch/powerpc/include/asm/config_mpc85xx.h @@ -192,7 +192,7 @@ #define CFG_FSL_FM_10GEC_REGULAR_NOTATION #define CONFIG_SYS_FSL_IFC_BANK_COUNT 8 #define CFG_SYS_FM1_CLK 0 -#define CONFIG_QBMAN_CLK_DIV 1 +#define CFG_QBMAN_CLK_DIV 1 #define CFG_SYS_FM_MURAM_SIZE 0x30000 #define ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE #define QE_MURAM_SIZE 0x6000UL diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 3ee3720b8876..2a06cc5d3041 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -168,7 +168,7 @@ CFG_POWER_PFUZE3000_I2C_ADDR CFG_PPC_SPINTABLE_COMPATIBLE CFG_PRAM CFG_PSRAM_SCFG -CONFIG_QBMAN_CLK_DIV +CFG_QBMAN_CLK_DIV CONFIG_RAMBOOT_SPIFLASH CONFIG_RAMBOOT_TEXT_BASE CONFIG_RAMDISK_ADDR