Make more use of the Kconfig and move CONFIG_CMD_NAND config option to defconfigs for ti omap/am based boards.
Signed-off-by: Igor Grinberg grinberg@compulab.co.il Cc: Yegor Yefremov yegorslists@googlemail.com Cc: Enric Balletbo i Serra eballetbo@iseebcn.com Cc: Lokesh Vutla lokeshvutla@ti.com Cc: "Albert ARIBAUD (3ADEV)" albert.aribaud@3adev.fr Cc: Nikita Kiryanov nikita@compulab.co.il Cc: Thomas Weber weber@corscience.de Cc: Steve Sakoman sakoman@gmail.com Cc: Grazvydas Ignotas notasas@gmail.com Cc: Nishanth Menon nm@ti.com Cc: Lothar Felten lothar.felten@gmail.com --- configs/am335x_baltos_defconfig | 1 + configs/am335x_evm_defconfig | 1 + configs/am335x_evm_nor_defconfig | 1 + configs/am335x_evm_usbspl_defconfig | 1 + configs/am335x_gp_evm_defconfig | 1 + configs/am335x_igep0033_defconfig | 1 + configs/am43xx_evm_defconfig | 1 + configs/am43xx_evm_ethboot_defconfig | 1 + configs/am43xx_evm_usbhost_boot_defconfig | 1 + configs/cairo_defconfig | 1 + configs/cm_t335_defconfig | 1 + configs/cm_t35_defconfig | 1 + configs/cm_t43_defconfig | 1 + configs/devkit8000_defconfig | 1 + configs/igep0020_nand_defconfig | 1 + configs/igep0030_nand_defconfig | 1 + configs/omap3_beagle_defconfig | 1 + configs/omap3_overo_defconfig | 1 + configs/omap3_pandora_defconfig | 1 + configs/omap3_zoom1_defconfig | 1 + configs/pengwyn_defconfig | 1 + include/configs/cm_t335.h | 1 - include/configs/cm_t35.h | 1 - include/configs/omap3_beagle.h | 1 - include/configs/ti_armv7_omap.h | 1 - 25 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig index c20af0e..c0b0797 100644 --- a/configs/am335x_baltos_defconfig +++ b/configs/am335x_baltos_defconfig @@ -11,3 +11,4 @@ CONFIG_SYS_EXTRA_OPTIONS="NAND" # CONFIG_CMD_SETEXPR is not set CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y +CONFIG_CMD_NAND=y diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig index 396f082..2740553 100644 --- a/configs/am335x_evm_defconfig +++ b/configs/am335x_evm_defconfig @@ -10,3 +10,4 @@ CONFIG_SYS_EXTRA_OPTIONS="NAND" CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y +CONFIG_CMD_NAND=y diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig index 2cbb73d..9c55145 100644 --- a/configs/am335x_evm_nor_defconfig +++ b/configs/am335x_evm_nor_defconfig @@ -10,3 +10,4 @@ CONFIG_SYS_EXTRA_OPTIONS="NAND" CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y +CONFIG_CMD_NAND=y diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig index 710c1bd..c2e8c05 100644 --- a/configs/am335x_evm_usbspl_defconfig +++ b/configs/am335x_evm_usbspl_defconfig @@ -10,3 +10,4 @@ CONFIG_SYS_EXTRA_OPTIONS="NAND,SPL_USBETH_SUPPORT" CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y +CONFIG_CMD_NAND=y diff --git a/configs/am335x_gp_evm_defconfig b/configs/am335x_gp_evm_defconfig index 3cfc521..542e12c 100644 --- a/configs/am335x_gp_evm_defconfig +++ b/configs/am335x_gp_evm_defconfig @@ -13,3 +13,4 @@ CONFIG_SPL_DISABLE_OF_CONTROL=y CONFIG_SPI_FLASH=y CONFIG_RSA=y CONFIG_HUSH_PARSER=y +CONFIG_CMD_NAND=y diff --git a/configs/am335x_igep0033_defconfig b/configs/am335x_igep0033_defconfig index d89af42..9a0ad77 100644 --- a/configs/am335x_igep0033_defconfig +++ b/configs/am335x_igep0033_defconfig @@ -8,3 +8,4 @@ CONFIG_SPL_STACK_R_ADDR=0x82000000 # CONFIG_CMD_SETEXPR is not set CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y +CONFIG_CMD_NAND=y diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig index 526373f..f30fc90 100644 --- a/configs/am43xx_evm_defconfig +++ b/configs/am43xx_evm_defconfig @@ -9,3 +9,4 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y +CONFIG_CMD_NAND=y diff --git a/configs/am43xx_evm_ethboot_defconfig b/configs/am43xx_evm_ethboot_defconfig index 4ebe3ef..909529c 100644 --- a/configs/am43xx_evm_ethboot_defconfig +++ b/configs/am43xx_evm_ethboot_defconfig @@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND,SPL_ETH_SUPPORT" CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y +CONFIG_CMD_NAND=y diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig index 392747d..cf789c6 100644 --- a/configs/am43xx_evm_usbhost_boot_defconfig +++ b/configs/am43xx_evm_usbhost_boot_defconfig @@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND,SPL_USB_HOST_SUPPORT" CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y +CONFIG_CMD_NAND=y diff --git a/configs/cairo_defconfig b/configs/cairo_defconfig index a972ad7..0fe118d 100644 --- a/configs/cairo_defconfig +++ b/configs/cairo_defconfig @@ -10,3 +10,4 @@ CONFIG_SPL=y CONFIG_SYS_PROMPT="Cairo # " CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y +CONFIG_CMD_NAND=y diff --git a/configs/cm_t335_defconfig b/configs/cm_t335_defconfig index ad1b008..ac7b7a0 100644 --- a/configs/cm_t335_defconfig +++ b/configs/cm_t335_defconfig @@ -7,3 +7,4 @@ CONFIG_SPL=y CONFIG_SYS_PROMPT="CM-T335 # " CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y +CONFIG_CMD_NAND=y diff --git a/configs/cm_t35_defconfig b/configs/cm_t35_defconfig index c94882a..6e100e4 100644 --- a/configs/cm_t35_defconfig +++ b/configs/cm_t35_defconfig @@ -7,5 +7,6 @@ CONFIG_SYS_PROMPT="CM-T3x # " CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set +CONFIG_CMD_NAND=y # CONFIG_CMD_FPGA is not set # CONFIG_CMD_SETEXPR is not set diff --git a/configs/cm_t43_defconfig b/configs/cm_t43_defconfig index 04fd46f..0835b75 100644 --- a/configs/cm_t43_defconfig +++ b/configs/cm_t43_defconfig @@ -10,3 +10,4 @@ CONFIG_CMD_USB=y CONFIG_DM=y CONFIG_DM_GPIO=y CONFIG_CMD_BOOTZ=y +CONFIG_CMD_NAND=y diff --git a/configs/devkit8000_defconfig b/configs/devkit8000_defconfig index cdb7b99..c011b1a 100644 --- a/configs/devkit8000_defconfig +++ b/configs/devkit8000_defconfig @@ -8,3 +8,4 @@ CONFIG_SPL=y # CONFIG_CMD_FPGA is not set # CONFIG_CMD_SETEXPR is not set CONFIG_HUSH_PARSER=y +CONFIG_CMD_NAND=y diff --git a/configs/igep0020_nand_defconfig b/configs/igep0020_nand_defconfig index a0451ac..9a8552f 100644 --- a/configs/igep0020_nand_defconfig +++ b/configs/igep0020_nand_defconfig @@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0020,BOOT_NAND" # CONFIG_CMD_SETEXPR is not set CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y +CONFIG_CMD_NAND=y diff --git a/configs/igep0030_nand_defconfig b/configs/igep0030_nand_defconfig index a7669c5..ad54a2e 100644 --- a/configs/igep0030_nand_defconfig +++ b/configs/igep0030_nand_defconfig @@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0030,BOOT_NAND" # CONFIG_CMD_SETEXPR is not set CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y +CONFIG_CMD_NAND=y diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig index 83adb07..2c70c9e 100644 --- a/configs/omap3_beagle_defconfig +++ b/configs/omap3_beagle_defconfig @@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="NAND" # CONFIG_CMD_FLASH is not set CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y +CONFIG_CMD_NAND=y diff --git a/configs/omap3_overo_defconfig b/configs/omap3_overo_defconfig index 9f50060..223d1fb 100644 --- a/configs/omap3_overo_defconfig +++ b/configs/omap3_overo_defconfig @@ -11,3 +11,4 @@ CONFIG_SPL=y CONFIG_SYS_PROMPT="Overo # " CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y +CONFIG_CMD_NAND=y diff --git a/configs/omap3_pandora_defconfig b/configs/omap3_pandora_defconfig index eac4490..ede8667 100644 --- a/configs/omap3_pandora_defconfig +++ b/configs/omap3_pandora_defconfig @@ -11,3 +11,4 @@ CONFIG_TARGET_OMAP3_PANDORA=y CONFIG_SYS_PROMPT="Pandora # " CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y +CONFIG_CMD_NAND=y diff --git a/configs/omap3_zoom1_defconfig b/configs/omap3_zoom1_defconfig index da5ed47..412fa3a 100644 --- a/configs/omap3_zoom1_defconfig +++ b/configs/omap3_zoom1_defconfig @@ -8,3 +8,4 @@ CONFIG_TARGET_OMAP3_ZOOM1=y # CONFIG_CMD_SETEXPR is not set CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y +CONFIG_CMD_NAND=y diff --git a/configs/pengwyn_defconfig b/configs/pengwyn_defconfig index 7322be7..45ed9d9 100644 --- a/configs/pengwyn_defconfig +++ b/configs/pengwyn_defconfig @@ -6,3 +6,4 @@ CONFIG_SPL=y # CONFIG_CMD_SETEXPR is not set CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y +CONFIG_CMD_NAND=y diff --git a/include/configs/cm_t335.h b/include/configs/cm_t335.h index adf05b1..0b74f8d 100644 --- a/include/configs/cm_t335.h +++ b/include/configs/cm_t335.h @@ -138,7 +138,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 e9370ab..22d556c 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -123,7 +123,6 @@
#define CONFIG_CMD_I2C /* I2C serial bus support */ #define CONFIG_CMD_MMC /* MMC support */ -#define CONFIG_CMD_NAND /* NAND support */ #define CONFIG_CMD_DHCP #define CONFIG_CMD_PING
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index bf986f8..e6cd135 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -106,7 +106,6 @@ "4m(kernel),-(fs)"
#define CONFIG_USB_STORAGE /* USB storage support */ -#define CONFIG_CMD_NAND /* NAND support */ #define CONFIG_CMD_LED /* LED support */ #define CONFIG_CMD_GPIO /* Enable gpio command */ #define CONFIG_CMD_DHCP diff --git a/include/configs/ti_armv7_omap.h b/include/configs/ti_armv7_omap.h index 7548170..0bc713c 100644 --- a/include/configs/ti_armv7_omap.h +++ b/include/configs/ti_armv7_omap.h @@ -40,7 +40,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 */