All of lore.kernel.org
 help / color / mirror / Atom feed
From: York Sun <york.sun@nxp.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 02/24] powerpc: mpc85xx: Move CONFIG_SYS_NUM_TLBCAMS to Kconfig
Date: Wed, 28 Dec 2016 08:43:28 -0800	[thread overview]
Message-ID: <1482943430-10231-3-git-send-email-york.sun@nxp.com> (raw)
In-Reply-To: <1482943430-10231-1-git-send-email-york.sun@nxp.com>

Use Kconfig option for SYS_NUM_TLBCAMS and clean up existing macros.

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

 arch/powerpc/cpu/mpc85xx/Kconfig          | 8 ++++++++
 arch/powerpc/include/asm/config_mpc85xx.h | 7 -------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig
index 6d8709e..2b1d0f6 100644
--- a/arch/powerpc/cpu/mpc85xx/Kconfig
+++ b/arch/powerpc/cpu/mpc85xx/Kconfig
@@ -647,6 +647,14 @@ config SYS_FSL_NUM_LAWS
 		Number of local access windows. This is fixed per SoC.
 		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/bsc9131rdb/Kconfig"
 source "board/freescale/bsc9132qds/Kconfig"
diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h
index 8cfc612..5761218 100644
--- a/arch/powerpc/include/asm/config_mpc85xx.h
+++ b/arch/powerpc/include/asm/config_mpc85xx.h
@@ -24,13 +24,6 @@
 #define CONFIG_SYS_FSL_SFP_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)
 #define CONFIG_SYS_PPC_E500_DEBUG_TLB	1
 #define CONFIG_SYS_FSL_SEC_COMPAT	2
-- 
2.7.4

  parent reply	other threads:[~2016-12-28 16:43 UTC|newest]

