diff mbox

[U-Boot,09/11] powerpc: mpc86xx: Move CONFIG_FSL_LAW to Kconfig

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

Commit Message

York Sun Dec. 2, 2016, 9:37 p.m. UTC 
Clean up existing definitions and drop from white list.

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

 arch/powerpc/cpu/mpc86xx/Kconfig | 7 +++++++
 include/configs/MPC8610HPCD.h    | 1 -
 include/configs/MPC8641HPCN.h    | 1 -
 include/configs/sbc8641d.h       | 1 -
 include/configs/xpedite517x.h    | 1 -
 scripts/config_whitelist.txt     | 1 -
 6 files changed, 7 insertions(+), 5 deletions(-)
diff mbox

Patch

diff --git a/arch/powerpc/cpu/mpc86xx/Kconfig b/arch/powerpc/cpu/mpc86xx/Kconfig
index 57e7476..42b2ed2 100644
--- a/arch/powerpc/cpu/mpc86xx/Kconfig
+++ b/arch/powerpc/cpu/mpc86xx/Kconfig
@@ -28,9 +28,16 @@  endchoice
 
 config ARCH_MPC8610
 	bool
+	select FSL_LAW
 
 config ARCH_MPC8641
 	bool
+	select FSL_LAW
+
+config FSL_LAW
+	bool
+	help
+		Use Freescale common code for Local Access Window
 
 config SYS_CCSRBAR_DEFAULT
 	hex "Default CCSRBAR address"
diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h
index 4cf9bd6..761032e 100644
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@@ -42,7 +42,6 @@ 
 #define CONFIG_FSL_PCI_INIT	1	/* Use common FSL init code */
 #define CONFIG_PCI_INDIRECT_BRIDGE 1	/* indirect PCI bridge support */
 #define CONFIG_SYS_PCI_64BIT	1	/* enable 64-bit PCI resources */
-#define CONFIG_FSL_LAW		1	/* Use common FSL init code */
 
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_INTERRUPTS		/* enable pci, srio, ddr interrupts */
diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h
index 06ef0d9..8845ea9 100644
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -44,7 +44,6 @@ 
 #define CONFIG_PCIE2		1	/* PCIE controller 2 (slot) */
 #define CONFIG_FSL_PCI_INIT	1	/* Use common FSL init code */
 #define CONFIG_SYS_PCI_64BIT	1	/* enable 64-bit PCI resources */
-#define CONFIG_FSL_LAW		1	/* Use common FSL law init code */
 
 #define CONFIG_TSEC_ENET		/* tsec ethernet support */
 #define CONFIG_ENV_OVERWRITE
diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h
index 7c8ceb3..87056db 100644
--- a/include/configs/sbc8641d.h
+++ b/include/configs/sbc8641d.h
@@ -46,7 +46,6 @@ 
 #define CONFIG_PCIE2		1	/* PCIE controller 2 (slot 2) */
 #define CONFIG_FSL_PCI_INIT	1	/* Use common FSL init code */
 #define CONFIG_PCI_INDIRECT_BRIDGE 1	/* indirect PCI bridge support */
-#define CONFIG_FSL_LAW		1	/* Use common FSL init code */
 
 #define CONFIG_TSEC_ENET		/* tsec ethernet support */
 #define CONFIG_ENV_OVERWRITE
diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h
index 86bc1cf..df36ad7 100644
--- a/include/configs/xpedite517x.h
+++ b/include/configs/xpedite517x.h
@@ -31,7 +31,6 @@ 
 #define CONFIG_FSL_PCI_INIT	1	/* Use common FSL init code */
 #define CONFIG_PCI_INDIRECT_BRIDGE 1	/* indirect PCI bridge support */
 #define CONFIG_SYS_PCI_64BIT	1	/* enable 64-bit PCI resources */
-#define CONFIG_FSL_LAW		1	/* Use common FSL init code */
 
 /*
  * DDR config
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 4d5403d..e123f74 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1276,7 +1276,6 @@  CONFIG_FSL_I2C_CUSTOM_FDR
 CONFIG_FSL_IFC
 CONFIG_FSL_IIM
 CONFIG_FSL_ISBC_KEY_EXT
-CONFIG_FSL_LAW
 CONFIG_FSL_LAYERSCAPE
 CONFIG_FSL_LBC
 CONFIG_FSL_LINFLEXUART