powerpc: mpc86xx: Convert CONFIG_SYS_FSL_NUM_LAWS to Kconfig option

Use Kconfig instead of defining this macro in header file.

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

diff --git a/arch/powerpc/cpu/mpc86xx/Kconfig b/arch/powerpc/cpu/mpc86xx/Kconfig
index 42b2ed266655b6366672cf5f91b2f7fb0614835e..11afffa83033e39412787a367e90befd13aa1391 100644 (file)
--- a/arch/powerpc/cpu/mpc86xx/Kconfig
+++ b/arch/powerpc/cpu/mpc86xx/Kconfig
@@ -47,6 +47,12 @@ config SYS_CCSRBAR_DEFAULT
                is fixed on each SoC. Some SoCs can have different value
                if changed by pre-boot regime. The value here must match
                the current value in SoC. If not sure, do not change.
                is fixed on each SoC. Some SoCs can have different value
                if changed by pre-boot regime. The value here must match
                the current value in SoC. If not sure, do not change.

+config SYS_FSL_NUM_LAWS
+       int "Number of local access windows"
+       default 10 if ARCH_MPC8610 || ARCH_MPC8641
+       help
+               Number of local access windows. This is fixed per SoC.
+               If not sure, do not change.

 
 source "board/freescale/mpc8610hpcd/Kconfig"
 source "board/freescale/mpc8641hpcn/Kconfig"
 
 source "board/freescale/mpc8610hpcd/Kconfig"
 source "board/freescale/mpc8641hpcn/Kconfig"

diff --git a/arch/powerpc/include/asm/config_mpc86xx.h b/arch/powerpc/include/asm/config_mpc86xx.h
index c41dc99681c3abbe57e87605f08df843d3335568..f053b9cf5ea7aa954e74f062510e4278f7069379 100644 (file)
--- a/arch/powerpc/include/asm/config_mpc86xx.h
+++ b/arch/powerpc/include/asm/config_mpc86xx.h
@@ -9,16 +9,4 @@
 
 #define CONFIG_SYS_FSL_DDR_86XX
 
 
 #define CONFIG_SYS_FSL_DDR_86XX
 

-/* SoC specific defines for Freescale MPC86xx processors */
-
-#if defined(CONFIG_ARCH_MPC8610)
-#define CONFIG_SYS_FSL_NUM_LAWS                10
-
-#elif defined(CONFIG_ARCH_MPC8641)
-#define CONFIG_SYS_FSL_NUM_LAWS                10
-
-#else
-#error Processor type not defined for this platform
-#endif
-

 #endif /* _ASM_MPC85xx_CONFIG_H_ */
 #endif /* _ASM_MPC85xx_CONFIG_H_ */

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index e123f7429f08ebe55770ccfe0655d08c4d6cebf2..8e4567982a57e1e518543681014b727c59fa1a92 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -5514,7 +5514,6 @@ CONFIG_SYS_FSL_NI_SIZE
 CONFIG_SYS_FSL_NO_SERDES
 CONFIG_SYS_FSL_NUM_CC_PLL
 CONFIG_SYS_FSL_NUM_CC_PLLS
 CONFIG_SYS_FSL_NO_SERDES
 CONFIG_SYS_FSL_NUM_CC_PLL
 CONFIG_SYS_FSL_NUM_CC_PLLS

-CONFIG_SYS_FSL_NUM_LAWS

 CONFIG_SYS_FSL_OCRAM_BASE
 CONFIG_SYS_FSL_OCRAM_SIZE
 CONFIG_SYS_FSL_OTHER_DDR_NUM_CTRLS
 CONFIG_SYS_FSL_OCRAM_BASE
 CONFIG_SYS_FSL_OCRAM_SIZE
 CONFIG_SYS_FSL_OTHER_DDR_NUM_CTRLS