Thread overview: 52+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-12-28 16:43 [U-Boot] [PATCH 00/24] Lift mpc85xx config options to Kconfig York Sun
2016-12-28 16:43 ` [U-Boot] [PATCH 01/24] powerpc: E500: Move CONFIG_E500 and CONFIG_E500MC " York Sun
2017-01-05 13:28   ` [U-Boot] [U-Boot, " Tom Rini
2016-12-28 16:43 ` York Sun [this message]
2017-01-05 13:28   ` [U-Boot] [U-Boot, 02/24] powerpc: mpc85xx: Move CONFIG_SYS_NUM_TLBCAMS " Tom Rini
2016-12-28 16:43 ` [U-Boot] [PATCH 03/24] powerpc: mpc85xx: Move CONFIG_SYS_PPC_E500_DEBUG_TLB " York Sun
2017-01-05 13:28   ` [U-Boot] [U-Boot, " Tom Rini
2016-12-28 16:43 ` [U-Boot] [PATCH 04/24] crypto: Move SYS_FSL_SEC_COMPAT into driver Kconfig York Sun
2017-01-05 13:28   ` [U-Boot] [U-Boot, " Tom Rini
2016-12-28 16:43 ` [U-Boot] [PATCH 05/24] crypto: Move CONFIG_SYS_FSL_SEC_LE and _BE to Kconfig York Sun
2017-01-05 13:28   ` [U-Boot] [U-Boot, " Tom Rini
2016-12-28 16:43 ` [U-Boot] [PATCH 06/24] powerpc: mpc85xx: Remove variant SoCs T1020/T1022/T1013/T1014 York Sun
2017-01-05 13:28   ` [U-Boot] [U-Boot, " Tom Rini
2016-12-28 16:43 ` [U-Boot] [PATCH 07/24] powerpc: T1023RDB: Remove macro CONFIG_T1023RDB York Sun
2017-01-05 13:28   ` [U-Boot] [U-Boot, " Tom Rini
2016-12-28 16:43 ` [U-Boot] [PATCH 08/24] powerpc: T1024RDB: Remove macro CONFIG_T1024RDB York Sun
2017-01-05 13:29   ` [U-Boot] [U-Boot, " Tom Rini
2016-12-28 16:43 ` [U-Boot] [PATCH 09/24] powerpc: T1040QDS: Remove macro CONFIG_T1040QDS York Sun
2017-01-05 13:29   ` [U-Boot] [U-Boot, " Tom Rini
2016-12-28 16:43 ` [U-Boot] [PATCH 10/24] powerpc: T2080QDS: Remove macro T2080QDS York Sun
2017-01-05 13:29   ` [U-Boot] [U-Boot, " Tom Rini
2016-12-28 16:43 ` [U-Boot] [PATCH 11/24] powerpc: T2080RDB: Remove macro CONFIG_T2080RDB York Sun
2017-01-05 13:29   ` [U-Boot] [U-Boot, " Tom Rini
2016-12-28 16:43 ` [U-Boot] [PATCH 12/24] powerpc: T2081QDS: Remove macro T2081QDS York Sun
2017-01-05 13:29   ` [U-Boot] [U-Boot, " Tom Rini
2016-12-28 16:43 ` [U-Boot] [PATCH 13/24] powerpc: T104xQDS: Remove macro CONFIG_T104xD4QDS York Sun
2017-01-05 13:29   ` [U-Boot] [U-Boot, " Tom Rini
2016-12-28 16:43 ` [U-Boot] [PATCH 14/24] fsl_ddr: Move DDR config options to driver Kconfig York Sun
2017-01-05 13:29   ` [U-Boot] [U-Boot, " Tom Rini
2016-12-28 16:43 ` [U-Boot] [PATCH 15/24] arm: layerscape: Move CONFIG_SYS_FSL_ERRATUM_* to Kconfig York Sun
2017-01-05 13:29   ` [U-Boot] [U-Boot, " Tom Rini
2016-12-28 16:43 ` [U-Boot] [PATCH 16/24] mmc: move CONFIG_SYS_FSL_ERRATUM_ESDHC* " York Sun
2017-01-05 13:29   ` [U-Boot] [U-Boot, " Tom Rini
2016-12-28 16:43 ` [U-Boot] [PATCH 17/24] powerpc: mpc85xx: Move CONFIG_SYS_FSL_ERRATUM_* " York Sun
2017-01-05 13:29   ` [U-Boot] [U-Boot, " Tom Rini
2016-12-28 16:43 ` [U-Boot] [PATCH 18/24] ddr: fsl: Move macro CONFIG_NUM_DDR_CONTROLLERS " York Sun
2017-01-05 13:29   ` [U-Boot] [U-Boot, " Tom Rini
2016-12-28 16:43 ` [U-Boot] [PATCH 19/24] ddr: fsl: Merge macro CONFIG_NUM_DDR_CONTROLLERS and CONFIG_SYS_NUM_DDR_CTRLS York Sun
2017-01-05 13:29   ` [U-Boot] [U-Boot, " Tom Rini
2016-12-28 16:43 ` [U-Boot] [PATCH 20/24] ddr: fsl: Move CONFIG_SYS_FSL_DDR_VER to Kconfig York Sun
2017-01-05 13:29   ` [U-Boot] [U-Boot, " Tom Rini
2016-12-28 16:43 ` [U-Boot] [PATCH 21/24] powerpc: mpc85xx: Remove unused ifdef in config header York Sun
2017-01-05 13:30   ` [U-Boot] [U-Boot, " Tom Rini
2016-12-28 16:43 ` [U-Boot] [PATCH 22/24] powerpc: E6500: Move macro CONFIG_E6500 to Kconfig York Sun
2017-01-05 13:30   ` [U-Boot] [U-Boot, " Tom Rini
2016-12-28 16:43 ` [U-Boot] [PATCH 23/24] powerpc: mpc85xx: Move CONFIG_SYS_FSL_QORIQ_CHASSIS* " York Sun
2017-01-05 13:30   ` [U-Boot] [U-Boot, " Tom Rini
2016-12-28 16:43 ` [U-Boot] [PATCH 24/24] powerpc: mpc85xx: Move macro CONFIG_SYS_PPC64 " York Sun
2017-01-05 13:30   ` [U-Boot] [U-Boot, " Tom Rini
2017-01-05 13:28 ` [U-Boot] [PATCH 00/24] Lift mpc85xx config options " Tom Rini
2017-01-05 16:28   ` york sun
2017-01-05 17:34   ` york sun

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1482943430-10231-3-git-send-email-york.sun@nxp.com \
    --to=york.sun@nxp.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.