powerpc: mpc85xx: Move CONFIG_SYS_NUM_TLBCAMS to Kconfig

Use Kconfig option for SYS_NUM_TLBCAMS and clean up existing macros.

Signed-off-by: York Sun <york.sun@nxp.com>
This commit is contained in:
York Sun 2016-12-28 08:43:28 -08:00 committed by Tom Rini
parent f8dee36034
commit 26e79b6547
2 changed files with 8 additions and 7 deletions

View file

@ -647,6 +647,14 @@ config SYS_FSL_NUM_LAWS
Number of local access windows. This is fixed per SoC. Number of local access windows. This is fixed per SoC.
If not sure, do not change. If not sure, do not change.
config SYS_NUM_TLBCAMS
int "Number of TLB CAM entries"
default 64 if E500MC
default 16
help
Number of TLB CAM entries for Book-E chips. 64 for E500MC,
16 for other E500 SoCs.
source "board/freescale/b4860qds/Kconfig" source "board/freescale/b4860qds/Kconfig"
source "board/freescale/bsc9131rdb/Kconfig" source "board/freescale/bsc9131rdb/Kconfig"
source "board/freescale/bsc9132qds/Kconfig" source "board/freescale/bsc9132qds/Kconfig"

View file

@ -24,13 +24,6 @@
#define CONFIG_SYS_FSL_SFP_BE #define CONFIG_SYS_FSL_SFP_BE
#define CONFIG_SYS_FSL_SEC_MON_BE #define CONFIG_SYS_FSL_SEC_MON_BE
/* Number of TLB CAM entries we have on FSL Book-E chips */
#if defined(CONFIG_E500MC)
#define CONFIG_SYS_NUM_TLBCAMS 64
#elif defined(CONFIG_E500)
#define CONFIG_SYS_NUM_TLBCAMS 16
#endif
#if defined(CONFIG_ARCH_MPC8536) #if defined(CONFIG_ARCH_MPC8536)
#define CONFIG_SYS_PPC_E500_DEBUG_TLB 1 #define CONFIG_SYS_PPC_E500_DEBUG_TLB 1
#define CONFIG_SYS_FSL_SEC_COMPAT 2 #define CONFIG_SYS_FSL_SEC_COMPAT 2