diff mbox

[U-Boot,04/11] script: remove CONFIG_SYS_CCSRBAR_DEFAULT from white list

Message ID 1480714672-21632-5-git-send-email-york.sun@nxp.com
State Accepted
Commit 86d8000f105c7a2d0846dbf60831bcfa0967d079
Delegated to: York Sun
Headers show

Commit Message

York Sun Dec. 2, 2016, 9:37 p.m. UTC 
Now all mpc85xx and mpc86xx have converted to use SYS_CCSRBAR_DEFAULT
in Kconfig. Drop this macro for LSCH2 and remove from white list.

Signed-off-by: York Sun <york.sun@nxp.com>
---

 arch/arm/include/asm/arch-fsl-layerscape/config.h      | 1 -
 arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h | 4 ++--
 scripts/config_whitelist.txt                           | 1 -
 3 files changed, 2 insertions(+), 4 deletions(-)
diff mbox

Patch

diff --git a/arch/arm/include/asm/arch-fsl-layerscape/config.h b/arch/arm/include/asm/arch-fsl-layerscape/config.h
index 6c3ba49..c50894a 100644
--- a/arch/arm/include/asm/arch-fsl-layerscape/config.h
+++ b/arch/arm/include/asm/arch-fsl-layerscape/config.h
@@ -138,7 +138,6 @@ 
 #define CONFIG_SYS_FSL_SEC_COMPAT		5
 #define CONFIG_SYS_FSL_OCRAM_BASE		0x10000000 /* initial RAM */
 #define CONFIG_SYS_FSL_OCRAM_SIZE		0x00200000 /* 2M */
-#define CONFIG_SYS_CCSRBAR_DEFAULT		0x01000000
 
 #define CONFIG_SYS_FSL_CCSR_SCFG_BE
 #define CONFIG_SYS_FSL_ESDHC_BE
diff --git a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h
index d88543d..d684a07 100644
--- a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h
+++ b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h
@@ -120,7 +120,7 @@  CONFIG_SYS_CCSRBAR_PHYS_LOW and/or CONFIG_SYS_CCSRBAR_PHYS_HIGH instead."
 #endif
 
 #ifndef CONFIG_SYS_CCSRBAR
-#define CONFIG_SYS_CCSRBAR		CONFIG_SYS_CCSRBAR_DEFAULT
+#define CONFIG_SYS_CCSRBAR		0x01000000
 #endif
 
 #ifndef CONFIG_SYS_CCSRBAR_PHYS_HIGH
@@ -128,7 +128,7 @@  CONFIG_SYS_CCSRBAR_PHYS_LOW and/or CONFIG_SYS_CCSRBAR_PHYS_HIGH instead."
 #endif
 
 #ifndef CONFIG_SYS_CCSRBAR_PHYS_LOW
-#define CONFIG_SYS_CCSRBAR_PHYS_LOW	CONFIG_SYS_CCSRBAR_DEFAULT
+#define CONFIG_SYS_CCSRBAR_PHYS_LOW	0x01000000
 #endif
 
 #define CONFIG_SYS_CCSRBAR_PHYS ((CONFIG_SYS_CCSRBAR_PHYS_HIGH * 1ull) << 32 | \
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index b3ed48b..4d5403d 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -4482,7 +4482,6 @@  CONFIG_SYS_CBSIZE
 CONFIG_SYS_CCCR
 CONFIG_SYS_CCI400_ADDR
 CONFIG_SYS_CCSRBAR
-CONFIG_SYS_CCSRBAR_DEFAULT
 CONFIG_SYS_CCSRBAR_PHYS
 CONFIG_SYS_CCSRBAR_PHYS_HIGH
 CONFIG_SYS_CCSRBAR_PHYS_LOW