From fdd0da4ca432f227cfa19c9c1e6daf31910b6261 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Fri, 11 Mar 2022 09:11:59 -0500 Subject: [PATCH] Convert CONFIG_A003399_NOR_WORKAROUND to Kconfig This converts the following to Kconfig: CONFIG_A003399_NOR_WORKAROUND Signed-off-by: Tom Rini --- README | 4 ---- arch/powerpc/cpu/mpc85xx/Kconfig | 7 +++++++ include/configs/P1010RDB.h | 6 ------ 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/README b/README index b2a61c6696..2f3b2889b3 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 a978eea161..0e0b9235ad 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 5f36951932..8fd9eb7bfa 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 */ -- 2.39.5