Signed-off-by: Tom Rini trini@konsulko.com --- arch/powerpc/include/asm/config_mpc85xx.h | 8 ++++---- include/fsl_esdhc.h | 2 +- include/fsl_esdhc_imx.h | 2 +- scripts/config_whitelist.txt | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h index 410ae34e9504..d6b2b9b469a3 100644 --- a/arch/powerpc/include/asm/config_mpc85xx.h +++ b/arch/powerpc/include/asm/config_mpc85xx.h @@ -23,7 +23,7 @@ #define CFG_SYS_FSL_SRIO_MSG_UNIT_NUM 2
#elif defined(CONFIG_ARCH_P1010) -#define CONFIG_FSL_SDHC_V2_3 +#define CFG_FSL_SDHC_V2_3 #define CONFIG_TSECV2 #define CONFIG_SYS_FSL_IFC_BANK_COUNT 4
@@ -107,12 +107,12 @@ #define CFG_SYS_FSL_CORENET_SNOOPVEC_COREONLY 0xf0000000
#elif defined(CONFIG_ARCH_BSC9131) -#define CONFIG_FSL_SDHC_V2_3 +#define CFG_FSL_SDHC_V2_3 #define CONFIG_TSECV2 #define CONFIG_SYS_FSL_IFC_BANK_COUNT 3
#elif defined(CONFIG_ARCH_BSC9132) -#define CONFIG_FSL_SDHC_V2_3 +#define CFG_FSL_SDHC_V2_3 #define CONFIG_TSECV2 #define CONFIG_SYS_FSL_IFC_BANK_COUNT 3
@@ -220,7 +220,7 @@
#elif defined(CONFIG_ARCH_C29X) -#define CONFIG_FSL_SDHC_V2_3 +#define CFG_FSL_SDHC_V2_3 #define CONFIG_TSECV2_1 #define CONFIG_SYS_FSL_IFC_BANK_COUNT 8 #define CFG_SYS_FSL_SEC_IDX_OFFSET 0x20000 diff --git a/include/fsl_esdhc.h b/include/fsl_esdhc.h index 7ab1460abc6e..b2c238461a1b 100644 --- a/include/fsl_esdhc.h +++ b/include/fsl_esdhc.h @@ -140,7 +140,7 @@
#define WML 0x2e044 #define WML_WRITE 0x00010000 -#ifdef CONFIG_FSL_SDHC_V2_3 +#ifdef CFG_FSL_SDHC_V2_3 #define WML_RD_WML_MAX 0x80 #define WML_WR_WML_MAX 0x80 #define WML_RD_WML_MAX_VAL 0x0 diff --git a/include/fsl_esdhc_imx.h b/include/fsl_esdhc_imx.h index b8efd2a1664c..dc789c0ba653 100644 --- a/include/fsl_esdhc_imx.h +++ b/include/fsl_esdhc_imx.h @@ -143,7 +143,7 @@
#define WML 0x2e044 #define WML_WRITE 0x00010000 -#ifdef CONFIG_FSL_SDHC_V2_3 +#ifdef CFG_FSL_SDHC_V2_3 #define WML_RD_WML_MAX 0x80 #define WML_WR_WML_MAX 0x80 #define WML_RD_WML_MAX_VAL 0x0 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 8ba453991703..1093721dca5c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -44,7 +44,7 @@ CFG_FSL_PMIC_BUS CFG_FSL_PMIC_CLK CFG_FSL_PMIC_CS CFG_FSL_PMIC_MODE -CONFIG_FSL_SDHC_V2_3 +CFG_FSL_SDHC_V2_3 CONFIG_FSL_SERDES1 CONFIG_FSL_SERDES2 CONFIG_GATEWAYIP