diff mbox series

[v2,05/15] Convert CONFIG_A008044_WORKAROUND to Kconfig

Message ID 20220311141210.2810346-5-trini@konsulko.com
State Accepted
Commit 5f7c886c8218a5dc8ac63fff93ec937a6ed5b200
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:12 p.m. UTC 
This converts the following to Kconfig:
   CONFIG_A008044_WORKAROUND

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

Comments

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

> This converts the following to Kconfig:
>    CONFIG_A008044_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 95da83b76414..a8e099485f3d 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_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
-
 		CONFIG_SYS_FSL_CORENET_SNOOPVEC_COREONLY
 
 		This is the value to write into CCSR offset 0x18600
diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig
index 0e0b9235ad0e..b06416a90e83 100644
--- a/arch/powerpc/cpu/mpc85xx/Kconfig
+++ b/arch/powerpc/cpu/mpc85xx/Kconfig
@@ -885,6 +885,12 @@  config A003399_NOR_WORKAROUND
 	  Enables a workaround for IFC erratum A003399. It is only required
 	  during NOR boot.
 
+config A008044_WORKAROUND
+	bool
+	help
+	  Enables a workaround for T1040/T1042 erratum A008044. It is only
+	  required during NAND boot and valid for Rev 1.0 SoC revision
+
 config SYS_FSL_ERRATUM_A004468
 	bool
 
@@ -967,6 +973,7 @@  config SYS_FSL_ERRATUM_A007907
 
 config SYS_FSL_ERRATUM_A008044
 	bool
+	select A008044_WORKAROUND if MTD_RAW_NAND
 
 config SYS_FSL_ERRATUM_CPC_A002
 	bool
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index 8a71807679ee..d66ad8c481cb 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -310,12 +310,6 @@ 
 #define CONFIG_SYS_RAMBOOT
 #endif
 
-#ifdef CONFIG_SYS_FSL_ERRATUM_A008044
-#if defined(CONFIG_MTD_RAW_NAND)
-#define CONFIG_A008044_WORKAROUND
-#endif
-#endif
-
 #define CONFIG_HWCONFIG
 
 /* define to use L1 as initial stack */