From 53f06134ed24f4a49453e4f57e2f9c789dc27118 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Wed, 22 Sep 2021 14:50:37 -0400 Subject: Convert CONFIG_NAND_FSL_ELBC et al to Kconfig This converts the following to Kconfig: CONFIG_NAND_FSL_ELBC CONFIG_NAND_FSL_IFC Note that a number of PowerPC platforms had previously enabled CONFIG_NAND_FSL_ELBC without CONFIG_MTD_RAW_NAND, and now they no longer enable the option, reducing the size of a few functions. Signed-off-by: Tom Rini --- include/configs/P1010RDB.h | 1 - include/configs/P2041RDB.h | 1 - include/configs/P3041DS.h | 1 - include/configs/P5040DS.h | 1 - include/configs/T102xRDB.h | 1 - include/configs/T104xRDB.h | 1 - include/configs/T208xQDS.h | 1 - include/configs/T208xRDB.h | 1 - include/configs/T4240RDB.h | 1 - include/configs/ids8313.h | 1 - include/configs/km/pg-wcom-ls102xa.h | 1 - include/configs/kmcent2.h | 1 - include/configs/ls1021aqds.h | 1 - include/configs/ls1043aqds.h | 1 - include/configs/ls1043ardb.h | 3 --- include/configs/ls1046afrwy.h | 1 - include/configs/ls1046aqds.h | 1 - include/configs/ls1046ardb.h | 1 - include/configs/ls1088aqds.h | 1 - include/configs/ls1088ardb.h | 4 ---- include/configs/ls2080aqds.h | 1 - include/configs/ls2080ardb.h | 1 - include/configs/p1_p2_rdb_pc.h | 11 ++--------- 23 files changed, 2 insertions(+), 36 deletions(-) (limited to 'include/configs') diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 899a51d..1841eff 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -14,7 +14,6 @@ #include #include -#define CONFIG_NAND_FSL_IFC #ifdef CONFIG_SDCARD #define CONFIG_SPL_FLUSH_IMAGE diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index bdddb24..21e56d6 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -159,7 +159,6 @@ unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_RAMBOOT #endif -#define CONFIG_NAND_FSL_ELBC /* Nand Flash */ #ifdef CONFIG_NAND_FSL_ELBC #define CONFIG_SYS_NAND_BASE 0xffa00000 diff --git a/include/configs/P3041DS.h b/include/configs/P3041DS.h index 2f6cc5d..f1417b1 100644 --- a/include/configs/P3041DS.h +++ b/include/configs/P3041DS.h @@ -9,7 +9,6 @@ */ #define CONFIG_FSL_NGPIXIS /* use common ngPIXIS code */ -#define CONFIG_NAND_FSL_ELBC #define CONFIG_FSL_SATA_V2 #define CONFIG_PCIE3 #define CONFIG_PCIE4 diff --git a/include/configs/P5040DS.h b/include/configs/P5040DS.h index 12666d6..fc2a07b 100644 --- a/include/configs/P5040DS.h +++ b/include/configs/P5040DS.h @@ -9,7 +9,6 @@ */ #define CONFIG_FSL_NGPIXIS /* use common ngPIXIS code */ -#define CONFIG_NAND_FSL_ELBC #define CONFIG_PCIE3 #define CONFIG_FSL_SATA_V2 #define CONFIG_SYS_FSL_RAID_ENGINE diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 7a23f2b..ef79c1b 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -242,7 +242,6 @@ unsigned long get_board_sys_clk(void); #endif /* NAND Flash on IFC */ -#define CONFIG_NAND_FSL_IFC #define CONFIG_SYS_NAND_BASE 0xff800000 #ifdef CONFIG_PHYS_64BIT #define CONFIG_SYS_NAND_BASE_PHYS (0xf00000000ull | CONFIG_SYS_NAND_BASE) diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index a9152d1..4485f40 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -236,7 +236,6 @@ #define CONFIG_SYS_CS2_FTIM3 0x0 /* NAND Flash on IFC */ -#define CONFIG_NAND_FSL_IFC #define CONFIG_SYS_NAND_BASE 0xff800000 #define CONFIG_SYS_NAND_BASE_PHYS (0xf00000000ull | CONFIG_SYS_NAND_BASE) diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 91d7c0e..e70d108 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -214,7 +214,6 @@ unsigned long get_board_sys_clk(void); #define CONFIG_SYS_CS3_FTIM3 0x0 /* NAND Flash on IFC */ -#define CONFIG_NAND_FSL_IFC #define CONFIG_SYS_NAND_BASE 0xff800000 #define CONFIG_SYS_NAND_BASE_PHYS (0xf00000000ull | CONFIG_SYS_NAND_BASE) diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 886e0b7..fbe8852 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -188,7 +188,6 @@ unsigned long get_board_sys_clk(void); #define CONFIG_SYS_CS2_FTIM3 0x0 /* NAND Flash on IFC */ -#define CONFIG_NAND_FSL_IFC #define CONFIG_SYS_NAND_BASE 0xff800000 #define CONFIG_SYS_NAND_BASE_PHYS (0xf00000000ull | CONFIG_SYS_NAND_BASE) diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index 7f0a579..87e3e67 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -284,7 +284,6 @@ unsigned long get_board_sys_clk(void); + 0x8000000, CONFIG_SYS_FLASH_BASE_PHYS} /* NAND Flash on IFC */ -#define CONFIG_NAND_FSL_IFC #define CONFIG_SYS_NAND_MAX_ECCPOS 256 #define CONFIG_SYS_NAND_MAX_OOBFREE 2 #define CONFIG_SYS_NAND_BASE 0xff800000 diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h index 5e2f377..370f7ed 100644 --- a/include/configs/ids8313.h +++ b/include/configs/ids8313.h @@ -129,7 +129,6 @@ */ #define CONFIG_SYS_NAND_BASE 0xE1000000 #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_NAND_FSL_ELBC #define NAND_CACHE_PAGES 64 diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h index 1ce6ac9..a5bc689 100644 --- a/include/configs/km/pg-wcom-ls102xa.h +++ b/include/configs/km/pg-wcom-ls102xa.h @@ -94,7 +94,6 @@ #define CONFIG_SYS_CS0_FTIM3 CONFIG_SYS_NOR_FTIM3 /* NAND Flash Definitions */ -#define CONFIG_NAND_FSL_IFC #define CONFIG_SYS_NAND_BASE 0x68000000 #define CONFIG_SYS_NAND_BASE_PHYS CONFIG_SYS_NAND_BASE diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h index 93a2255..91b50cb 100644 --- a/include/configs/kmcent2.h +++ b/include/configs/kmcent2.h @@ -256,7 +256,6 @@ #define CONFIG_SYS_FLASH_BANKS_LIST {CONFIG_SYS_FLASH_BASE_PHYS} /* NAND Flash on IFC CS1*/ -#define CONFIG_NAND_FSL_IFC #define CONFIG_SYS_NAND_BASE 0xfa000000 #define CONFIG_SYS_NAND_BASE_PHYS (0xf00000000ull | CONFIG_SYS_NAND_BASE) diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 4fb6ec4..795c8e5 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -125,7 +125,6 @@ unsigned long get_board_sys_clk(void); /* * NAND Flash Definitions */ -#define CONFIG_NAND_FSL_IFC #define CONFIG_SYS_NAND_BASE 0x7e800000 #define CONFIG_SYS_NAND_BASE_PHYS CONFIG_SYS_NAND_BASE diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h index 597745b..5df42d9 100644 --- a/include/configs/ls1043aqds.h +++ b/include/configs/ls1043aqds.h @@ -111,7 +111,6 @@ unsigned long get_board_sys_clk(void); /* * NAND Flash Definitions */ -#define CONFIG_NAND_FSL_IFC #define CONFIG_SYS_NAND_BASE 0x7e800000 #define CONFIG_SYS_NAND_BASE_PHYS CONFIG_SYS_NAND_BASE diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h index e9cd74d..f367ad6 100644 --- a/include/configs/ls1043ardb.h +++ b/include/configs/ls1043ardb.h @@ -72,9 +72,6 @@ /* * NAND Flash Definitions */ -#ifndef SPL_NO_IFC -#define CONFIG_NAND_FSL_IFC -#endif #define CONFIG_SYS_NAND_BASE 0x7e800000 #define CONFIG_SYS_NAND_BASE_PHYS CONFIG_SYS_NAND_BASE diff --git a/include/configs/ls1046afrwy.h b/include/configs/ls1046afrwy.h index 4bebc31..5b78c5f 100644 --- a/include/configs/ls1046afrwy.h +++ b/include/configs/ls1046afrwy.h @@ -22,7 +22,6 @@ /* * NAND Flash Definitions */ -#define CONFIG_NAND_FSL_IFC #define CONFIG_SYS_NAND_BASE 0x7e800000 #define CONFIG_SYS_NAND_BASE_PHYS CONFIG_SYS_NAND_BASE diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h index c581f5c..ca4b856 100644 --- a/include/configs/ls1046aqds.h +++ b/include/configs/ls1046aqds.h @@ -126,7 +126,6 @@ unsigned long get_board_sys_clk(void); /* * NAND Flash Definitions */ -#define CONFIG_NAND_FSL_IFC #define CONFIG_SYS_NAND_BASE 0x7e800000 #define CONFIG_SYS_NAND_BASE_PHYS CONFIG_SYS_NAND_BASE diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h index 52c2368..d06f338 100644 --- a/include/configs/ls1046ardb.h +++ b/include/configs/ls1046ardb.h @@ -33,7 +33,6 @@ /* * NAND Flash Definitions */ -#define CONFIG_NAND_FSL_IFC #endif #define CONFIG_SYS_NAND_BASE 0x7e800000 diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h index 27fe2f8..8923e32 100644 --- a/include/configs/ls1088aqds.h +++ b/include/configs/ls1088aqds.h @@ -95,7 +95,6 @@ unsigned long get_board_sys_clk(void); #endif #endif -#define CONFIG_NAND_FSL_IFC #define CONFIG_SYS_NAND_MAX_ECCPOS 256 #define CONFIG_SYS_NAND_MAX_OOBFREE 2 diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h index 875bc1e..f82b618 100644 --- a/include/configs/ls1088ardb.h +++ b/include/configs/ls1088ardb.h @@ -71,10 +71,6 @@ #endif #endif -#ifndef SPL_NO_IFC -#define CONFIG_NAND_FSL_IFC -#endif - #define CONFIG_SYS_NAND_MAX_ECCPOS 256 #define CONFIG_SYS_NAND_MAX_OOBFREE 2 diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h index d2832a6..27fd397 100644 --- a/include/configs/ls2080aqds.h +++ b/include/configs/ls2080aqds.h @@ -100,7 +100,6 @@ unsigned long get_board_sys_clk(void); CONFIG_SYS_FLASH_BASE + 0x40000000} #endif -#define CONFIG_NAND_FSL_IFC #define CONFIG_SYS_NAND_MAX_ECCPOS 256 #define CONFIG_SYS_NAND_MAX_OOBFREE 2 diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index 45f70b1..928747f 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -108,7 +108,6 @@ unsigned long get_board_sys_clk(void); CONFIG_SYS_FLASH_BASE + 0x40000000} #endif -#define CONFIG_NAND_FSL_IFC #define CONFIG_SYS_NAND_MAX_ECCPOS 256 #define CONFIG_SYS_NAND_MAX_OOBFREE 2 diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index b948eea..d3ac057 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -14,7 +14,6 @@ #if defined(CONFIG_TARGET_P1020RDB_PC) #define CONFIG_BOARDNAME "P1020RDB-PC" -#define CONFIG_NAND_FSL_ELBC #define CONFIG_VSC7385_ENET #define CONFIG_SLIC #define __SW_BOOT_MASK 0x03 @@ -41,7 +40,6 @@ */ #if defined(CONFIG_TARGET_P1020RDB_PD) #define CONFIG_BOARDNAME "P1020RDB-PD" -#define CONFIG_NAND_FSL_ELBC #define CONFIG_VSC7385_ENET #define CONFIG_SLIC #define __SW_BOOT_MASK 0x03 @@ -58,7 +56,6 @@ #if defined(CONFIG_TARGET_P2020RDB) #define CONFIG_BOARDNAME "P2020RDB-PC" -#define CONFIG_NAND_FSL_ELBC #define CONFIG_VSC7385_ENET #define __SW_BOOT_MASK 0x03 #define __SW_BOOT_NOR 0xc8 @@ -85,9 +82,7 @@ #ifdef CONFIG_SPL_BUILD #define CONFIG_SPL_COMMON_INIT_DDR #endif -#endif - -#ifdef CONFIG_SPIFLASH +#elif defined(CONFIG_SPIFLASH) #define CONFIG_SPL_SPI_FLASH_MINIMAL #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" @@ -101,9 +96,7 @@ #ifdef CONFIG_SPL_BUILD #define CONFIG_SPL_COMMON_INIT_DDR #endif -#endif - -#ifdef CONFIG_MTD_RAW_NAND +#elif defined(CONFIG_MTD_RAW_NAND) #ifdef CONFIG_TPL_BUILD #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_NAND_INIT -- cgit v1.1