diff mbox series

[v2,04/15] Convert CONFIG_A003399_NOR_WORKAROUND to Kconfig

Message ID 20220311141210.2810346-4-trini@konsulko.com
State Accepted
Commit fdd0da4ca432f227cfa19c9c1e6daf31910b6261
Delegated to: Tom Rini
Headers show
Series [v2,01/15] Convert CONFIG_ARMV7_SECURE_BASE et al to Kconfig | expand

Commit Message

Tom Rini March 11, 2022, 2:11 p.m. UTC 
This converts the following to Kconfig:
   CONFIG_A003399_NOR_WORKAROUND

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 README                           | 4 ----
 arch/powerpc/cpu/mpc85xx/Kconfig | 7 +++++++
 include/configs/P1010RDB.h       | 6 ------
 3 files changed, 7 insertions(+), 10 deletions(-)

Comments

Tom Rini March 19, 2022, 1:26 a.m. UTC | #1 
On Fri, Mar 11, 2022 at 09:11:59AM -0500, Tom Rini wrote:

> This converts the following to Kconfig:
>    CONFIG_A003399_NOR_WORKAROUND
> 
> Signed-off-by: Tom Rini <trini@konsulko.com>

Applied to u-boot/next, thanks!
diff mbox series

Patch

diff --git a/README b/README
index 6bb8d6e25bdc..95da83b76414 100644
--- a/README
+++ b/README
@@ -374,10 +374,6 @@  The following options need to be configured:
 		See Freescale App Note 4493 for more information about
 		this erratum.
 
-		CONFIG_A003399_NOR_WORKAROUND
-		Enables a workaround for IFC erratum A003399. It is only
-		required during NOR boot.
-
 		CONFIG_A008044_WORKAROUND
 		Enables a workaround for T1040/T1042 erratum A008044. It is only
 		required during NAND boot and valid for Rev 1.0 SoC revision
diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig
index a978eea1617a..0e0b9235ad0e 100644
--- a/arch/powerpc/cpu/mpc85xx/Kconfig
+++ b/arch/powerpc/cpu/mpc85xx/Kconfig
@@ -354,6 +354,7 @@  config ARCH_MPC8560
 
 config ARCH_P1010
 	bool
+	select A003399_NOR_WORKAROUND if SYS_FSL_ERRATUM_IFC_A003399 && !SPL
 	select BTB
 	select FSL_LAW
 	select SYS_CACHE_SHIFT_5
@@ -878,6 +879,12 @@  config SYS_CCSRBAR_DEFAULT
 		if changed by pre-boot regime. The value here must match
 		the current value in SoC. If not sure, do not change.
 
+config A003399_NOR_WORKAROUND
+	bool
+	help
+	  Enables a workaround for IFC erratum A003399. It is only required
+	  during NOR boot.
+
 config SYS_FSL_ERRATUM_A004468
 	bool
 
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index 5f36951932d4..8fd9eb7bfa64 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -411,12 +411,6 @@  extern unsigned long get_sdram_size(void);
 #undef CONFIG_SYS_RAMBOOT
 #endif
 
-#ifdef CONFIG_SYS_FSL_ERRATUM_IFC_A003399
-#if !defined(CONFIG_SPL) && !defined(CONFIG_SYS_RAMBOOT)
-#define CONFIG_A003399_NOR_WORKAROUND
-#endif
-#endif
-
 #define CONFIG_SYS_INIT_RAM_LOCK
 #define CONFIG_SYS_INIT_RAM_ADDR	0xffd00000 /* stack in RAM */
 #define CONFIG_SYS_INIT_RAM_SIZE	0x00004000 /* End of used area in RAM */