diff options
| author | Tom Rini <trini@konsulko.com> | 2017-07-28 21:31:42 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-07-31 12:21:40 -0400 |
| commit | 8f1a80e99e4a838d1540cdb1d59ccc7785fe4618 (patch) | |
| tree | 87b8475abafdaa74fc0ee38afa2b3a16e2c807ef /include/configs | |
| parent | 7b3c4c3a5305c68a7de2444f555ac7241d6fdb8e (diff) | |
configs: Migrate CMD_NAND*
Migrate all remaining instances of CMD_NAND, CMD_NAND_TRIMFFS
CMD_NAND_LOCK_UNLOCK and CMD_NAND_TORTURE from the headers into the
defconfig files.
Tested-by: Adam Ford <aford173@gmail.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Diffstat (limited to 'include/configs')
143 files changed, 10 insertions, 354 deletions
diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index f9a677124b..4ec65759b5 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -356,7 +356,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_NAND_BASE_LIST { CONFIG_SYS_NAND_BASE } #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_CMD_NAND #define CONFIG_SYS_NAND_BLOCK_SIZE (128 * 1024) diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h index eadfa758c7..a7c97a3b79 100644 --- a/include/configs/BSC9131RDB.h +++ b/include/configs/BSC9131RDB.h @@ -181,7 +181,6 @@ extern unsigned long get_sdram_size(void); #define CONFIG_SYS_NAND_BASE_LIST { CONFIG_SYS_NAND_BASE } #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_CMD_NAND #define CONFIG_SYS_NAND_BLOCK_SIZE (128 * 1024) #define CONFIG_SYS_NAND_DDR_LAW 11 diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index 4395eb9c07..b0a3cf8e47 100644 --- a/include/configs/BSC9132QDS.h +++ b/include/configs/BSC9132QDS.h @@ -293,7 +293,6 @@ combinations. this should be removed later /* NAND */ #define CONFIG_SYS_NAND_BASE_LIST { CONFIG_SYS_NAND_BASE } #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_CMD_NAND #define CONFIG_SYS_NAND_BLOCK_SIZE (128 * 1024) diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h index 629a326d7b..050847b4aa 100644 --- a/include/configs/C29XPCIE.h +++ b/include/configs/C29XPCIE.h @@ -200,7 +200,6 @@ #define CONFIG_SYS_NAND_BASE_LIST { CONFIG_SYS_NAND_BASE } #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_CMD_NAND #define CONFIG_SYS_NAND_BLOCK_SIZE (1024 * 1024) /* 8Bit NAND Flash - K9F1G08U0B */ diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h index 45cdf9da15..f7b284fda8 100644 --- a/include/configs/M5329EVB.h +++ b/include/configs/M5329EVB.h @@ -25,10 +25,6 @@ #undef CONFIG_WATCHDOG #define CONFIG_WATCHDOG_TIMEOUT 5000 /* timeout in milliseconds, max timeout is 6.71sec */ -#ifdef CONFIG_NANDFLASH_SIZE -# define CONFIG_CMD_NAND -#endif - #define CONFIG_SYS_UNIFY_CACHE #define CONFIG_MCFFEC diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h index 26639fc41f..b85e0f088f 100644 --- a/include/configs/M5373EVB.h +++ b/include/configs/M5373EVB.h @@ -25,10 +25,6 @@ #undef CONFIG_WATCHDOG #define CONFIG_WATCHDOG_TIMEOUT 3360 /* timeout in ms, max is 3.36 sec */ -#ifdef CONFIG_NANDFLASH_SIZE -# define CONFIG_CMD_NAND -#endif - #define CONFIG_SYS_UNIFY_CACHE #define CONFIG_MCFFEC diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h index b4b1ba88d6..7552f4daf6 100644 --- a/include/configs/M54418TWR.h +++ b/include/configs/M54418TWR.h @@ -36,9 +36,6 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME -/* Command line configuration */ -#undef CONFIG_CMD_NAND - /* * NAND FLASH */ diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h index cf0c7234dc..d666f960b6 100644 --- a/include/configs/MPC8313ERDB.h +++ b/include/configs/MPC8313ERDB.h @@ -264,7 +264,6 @@ "mtdparts=e2800000.flash:512k(uboot),128k(env),6m@1m(kernel),-(fs)" #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_CMD_NAND 1 #define CONFIG_NAND_FSL_ELBC 1 #define CONFIG_SYS_NAND_BLOCK_SIZE 16384 #define CONFIG_SYS_NAND_WINDOW_SIZE (32 * 1024) diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h index be1a6afff3..69107ca12d 100644 --- a/include/configs/MPC8315ERDB.h +++ b/include/configs/MPC8315ERDB.h @@ -240,7 +240,6 @@ "mtdparts=e0600000.flash:512k(uboot),128k(env),6m@1m(kernel),-(fs)" #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_CMD_NAND 1 #define CONFIG_NAND_FSL_ELBC 1 #define CONFIG_SYS_NAND_BLOCK_SIZE 16384 #define CONFIG_SYS_NAND_WINDOW_SIZE (32 * 1024) /* 0x00008000 */ diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h index 1a65c25c48..f6afa9dcc9 100644 --- a/include/configs/MPC837XEMDS.h +++ b/include/configs/MPC837XEMDS.h @@ -278,7 +278,6 @@ /* * NAND Flash on the Local Bus */ -#define CONFIG_CMD_NAND 1 #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_NAND_FSL_ELBC 1 diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index 0245fc68eb..38a2ca146c 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -286,7 +286,6 @@ CONFIG_SYS_NAND_BASE + 0x80000, \ CONFIG_SYS_NAND_BASE + 0xC0000} #define CONFIG_SYS_MAX_NAND_DEVICE 4 -#define CONFIG_CMD_NAND 1 #define CONFIG_NAND_FSL_ELBC 1 #define CONFIG_SYS_NAND_BLOCK_SIZE (128 * 1024) diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h index a75ce0b93d..716bb069b3 100644 --- a/include/configs/MPC8569MDS.h +++ b/include/configs/MPC8569MDS.h @@ -181,7 +181,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_SYS_NAND_BASE_PHYS CONFIG_SYS_NAND_BASE #define CONFIG_SYS_NAND_BASE_LIST { CONFIG_SYS_NAND_BASE, } #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_CMD_NAND 1 #define CONFIG_NAND_FSL_ELBC 1 #define CONFIG_SYS_NAND_BLOCK_SIZE (128 * 1024) #define CONFIG_SYS_NAND_BR_PRELIM (CONFIG_SYS_NAND_BASE_PHYS \ diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h index 32c593291a..906270222a 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h @@ -285,7 +285,6 @@ CONFIG_SYS_NAND_BASE + 0x80000,\ CONFIG_SYS_NAND_BASE + 0xC0000} #define CONFIG_SYS_MAX_NAND_DEVICE 4 -#define CONFIG_CMD_NAND 1 #define CONFIG_NAND_FSL_ELBC 1 #define CONFIG_SYS_NAND_BLOCK_SIZE (128 * 1024) #define CONFIG_SYS_NAND_MAX_OOBFREE 5 diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 23fe9f9f7c..08288ccf35 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -388,7 +388,6 @@ extern unsigned long get_sdram_size(void); #define CONFIG_SYS_NAND_BASE_LIST { CONFIG_SYS_NAND_BASE } #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_CMD_NAND #if defined(CONFIG_TARGET_P1010RDB_PA) /* NAND Flash Timing Params */ diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index db70b469dc..a1035d6794 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -245,7 +245,6 @@ #define CONFIG_SYS_NAND_BASE_LIST {CONFIG_SYS_NAND_BASE} #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_CMD_NAND 1 #define CONFIG_SYS_NAND_BLOCK_SIZE (256 * 1024) #define CONFIG_ELBC_NAND_SPL_STATIC_PGSIZE diff --git a/include/configs/P1023RDB.h b/include/configs/P1023RDB.h index be42dadac7..75d1efd127 100644 --- a/include/configs/P1023RDB.h +++ b/include/configs/P1023RDB.h @@ -125,7 +125,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_SYS_NAND_BASE_LIST { CONFIG_SYS_NAND_BASE } #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_CMD_NAND #define CONFIG_NAND_FSL_ELBC #define CONFIG_SYS_NAND_BLOCK_SIZE (128 * 1024) diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index 38fbf3785f..7c139bbcd1 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -227,7 +227,6 @@ unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_NAND_BASE_LIST {CONFIG_SYS_NAND_BASE} #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_CMD_NAND #define CONFIG_SYS_NAND_BLOCK_SIZE (128 * 1024) /* NAND flash config */ diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index cfb495fe8b..163ec10cfb 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -365,7 +365,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_NAND_DDR_LAW 11 #define CONFIG_SYS_NAND_BASE_LIST { CONFIG_SYS_NAND_BASE } #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_CMD_NAND #define CONFIG_SYS_NAND_BLOCK_SIZE (128 * 1024) diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 3b592eb395..cdd459e197 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -392,7 +392,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_NAND_DDR_LAW 11 #define CONFIG_SYS_NAND_BASE_LIST { CONFIG_SYS_NAND_BASE } #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_CMD_NAND #if defined(CONFIG_NAND) #define CONFIG_SYS_CSPR0_EXT CONFIG_SYS_NAND_CSPR_EXT diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index bf2c15a183..0a848b6440 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -283,7 +283,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_NAND_DDR_LAW 11 #define CONFIG_SYS_NAND_BASE_LIST { CONFIG_SYS_NAND_BASE } #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_CMD_NAND #define CONFIG_SYS_NAND_BLOCK_SIZE (128 * 1024) diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 1454b9f62e..13efcb9e36 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -397,7 +397,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg #define CONFIG_SYS_NAND_DDR_LAW 11 #define CONFIG_SYS_NAND_BASE_LIST { CONFIG_SYS_NAND_BASE } #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_CMD_NAND #define CONFIG_SYS_NAND_BLOCK_SIZE (512 * 1024) diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 119c543612..1e4a49e886 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -337,7 +337,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_NAND_DDR_LAW 11 #define CONFIG_SYS_NAND_BASE_LIST { CONFIG_SYS_NAND_BASE } #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_CMD_NAND #define CONFIG_SYS_NAND_BLOCK_SIZE (128 * 1024) #if defined(CONFIG_NAND) diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 862e079e67..ecce5163a1 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -301,7 +301,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_NAND_DDR_LAW 11 #define CONFIG_SYS_NAND_BASE_LIST { CONFIG_SYS_NAND_BASE } #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_CMD_NAND #define CONFIG_SYS_NAND_BLOCK_SIZE (512 * 1024) #if defined(CONFIG_NAND) diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h index 944dab8068..e041ea0abd 100644 --- a/include/configs/T4240QDS.h +++ b/include/configs/T4240QDS.h @@ -258,7 +258,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_NAND_BASE_LIST { CONFIG_SYS_NAND_BASE } #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_CMD_NAND #define CONFIG_SYS_NAND_BLOCK_SIZE (128 * 1024) #define CONFIG_SYS_NAND_MAX_OOBFREE 2 diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index df3888310c..f4f025a3be 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -452,7 +452,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_NAND_DDR_LAW 11 #define CONFIG_SYS_NAND_BASE_LIST { CONFIG_SYS_NAND_BASE } #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_CMD_NAND #define CONFIG_SYS_NAND_BLOCK_SIZE (512 * 1024) diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index 77d9ba1899..36adea749e 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -100,10 +100,6 @@ #endif /* CONFIG_USB_AM35X */ -/* commands to include */ - -#define CONFIG_CMD_NAND /* NAND support */ - #define CONFIG_SYS_I2C #define CONFIG_SYS_OMAP24_I2C_SPEED 100000 #define CONFIG_SYS_OMAP24_I2C_SLAVE 1 diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 26036c4e97..2f2e13c5bb 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -87,9 +87,6 @@ #endif /* CONFIG_USB_MUSB_AM35X */ -/* commands to include */ -#define CONFIG_CMD_NAND - /* I2C */ #define CONFIG_SYS_I2C #define CONFIG_SYS_OMAP24_I2C_SPEED 100000 diff --git a/include/configs/apf27.h b/include/configs/apf27.h index b122fe617b..29cbbabd1e 100644 --- a/include/configs/apf27.h +++ b/include/configs/apf27.h @@ -52,13 +52,6 @@ #define CONFIG_ROOTPATH "/tftpboot/" __stringify(CONFIG_BOARD_NAME) "-root" /* - * U-Boot Commands - */ -#define CONFIG_CMD_NAND /* NAND support */ -#define CONFIG_CMD_NAND_LOCK_UNLOCK -#define CONFIG_CMD_NAND_TRIMFFS - -/* * Memory configurations */ #define CONFIG_NR_DRAM_POPULATED 1 diff --git a/include/configs/apx4devkit.h b/include/configs/apx4devkit.h index fd319b3932..bb68125462 100644 --- a/include/configs/apx4devkit.h +++ b/include/configs/apx4devkit.h @@ -18,10 +18,6 @@ #define CONFIG_MX28 /* i.MX28 SoC */ #define CONFIG_MACH_TYPE MACH_TYPE_APX4DEVKIT -/* U-Boot Commands */ - -#define CONFIG_CMD_NAND - /* Memory configuration */ #define CONFIG_NR_DRAM_BANKS 1 /* 1 bank of DRAM */ #define PHYS_SDRAM_1 0x40000000 /* Base address */ diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h index 0495dbffbd..6ad956f03c 100644 --- a/include/configs/aristainetos-common.h +++ b/include/configs/aristainetos-common.h @@ -182,8 +182,6 @@ #define CONFIG_SYS_I2C_NOPROBES { {0, 0x00} } /* NAND stuff */ -#define CONFIG_CMD_NAND -#define CONFIG_CMD_NAND_TRIMFFS #define CONFIG_NAND_MXS #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE 0x40000000 diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h index 51b6fab716..00efcf032d 100644 --- a/include/configs/at91sam9260ek.h +++ b/include/configs/at91sam9260ek.h @@ -55,11 +55,6 @@ #define CONFIG_BOOTP_HOSTNAME 1 /* - * Command line configuration. - */ -#define CONFIG_CMD_NAND 1 - -/* * SDRAM: 1 bank, min 32, max 128 MB * Initialized before u-boot gets started. */ diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h index 4e151cdd04..fdab1abc0f 100644 --- a/include/configs/at91sam9261ek.h +++ b/include/configs/at91sam9261ek.h @@ -71,11 +71,6 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME -/* - * Command line configuration. - */ -#define CONFIG_CMD_NAND - /* SDRAM */ #define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE 0x20000000 diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h index 62099c7024..27001e7007 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -63,11 +63,6 @@ #define CONFIG_BOOTP_GATEWAY 1 #define CONFIG_BOOTP_HOSTNAME 1 -/* - * Command line configuration. - */ -#define CONFIG_CMD_NAND 1 - /* SDRAM */ #define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE ATMEL_BASE_CS1 diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h index 45a6a9a134..019006a84a 100644 --- a/include/configs/at91sam9m10g45ek.h +++ b/include/configs/at91sam9m10g45ek.h @@ -50,12 +50,6 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME -/* - * Command line configuration. - */ - -#define CONFIG_CMD_NAND - /* SDRAM */ #define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE ATMEL_BASE_CS6 diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h index 975cfd9ed6..db04662799 100644 --- a/include/configs/at91sam9n12ek.h +++ b/include/configs/at91sam9n12ek.h @@ -45,11 +45,6 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME -/* - * Command line configuration. - */ -#define CONFIG_CMD_NAND - #define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE 0x20000000 #define CONFIG_SYS_SDRAM_SIZE 0x08000000 @@ -76,6 +71,7 @@ #define CONFIG_SYS_NAND_MASK_CLE (1 << 22) #define CONFIG_SYS_NAND_ENABLE_PIN GPIO_PIN_PD(4) #define CONFIG_SYS_NAND_READY_PIN GPIO_PIN_PD(5) +#endif /* PMECC & PMERRLOC */ #define CONFIG_ATMEL_NAND_HWECC @@ -84,10 +80,6 @@ #define CONFIG_PMECC_SECTOR_SIZE 512 #define CONFIG_PMECC_INDEX_TABLE_OFFSET 0x8000 -#define CONFIG_CMD_NAND_TRIMFFS - -#endif - #define CONFIG_MTD_PARTITIONS #define CONFIG_MTD_DEVICE #define MTDIDS_DEFAULT "nand0=atmel_nand" diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h index 1192e8bb78..683322a6fa 100644 --- a/include/configs/at91sam9rlek.h +++ b/include/configs/at91sam9rlek.h @@ -45,12 +45,6 @@ /* Let board_init_f handle the framebuffer allocation */ #undef CONFIG_FB_ADDR -/* - * Command line configuration. - */ - -#define CONFIG_CMD_NAND 1 - /* SDRAM */ #define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE ATMEL_BASE_CS1 diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index 14575fac03..608be149a0 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -46,11 +46,6 @@ #define CONFIG_BOOTP_HOSTNAME /* - * Command line configuration. - */ -#define CONFIG_CMD_NAND - -/* * define CONFIG_USB_EHCI_HCD to enable USB Hi-Speed (aka 2.0) * NB: in this case, USB 1.1 devices won't be recognized. */ @@ -81,18 +76,16 @@ #define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PD4 #define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PD5 +#define CONFIG_MTD_DEVICE +#define CONFIG_MTD_PARTITIONS +#endif + /* PMECC & PMERRLOC */ #define CONFIG_ATMEL_NAND_HWECC 1 #define CONFIG_ATMEL_NAND_HW_PMECC 1 #define CONFIG_PMECC_CAP 2 #define CONFIG_PMECC_SECTOR_SIZE 512 -#define CONFIG_CMD_NAND_TRIMFFS - -#define CONFIG_MTD_DEVICE -#define CONFIG_MTD_PARTITIONS -#endif - /* USB */ #ifdef CONFIG_CMD_USB #ifndef CONFIG_USB_EHCI_HCD diff --git a/include/configs/axs10x.h b/include/configs/axs10x.h index b3ec64a5bc..07b53b1fcf 100644 --- a/include/configs/axs10x.h +++ b/include/configs/axs10x.h @@ -63,11 +63,6 @@ #define CONFIG_USB_OHCI_NEW #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1 -/* - * Commands still not supported in Kconfig - */ -#define CONFIG_CMD_NAND - #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_MAXARGS 16 #define CONFIG_CMDLINE_EDITING diff --git a/include/configs/baltos.h b/include/configs/baltos.h index 17b3a1571e..aba7208c5a 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -311,7 +311,6 @@ /* NAND support */ #ifdef CONFIG_NAND -#define CONFIG_CMD_NAND #define GPMC_NAND_ECC_LP_x8_LAYOUT 1 #if !defined(CONFIG_SPI_BOOT) && !defined(CONFIG_NOR_BOOT) #define MTDIDS_DEFAULT "nand0=omap2-nand.0" diff --git a/include/configs/bg0900.h b/include/configs/bg0900.h index c76053e49a..b47a0260ac 100644 --- a/include/configs/bg0900.h +++ b/include/configs/bg0900.h @@ -9,11 +9,6 @@ /* System configurations */ #define CONFIG_MX28 /* i.MX28 SoC */ -/* U-Boot Commands */ - -#define CONFIG_CMD_NAND -#define CONFIG_CMD_NAND_TRIMFFS - /* Memory configuration */ #define CONFIG_NR_DRAM_BANKS 1 /* 1 bank of DRAM */ #define PHYS_SDRAM_1 0x40000000 /* Base address */ diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index 481b837175..e2c43b1f40 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -176,7 +176,6 @@ /* NAND */ #ifndef CONFIG_SPL_BUILD -#define CONFIG_CMD_NAND #define CONFIG_SYS_NAND_BASE 0x40000000 #define CONFIG_SYS_NAND_MAX_CHIPS 1 #define CONFIG_SYS_MAX_NAND_DEVICE 1 diff --git a/include/configs/cm_t335.h b/include/configs/cm_t335.h index a1b8e141a9..ed7bb1d21c 100644 --- a/include/configs/cm_t335.h +++ b/include/configs/cm_t335.h @@ -130,7 +130,6 @@ #undef CONFIG_SYS_NAND_U_BOOT_OFFS #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x200000 -#define CONFIG_CMD_NAND #define MTDIDS_DEFAULT "nand0=nand" #define MTDPARTS_DEFAULT "mtdparts=nand:2m(spl)," \ "1m(u-boot),1m(u-boot-env)," \ diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 99d4800327..bdbbfdd5de 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -90,8 +90,6 @@ "1920k(u-boot),256k(u-boot-env),"\ "4m(kernel),-(fs)" -#define CONFIG_CMD_NAND /* NAND support */ - #define CONFIG_SYS_I2C #define CONFIG_SYS_OMAP24_I2C_SPEED 100000 #define CONFIG_SYS_OMAP24_I2C_SLAVE 1 diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h index 3fb66760c8..93bf04ffaa 100644 --- a/include/configs/cm_t3517.h +++ b/include/configs/cm_t3517.h @@ -98,8 +98,6 @@ "1920k(u-boot),256k(u-boot-env),"\ "4m(kernel),-(fs)" -#define CONFIG_CMD_NAND /* NAND support */ - #define CONFIG_SYS_I2C #define CONFIG_SYS_OMAP24_I2C_SPEED 400000 #define CONFIG_SYS_OMAP24_I2C_SLAVE 1 diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index 8aca89ddd8..4baa0383b8 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -161,7 +161,6 @@ #endif #define CONFIG_NAND_MXS -#define CONFIG_CMD_NAND_TRIMFFS /* NAND stuff */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 @@ -169,7 +168,6 @@ #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_ONFI_DETECTION #define CONFIG_SYS_NAND_MX7_GPMI_62_ECC_BYTES -#define CONFIG_CMD_NAND_TORTURE /* Dynamic MTD partition support */ #define CONFIG_MTD_PARTITIONS diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h index d9fd642655..c1d4b62385 100644 --- a/include/configs/colibri_t20.h +++ b/include/configs/colibri_t20.h @@ -41,7 +41,6 @@ #define CONFIG_LCD_LOGO /* NAND support */ -#define CONFIG_CMD_NAND #define CONFIG_TEGRA_NAND #define CONFIG_SYS_MAX_NAND_DEVICE 1 diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 72e3ea73e8..15a06384f4 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -43,7 +43,6 @@ #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG /* NAND support */ -#define CONFIG_CMD_NAND #define CONFIG_SYS_NAND_ONFI_DETECTION #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE NFC_BASE_ADDR diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index 0ea76b3300..77a997b111 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -236,7 +236,6 @@ #define CONFIG_SYS_NAND_BASE_LIST {CONFIG_SYS_NAND_BASE} #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_CMD_NAND #define CONFIG_SYS_NAND_BLOCK_SIZE (128 * 1024) /* NAND flash config */ diff --git a/include/configs/corvus.h b/include/configs/corvus.h index 015072720e..e255a8b473 100644 --- a/include/configs/corvus.h +++ b/include/configs/corvus.h @@ -60,11 +60,6 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME -/* - * Command line configuration. - */ -#define CONFIG_CMD_NAND - /* SDRAM */ #define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE ATMEL_BASE_CS6 diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index c610ff3f8f..695f3f6874 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -276,8 +276,6 @@ #endif #ifdef CONFIG_USE_NAND -#define CONFIG_CMD_NAND - #define CONFIG_MTD_DEVICE #define CONFIG_MTD_PARTITIONS #endif diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h index 6ad5206fc0..7174f6b40e 100644 --- a/include/configs/db-mv784mp-gp.h +++ b/include/configs/db-mv784mp-gp.h @@ -25,7 +25,6 @@ /* * Commands configuration */ -#define CONFIG_CMD_NAND #define CONFIG_CMD_PCI /* I2C */ diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index dfe9935520..f1a5c6c90a 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -110,8 +110,6 @@ #define CONFIG_SYS_NAND_PAGE_SIZE NAND_LARGE_BLOCK_PAGE_SIZE #define CONFIG_SYS_NAND_USE_FLASH_BBT -#define CONFIG_CMD_NAND - /* * USB */ diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index 5476961847..fb9e4c6428 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -90,9 +90,6 @@ #define CONFIG_JFFS2_PART_SIZE 0xf980000 /* size of jffs2 */ /* partition */ -/* commands to include */ -#define CONFIG_CMD_NAND_LOCK_UNLOCK /* nand (un)lock commands */ - #undef CONFIG_SUPPORT_RAW_INITRD /* BOOTP/DHCP options */ diff --git a/include/configs/dns325.h b/include/configs/dns325.h index 3e931edc71..f8166854c1 100644 --- a/include/configs/dns325.h +++ b/include/configs/dns325.h @@ -28,7 +28,6 @@ /* * Commands configuration */ -#define CONFIG_CMD_NAND #define CONFIG_SYS_MVFS #define CONFIG_NR_DRAM_BANKS 1 diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h index 15e3292c09..2389086597 100644 --- a/include/configs/dockstar.h +++ b/include/configs/dockstar.h @@ -21,10 +21,6 @@ #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ /* - * Commands configuration - */ -#define CONFIG_CMD_NAND -/* * mv-common.h should be defined after CMD configs since it used them * to enable certain macros */ diff --git a/include/configs/ea20.h b/include/configs/ea20.h index 16f65f3480..b1c4e3a750 100644 --- a/include/configs/ea20.h +++ b/include/configs/ea20.h @@ -135,8 +135,6 @@ /* NAND Setup */ #ifdef CONFIG_SYS_USE_NAND -#define CONFIG_CMD_NAND - #define CONFIG_MTD_DEVICE #define CONFIG_MTD_PARTITIONS diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h index 4c0647bb69..8bec154f43 100644 --- a/include/configs/ethernut5.h +++ b/include/configs/ethernut5.h @@ -82,9 +82,6 @@ /* Misc. hardware drivers */ #define CONFIG_AT91_GPIO -/* Command line configuration */ -#define CONFIG_CMD_NAND - #ifndef MINIMAL_LOADER #define CONFIG_CMD_REISER #define CONFIG_CMD_SAVES diff --git a/include/configs/flea3.h b/include/configs/flea3.h index a09986d14c..584a2b4fb0 100644 --- a/include/configs/flea3.h +++ b/include/configs/flea3.h @@ -67,8 +67,6 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_DNS -#define CONFIG_CMD_NAND - #define CONFIG_NET_RETRY_COUNT 100 diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h index 7fdadab101..aaa336e34c 100644 --- a/include/configs/goflexhome.h +++ b/include/configs/goflexhome.h @@ -43,7 +43,6 @@ * Commands configuration */ -#define CONFIG_CMD_NAND #define CONFIG_SYS_MVFS /* Picks up Filesystem from mv-common.h */ /* diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index ff2b9c6e72..bddebde042 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -69,8 +69,6 @@ #elif defined(CONFIG_SPL_NAND_SUPPORT) /* Enable NAND support */ -#define CONFIG_CMD_NAND -#define CONFIG_CMD_NAND_TRIMFFS #ifdef CONFIG_CMD_NAND #define CONFIG_NAND_MXS #define CONFIG_SYS_MAX_NAND_DEVICE 1 diff --git a/include/configs/harmony.h b/include/configs/harmony.h index cc312199ac..75bc50327b 100644 --- a/include/configs/harmony.h +++ b/include/configs/harmony.h @@ -27,7 +27,6 @@ #define CONFIG_MACH_TYPE MACH_TYPE_HARMONY /* NAND support */ -#define CONFIG_CMD_NAND #define CONFIG_TEGRA_NAND #define CONFIG_SYS_MAX_NAND_DEVICE 1 diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h index 0748a4ef00..26dbe53943 100644 --- a/include/configs/iconnect.h +++ b/include/configs/iconnect.h @@ -30,7 +30,6 @@ * Commands configuration */ #define CONFIG_SYS_MVFS -#define CONFIG_CMD_NAND /* * mv-common.h should be defined after CMD configs since it used them diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h index 02d5b2cf65..e2f7217ff6 100644 --- a/include/configs/ids8313.h +++ b/include/configs/ids8313.h @@ -411,7 +411,6 @@ /* * U-Boot environment setup */ -#define CONFIG_CMD_NAND #define CONFIG_CMDLINE_EDITING #define CONFIG_BOOTP_SUBNETMASK #define CONFIG_BOOTP_GATEWAY @@ -524,7 +523,6 @@ "bootm ${loadaddr} - ${fdtaddr}" /* UBI Support */ -#define CONFIG_CMD_NAND_TRIMFFS #define CONFIG_MTD_PARTITIONS /* bootcount support */ diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h index 01c5cc496a..e2b6fca543 100644 --- a/include/configs/imx27lite-common.h +++ b/include/configs/imx27lite-common.h @@ -150,12 +150,6 @@ #define CONFIG_CMDLINE_EDITING #define CONFIG_SYS_LONGHELP -/* - * U-Boot commands - */ -#define CONFIG_CMD_NAND - - #define CONFIG_LOADADDR 0xa0800000 /* loadaddr env var */ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h index 95cb810fcd..f56618af86 100644 --- a/include/configs/imx6_logic.h +++ b/include/configs/imx6_logic.h @@ -145,7 +145,6 @@ #define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE /* NAND stuff */ -#define CONFIG_CMD_NAND_TRIMFFS #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE 0x40000000 #define CONFIG_SYS_NAND_5_ADDR_CYCLE diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h index 7f1f3cca3a..a21261f4d5 100644 --- a/include/configs/ipam390.h +++ b/include/configs/ipam390.h @@ -248,9 +248,6 @@ #ifndef CONFIG_DRIVER_TI_EMAC #endif -#define CONFIG_CMD_NAND -#define CONFIG_CMD_NAND_TRIMFFS - #define CONFIG_MTD_DEVICE #define CONFIG_MTD_PARTITIONS diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h index 04afde7e20..42a6032f49 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -36,8 +36,6 @@ /* include common defines/options for all Keymile boards */ #include "keymile-common.h" -#define CONFIG_CMD_NAND - /* SPI NOR Flash default params, used by sf commands */ #define CONFIG_SF_DEFAULT_SPEED 8100000 #define CONFIG_SF_DEFAULT_MODE SPI_MODE_3 diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h index 373e4bc3b4..3c66f8a170 100644 --- a/include/configs/km/kmp204x-common.h +++ b/include/configs/km/kmp204x-common.h @@ -152,7 +152,6 @@ unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_NAND_BASE_LIST {CONFIG_SYS_NAND_BASE} #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_CMD_NAND #define CONFIG_SYS_NAND_BLOCK_SIZE (128 * 1024) #define CONFIG_BCH diff --git a/include/configs/km8360.h b/include/configs/km8360.h index 3104a8f05c..9c1c158ec8 100644 --- a/include/configs/km8360.h +++ b/include/configs/km8360.h @@ -21,7 +21,6 @@ #define CONFIG_HOSTNAME kmcoge5ne #define CONFIG_KM_BOARD_NAME "kmcoge5ne" #define CONFIG_KM_DEF_NETDEV "netdev=eth1\0" -#define CONFIG_CMD_NAND #define CONFIG_NAND_ECC_BCH #define CONFIG_BCH #define CONFIG_NAND_KMETER1 diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 83e7e7a50e..bd05b45f70 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -220,7 +220,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_NAND_BASE_LIST { CONFIG_SYS_NAND_BASE } #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_CMD_NAND #define CONFIG_SYS_NAND_BLOCK_SIZE (128 * 1024) #endif diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h index 0897da1998..2d58b3b268 100644 --- a/include/configs/ls1043aqds.h +++ b/include/configs/ls1043aqds.h @@ -199,7 +199,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_NAND_BASE_LIST { CONFIG_SYS_NAND_BASE } #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_MTD_NAND_VERIFY_WRITE -#define CONFIG_CMD_NAND #define CONFIG_SYS_NAND_BLOCK_SIZE (128 * 1024) #endif diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h index 617a712398..937fd930ee 100644 --- a/include/configs/ls1043ardb.h +++ b/include/configs/ls1043ardb.h @@ -129,7 +129,6 @@ #define CONFIG_SYS_NAND_BASE_LIST { CONFIG_SYS_NAND_BASE } #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_MTD_NAND_VERIFY_WRITE -#define CONFIG_CMD_NAND #define CONFIG_SYS_NAND_BLOCK_SIZE (128 * 1024) diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h index bb3d9416a8..53cdcf2caf 100644 --- a/include/configs/ls1046aqds.h +++ b/include/configs/ls1046aqds.h @@ -253,7 +253,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_NAND_BASE_LIST { CONFIG_SYS_NAND_BASE } #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_MTD_NAND_VERIFY_WRITE -#define CONFIG_CMD_NAND #define CONFIG_SYS_NAND_BLOCK_SIZE (256 * 1024) #endif diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h index 8c72291f62..10af410136 100644 --- a/include/configs/ls1046ardb.h +++ b/include/configs/ls1046ardb.h @@ -95,7 +95,6 @@ #define CONFIG_SYS_NAND_BASE_LIST { CONFIG_SYS_NAND_BASE } #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_MTD_NAND_VERIFY_WRITE -#define CONFIG_CMD_NAND #define CONFIG_SYS_NAND_BLOCK_SIZE (128 * 1024) diff --git a/include/configs/ls2080a_simu.h b/include/configs/ls2080a_simu.h index 02589be5fd..dad1090f84 100644 --- a/include/configs/ls2080a_simu.h +++ b/include/configs/ls2080a_simu.h @@ -110,7 +110,6 @@ #define CONFIG_SYS_NAND_BASE_LIST { CONFIG_SYS_NAND_BASE } #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_MTD_NAND_VERIFY_WRITE -#define CONFIG_CMD_NAND #define CONFIG_SYS_NAND_BLOCK_SIZE (128 * 1024) diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h index 66936c4a9e..6ce177e77e 100644 --- a/include/configs/ls2080aqds.h +++ b/include/configs/ls2080aqds.h @@ -154,7 +154,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_NAND_BASE_LIST { CONFIG_SYS_NAND_BASE } #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_MTD_NAND_VERIFY_WRITE -#define CONFIG_CMD_NAND #define CONFIG_SYS_NAND_BLOCK_SIZE (128 * 1024) diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index 744a78997b..2a6aa8e20b 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -163,7 +163,6 @@ unsigned long get_board_sys_clk(void); #define CONFIG_SYS_NAND_BASE_LIST { CONFIG_SYS_NAND_BASE } #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_MTD_NAND_VERIFY_WRITE -#define CONFIG_CMD_NAND #define CONFIG_SYS_NAND_BLOCK_SIZE (512 * 1024) #define CONFIG_FSL_QIXIS /* use common QIXIS code */ diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h index 14874a5ebc..0a084a5027 100644 --- a/include/configs/m28evk.h +++ b/include/configs/m28evk.h @@ -13,10 +13,6 @@ #define CONFIG_TIMESTAMP /* Print image info with timestamp */ -/* U-Boot Commands */ -#define CONFIG_CMD_NAND -#define CONFIG_CMD_NAND_TRIMFFS - /* Memory configuration */ #define CONFIG_NR_DRAM_BANKS 1 /* 1 bank of DRAM */ #define PHYS_SDRAM_1 0x40000000 /* Base address */ diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h index f4fcbd315a..138525b3dd 100644 --- a/include/configs/m53evk.h +++ b/include/configs/m53evk.h @@ -18,12 +18,6 @@ #define CONFIG_TIMESTAMP /* Print image info with timestamp */ /* - * U-Boot Commands - */ -#define CONFIG_CMD_NAND -#define CONFIG_CMD_NAND_TRIMFFS - -/* * Memory configurations */ #define CONFIG_NR_DRAM_BANKS 2 diff --git a/include/configs/mcx.h b/include/configs/mcx.h index 3f5fdab9a9..91384525ce 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -80,7 +80,6 @@ /* commands to include */ -#define CONFIG_CMD_NAND /* NAND support */ #define CONFIG_MTD_PARTITIONS #define CONFIG_MTD_DEVICE diff --git a/include/configs/medcom-wide.h b/include/configs/medcom-wide.h index e007370f90..2caa8ffa9e 100644 --- a/include/configs/medcom-wide.h +++ b/include/configs/medcom-wide.h @@ -20,7 +20,6 @@ #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE /* NAND support */ -#define CONFIG_CMD_NAND #define CONFIG_TEGRA_NAND #define CONFIG_SYS_MAX_NAND_DEVICE 1 diff --git a/include/configs/meesc.h b/include/configs/meesc.h index 63d3fdc6ee..baa313ceb3 100644 --- a/include/configs/meesc.h +++ b/include/configs/meesc.h @@ -65,14 +65,6 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME -/* - * Command line configuration. - */ - -#ifdef CONFIG_SYS_USE_NANDFLASH -#define CONFIG_CMD_NAND -#endif - /* LED */ #define CONFIG_AT91_LED diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h index 66a310cff9..2d43f684f4 100644 --- a/include/configs/mx28evk.h +++ b/include/configs/mx28evk.h @@ -15,11 +15,6 @@ #define CONFIG_MX28 /* i.MX28 SoC */ #define CONFIG_MACH_TYPE MACH_TYPE_MX28EVK -/* U-Boot Commands */ - -#define CONFIG_CMD_NAND -#define CONFIG_CMD_NAND_TRIMFFS - /* Memory configuration */ #define CONFIG_NR_DRAM_BANKS 1 /* 1 bank of DRAM */ #define PHYS_SDRAM_1 0x40000000 /* Base address */ diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h index 7ed9012ec9..3b776b1d9f 100644 --- a/include/configs/mx31pdk.h +++ b/include/configs/mx31pdk.h @@ -69,12 +69,6 @@ #define CONFIG_ENV_OVERWRITE #define CONFIG_CONS_INDEX 1 -/*********************************************************** - * Command definition - ***********************************************************/ -#define CONFIG_CMD_NAND - - #define CONFIG_EXTRA_ENV_SETTINGS \ "bootargs_base=setenv bootargs console=ttymxc0,115200\0" \ "bootargs_nfs=setenv bootargs $(bootargs) root=/dev/nfs " \ diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h index 8338d6df79..526f794bd1 100644 --- a/include/configs/mx35pdk.h +++ b/include/configs/mx35pdk.h @@ -77,8 +77,6 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_DNS -#define CONFIG_CMD_NAND - #define CONFIG_NET_RETRY_COUNT 100 diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h index ccbac6ab28..1f1c45e3ec 100644 --- a/include/configs/mx53ard.h +++ b/include/configs/mx53ard.h @@ -33,7 +33,6 @@ #define CONFIG_SYS_NAND_LARGEPAGE #define CONFIG_MXC_NAND_HWECC #define CONFIG_SYS_NAND_USE_FLASH_BBT -#define CONFIG_CMD_NAND #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART1_BASE diff --git a/include/configs/mx6sabreauto.h b/include/configs/mx6sabreauto.h index 900e2a904b..bd178a4a87 100644 --- a/include/configs/mx6sabreauto.h +++ b/include/configs/mx6sabreauto.h @@ -69,10 +69,6 @@ #define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */ #define CONFIG_SYS_I2C_SPEED 100000 -/* NAND flash command */ -#define CONFIG_CMD_NAND -#define CONFIG_CMD_NAND_TRIMFFS - /* NAND stuff */ #define CONFIG_NAND_MXS #define CONFIG_SYS_MAX_NAND_DEVICE 1 diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h index 3468b491a7..060ebd77e1 100644 --- a/include/configs/mx6sxsabreauto.h +++ b/include/configs/mx6sxsabreauto.h @@ -118,10 +118,6 @@ #define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */ #define CONFIG_SYS_I2C_SPEED 100000 -/* NAND flash command */ -#define CONFIG_CMD_NAND -#define CONFIG_CMD_NAND_TRIMFFS - /* NAND stuff */ #define CONFIG_NAND_MXS #define CONFIG_SYS_MAX_NAND_DEVICE 1 diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h index 43453323f7..d4dd0b330d 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -191,9 +191,6 @@ * to support nand, since emmc has pin conflicts with nand */ #ifdef CONFIG_NAND_MXS -#define CONFIG_CMD_NAND -#define CONFIG_CMD_NAND_TRIMFFS - /* NAND stuff */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE 0x40000000 diff --git a/include/configs/nas220.h b/include/configs/nas220.h index 52db4215a3..089263f96f 100644 --- a/include/configs/nas220.h +++ b/include/configs/nas220.h @@ -41,7 +41,6 @@ /* * Commands configuration */ -#define CONFIG_CMD_NAND #define CONFIG_SYS_LONGHELP #define CONFIG_AUTO_COMPLETE #define CONFIG_CMDLINE_EDITING diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index 2fc6693579..a87a75e3cc 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -70,8 +70,6 @@ "1920k(u-boot),128k(u-boot-env),"\ "4m(kernel),-(fs)" -#define CONFIG_CMD_NAND /* NAND support */ - #define CONFIG_VIDEO_OMAP3 /* DSS Support */ /* diff --git a/include/configs/omap3_cairo.h b/include/configs/omap3_cairo.h index 7e1f4751fb..4f8ce54144 100644 --- a/include/configs/omap3_cairo.h +++ b/include/configs/omap3_cairo.h @@ -53,9 +53,6 @@ #define CONFIG_NAND -/* commands to include */ -#define CONFIG_CMD_NAND_LOCK_UNLOCK - /* * TWL4030 */ diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index 15eb08bba8..70cd0ea27e 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -21,13 +21,6 @@ #include <asm/arch/omap.h> /* ---------------------------------------------------------------------------- - * Supported U-Boot commands - * ---------------------------------------------------------------------------- - */ - -#define CONFIG_CMD_NAND - -/* ---------------------------------------------------------------------------- * Supported U-Boot features * ---------------------------------------------------------------------------- */ diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index e4d15c4d98..2ab74cb0e9 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -52,10 +52,6 @@ #define CONFIG_USB_OMAP3 -/* commands to include */ -#define CONFIG_CMD_NAND -#define CONFIG_CMD_NAND_LOCK_UNLOCK /* nand (un)lock commands */ - /* I2C */ #define CONFIG_SYS_I2C_OMAP34XX #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* EEPROM AT24C64 */ diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index 23603c61e2..b86292400a 100644 --- a/include/configs/omap3_zoom1.h +++ b/include/configs/omap3_zoom1.h @@ -61,7 +61,6 @@ #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x280000 #define CONFIG_CMD_SPL_WRITE_SIZE 0x2000 #endif -#define CONFIG_CMD_NAND_LOCK_UNLOCK /* Enable lock/unlock support */ #endif #undef CONFIG_SYS_I2C_OMAP24XX diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index 2c17840218..08e7deb30f 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -286,8 +286,6 @@ #endif #ifdef CONFIG_USE_NAND -#define CONFIG_CMD_NAND - #define CONFIG_MTD_DEVICE #define CONFIG_MTD_PARTITIONS #endif diff --git a/include/configs/openrd.h b/include/configs/openrd.h index a30efdeb85..d685411bbb 100644 --- a/include/configs/openrd.h +++ b/include/configs/openrd.h @@ -26,7 +26,6 @@ * Commands configuration */ #define CONFIG_SYS_MVFS -#define CONFIG_CMD_NAND /* * mv-common.h should be defined after CMD configs since it used them diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 6dbd9900f4..6eae41c7e5 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -430,7 +430,6 @@ #define CONFIG_SYS_NAND_BASE_LIST { CONFIG_SYS_NAND_BASE } #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_CMD_NAND #if defined(CONFIG_TARGET_P1020RDB_PD) #define CONFIG_SYS_NAND_BLOCK_SIZE (128 * 1024) #else diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h index 9e1c89bd33..71c5078cc7 100644 --- a/include/configs/pcm052.h +++ b/include/configs/pcm052.h @@ -23,8 +23,6 @@ #define CONFIG_ENV_OVERWRITE /* NAND support */ -#define CONFIG_CMD_NAND -#define CONFIG_CMD_NAND_TRIMFFS #define CONFIG_SYS_NAND_ONFI_DETECTION #ifdef CONFIG_CMD_NAND diff --git a/include/configs/pcm058.h b/include/configs/pcm058.h index 70e7f78c8d..e3a84ed061 100644 --- a/include/configs/pcm058.h +++ b/include/configs/pcm058.h @@ -61,9 +61,7 @@ #define CONFIG_SYS_I2C_SPEED 100000 #ifndef CONFIG_SPL_BUILD -#define CONFIG_CMD_NAND /* Enable NAND support */ -#define CONFIG_CMD_NAND_TRIMFFS #define CONFIG_NAND_MXS #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE 0x40000000 diff --git a/include/configs/pengwyn.h b/include/configs/pengwyn.h index c77c82aacc..dbe0ddd785 100644 --- a/include/configs/pengwyn.h +++ b/include/configs/pengwyn.h @@ -114,7 +114,6 @@ /* SPL */ /* NAND support */ -#define CONFIG_CMD_NAND #define CONFIG_NAND_OMAP_GPMC #define CONFIG_NAND_OMAP_ELM diff --git a/include/configs/platinum.h b/include/configs/platinum.h index a1cd18ef08..1cdab00e3b 100644 --- a/include/configs/platinum.h +++ b/include/configs/platinum.h @@ -16,13 +16,6 @@ #include "mx6_common.h" /* - * Console configuration - */ - -#define CONFIG_CMD_NAND -#define CONFIG_CMD_NAND_TRIMFFS - -/* * Hardware configuration */ diff --git a/include/configs/plutux.h b/include/configs/plutux.h index 5d692d159c..cd7c55cfb4 100644 --- a/include/configs/plutux.h +++ b/include/configs/plutux.h @@ -20,7 +20,6 @@ #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE /* NAND support */ -#define CONFIG_CMD_NAND #define CONFIG_TEGRA_NAND #define CONFIG_SYS_MAX_NAND_DEVICE 1 diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h index f100a40f21..b9c93b0f21 100644 --- a/include/configs/pm9261.h +++ b/include/configs/pm9261.h @@ -170,11 +170,6 @@ #define CONFIG_BOOTP_GATEWAY 1 #define CONFIG_BOOTP_HOSTNAME 1 -/* - * Command line configuration. - */ -#define CONFIG_CMD_NAND 1 - /* SDRAM */ #define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM 0x20000000 diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h index da0cd9d62b..d24280cf8d 100644 --- a/include/configs/pm9263.h +++ b/include/configs/pm9263.h @@ -184,11 +184,6 @@ #define CONFIG_BOOTP_GATEWAY 1 #define CONFIG_BOOTP_HOSTNAME 1 -/* - * Command line configuration. - */ -#define CONFIG_CMD_NAND 1 - /* SDRAM */ #define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM 0x20000000 diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h index dc4ebeab31..191810fe24 100644 --- a/include/configs/pm9g45.h +++ b/include/configs/pm9g45.h @@ -64,11 +64,6 @@ #define CONFIG_BOOTP_GATEWAY 1 #define CONFIG_BOOTP_HOSTNAME 1 -/* - * Command line configuration. - */ -#define CONFIG_CMD_NAND 1 - #define CONFIG_JFFS2_CMDLINE 1 #define CONFIG_JFFS2_NAND 1 #define CONFIG_JFFS2_DEV "nand0" /* NAND dev jffs2 lives on */ diff --git a/include/configs/pogo_e02.h b/include/configs/pogo_e02.h index 31d7156902..809005e289 100644 --- a/include/configs/pogo_e02.h +++ b/include/configs/pogo_e02.h @@ -29,7 +29,6 @@ * Commands configuration */ #define CONFIG_SYS_MVFS -#define CONFIG_CMD_NAND /* * mv-common.h should be defined after CMD configs since it used them diff --git a/include/configs/s32v234evb.h b/include/configs/s32v234evb.h index c56125209d..c8877718b4 100644 --- a/include/configs/s32v234evb.h +++ b/include/configs/s32v234evb.h @@ -103,7 +103,6 @@ #ifdef CONFIG_SYS_USE_NAND /* Nand Flash Configs */ -#define CONFIG_CMD_NAND #define CONFIG_JFFS2_NAND #define MTD_NAND_FSL_NFC_SWECC 1 #define CONFIG_NAND_FSL_NFC diff --git a/include/configs/sama5d2_ptc.h b/include/configs/sama5d2_ptc.h index 401f1987ee..ce8904e688 100644 --- a/include/configs/sama5d2_ptc.h +++ b/include/configs/sama5d2_ptc.h @@ -45,8 +45,6 @@ #endif /* NAND flash */ -#define CONFIG_CMD_NAND - #ifdef CONFIG_CMD_NAND #define CONFIG_NAND_ATMEL #define CONFIG_SYS_MAX_NAND_DEVICE 1 @@ -59,7 +57,6 @@ /* PMECC & PMERRLOC */ #define CONFIG_ATMEL_NAND_HWECC #define CONFIG_ATMEL_NAND_HW_PMECC -#define CONFIG_CMD_NAND_TRIMFFS #endif /* USB */ diff --git a/include/configs/sama5d2_xplained.h b/include/configs/sama5d2_xplained.h index e4fb0fbef2..13d454f18a 100644 --- a/include/configs/sama5d2_xplained.h +++ b/include/configs/sama5d2_xplained.h @@ -35,9 +35,6 @@ #define CONFIG_SF_DEFAULT_SPEED 30000000 #endif -/* NAND flash */ -#undef CONFIG_CMD_NAND - /* I2C */ #define AT24MAC_ADDR 0x5c #define AT24MAC_REG 0x9a diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h index 76533e3954..cc12521577 100644 --- a/include/configs/sama5d3_xplained.h +++ b/include/configs/sama5d3_xplained.h @@ -36,8 +36,6 @@ #endif /* NAND flash */ -#define CONFIG_CMD_NAND - #ifdef CONFIG_CMD_NAND #define CONFIG_NAND_ATMEL #define CONFIG_SYS_MAX_NAND_DEVICE 1 @@ -47,16 +45,15 @@ /* our CLE is AD22 */ #define CONFIG_SYS_NAND_MASK_CLE (1 << 22) #define CONFIG_SYS_NAND_ONFI_DETECTION + +#define CONFIG_MTD_DEVICE +#define CONFIG_MTD_PARTITIONS +#endif /* PMECC & PMERRLOC */ #define CONFIG_ATMEL_NAND_HWECC #define CONFIG_ATMEL_NAND_HW_PMECC #define CONFIG_PMECC_CAP 4 #define CONFIG_PMECC_SECTOR_SIZE 512 -#define CONFIG_CMD_NAND_TRIMFFS - -#define CONFIG_MTD_DEVICE -#define CONFIG_MTD_PARTITIONS -#endif /* USB */ diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h index a5a0f7c32f..83b527c0de 100644 --- a/include/configs/sama5d3xek.h +++ b/include/configs/sama5d3xek.h @@ -69,8 +69,6 @@ #endif /* NAND flash */ -#define CONFIG_CMD_NAND - #ifdef CONFIG_CMD_NAND #define CONFIG_NAND_ATMEL #define CONFIG_SYS_MAX_NAND_DEVICE 1 @@ -80,13 +78,12 @@ /* our CLE is AD22 */ #define CONFIG_SYS_NAND_MASK_CLE (1 << 22) #define CONFIG_SYS_NAND_ONFI_DETECTION +#endif /* PMECC & PMERRLOC */ #define CONFIG_ATMEL_NAND_HWECC #define CONFIG_ATMEL_NAND_HW_PMECC #define CONFIG_PMECC_CAP 4 #define CONFIG_PMECC_SECTOR_SIZE 512 -#define CONFIG_CMD_NAND_TRIMFFS -#endif #define CONFIG_PHY_MICREL_KSZ9021 diff --git a/include/configs/sama5d4_xplained.h b/include/configs/sama5d4_xplained.h index f1cf65f42c..f0c80260d0 100644 --- a/include/configs/sama5d4_xplained.h +++ b/include/configs/sama5d4_xplained.h @@ -31,8 +31,6 @@ #endif /* NAND flash */ -#define CONFIG_CMD_NAND - #ifdef CONFIG_CMD_NAND #define CONFIG_NAND_ATMEL #define CONFIG_SYS_MAX_NAND_DEVICE 1 diff --git a/include/configs/sama5d4ek.h b/include/configs/sama5d4ek.h index 09a9757e6e..ab858cecfa 100644 --- a/include/configs/sama5d4ek.h +++ b/include/configs/sama5d4ek.h @@ -31,8 +31,6 @@ #endif /* NAND flash */ -#define CONFIG_CMD_NAND - #ifdef CONFIG_CMD_NAND #define CONFIG_NAND_ATMEL #define CONFIG_SYS_MAX_NAND_DEVICE 1 diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h index 2482ba1dcd..ce4bb32cff 100644 --- a/include/configs/seaboard.h +++ b/include/configs/seaboard.h @@ -47,7 +47,6 @@ #define CONFIG_KEYBOARD /* NAND support */ -#define CONFIG_CMD_NAND #define CONFIG_TEGRA_NAND /* Max number of NAND devices */ diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 22f070d502..5a5bf7ac5a 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -235,8 +235,6 @@ #define CONFIG_NAND /* NAND support */ #ifdef CONFIG_NAND -#define CONFIG_CMD_NAND - /* UBI Support */ #ifndef CONFIG_SPL_BUILD #define CONFIG_MTD_PARTITIONS diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index bccb432a60..cc83b98348 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -196,14 +196,6 @@ \ "mtdparts="MTDPARTS_DEFAULT"\0" -/* Command line & features configuration */ - -#define CONFIG_CMD_NAND - -#ifdef CONFIG_MACB -#else -#endif /* CONFIG_MACB */ - #ifdef CONFIG_SPL_BUILD #define CONFIG_SYS_INIT_SP_ADDR 0x301000 #define CONFIG_SPL_STACK_R diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h index 14b49c4faf..3e3575438a 100644 --- a/include/configs/smdkc100.h +++ b/include/configs/smdkc100.h @@ -59,8 +59,6 @@ /*********************************************************** * Command definition ***********************************************************/ -#undef CONFIG_CMD_NAND - #define CONFIG_CMD_ONENAND #define CONFIG_MTD_DEVICE diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h index 63bc769efe..5ec8c1b695 100644 --- a/include/configs/snapper9260.h +++ b/include/configs/snapper9260.h @@ -137,7 +137,6 @@ #define CONFIG_SYS_MALLOC_LEN (1 << 20) /* Command line configuration */ -#define CONFIG_CMD_NAND #define CONFIG_CMD_PCA953X #define CONFIG_CMD_PCA953X_INFO diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h index 47dd99100b..13977cb9a6 100644 --- a/include/configs/snapper9g45.h +++ b/include/configs/snapper9g45.h @@ -128,7 +128,6 @@ #define CONFIG_CMD_USB #define CONFIG_CMD_MII #define CONFIG_CMD_MMC -#define CONFIG_CMD_NAND #define CONFIG_CMD_CACHE #endif /* __CONFIG_H */ diff --git a/include/configs/socrates.h b/include/configs/socrates.h index 3864dfb09f..406a985b60 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -152,7 +152,6 @@ #define CONFIG_SYS_NAND_BASE (CONFIG_SYS_FPGA_BASE + 0x70) #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_CMD_NAND /* LIME GDC */ #define CONFIG_SYS_LIME_BASE 0xc8000000 diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h index 86e14ffac8..83060e71a6 100644 --- a/include/configs/spear-common.h +++ b/include/configs/spear-common.h @@ -96,7 +96,6 @@ /* * Command support defines */ -#define CONFIG_CMD_NAND #define CONFIG_CMD_SAVES /* diff --git a/include/configs/suvd3.h b/include/configs/suvd3.h index af8730a6cb..7b3b050ad9 100644 --- a/include/configs/suvd3.h +++ b/include/configs/suvd3.h @@ -57,7 +57,6 @@ #define CONFIG_ENV_ADDR 0xF0100000 #define CONFIG_ENV_OFFSET 0x100000 -#define CONFIG_CMD_NAND #define CONFIG_NAND_ECC_BCH #define CONFIG_BCH #define CONFIG_NAND_KMETER1 diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index fb173ebfb4..b695d8d346 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -68,9 +68,6 @@ /* EHCI */ #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 25 -/* commands to include */ -#define CONFIG_CMD_NAND /* NAND support */ - #define CONFIG_SYS_I2C #define CONFIG_SYS_OMAP24_I2C_SPEED 400000 #define CONFIG_SYS_OMAP24_I2C_SLAVE 1 diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index 08134f4a1e..3dd7a9bfc7 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -68,8 +68,6 @@ "1920k(u-boot),128k(u-boot-env),"\ "4m(kernel),-(fs)" -#define CONFIG_CMD_NAND /* NAND support */ - #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_OMAP34XX #define CONFIG_SYS_OMAP24_I2C_SPEED 100000 diff --git a/include/configs/taurus.h b/include/configs/taurus.h index cdea9ebf59..7e1c58fdd3 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -58,11 +58,6 @@ /* - * Command line configuration. - */ -#define CONFIG_CMD_NAND - -/* * SDRAM: 1 bank, min 32, max 128 MB * Initialized before u-boot gets started. */ diff --git a/include/configs/tec.h b/include/configs/tec.h index 5f84f2489a..96e37391d7 100644 --- a/include/configs/tec.h +++ b/include/configs/tec.h @@ -20,7 +20,6 @@ #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE /* NAND support */ -#define CONFIG_CMD_NAND #define CONFIG_TEGRA_NAND #define CONFIG_SYS_MAX_NAND_DEVICE 1 diff --git a/include/configs/ti_armv7_omap.h b/include/configs/ti_armv7_omap.h index b4565daf41..85f1d96823 100644 --- a/include/configs/ti_armv7_omap.h +++ b/include/configs/ti_armv7_omap.h @@ -30,7 +30,6 @@ #define CONFIG_SYS_NAND_BASE 0x8000000 #endif #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_CMD_NAND #endif /* Now for the remaining common defines */ diff --git a/include/configs/titanium.h b/include/configs/titanium.h index 6d9c343260..606da4a854 100644 --- a/include/configs/titanium.h +++ b/include/configs/titanium.h @@ -150,9 +150,6 @@ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) /* Enable NAND support */ -#define CONFIG_CMD_NAND -#define CONFIG_CMD_NAND_TRIMFFS - #ifdef CONFIG_CMD_NAND /* NAND stuff */ diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index a0fd583c0a..6e80e5b462 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -97,10 +97,6 @@ #define CONFIG_SYS_NAND_MAX_OOBFREE 2 #define CONFIG_SYS_NAND_MAX_ECCPOS 56 -/* commands to include */ -#define CONFIG_CMD_NAND /* NAND support */ -#define CONFIG_CMD_NAND_LOCK_UNLOCK /* nand (un)lock commands */ - /* needed for ubi */ #define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ #define CONFIG_MTD_PARTITIONS diff --git a/include/configs/usb_a9263.h b/include/configs/usb_a9263.h index 335ce4e12e..4e77d9cfce 100644 --- a/include/configs/usb_a9263.h +++ b/include/configs/usb_a9263.h @@ -52,11 +52,6 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME -/* - * Command line configuration. - */ -#define CONFIG_CMD_NAND - /* SDRAM */ #define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE ATMEL_BASE_CS1 diff --git a/include/configs/vct.h b/include/configs/vct.h index f3c6c27696..2cb4ab149c 100644 --- a/include/configs/vct.h +++ b/include/configs/vct.h @@ -105,10 +105,6 @@ #define CONFIG_EHCI_HCD_INIT_AFTER_RESET /* re-init HCD after CMD_RESET */ #endif /* CONFIG_CMD_USB */ -#if defined(CONFIG_VCT_NAND) -#define CONFIG_CMD_NAND -#endif - #if defined(CONFIG_VCT_ONENAND) #define CONFIG_CMD_ONENAND #endif diff --git a/include/configs/ve8313.h b/include/configs/ve8313.h index 32ed2f95c9..291185fecd 100644 --- a/include/configs/ve8313.h +++ b/include/configs/ve8313.h @@ -180,7 +180,6 @@ */ #define CONFIG_SYS_NAND_BASE 0x61000000 #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_CMD_NAND 1 #define CONFIG_NAND_FSL_ELBC 1 #define CONFIG_SYS_NAND_BLOCK_SIZE 16384 diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h index ae5f627ad8..04abe1e355 100644 --- a/include/configs/vf610twr.h +++ b/include/configs/vf610twr.h @@ -31,8 +31,6 @@ #define CONFIG_ENV_OVERWRITE /* NAND support */ -#define CONFIG_CMD_NAND -#define CONFIG_CMD_NAND_TRIMFFS #define CONFIG_SYS_NAND_ONFI_DETECTION #ifdef CONFIG_CMD_NAND diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h index 515f360400..dc8008c135 100644 --- a/include/configs/woodburn_common.h +++ b/include/configs/woodburn_common.h @@ -76,8 +76,6 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_DNS -#define CONFIG_CMD_NAND - #define CONFIG_MXC_GPIO #define CONFIG_NET_RETRY_COUNT 100 diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index 807cb99c81..0ac7b85f4b 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -119,8 +119,6 @@ #define CONFIG_SYS_NAND_BASE MLC_NAND_BASE #define CONFIG_NAND_LPC32XX_MLC -#define CONFIG_CMD_NAND - /* * GPIO */ diff --git a/include/configs/x600.h b/include/configs/x600.h index 007670740e..a8435d8b01 100644 --- a/include/configs/x600.h +++ b/include/configs/x600.h @@ -103,7 +103,6 @@ /* * Command support defines */ -#define CONFIG_CMD_NAND #define CONFIG_CMD_SAVES /* Filesystem support (for USB key) */ diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index b73502b346..363c2924f0 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -76,7 +76,6 @@ #endif #ifdef CONFIG_NAND_ARASAN -# define CONFIG_CMD_NAND_LOCK_UNLOCK # define CONFIG_SYS_MAX_NAND_DEVICE 1 # define CONFIG_SYS_NAND_SELF_INIT # define CONFIG_SYS_NAND_ONFI_DETECTION diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h index 9b6a5f8ce1..c21c944b29 100644 --- a/include/configs/xpedite517x.h +++ b/include/configs/xpedite517x.h @@ -484,7 +484,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); /* * Command configuration. */ -#define CONFIG_CMD_NAND #define CONFIG_CMD_PCA953X #define CONFIG_CMD_PCA953X_INFO #define CONFIG_CMD_PCI diff --git a/include/configs/xpedite520x.h b/include/configs/xpedite520x.h index 715acc4fbc..eb801542eb 100644 --- a/include/configs/xpedite520x.h +++ b/include/configs/xpedite520x.h @@ -287,7 +287,6 @@ /* * Command configuration. */ -#define CONFIG_CMD_NAND #define CONFIG_CMD_PCA953X #define CONFIG_CMD_PCA953X_INFO #define CONFIG_CMD_PCI diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h index 7d05a5aa82..bc423136ba 100644 --- a/include/configs/xpedite537x.h +++ b/include/configs/xpedite537x.h @@ -337,7 +337,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); /* * Command configuration. */ -#define CONFIG_CMD_NAND #define CONFIG_CMD_PCA953X #define CONFIG_CMD_PCA953X_INFO #define CONFIG_CMD_PCI diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h index 68795d8faa..13be539db3 100644 --- a/include/configs/xpedite550x.h +++ b/include/configs/xpedite550x.h @@ -336,7 +336,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); /* * Command configuration. */ -#define CONFIG_CMD_NAND #define CONFIG_CMD_PCA953X #define CONFIG_CMD_PCA953X_INFO #define CONFIG_CMD_PCI diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 83a2a028e9..4975d76c36 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -75,7 +75,6 @@ #endif #ifdef CONFIG_NAND_ZYNQ -#define CONFIG_CMD_NAND_LOCK_UNLOCK #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_ONFI_DETECTION #define CONFIG_MTD_DEVICE |