[U-Boot] [PATCH 00/10] Kconfig and ti omap configs tidy up
The patch set is aimed to transferring several config options from the old config.h configuration style to the new Kconfig framework and also move some of the existing (in Kconfig) ones from config.h style to the defconfig style in the ti-omap land.
It is based on the 7d31c6a (Merge git://git.denx.de/u-boot-pxa) commit upstream.
Igor Grinberg (10): configs: remove remnants of CONFIG_SYS_NAND_QUIET_TEST Kconfig: fix typo in CONFIG_FIT description Kconfig: add CONFIG_BOOTDELAY Kconfig: add CONFIG_CMD_BOOTZ ti: omap3: config: remove 1 from boolean define ti: omap/am: move CONFIG_HUSH_PARSER to defconfig ti: omap/am: move CONFIG_CMD_BOOTZ to defconfig ti: omap/am: move CONFIG_CMD_NAND to defconfig ti: omap/am: move CONFIG_CMD_I2C to defconfig ti: omap/am: move CONFIG_BOOTDELAY to defconfig
Kconfig | 2 +- common/Kconfig | 23 +++++++++++++++++++++++ configs/am335x_baltos_defconfig | 6 ++++++ configs/am335x_evm_defconfig | 6 ++++++ configs/am335x_evm_nor_defconfig | 6 ++++++ configs/am335x_evm_norboot_defconfig | 5 +++++ configs/am335x_evm_spiboot_defconfig | 5 +++++ configs/am335x_evm_usbspl_defconfig | 6 ++++++ configs/am335x_gp_evm_defconfig | 4 ++++ configs/am335x_igep0033_defconfig | 6 ++++++ configs/am43xx_evm_defconfig | 6 ++++++ configs/am43xx_evm_ethboot_defconfig | 6 ++++++ configs/am43xx_evm_qspiboot_defconfig | 5 +++++ configs/am43xx_evm_usbhost_boot_defconfig | 6 ++++++ configs/beagle_x15_defconfig | 5 +++++ configs/birdland_bav335a_defconfig | 5 +++++ configs/birdland_bav335b_defconfig | 5 +++++ configs/cairo_defconfig | 6 ++++++ configs/cm_t335_defconfig | 6 ++++++ configs/cm_t35_defconfig | 8 +++++++- configs/cm_t43_defconfig | 8 +++++++- configs/cm_t54_defconfig | 5 +++++ configs/devkit8000_defconfig | 5 +++++ configs/dra72_evm_defconfig | 5 +++++ configs/dra7xx_evm_defconfig | 5 +++++ configs/dra7xx_evm_qspiboot_defconfig | 5 +++++ configs/dra7xx_evm_uart3_defconfig | 5 +++++ configs/draco_defconfig | 1 + configs/duovero_defconfig | 5 +++++ configs/igep0020_defconfig | 5 +++++ configs/igep0020_nand_defconfig | 6 ++++++ configs/igep0030_defconfig | 5 +++++ configs/igep0030_nand_defconfig | 6 ++++++ configs/igep0032_defconfig | 5 +++++ configs/k2e_evm_defconfig | 7 ++++++- configs/k2hk_evm_defconfig | 7 ++++++- configs/k2l_evm_defconfig | 7 ++++++- configs/omap3_beagle_defconfig | 6 ++++++ configs/omap3_overo_defconfig | 6 ++++++ configs/omap3_pandora_defconfig | 6 ++++++ configs/omap3_zoom1_defconfig | 6 ++++++ configs/omap4_panda_defconfig | 5 +++++ configs/omap4_sdp4430_defconfig | 5 +++++ configs/omap5_uevm_defconfig | 5 +++++ configs/pcm051_rev1_defconfig | 5 +++++ configs/pcm051_rev3_defconfig | 5 +++++ configs/pengwyn_defconfig | 6 ++++++ configs/pepper_defconfig | 5 +++++ configs/pxm2_defconfig | 1 + configs/rastaban_defconfig | 1 + configs/rut_defconfig | 1 + configs/thuban_defconfig | 1 + include/config_distro_defaults.h | 6 ++++++ include/configs/PMC440.h | 1 - include/configs/alpr.h | 1 - include/configs/cm_t35.h | 6 ------ include/configs/cm_t3517.h | 1 - include/configs/cm_t43.h | 1 - include/configs/cm_t54.h | 3 --- include/configs/devkit8000.h | 1 - include/configs/omap3_beagle.h | 1 - include/configs/omap3_cairo.h | 4 ---- include/configs/omap3_logic.h | 1 - include/configs/omap3_overo.h | 1 - include/configs/spear-common.h | 1 - include/configs/tao3530.h | 1 - include/configs/ti_armv7_common.h | 8 -------- include/configs/ti_armv7_omap.h | 1 - include/configs/ti_omap3_common.h | 2 +- include/configs/xpedite517x.h | 1 - include/configs/xpedite537x.h | 1 - include/configs/xpedite550x.h | 1 - 72 files changed, 284 insertions(+), 42 deletions(-)
The config option has been removed by one of the syncs with the Linux mainline MTD subsystem: ff94bc40af (mtd, ubi, ubifs: resync with Linux-3.14) It has been left inside the config files. Currently does not look to serve any purpose, so remove it now from all the configs.
Signed-off-by: Igor Grinberg grinberg@compulab.co.il Cc: Matthias Fuchs matthias.fuchs@esd-electronics.com Cc: Stefan Roese sr@denx.de Cc: "Albert ARIBAUD (3ADEV)" albert.aribaud@3adev.fr Cc: Peter Barada peter.barada@logicpd.com Cc: Steve Sakoman sakoman@gmail.com Cc: Peter Tyser ptyser@xes-inc.com Cc: Joe Hershberger joe.hershberger@ni.com Cc: Simon Glass sjg@chromium.org --- include/configs/PMC440.h | 1 - include/configs/alpr.h | 1 - include/configs/cm_t35.h | 1 - include/configs/cm_t3517.h | 1 - include/configs/omap3_beagle.h | 1 - include/configs/omap3_cairo.h | 1 - include/configs/omap3_logic.h | 1 - include/configs/omap3_overo.h | 1 - include/configs/spear-common.h | 1 - include/configs/tao3530.h | 1 - include/configs/xpedite517x.h | 1 - include/configs/xpedite537x.h | 1 - include/configs/xpedite550x.h | 1 - 13 files changed, 13 deletions(-)
diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h index 9ed6c61..17bd180 100644 --- a/include/configs/PMC440.h +++ b/include/configs/PMC440.h @@ -406,7 +406,6 @@ #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE (CONFIG_SYS_NAND_ADDR + CONFIG_SYS_NAND_CS) #define CONFIG_SYS_NAND_SELECT_DEVICE 1 /* nand driver supports mutipl. chips */ -#define CONFIG_SYS_NAND_QUIET_TEST 1
#if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ diff --git a/include/configs/alpr.h b/include/configs/alpr.h index f113ebd..20165bc 100644 --- a/include/configs/alpr.h +++ b/include/configs/alpr.h @@ -316,7 +316,6 @@ #define CONFIG_SYS_NAND_BASE 0xF0000000 /* NAND FLASH Base Address */ #define CONFIG_SYS_NAND_BASE_LIST { CONFIG_SYS_NAND_BASE + 0, CONFIG_SYS_NAND_BASE + 2, \ CONFIG_SYS_NAND_BASE + 4, CONFIG_SYS_NAND_BASE + 6 } -#define CONFIG_SYS_NAND_QUIET_TEST 1 /* don't warn upon unknown NAND flash */ #define CONFIG_SYS_NAND_MAX_OOBFREE 2 #define CONFIG_SYS_NAND_MAX_ECCPOS 56
diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 281d614..e5fb474 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -147,7 +147,6 @@ /* * Board NAND Info. */ -#define CONFIG_SYS_NAND_QUIET_TEST #define CONFIG_NAND_OMAP_GPMC #define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */ /* to access nand */ diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h index 33b22a7..c91b7fa 100644 --- a/include/configs/cm_t3517.h +++ b/include/configs/cm_t3517.h @@ -152,7 +152,6 @@ /* * Board NAND Info. */ -#define CONFIG_SYS_NAND_QUIET_TEST #define CONFIG_NAND_OMAP_GPMC #define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */ /* to access nand */ diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index f309b2e..bf986f8 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -121,7 +121,6 @@ /* * Board NAND Info. */ -#define CONFIG_SYS_NAND_QUIET_TEST 1 #define CONFIG_NAND_OMAP_GPMC #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */ /* devices */ diff --git a/include/configs/omap3_cairo.h b/include/configs/omap3_cairo.h index 713df3c..3f777b6 100644 --- a/include/configs/omap3_cairo.h +++ b/include/configs/omap3_cairo.h @@ -70,7 +70,6 @@ /* * Board NAND Info. */ -#define CONFIG_SYS_NAND_QUIET_TEST 1 #define CONFIG_NAND_OMAP_GPMC #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */ /* devices */ diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index e09e617..8dfcb9e 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -125,7 +125,6 @@ /* * Board NAND Info. */ -#define CONFIG_SYS_NAND_QUIET_TEST #define CONFIG_NAND_OMAP_GPMC #define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */ /* to access nand */ diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index 53ff61d..3b1e5d7 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -88,7 +88,6 @@ #endif /* CONFIG_NAND */
/* Board NAND Info. */ -#define CONFIG_SYS_NAND_QUIET_TEST #define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */ /* to access nand */ /* Environment information */ diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h index fb1bf66..edae831 100644 --- a/include/configs/spear-common.h +++ b/include/configs/spear-common.h @@ -97,7 +97,6 @@ #define CONFIG_NAND_FSMC #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_ONFI_DETECTION -#define CONFIG_SYS_NAND_QUIET_TEST
/* * Command support defines diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index 408895f..bd1c07c 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -126,7 +126,6 @@ /* * Board NAND Info. */ -#define CONFIG_SYS_NAND_QUIET_TEST #define CONFIG_NAND_OMAP_GPMC #define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */ /* to access nand */ diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h index 669aa53..b5d1126 100644 --- a/include/configs/xpedite517x.h +++ b/include/configs/xpedite517x.h @@ -138,7 +138,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_NAND_ACTL_CLE (1 << 15) /* C_LA15 */ #define CONFIG_SYS_NAND_ACTL_NCE 0 /* NCE not controlled by ADDR */ #define CONFIG_SYS_NAND_ACTL_DELAY 25 -#define CONFIG_SYS_NAND_QUIET_TEST #define CONFIG_JFFS2_NAND
/* diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h index 58ace2c..0d24234 100644 --- a/include/configs/xpedite537x.h +++ b/include/configs/xpedite537x.h @@ -131,7 +131,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); #define CONFIG_SYS_NAND_BASE_LIST {CONFIG_SYS_NAND_BASE, \ CONFIG_SYS_NAND_BASE2} #define CONFIG_SYS_MAX_NAND_DEVICE 2 -#define CONFIG_SYS_NAND_QUIET_TEST /* 2nd NAND flash not always populated */ #define CONFIG_NAND_FSL_ELBC
/* diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h index 765aaad..f30d199 100644 --- a/include/configs/xpedite550x.h +++ b/include/configs/xpedite550x.h @@ -122,7 +122,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); #define CONFIG_SYS_NAND_BASE_LIST {CONFIG_SYS_NAND_BASE, \ CONFIG_SYS_NAND_BASE2} #define CONFIG_SYS_MAX_NAND_DEVICE 2 -#define CONFIG_SYS_NAND_QUIET_TEST /* 2nd NAND flash not always populated */ #define CONFIG_NAND_FSL_ELBC
/*
On 26.08.2015 16:54, Igor Grinberg wrote:
The config option has been removed by one of the syncs with the Linux mainline MTD subsystem: ff94bc40af (mtd, ubi, ubifs: resync with Linux-3.14) It has been left inside the config files. Currently does not look to serve any purpose, so remove it now from all the configs.
Signed-off-by: Igor Grinberg grinberg@compulab.co.il Cc: Matthias Fuchs matthias.fuchs@esd-electronics.com Cc: Stefan Roese sr@denx.de Cc: "Albert ARIBAUD (3ADEV)" albert.aribaud@3adev.fr Cc: Peter Barada peter.barada@logicpd.com Cc: Steve Sakoman sakoman@gmail.com Cc: Peter Tyser ptyser@xes-inc.com Cc: Joe Hershberger joe.hershberger@ni.com Cc: Simon Glass sjg@chromium.org
Acked-by: Stefan Roese sr@denx.de
Thanks, Stefan
On Wed, Aug 26, 2015 at 05:54:44PM +0300, Igor Grinberg wrote:
The config option has been removed by one of the syncs with the Linux mainline MTD subsystem: ff94bc40af (mtd, ubi, ubifs: resync with Linux-3.14) It has been left inside the config files. Currently does not look to serve any purpose, so remove it now from all the configs.
Signed-off-by: Igor Grinberg grinberg@compulab.co.il Cc: Matthias Fuchs matthias.fuchs@esd-electronics.com Cc: Stefan Roese sr@denx.de Cc: "Albert ARIBAUD (3ADEV)" albert.aribaud@3adev.fr Cc: Peter Barada peter.barada@logicpd.com Cc: Steve Sakoman sakoman@gmail.com Cc: Peter Tyser ptyser@xes-inc.com Cc: Joe Hershberger joe.hershberger@ni.com Cc: Simon Glass sjg@chromium.org Acked-by: Stefan Roese sr@denx.de
Applied to u-boot/master, thanks!
Fix typo in CONFIG_FIT description - remove the accidentially added redundand 'the'.
Signed-off-by: Igor Grinberg grinberg@compulab.co.il Cc: Masahiro Yamada yamada.masahiro@socionext.com Cc: Simon Glass sjg@chromium.org --- Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Kconfig b/Kconfig index 05a34f7..f364a7a 100644 --- a/Kconfig +++ b/Kconfig @@ -146,7 +146,7 @@ config FIT Flattened Image Tree. FIT is formally a FDT, which can include images of various types (kernel, FDT blob, ramdisk, etc.) in a single blob. To boot this new uImage structure, - pass the the address of the blob to the "bootm" command. + pass the address of the blob to the "bootm" command.
config FIT_VERBOSE bool "Display verbose messages on FIT boot"
On 26 August 2015 at 08:54, Igor Grinberg grinberg@compulab.co.il wrote:
Fix typo in CONFIG_FIT description - remove the accidentially added redundand 'the'.
Signed-off-by: Igor Grinberg grinberg@compulab.co.il Cc: Masahiro Yamada yamada.masahiro@socionext.com Cc: Simon Glass sjg@chromium.org
Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Reviewed-by: Simon Glass sjg@chromium.org
On Wed, Aug 26, 2015 at 05:54:45PM +0300, Igor Grinberg wrote:
Fix typo in CONFIG_FIT description - remove the accidentially added redundand 'the'.
Signed-off-by: Igor Grinberg grinberg@compulab.co.il Cc: Masahiro Yamada yamada.masahiro@socionext.com Cc: Simon Glass sjg@chromium.org Reviewed-by: Simon Glass sjg@chromium.org
Applied to u-boot/master, thanks!
Add CONFIG_BOOTDELAY to the Kconfig. To make the transition easier, we define CONFIG_AUTOBOOT_BOOTDELAY to actually enable the CONFIG_BOOTDELAY Kconfig setting. Once all boards finish transitioning to Kconfig, we can remove the CONFIG_AUTOBOOT_BOOTDELAY and just leave the CONFIG_BOOTDELAY unguarded.
Signed-off-by: Igor Grinberg grinberg@compulab.co.il Cc: Simon Glass sjg@chromium.org Cc: Masahiro Yamada yamada.masahiro@socionext.com --- common/Kconfig | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
diff --git a/common/Kconfig b/common/Kconfig index 88dc016..ecbf6cb 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -100,6 +100,23 @@ config AUTOBOOT_STOP_STR_SHA256 string / password matches a values that is encypted via a SHA256 hash and saved in the environment.
+config AUTOBOOT_BOOTDELAY + bool "Enable specifying the boot delay" + help + This option enables specifying the delay time (in seconds) + before automatically booting the default image. + +config BOOTDELAY + int "Seconds to delay before autobooting" + depends on AUTOBOOT_BOOTDELAY + default 1 + help + Delay before automatically booting the default image; + set to -1 to disable autoboot. + set to -2 to autoboot with no delay and not check for abort + (even when CONFIG_ZERO_BOOTDELAY_CHECK is defined). + See doc/README.autoboot for additional information. + endmenu
comment "Commands"
Hi Igor,
On 26 August 2015 at 08:54, Igor Grinberg grinberg@compulab.co.il wrote:
Add CONFIG_BOOTDELAY to the Kconfig. To make the transition easier, we define CONFIG_AUTOBOOT_BOOTDELAY to actually enable the CONFIG_BOOTDELAY Kconfig setting. Once all boards finish transitioning to Kconfig, we can remove the CONFIG_AUTOBOOT_BOOTDELAY and just leave the CONFIG_BOOTDELAY unguarded.
Signed-off-by: Igor Grinberg grinberg@compulab.co.il Cc: Simon Glass sjg@chromium.org Cc: Masahiro Yamada yamada.masahiro@socionext.com
common/Kconfig | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
diff --git a/common/Kconfig b/common/Kconfig index 88dc016..ecbf6cb 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -100,6 +100,23 @@ config AUTOBOOT_STOP_STR_SHA256 string / password matches a values that is encypted via a SHA256 hash and saved in the environment.
+config AUTOBOOT_BOOTDELAY
bool "Enable specifying the boot delay"helpThis option enables specifying the delay time (in seconds)before automatically booting the default image.+config BOOTDELAY
int "Seconds to delay before autobooting"depends on AUTOBOOT_BOOTDELAYdefault 1helpDelay before automatically booting the default image;set to -1 to disable autoboot.set to -2 to autoboot with no delay and not check for abort(even when CONFIG_ZERO_BOOTDELAY_CHECK is defined).See doc/README.autoboot for additional information.endmenu
comment "Commands"
How about using the moveconfig tool to move all boards to Kconfig for the option you add?
Regards, Simon
Add CONFIG_CMD_BOOTZ to the Kconfig. Since the CONFIG_CMD_BOOTZ cannot live without the CONFIG_CMD_BOOTM, make it select the CONFIG_CMD_BOOTM.
Signed-off-by: Igor Grinberg grinberg@compulab.co.il Cc: Masahiro Yamada yamada.masahiro@socionext.com Cc: Simon Glass sjg@chromium.org --- common/Kconfig | 6 ++++++ 1 file changed, 6 insertions(+)
diff --git a/common/Kconfig b/common/Kconfig index ecbf6cb..b7791bd 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -165,6 +165,12 @@ config CMD_BOOTM help Boot an application image from the memory.
+config CMD_BOOTZ + bool "bootz" + select CMD_BOOTM + help + Boot a Linux kernel zImage from the memory. + config CMD_GO bool "go" default y
ping.
On 08/26/15 17:54, Igor Grinberg wrote:
Add CONFIG_CMD_BOOTZ to the Kconfig. Since the CONFIG_CMD_BOOTZ cannot live without the CONFIG_CMD_BOOTM, make it select the CONFIG_CMD_BOOTM.
Signed-off-by: Igor Grinberg grinberg@compulab.co.il Cc: Masahiro Yamada yamada.masahiro@socionext.com Cc: Simon Glass sjg@chromium.org
common/Kconfig | 6 ++++++ 1 file changed, 6 insertions(+)
diff --git a/common/Kconfig b/common/Kconfig index ecbf6cb..b7791bd 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -165,6 +165,12 @@ config CMD_BOOTM help Boot an application image from the memory.
+config CMD_BOOTZ
- bool "bootz"
- select CMD_BOOTM
- help
Boot a Linux kernel zImage from the memory.config CMD_GO bool "go" default y
ping x2
On 09/24/15 12:57, Igor Grinberg wrote:
ping.
On 08/26/15 17:54, Igor Grinberg wrote:
Add CONFIG_CMD_BOOTZ to the Kconfig. Since the CONFIG_CMD_BOOTZ cannot live without the CONFIG_CMD_BOOTM, make it select the CONFIG_CMD_BOOTM.
Signed-off-by: Igor Grinberg grinberg@compulab.co.il Cc: Masahiro Yamada yamada.masahiro@socionext.com Cc: Simon Glass sjg@chromium.org
common/Kconfig | 6 ++++++ 1 file changed, 6 insertions(+)
diff --git a/common/Kconfig b/common/Kconfig index ecbf6cb..b7791bd 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -165,6 +165,12 @@ config CMD_BOOTM help Boot an application image from the memory.
+config CMD_BOOTZ
- bool "bootz"
- select CMD_BOOTM
- help
Boot a Linux kernel zImage from the memory.config CMD_GO bool "go" default y
On Tue, Sep 29, 2015 at 07:25:02PM +0300, Igor Grinberg wrote:
ping x2
On 09/24/15 12:57, Igor Grinberg wrote:
ping.
On 08/26/15 17:54, Igor Grinberg wrote:
Add CONFIG_CMD_BOOTZ to the Kconfig. Since the CONFIG_CMD_BOOTZ cannot live without the CONFIG_CMD_BOOTM, make it select the CONFIG_CMD_BOOTM.
Signed-off-by: Igor Grinberg grinberg@compulab.co.il Cc: Masahiro Yamada yamada.masahiro@socionext.com Cc: Simon Glass sjg@chromium.org
common/Kconfig | 6 ++++++ 1 file changed, 6 insertions(+)
diff --git a/common/Kconfig b/common/Kconfig index ecbf6cb..b7791bd 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -165,6 +165,12 @@ config CMD_BOOTM help Boot an application image from the memory.
+config CMD_BOOTZ
- bool "bootz"
- select CMD_BOOTM
- help
Boot a Linux kernel zImage from the memory.config CMD_GO bool "go" default y
I figured you were tackling this later with moveconfig.py, no?
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256
On 09/29/15 20:11, Tom Rini wrote:
On Tue, Sep 29, 2015 at 07:25:02PM +0300, Igor Grinberg wrote:
ping x2
On 09/24/15 12:57, Igor Grinberg wrote:
ping.
On 08/26/15 17:54, Igor Grinberg wrote:
Add CONFIG_CMD_BOOTZ to the Kconfig. Since the CONFIG_CMD_BOOTZ cannot live without the CONFIG_CMD_BOOTM, make it select the CONFIG_CMD_BOOTM.
Signed-off-by: Igor Grinberg grinberg@compulab.co.il Cc: Masahiro Yamada yamada.masahiro@socionext.com Cc: Simon Glass sjg@chromium.org
common/Kconfig | 6 ++++++ 1 file changed, 6 insertions(+)
diff --git a/common/Kconfig b/common/Kconfig index ecbf6cb..b7791bd 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -165,6 +165,12 @@ config CMD_BOOTM help Boot an application image from the memory.
+config CMD_BOOTZ
- bool "bootz"
- select CMD_BOOTM
- help
Boot a Linux kernel zImage from the memory.config CMD_GO bool "go" default y
I figured you were tackling this later with moveconfig.py, no?
Aahh, yes that is true. Sorry about that.
- -- Regards, Igor.
CONFIG_TWL4030_POWER is a boolean define variable. It is either defined or not defined and should not have a value assigned to it. Remove the value.
Signed-off-by: Igor Grinberg grinberg@compulab.co.il --- include/configs/ti_omap3_common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/configs/ti_omap3_common.h b/include/configs/ti_omap3_common.h index be231a5..e399a87 100644 --- a/include/configs/ti_omap3_common.h +++ b/include/configs/ti_omap3_common.h @@ -66,7 +66,7 @@ #define CONFIG_SYS_MONITOR_LEN (256 << 10)
/* TWL4030 */ -#define CONFIG_TWL4030_POWER 1 +#define CONFIG_TWL4030_POWER
/* SPL */ #define CONFIG_SPL_TEXT_BASE 0x40200800
Hi Tom,
On 08/26/15 17:54, Igor Grinberg wrote:
CONFIG_TWL4030_POWER is a boolean define variable. It is either defined or not defined and should not have a value assigned to it. Remove the value.
Signed-off-by: Igor Grinberg grinberg@compulab.co.il
I think this one can also be applied, no?
include/configs/ti_omap3_common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/configs/ti_omap3_common.h b/include/configs/ti_omap3_common.h index be231a5..e399a87 100644 --- a/include/configs/ti_omap3_common.h +++ b/include/configs/ti_omap3_common.h @@ -66,7 +66,7 @@ #define CONFIG_SYS_MONITOR_LEN (256 << 10)
/* TWL4030 */ -#define CONFIG_TWL4030_POWER 1 +#define CONFIG_TWL4030_POWER
/* SPL */ #define CONFIG_SPL_TEXT_BASE 0x40200800
ping
On 09/24/15 12:56, Igor Grinberg wrote:
Hi Tom,
On 08/26/15 17:54, Igor Grinberg wrote:
CONFIG_TWL4030_POWER is a boolean define variable. It is either defined or not defined and should not have a value assigned to it. Remove the value.
Signed-off-by: Igor Grinberg grinberg@compulab.co.il
I think this one can also be applied, no?
include/configs/ti_omap3_common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/configs/ti_omap3_common.h b/include/configs/ti_omap3_common.h index be231a5..e399a87 100644 --- a/include/configs/ti_omap3_common.h +++ b/include/configs/ti_omap3_common.h @@ -66,7 +66,7 @@ #define CONFIG_SYS_MONITOR_LEN (256 << 10)
/* TWL4030 */ -#define CONFIG_TWL4030_POWER 1 +#define CONFIG_TWL4030_POWER
/* SPL */ #define CONFIG_SPL_TEXT_BASE 0x40200800
On Tue, Sep 29, 2015 at 07:25:27PM +0300, Igor Grinberg wrote:
ping
On 09/24/15 12:56, Igor Grinberg wrote:
Hi Tom,
On 08/26/15 17:54, Igor Grinberg wrote:
CONFIG_TWL4030_POWER is a boolean define variable. It is either defined or not defined and should not have a value assigned to it. Remove the value.
Signed-off-by: Igor Grinberg grinberg@compulab.co.il
I think this one can also be applied, no?
include/configs/ti_omap3_common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/configs/ti_omap3_common.h b/include/configs/ti_omap3_common.h index be231a5..e399a87 100644 --- a/include/configs/ti_omap3_common.h +++ b/include/configs/ti_omap3_common.h @@ -66,7 +66,7 @@ #define CONFIG_SYS_MONITOR_LEN (256 << 10)
/* TWL4030 */ -#define CONFIG_TWL4030_POWER 1 +#define CONFIG_TWL4030_POWER
/* SPL */ #define CONFIG_SPL_TEXT_BASE 0x40200800
Reviewed-by: Tom Rini trini@konsulko.com
And I figured you just re-post this as part of v2 as it's trivially correct but also a tiny thing in a bigger series.
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256
On 09/29/15 20:12, Tom Rini wrote:
On Tue, Sep 29, 2015 at 07:25:27PM +0300, Igor Grinberg wrote:
ping
On 09/24/15 12:56, Igor Grinberg wrote:
Hi Tom,
On 08/26/15 17:54, Igor Grinberg wrote:
CONFIG_TWL4030_POWER is a boolean define variable. It is either defined or not defined and should not have a value assigned to it. Remove the value.
Signed-off-by: Igor Grinberg grinberg@compulab.co.il
I think this one can also be applied, no?
include/configs/ti_omap3_common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/configs/ti_omap3_common.h b/include/configs/ti_omap3_common.h index be231a5..e399a87 100644 --- a/include/configs/ti_omap3_common.h +++ b/include/configs/ti_omap3_common.h @@ -66,7 +66,7 @@ #define CONFIG_SYS_MONITOR_LEN (256 << 10)
/* TWL4030 */ -#define CONFIG_TWL4030_POWER 1 +#define CONFIG_TWL4030_POWER
/* SPL */ #define CONFIG_SPL_TEXT_BASE 0x40200800
Reviewed-by: Tom Rini trini@konsulko.com
And I figured you just re-post this as part of v2 as it's trivially correct but also a tiny thing in a bigger series.
Well, its relation is only by the affected file, so it will help me more (less things to carry for v2) if you can apply it already.
Thanks!
- -- Regards, Igor.
Make more use of the Kconfig and move CONFIG_HUSH_PARSER 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: Felipe Balbi balbi@ti.com Cc: Gilles Gameiro gilles@gigadevices.com Cc: "Albert ARIBAUD (3ADEV)" albert.aribaud@3adev.fr Cc: Nikita Kiryanov nikita@compulab.co.il Cc: Dmitry Lifshitz lifshitz@compulab.co.il Cc: Thomas Weber weber@corscience.de Cc: Ash Charles ash@gumstix.com Cc: Vitaly Andrianov vitalya@ti.com Cc: Steve Sakoman sakoman@gmail.com Cc: Grazvydas Ignotas notasas@gmail.com Cc: Nishanth Menon nm@ti.com Cc: Lars Poeschel poeschel@lemonage.de 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_norboot_defconfig | 1 + configs/am335x_evm_spiboot_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_qspiboot_defconfig | 1 + configs/am43xx_evm_usbhost_boot_defconfig | 1 + configs/beagle_x15_defconfig | 1 + configs/birdland_bav335a_defconfig | 1 + configs/birdland_bav335b_defconfig | 1 + configs/cairo_defconfig | 1 + configs/cm_t335_defconfig | 1 + configs/cm_t35_defconfig | 3 ++- configs/cm_t43_defconfig | 3 ++- configs/cm_t54_defconfig | 1 + configs/devkit8000_defconfig | 1 + configs/dra72_evm_defconfig | 1 + configs/dra7xx_evm_defconfig | 1 + configs/dra7xx_evm_qspiboot_defconfig | 1 + configs/dra7xx_evm_uart3_defconfig | 1 + configs/duovero_defconfig | 1 + configs/igep0020_defconfig | 1 + configs/igep0020_nand_defconfig | 1 + configs/igep0030_defconfig | 1 + configs/igep0030_nand_defconfig | 1 + configs/igep0032_defconfig | 1 + configs/k2e_evm_defconfig | 3 ++- configs/k2hk_evm_defconfig | 3 ++- configs/k2l_evm_defconfig | 3 ++- configs/omap3_beagle_defconfig | 1 + configs/omap3_overo_defconfig | 1 + configs/omap3_pandora_defconfig | 1 + configs/omap3_zoom1_defconfig | 1 + configs/omap4_panda_defconfig | 1 + configs/omap4_sdp4430_defconfig | 1 + configs/omap5_uevm_defconfig | 1 + configs/pcm051_rev1_defconfig | 1 + configs/pcm051_rev3_defconfig | 1 + configs/pengwyn_defconfig | 1 + configs/pepper_defconfig | 1 + include/config_distro_defaults.h | 2 ++ include/configs/cm_t35.h | 1 - include/configs/ti_armv7_common.h | 1 - 48 files changed, 52 insertions(+), 7 deletions(-)
diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig index 8e8a897..884fdf5 100644 --- a/configs/am335x_baltos_defconfig +++ b/configs/am335x_baltos_defconfig @@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="NAND" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set +CONFIG_HUSH_PARSER=y diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig index 96599c6..3358cf8 100644 --- a/configs/am335x_evm_defconfig +++ b/configs/am335x_evm_defconfig @@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="NAND" # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y +CONFIG_HUSH_PARSER=y diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig index 6a39041..d42ce40 100644 --- a/configs/am335x_evm_nor_defconfig +++ b/configs/am335x_evm_nor_defconfig @@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="NAND" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y +CONFIG_HUSH_PARSER=y diff --git a/configs/am335x_evm_norboot_defconfig b/configs/am335x_evm_norboot_defconfig index 9fdffca..3584763 100644 --- a/configs/am335x_evm_norboot_defconfig +++ b/configs/am335x_evm_norboot_defconfig @@ -5,3 +5,4 @@ CONFIG_NOR_BOOT=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y +CONFIG_HUSH_PARSER=y diff --git a/configs/am335x_evm_spiboot_defconfig b/configs/am335x_evm_spiboot_defconfig index bbeb3c9..cb96ed3 100644 --- a/configs/am335x_evm_spiboot_defconfig +++ b/configs/am335x_evm_spiboot_defconfig @@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SPI_BOOT" # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y +CONFIG_HUSH_PARSER=y diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig index c6109f1..85667f3 100644 --- a/configs/am335x_evm_usbspl_defconfig +++ b/configs/am335x_evm_usbspl_defconfig @@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="NAND,SPL_USBETH_SUPPORT" # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y +CONFIG_HUSH_PARSER=y diff --git a/configs/am335x_gp_evm_defconfig b/configs/am335x_gp_evm_defconfig index 62d3b6b..3cfc521 100644 --- a/configs/am335x_gp_evm_defconfig +++ b/configs/am335x_gp_evm_defconfig @@ -12,3 +12,4 @@ CONFIG_OF_CONTROL=y CONFIG_SPL_DISABLE_OF_CONTROL=y CONFIG_SPI_FLASH=y CONFIG_RSA=y +CONFIG_HUSH_PARSER=y diff --git a/configs/am335x_igep0033_defconfig b/configs/am335x_igep0033_defconfig index a31982a..fc2f79b 100644 --- a/configs/am335x_igep0033_defconfig +++ b/configs/am335x_igep0033_defconfig @@ -6,3 +6,4 @@ CONFIG_SPL_STACK_R_ADDR=0x82000000 # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set +CONFIG_HUSH_PARSER=y diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig index f84f57d..a44df2d 100644 --- a/configs/am43xx_evm_defconfig +++ b/configs/am43xx_evm_defconfig @@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND" # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y +CONFIG_HUSH_PARSER=y diff --git a/configs/am43xx_evm_ethboot_defconfig b/configs/am43xx_evm_ethboot_defconfig index 2d1a301..393dbe9 100644 --- a/configs/am43xx_evm_ethboot_defconfig +++ b/configs/am43xx_evm_ethboot_defconfig @@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND,SPL_ETH_SUPPORT" # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y +CONFIG_HUSH_PARSER=y diff --git a/configs/am43xx_evm_qspiboot_defconfig b/configs/am43xx_evm_qspiboot_defconfig index ff0109f..d4ae25f 100644 --- a/configs/am43xx_evm_qspiboot_defconfig +++ b/configs/am43xx_evm_qspiboot_defconfig @@ -5,3 +5,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,QSPI,QSPI_BOOT" # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y +CONFIG_HUSH_PARSER=y diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig index 2a6c3dc..ae8ac44 100644 --- a/configs/am43xx_evm_usbhost_boot_defconfig +++ b/configs/am43xx_evm_usbhost_boot_defconfig @@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND,SPL_USB_HOST_SUPPORT" # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y +CONFIG_HUSH_PARSER=y diff --git a/configs/beagle_x15_defconfig b/configs/beagle_x15_defconfig index 3b3c027..d8344f0 100644 --- a/configs/beagle_x15_defconfig +++ b/configs/beagle_x15_defconfig @@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=3" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set +CONFIG_HUSH_PARSER=y diff --git a/configs/birdland_bav335a_defconfig b/configs/birdland_bav335a_defconfig index 244c770..37e8180 100644 --- a/configs/birdland_bav335a_defconfig +++ b/configs/birdland_bav335a_defconfig @@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1" # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y +CONFIG_HUSH_PARSER=y diff --git a/configs/birdland_bav335b_defconfig b/configs/birdland_bav335b_defconfig index a86b203..05bcc26 100644 --- a/configs/birdland_bav335b_defconfig +++ b/configs/birdland_bav335b_defconfig @@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1" # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y +CONFIG_HUSH_PARSER=y diff --git a/configs/cairo_defconfig b/configs/cairo_defconfig index 756457c..b5a66ce 100644 --- a/configs/cairo_defconfig +++ b/configs/cairo_defconfig @@ -8,3 +8,4 @@ CONFIG_SPL=y # CONFIG_CMD_FPGA is not set # CONFIG_CMD_NET is not set CONFIG_SYS_PROMPT="Cairo # " +CONFIG_HUSH_PARSER=y diff --git a/configs/cm_t335_defconfig b/configs/cm_t335_defconfig index 4f4bd0b..81aa52d 100644 --- a/configs/cm_t335_defconfig +++ b/configs/cm_t335_defconfig @@ -5,3 +5,4 @@ CONFIG_SPL=y # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_SYS_PROMPT="CM-T335 # " +CONFIG_HUSH_PARSER=y diff --git a/configs/cm_t35_defconfig b/configs/cm_t35_defconfig index 99dd2f4..966b81f 100644 --- a/configs/cm_t35_defconfig +++ b/configs/cm_t35_defconfig @@ -2,8 +2,9 @@ CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_CM_T35=y CONFIG_SPL=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="CM-T3x # " # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set # CONFIG_CMD_SETEXPR is not set -CONFIG_SYS_PROMPT="CM-T3x # " diff --git a/configs/cm_t43_defconfig b/configs/cm_t43_defconfig index 19ac18a..242b8c7 100644 --- a/configs/cm_t43_defconfig +++ b/configs/cm_t43_defconfig @@ -1,10 +1,11 @@ CONFIG_ARM=y CONFIG_TARGET_CM_T43=y CONFIG_SPL=y +CONFIG_HUSH_PARSER=y +# CONFIG_CMD_FLASH is not set CONFIG_CMD_SF=y CONFIG_CMD_USB=y # CONFIG_CMD_FPGA is not set -# CONFIG_CMD_FLASH is not set # CONFIG_CMD_NFS is not set CONFIG_DM=y CONFIG_DM_GPIO=y diff --git a/configs/cm_t54_defconfig b/configs/cm_t54_defconfig index fc72ffa..fd4b3f3 100644 --- a/configs/cm_t54_defconfig +++ b/configs/cm_t54_defconfig @@ -7,3 +7,4 @@ CONFIG_SPL=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NFS is not set CONFIG_SYS_PROMPT="CM-T54 # " +CONFIG_HUSH_PARSER=y diff --git a/configs/devkit8000_defconfig b/configs/devkit8000_defconfig index 60ead72..cdb7b99 100644 --- a/configs/devkit8000_defconfig +++ b/configs/devkit8000_defconfig @@ -7,3 +7,4 @@ CONFIG_SPL=y # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set # CONFIG_CMD_SETEXPR is not set +CONFIG_HUSH_PARSER=y diff --git a/configs/dra72_evm_defconfig b/configs/dra72_evm_defconfig index 3205e72..fa06116 100644 --- a/configs/dra72_evm_defconfig +++ b/configs/dra72_evm_defconfig @@ -15,3 +15,4 @@ CONFIG_DM=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_DM_GPIO=y +CONFIG_HUSH_PARSER=y diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig index f98e7b7..952d146 100644 --- a/configs/dra7xx_evm_defconfig +++ b/configs/dra7xx_evm_defconfig @@ -10,3 +10,4 @@ CONFIG_SPL_STACK_R_ADDR=0x82000000 # CONFIG_CMD_NFS is not set CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y +CONFIG_HUSH_PARSER=y diff --git a/configs/dra7xx_evm_qspiboot_defconfig b/configs/dra7xx_evm_qspiboot_defconfig index f14fa62..6de333a 100644 --- a/configs/dra7xx_evm_qspiboot_defconfig +++ b/configs/dra7xx_evm_qspiboot_defconfig @@ -10,3 +10,4 @@ CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT" # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NFS is not set CONFIG_SPI_FLASH=y +CONFIG_HUSH_PARSER=y diff --git a/configs/dra7xx_evm_uart3_defconfig b/configs/dra7xx_evm_uart3_defconfig index 8882260..f4ba4ac 100644 --- a/configs/dra7xx_evm_uart3_defconfig +++ b/configs/dra7xx_evm_uart3_defconfig @@ -11,3 +11,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SPL_YMODEM_SUPPORT" # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NFS is not set CONFIG_SPI_FLASH=y +CONFIG_HUSH_PARSER=y diff --git a/configs/duovero_defconfig b/configs/duovero_defconfig index d3de28a..58d86e1 100644 --- a/configs/duovero_defconfig +++ b/configs/duovero_defconfig @@ -7,3 +7,4 @@ CONFIG_SPL=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NFS is not set CONFIG_SYS_PROMPT="duovero # " +CONFIG_HUSH_PARSER=y diff --git a/configs/igep0020_defconfig b/configs/igep0020_defconfig index e45e83c..d1dd75e 100644 --- a/configs/igep0020_defconfig +++ b/configs/igep0020_defconfig @@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0020,BOOT_ONENAND" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set +CONFIG_HUSH_PARSER=y diff --git a/configs/igep0020_nand_defconfig b/configs/igep0020_nand_defconfig index 75fabef..4bda465 100644 --- a/configs/igep0020_nand_defconfig +++ b/configs/igep0020_nand_defconfig @@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0020,BOOT_NAND" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set +CONFIG_HUSH_PARSER=y diff --git a/configs/igep0030_defconfig b/configs/igep0030_defconfig index 1bb7a6f..ebaff74 100644 --- a/configs/igep0030_defconfig +++ b/configs/igep0030_defconfig @@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0030,BOOT_ONENAND" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set +CONFIG_HUSH_PARSER=y diff --git a/configs/igep0030_nand_defconfig b/configs/igep0030_nand_defconfig index ed01766..85ef454 100644 --- a/configs/igep0030_nand_defconfig +++ b/configs/igep0030_nand_defconfig @@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0030,BOOT_NAND" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set +CONFIG_HUSH_PARSER=y diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig index bfa15d7..37937dc 100644 --- a/configs/igep0032_defconfig +++ b/configs/igep0032_defconfig @@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0032,BOOT_ONENAND" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set +CONFIG_HUSH_PARSER=y diff --git a/configs/k2e_evm_defconfig b/configs/k2e_evm_defconfig index c4cbadd..e1bec71 100644 --- a/configs/k2e_evm_defconfig +++ b/configs/k2e_evm_defconfig @@ -2,8 +2,9 @@ CONFIG_ARM=y CONFIG_ARCH_KEYSTONE=y CONFIG_TARGET_K2E_EVM=y CONFIG_SPL=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="K2E EVM # " # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y -CONFIG_SYS_PROMPT="K2E EVM # " diff --git a/configs/k2hk_evm_defconfig b/configs/k2hk_evm_defconfig index a604939..6e62326 100644 --- a/configs/k2hk_evm_defconfig +++ b/configs/k2hk_evm_defconfig @@ -2,8 +2,9 @@ CONFIG_ARM=y CONFIG_ARCH_KEYSTONE=y CONFIG_TARGET_K2HK_EVM=y CONFIG_SPL=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="K2HK EVM # " # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y -CONFIG_SYS_PROMPT="K2HK EVM # " diff --git a/configs/k2l_evm_defconfig b/configs/k2l_evm_defconfig index a687e0c..8a3f447 100644 --- a/configs/k2l_evm_defconfig +++ b/configs/k2l_evm_defconfig @@ -2,8 +2,9 @@ CONFIG_ARM=y CONFIG_ARCH_KEYSTONE=y CONFIG_TARGET_K2L_EVM=y CONFIG_SPL=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="K2L EVM # " # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y -CONFIG_SYS_PROMPT="K2L EVM # " diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig index dde076a..e0b8f4f 100644 --- a/configs/omap3_beagle_defconfig +++ b/configs/omap3_beagle_defconfig @@ -5,3 +5,4 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="NAND" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set +CONFIG_HUSH_PARSER=y diff --git a/configs/omap3_overo_defconfig b/configs/omap3_overo_defconfig index 5d03485..8f7b4de 100644 --- a/configs/omap3_overo_defconfig +++ b/configs/omap3_overo_defconfig @@ -9,3 +9,4 @@ CONFIG_SPL=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NFS is not set CONFIG_SYS_PROMPT="Overo # " +CONFIG_HUSH_PARSER=y diff --git a/configs/omap3_pandora_defconfig b/configs/omap3_pandora_defconfig index 4fb7899..93dde54 100644 --- a/configs/omap3_pandora_defconfig +++ b/configs/omap3_pandora_defconfig @@ -9,3 +9,4 @@ CONFIG_TARGET_OMAP3_PANDORA=y # CONFIG_CMD_NET is not set # CONFIG_CMD_NFS is not set CONFIG_SYS_PROMPT="Pandora # " +CONFIG_HUSH_PARSER=y diff --git a/configs/omap3_zoom1_defconfig b/configs/omap3_zoom1_defconfig index 9efd6de..654d94b 100644 --- a/configs/omap3_zoom1_defconfig +++ b/configs/omap3_zoom1_defconfig @@ -6,3 +6,4 @@ CONFIG_TARGET_OMAP3_ZOOM1=y # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set # CONFIG_CMD_SETEXPR is not set +CONFIG_HUSH_PARSER=y diff --git a/configs/omap4_panda_defconfig b/configs/omap4_panda_defconfig index 1be285d..0683fe2 100644 --- a/configs/omap4_panda_defconfig +++ b/configs/omap4_panda_defconfig @@ -6,3 +6,4 @@ CONFIG_SPL=y # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NFS is not set +CONFIG_HUSH_PARSER=y diff --git a/configs/omap4_sdp4430_defconfig b/configs/omap4_sdp4430_defconfig index b369d1d..248863f 100644 --- a/configs/omap4_sdp4430_defconfig +++ b/configs/omap4_sdp4430_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_OMAP44XX=y CONFIG_TARGET_OMAP4_SDP4430=y CONFIG_SPL=y +CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set diff --git a/configs/omap5_uevm_defconfig b/configs/omap5_uevm_defconfig index 15221ad..338d62c 100644 --- a/configs/omap5_uevm_defconfig +++ b/configs/omap5_uevm_defconfig @@ -5,3 +5,4 @@ CONFIG_SPL=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set +CONFIG_HUSH_PARSER=y diff --git a/configs/pcm051_rev1_defconfig b/configs/pcm051_rev1_defconfig index 2f1022c..aaf4632 100644 --- a/configs/pcm051_rev1_defconfig +++ b/configs/pcm051_rev1_defconfig @@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="REV1" # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y +CONFIG_HUSH_PARSER=y diff --git a/configs/pcm051_rev3_defconfig b/configs/pcm051_rev3_defconfig index 61d94b8..e02780c 100644 --- a/configs/pcm051_rev3_defconfig +++ b/configs/pcm051_rev3_defconfig @@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="REV3" # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y +CONFIG_HUSH_PARSER=y diff --git a/configs/pengwyn_defconfig b/configs/pengwyn_defconfig index 38add54..3fdadde 100644 --- a/configs/pengwyn_defconfig +++ b/configs/pengwyn_defconfig @@ -4,3 +4,4 @@ CONFIG_SPL=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set +CONFIG_HUSH_PARSER=y diff --git a/configs/pepper_defconfig b/configs/pepper_defconfig index 787c5f9..300c147 100644 --- a/configs/pepper_defconfig +++ b/configs/pepper_defconfig @@ -5,3 +5,4 @@ CONFIG_SPL=y # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_SYS_PROMPT="pepper# " +CONFIG_HUSH_PARSER=y diff --git a/include/config_distro_defaults.h b/include/config_distro_defaults.h index d8165cc..7503bff 100644 --- a/include/config_distro_defaults.h +++ b/include/config_distro_defaults.h @@ -66,6 +66,8 @@ #define CONFIG_DOS_PARTITION #define CONFIG_EFI_PARTITION #define CONFIG_SUPPORT_RAW_INITRD +#ifndef CONFIG_SYS_HUSH_PARSER #define CONFIG_SYS_HUSH_PARSER +#endif
#endif /* _CONFIG_CMD_DISTRO_DEFAULTS_H */ diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index e5fb474..3ff138f 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -220,7 +220,6 @@ #define CONFIG_TIMESTAMP #define CONFIG_SYS_AUTOLOAD "no" #define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ #define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ /* Print Buffer Size */ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index 18fca02..6dde989 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -114,7 +114,6 @@ #else #define CONFIG_SYS_MALLOC_LEN (16 << 20) #endif -#define CONFIG_SYS_HUSH_PARSER #define CONFIG_SYS_CONSOLE_INFO_QUIET #define CONFIG_BAUDRATE 115200 #define CONFIG_ENV_VARS_UBOOT_CONFIG /* Strongly encouraged */
Make more use of the Kconfig and move CONFIG_CMD_BOOTZ 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: Felipe Balbi balbi@ti.com Cc: Gilles Gameiro gilles@gigadevices.com Cc: "Albert ARIBAUD (3ADEV)" albert.aribaud@3adev.fr Cc: Nikita Kiryanov nikita@compulab.co.il Cc: Dmitry Lifshitz lifshitz@compulab.co.il Cc: Roger Meier r.meier@siemens.com Cc: Thomas Weber weber@corscience.de Cc: Ash Charles ash@gumstix.com Cc: Vitaly Andrianov vitalya@ti.com Cc: Steve Sakoman sakoman@gmail.com Cc: Grazvydas Ignotas notasas@gmail.com Cc: Nishanth Menon nm@ti.com Cc: Lars Poeschel poeschel@lemonage.de 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_norboot_defconfig | 1 + configs/am335x_evm_spiboot_defconfig | 1 + configs/am335x_evm_usbspl_defconfig | 1 + configs/am335x_igep0033_defconfig | 1 + configs/am43xx_evm_defconfig | 1 + configs/am43xx_evm_ethboot_defconfig | 1 + configs/am43xx_evm_qspiboot_defconfig | 1 + configs/am43xx_evm_usbhost_boot_defconfig | 1 + configs/beagle_x15_defconfig | 1 + configs/birdland_bav335a_defconfig | 1 + configs/birdland_bav335b_defconfig | 1 + configs/cairo_defconfig | 1 + configs/cm_t335_defconfig | 1 + configs/cm_t35_defconfig | 1 + configs/cm_t43_defconfig | 1 + configs/cm_t54_defconfig | 1 + configs/dra72_evm_defconfig | 1 + configs/dra7xx_evm_defconfig | 1 + configs/dra7xx_evm_qspiboot_defconfig | 1 + configs/dra7xx_evm_uart3_defconfig | 1 + configs/draco_defconfig | 1 + configs/duovero_defconfig | 1 + configs/igep0020_defconfig | 1 + configs/igep0020_nand_defconfig | 1 + configs/igep0030_defconfig | 1 + configs/igep0030_nand_defconfig | 1 + configs/igep0032_defconfig | 1 + configs/k2e_evm_defconfig | 1 + configs/k2hk_evm_defconfig | 1 + configs/k2l_evm_defconfig | 1 + configs/omap3_beagle_defconfig | 1 + configs/omap3_overo_defconfig | 1 + configs/omap3_pandora_defconfig | 1 + configs/omap3_zoom1_defconfig | 1 + configs/omap4_panda_defconfig | 1 + configs/omap4_sdp4430_defconfig | 1 + configs/omap5_uevm_defconfig | 1 + configs/pcm051_rev1_defconfig | 1 + configs/pcm051_rev3_defconfig | 1 + configs/pengwyn_defconfig | 1 + configs/pepper_defconfig | 1 + configs/pxm2_defconfig | 1 + configs/rastaban_defconfig | 1 + configs/rut_defconfig | 1 + configs/thuban_defconfig | 1 + include/config_distro_defaults.h | 2 ++ include/configs/cm_t35.h | 1 - include/configs/devkit8000.h | 1 - include/configs/ti_armv7_common.h | 1 - 52 files changed, 50 insertions(+), 3 deletions(-)
diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig index 884fdf5..c20af0e 100644 --- a/configs/am335x_baltos_defconfig +++ b/configs/am335x_baltos_defconfig @@ -10,3 +10,4 @@ CONFIG_SYS_EXTRA_OPTIONS="NAND" # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig index 3358cf8..396f082 100644 --- a/configs/am335x_evm_defconfig +++ b/configs/am335x_evm_defconfig @@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="NAND" # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig index d42ce40..2cbb73d 100644 --- a/configs/am335x_evm_nor_defconfig +++ b/configs/am335x_evm_nor_defconfig @@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="NAND" # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/am335x_evm_norboot_defconfig b/configs/am335x_evm_norboot_defconfig index 3584763..c5655ca 100644 --- a/configs/am335x_evm_norboot_defconfig +++ b/configs/am335x_evm_norboot_defconfig @@ -6,3 +6,4 @@ CONFIG_NOR_BOOT=y # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/am335x_evm_spiboot_defconfig b/configs/am335x_evm_spiboot_defconfig index cb96ed3..e0d4c83 100644 --- a/configs/am335x_evm_spiboot_defconfig +++ b/configs/am335x_evm_spiboot_defconfig @@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SPI_BOOT" # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig index 85667f3..710c1bd 100644 --- a/configs/am335x_evm_usbspl_defconfig +++ b/configs/am335x_evm_usbspl_defconfig @@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="NAND,SPL_USBETH_SUPPORT" # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/am335x_igep0033_defconfig b/configs/am335x_igep0033_defconfig index fc2f79b..d89af42 100644 --- a/configs/am335x_igep0033_defconfig +++ b/configs/am335x_igep0033_defconfig @@ -7,3 +7,4 @@ CONFIG_SPL_STACK_R_ADDR=0x82000000 # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig index a44df2d..526373f 100644 --- a/configs/am43xx_evm_defconfig +++ b/configs/am43xx_evm_defconfig @@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND" CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/am43xx_evm_ethboot_defconfig b/configs/am43xx_evm_ethboot_defconfig index 393dbe9..4ebe3ef 100644 --- a/configs/am43xx_evm_ethboot_defconfig +++ b/configs/am43xx_evm_ethboot_defconfig @@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND,SPL_ETH_SUPPORT" # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/am43xx_evm_qspiboot_defconfig b/configs/am43xx_evm_qspiboot_defconfig index d4ae25f..c105ff6 100644 --- a/configs/am43xx_evm_qspiboot_defconfig +++ b/configs/am43xx_evm_qspiboot_defconfig @@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,QSPI,QSPI_BOOT" # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig index ae8ac44..392747d 100644 --- a/configs/am43xx_evm_usbhost_boot_defconfig +++ b/configs/am43xx_evm_usbhost_boot_defconfig @@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND,SPL_USB_HOST_SUPPORT" # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/beagle_x15_defconfig b/configs/beagle_x15_defconfig index d8344f0..b6abfba 100644 --- a/configs/beagle_x15_defconfig +++ b/configs/beagle_x15_defconfig @@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=3" # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/birdland_bav335a_defconfig b/configs/birdland_bav335a_defconfig index 37e8180..0e37edf 100644 --- a/configs/birdland_bav335a_defconfig +++ b/configs/birdland_bav335a_defconfig @@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1" # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/birdland_bav335b_defconfig b/configs/birdland_bav335b_defconfig index 05bcc26..0ac5b49 100644 --- a/configs/birdland_bav335b_defconfig +++ b/configs/birdland_bav335b_defconfig @@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1" # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/cairo_defconfig b/configs/cairo_defconfig index b5a66ce..a972ad7 100644 --- a/configs/cairo_defconfig +++ b/configs/cairo_defconfig @@ -9,3 +9,4 @@ CONFIG_SPL=y # CONFIG_CMD_NET is not set CONFIG_SYS_PROMPT="Cairo # " CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/cm_t335_defconfig b/configs/cm_t335_defconfig index 81aa52d..ad1b008 100644 --- a/configs/cm_t335_defconfig +++ b/configs/cm_t335_defconfig @@ -6,3 +6,4 @@ CONFIG_SPL=y # CONFIG_CMD_SETEXPR is not set CONFIG_SYS_PROMPT="CM-T335 # " CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/cm_t35_defconfig b/configs/cm_t35_defconfig index 966b81f..c94882a 100644 --- a/configs/cm_t35_defconfig +++ b/configs/cm_t35_defconfig @@ -4,6 +4,7 @@ CONFIG_TARGET_CM_T35=y CONFIG_SPL=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="CM-T3x # " +CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set diff --git a/configs/cm_t43_defconfig b/configs/cm_t43_defconfig index 242b8c7..04fd46f 100644 --- a/configs/cm_t43_defconfig +++ b/configs/cm_t43_defconfig @@ -9,3 +9,4 @@ CONFIG_CMD_USB=y # CONFIG_CMD_NFS is not set CONFIG_DM=y CONFIG_DM_GPIO=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/cm_t54_defconfig b/configs/cm_t54_defconfig index fd4b3f3..af4c6c6 100644 --- a/configs/cm_t54_defconfig +++ b/configs/cm_t54_defconfig @@ -8,3 +8,4 @@ CONFIG_SPL=y # CONFIG_CMD_NFS is not set CONFIG_SYS_PROMPT="CM-T54 # " CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/dra72_evm_defconfig b/configs/dra72_evm_defconfig index fa06116..27345f6 100644 --- a/configs/dra72_evm_defconfig +++ b/configs/dra72_evm_defconfig @@ -16,3 +16,4 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_DM_GPIO=y CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig index 952d146..9778959 100644 --- a/configs/dra7xx_evm_defconfig +++ b/configs/dra7xx_evm_defconfig @@ -11,3 +11,4 @@ CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/dra7xx_evm_qspiboot_defconfig b/configs/dra7xx_evm_qspiboot_defconfig index 6de333a..f27fec8 100644 --- a/configs/dra7xx_evm_qspiboot_defconfig +++ b/configs/dra7xx_evm_qspiboot_defconfig @@ -11,3 +11,4 @@ CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT" # CONFIG_CMD_NFS is not set CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/dra7xx_evm_uart3_defconfig b/configs/dra7xx_evm_uart3_defconfig index f4ba4ac..7434db0 100644 --- a/configs/dra7xx_evm_uart3_defconfig +++ b/configs/dra7xx_evm_uart3_defconfig @@ -12,3 +12,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SPL_YMODEM_SUPPORT" # CONFIG_CMD_NFS is not set CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/draco_defconfig b/configs/draco_defconfig index d2fc98d..955c983 100644 --- a/configs/draco_defconfig +++ b/configs/draco_defconfig @@ -9,3 +9,4 @@ CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b" # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y CONFIG_SYS_PROMPT="U-Boot# " +CONFIG_CMD_BOOTZ=y diff --git a/configs/duovero_defconfig b/configs/duovero_defconfig index 58d86e1..d0eaf05 100644 --- a/configs/duovero_defconfig +++ b/configs/duovero_defconfig @@ -8,3 +8,4 @@ CONFIG_SPL=y # CONFIG_CMD_NFS is not set CONFIG_SYS_PROMPT="duovero # " CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/igep0020_defconfig b/configs/igep0020_defconfig index d1dd75e..245c0c2 100644 --- a/configs/igep0020_defconfig +++ b/configs/igep0020_defconfig @@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0020,BOOT_ONENAND" # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/igep0020_nand_defconfig b/configs/igep0020_nand_defconfig index 4bda465..a0451ac 100644 --- a/configs/igep0020_nand_defconfig +++ b/configs/igep0020_nand_defconfig @@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0020,BOOT_NAND" # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/igep0030_defconfig b/configs/igep0030_defconfig index ebaff74..395540e 100644 --- a/configs/igep0030_defconfig +++ b/configs/igep0030_defconfig @@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0030,BOOT_ONENAND" # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/igep0030_nand_defconfig b/configs/igep0030_nand_defconfig index 85ef454..a7669c5 100644 --- a/configs/igep0030_nand_defconfig +++ b/configs/igep0030_nand_defconfig @@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0030,BOOT_NAND" # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig index 37937dc..79d3b25 100644 --- a/configs/igep0032_defconfig +++ b/configs/igep0032_defconfig @@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0032,BOOT_ONENAND" # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/k2e_evm_defconfig b/configs/k2e_evm_defconfig index e1bec71..e12f82e 100644 --- a/configs/k2e_evm_defconfig +++ b/configs/k2e_evm_defconfig @@ -8,3 +8,4 @@ CONFIG_SYS_PROMPT="K2E EVM # " # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/k2hk_evm_defconfig b/configs/k2hk_evm_defconfig index 6e62326..d472f82 100644 --- a/configs/k2hk_evm_defconfig +++ b/configs/k2hk_evm_defconfig @@ -8,3 +8,4 @@ CONFIG_SYS_PROMPT="K2HK EVM # " # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/k2l_evm_defconfig b/configs/k2l_evm_defconfig index 8a3f447..2e7d754 100644 --- a/configs/k2l_evm_defconfig +++ b/configs/k2l_evm_defconfig @@ -8,3 +8,4 @@ CONFIG_SYS_PROMPT="K2L EVM # " # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig index e0b8f4f..83adb07 100644 --- a/configs/omap3_beagle_defconfig +++ b/configs/omap3_beagle_defconfig @@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="NAND" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/omap3_overo_defconfig b/configs/omap3_overo_defconfig index 8f7b4de..9f50060 100644 --- a/configs/omap3_overo_defconfig +++ b/configs/omap3_overo_defconfig @@ -10,3 +10,4 @@ CONFIG_SPL=y # CONFIG_CMD_NFS is not set CONFIG_SYS_PROMPT="Overo # " CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/omap3_pandora_defconfig b/configs/omap3_pandora_defconfig index 93dde54..eac4490 100644 --- a/configs/omap3_pandora_defconfig +++ b/configs/omap3_pandora_defconfig @@ -10,3 +10,4 @@ CONFIG_TARGET_OMAP3_PANDORA=y # CONFIG_CMD_NFS is not set CONFIG_SYS_PROMPT="Pandora # " CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/omap3_zoom1_defconfig b/configs/omap3_zoom1_defconfig index 654d94b..da5ed47 100644 --- a/configs/omap3_zoom1_defconfig +++ b/configs/omap3_zoom1_defconfig @@ -7,3 +7,4 @@ CONFIG_TARGET_OMAP3_ZOOM1=y # CONFIG_CMD_FPGA is not set # CONFIG_CMD_SETEXPR is not set CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/omap4_panda_defconfig b/configs/omap4_panda_defconfig index 0683fe2..3c95c05 100644 --- a/configs/omap4_panda_defconfig +++ b/configs/omap4_panda_defconfig @@ -7,3 +7,4 @@ CONFIG_SPL=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NFS is not set CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/omap4_sdp4430_defconfig b/configs/omap4_sdp4430_defconfig index 248863f..81b3eb2 100644 --- a/configs/omap4_sdp4430_defconfig +++ b/configs/omap4_sdp4430_defconfig @@ -8,3 +8,4 @@ CONFIG_HUSH_PARSER=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NET is not set # CONFIG_CMD_NFS is not set +CONFIG_CMD_BOOTZ=y diff --git a/configs/omap5_uevm_defconfig b/configs/omap5_uevm_defconfig index 338d62c..5cde3b0 100644 --- a/configs/omap5_uevm_defconfig +++ b/configs/omap5_uevm_defconfig @@ -6,3 +6,4 @@ CONFIG_SPL=y # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/pcm051_rev1_defconfig b/configs/pcm051_rev1_defconfig index aaf4632..76662a2 100644 --- a/configs/pcm051_rev1_defconfig +++ b/configs/pcm051_rev1_defconfig @@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="REV1" # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/pcm051_rev3_defconfig b/configs/pcm051_rev3_defconfig index e02780c..1168ade 100644 --- a/configs/pcm051_rev3_defconfig +++ b/configs/pcm051_rev3_defconfig @@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="REV3" # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/pengwyn_defconfig b/configs/pengwyn_defconfig index 3fdadde..7322be7 100644 --- a/configs/pengwyn_defconfig +++ b/configs/pengwyn_defconfig @@ -5,3 +5,4 @@ CONFIG_SPL=y # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/pepper_defconfig b/configs/pepper_defconfig index 300c147..a01a873 100644 --- a/configs/pepper_defconfig +++ b/configs/pepper_defconfig @@ -6,3 +6,4 @@ CONFIG_SPL=y # CONFIG_CMD_SETEXPR is not set CONFIG_SYS_PROMPT="pepper# " CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig index 41c2849..c0d54d4 100644 --- a/configs/pxm2_defconfig +++ b/configs/pxm2_defconfig @@ -9,3 +9,4 @@ CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b" # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y CONFIG_SYS_PROMPT="U-Boot# " +CONFIG_CMD_BOOTZ=y diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig index 7a3ac70..19d0905 100644 --- a/configs/rastaban_defconfig +++ b/configs/rastaban_defconfig @@ -9,3 +9,4 @@ CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b" # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y CONFIG_SYS_PROMPT="U-Boot# " +CONFIG_CMD_BOOTZ=y diff --git a/configs/rut_defconfig b/configs/rut_defconfig index 774957c..9639a26 100644 --- a/configs/rut_defconfig +++ b/configs/rut_defconfig @@ -9,3 +9,4 @@ CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b" # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y CONFIG_SYS_PROMPT="U-Boot# " +CONFIG_CMD_BOOTZ=y diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig index e2a6b0c..8a42645 100644 --- a/configs/thuban_defconfig +++ b/configs/thuban_defconfig @@ -9,3 +9,4 @@ CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b" # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y CONFIG_SYS_PROMPT="U-Boot# " +CONFIG_CMD_BOOTZ=y diff --git a/include/config_distro_defaults.h b/include/config_distro_defaults.h index 7503bff..e12dc4e 100644 --- a/include/config_distro_defaults.h +++ b/include/config_distro_defaults.h @@ -46,8 +46,10 @@ #ifdef CONFIG_ARM64 #define CONFIG_CMD_BOOTI #else +#ifndef CONFIG_CMD_BOOTZ #define CONFIG_CMD_BOOTZ #endif +#endif #define CONFIG_CMD_DHCP #define CONFIG_CMD_ELF #define CONFIG_CMD_EXT2 diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 3ff138f..e9370ab 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -199,7 +199,6 @@ "nand read ${loadaddr} 2a0000 400000; " \ "bootm ${loadaddr}\0" \
-#define CONFIG_CMD_BOOTZ #define CONFIG_BOOTCOMMAND \ "mmc dev ${mmcdev}; if mmc rescan; then " \ "if run loadbootscript; then " \ diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index 6d2c22e..6665f6f 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -103,7 +103,6 @@ #undef CONFIG_CMD_SPI #undef CONFIG_CMD_GPIO #undef CONFIG_CMD_ASKENV -#undef CONFIG_CMD_BOOTZ #undef CONFIG_SUPPORT_RAW_INITRD #undef CONFIG_FAT_WRITE #undef CONFIG_CMD_EXT4 diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index 6dde989..489c2fb 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -147,7 +147,6 @@ #endif
#define CONFIG_CMD_ASKENV -#define CONFIG_CMD_BOOTZ #define CONFIG_SUPPORT_RAW_INITRD
/*
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 */
Make more use of the Kconfig and move CONFIG_CMD_I2C 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: Felipe Balbi balbi@ti.com Cc: Gilles Gameiro gilles@gigadevices.com Cc: "Albert ARIBAUD (3ADEV)" albert.aribaud@3adev.fr Cc: Nikita Kiryanov nikita@compulab.co.il Cc: Dmitry Lifshitz lifshitz@compulab.co.il Cc: Thomas Weber weber@corscience.de Cc: Ash Charles ash@gumstix.com Cc: Vitaly Andrianov vitalya@ti.com Cc: Steve Sakoman sakoman@gmail.com Cc: Grazvydas Ignotas notasas@gmail.com Cc: Nishanth Menon nm@ti.com Cc: Lars Poeschel poeschel@lemonage.de 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_norboot_defconfig | 1 + configs/am335x_evm_spiboot_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_qspiboot_defconfig | 1 + configs/am43xx_evm_usbhost_boot_defconfig | 1 + configs/beagle_x15_defconfig | 1 + configs/birdland_bav335a_defconfig | 1 + configs/birdland_bav335b_defconfig | 1 + configs/cairo_defconfig | 1 + configs/cm_t335_defconfig | 1 + configs/cm_t35_defconfig | 1 + configs/cm_t43_defconfig | 1 + configs/cm_t54_defconfig | 1 + configs/devkit8000_defconfig | 1 + configs/dra72_evm_defconfig | 1 + configs/dra7xx_evm_defconfig | 1 + configs/dra7xx_evm_qspiboot_defconfig | 1 + configs/dra7xx_evm_uart3_defconfig | 1 + configs/duovero_defconfig | 1 + configs/igep0020_defconfig | 1 + configs/igep0020_nand_defconfig | 1 + configs/igep0030_defconfig | 1 + configs/igep0030_nand_defconfig | 1 + configs/igep0032_defconfig | 1 + configs/k2e_evm_defconfig | 1 + configs/k2hk_evm_defconfig | 1 + configs/k2l_evm_defconfig | 1 + configs/omap3_beagle_defconfig | 1 + configs/omap3_overo_defconfig | 1 + configs/omap3_pandora_defconfig | 1 + configs/omap3_zoom1_defconfig | 1 + configs/omap4_panda_defconfig | 1 + configs/omap4_sdp4430_defconfig | 1 + configs/omap5_uevm_defconfig | 1 + configs/pcm051_rev1_defconfig | 1 + configs/pcm051_rev3_defconfig | 1 + configs/pengwyn_defconfig | 1 + configs/pepper_defconfig | 1 + include/configs/cm_t35.h | 1 - include/configs/ti_armv7_common.h | 1 - 47 files changed, 45 insertions(+), 2 deletions(-)
diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig index c0b0797..6d0fe07 100644 --- a/configs/am335x_baltos_defconfig +++ b/configs/am335x_baltos_defconfig @@ -12,3 +12,4 @@ CONFIG_SYS_EXTRA_OPTIONS="NAND" CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NAND=y +CONFIG_CMD_I2C=y diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig index 2740553..21a9255 100644 --- a/configs/am335x_evm_defconfig +++ b/configs/am335x_evm_defconfig @@ -11,3 +11,4 @@ CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NAND=y +CONFIG_CMD_I2C=y diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig index 9c55145..30fa585 100644 --- a/configs/am335x_evm_nor_defconfig +++ b/configs/am335x_evm_nor_defconfig @@ -11,3 +11,4 @@ CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NAND=y +CONFIG_CMD_I2C=y diff --git a/configs/am335x_evm_norboot_defconfig b/configs/am335x_evm_norboot_defconfig index c5655ca..f565851 100644 --- a/configs/am335x_evm_norboot_defconfig +++ b/configs/am335x_evm_norboot_defconfig @@ -7,3 +7,4 @@ CONFIG_NOR_BOOT=y CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y +CONFIG_CMD_I2C=y diff --git a/configs/am335x_evm_spiboot_defconfig b/configs/am335x_evm_spiboot_defconfig index e0d4c83..bb4dbc2 100644 --- a/configs/am335x_evm_spiboot_defconfig +++ b/configs/am335x_evm_spiboot_defconfig @@ -10,3 +10,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SPI_BOOT" CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y +CONFIG_CMD_I2C=y diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig index c2e8c05..e350e5d 100644 --- a/configs/am335x_evm_usbspl_defconfig +++ b/configs/am335x_evm_usbspl_defconfig @@ -11,3 +11,4 @@ CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NAND=y +CONFIG_CMD_I2C=y diff --git a/configs/am335x_gp_evm_defconfig b/configs/am335x_gp_evm_defconfig index 542e12c..facf419 100644 --- a/configs/am335x_gp_evm_defconfig +++ b/configs/am335x_gp_evm_defconfig @@ -14,3 +14,4 @@ CONFIG_SPI_FLASH=y CONFIG_RSA=y CONFIG_HUSH_PARSER=y CONFIG_CMD_NAND=y +CONFIG_CMD_I2C=y diff --git a/configs/am335x_igep0033_defconfig b/configs/am335x_igep0033_defconfig index 9a0ad77..991a3d2 100644 --- a/configs/am335x_igep0033_defconfig +++ b/configs/am335x_igep0033_defconfig @@ -9,3 +9,4 @@ CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NAND=y +CONFIG_CMD_I2C=y diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig index f30fc90..39c148d 100644 --- a/configs/am43xx_evm_defconfig +++ b/configs/am43xx_evm_defconfig @@ -10,3 +10,4 @@ CONFIG_SPI_FLASH_BAR=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NAND=y +CONFIG_CMD_I2C=y diff --git a/configs/am43xx_evm_ethboot_defconfig b/configs/am43xx_evm_ethboot_defconfig index 909529c..5c696a9 100644 --- a/configs/am43xx_evm_ethboot_defconfig +++ b/configs/am43xx_evm_ethboot_defconfig @@ -9,3 +9,4 @@ CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NAND=y +CONFIG_CMD_I2C=y diff --git a/configs/am43xx_evm_qspiboot_defconfig b/configs/am43xx_evm_qspiboot_defconfig index c105ff6..0ea07a3 100644 --- a/configs/am43xx_evm_qspiboot_defconfig +++ b/configs/am43xx_evm_qspiboot_defconfig @@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,QSPI,QSPI_BOOT" CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y +CONFIG_CMD_I2C=y diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig index cf789c6..f00b064 100644 --- a/configs/am43xx_evm_usbhost_boot_defconfig +++ b/configs/am43xx_evm_usbhost_boot_defconfig @@ -9,3 +9,4 @@ CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NAND=y +CONFIG_CMD_I2C=y diff --git a/configs/beagle_x15_defconfig b/configs/beagle_x15_defconfig index b6abfba..c761fd5 100644 --- a/configs/beagle_x15_defconfig +++ b/configs/beagle_x15_defconfig @@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=3" # CONFIG_CMD_SETEXPR is not set CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y +CONFIG_CMD_I2C=y diff --git a/configs/birdland_bav335a_defconfig b/configs/birdland_bav335a_defconfig index 0e37edf..a33fbbf 100644 --- a/configs/birdland_bav335a_defconfig +++ b/configs/birdland_bav335a_defconfig @@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1" CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y +CONFIG_CMD_I2C=y diff --git a/configs/birdland_bav335b_defconfig b/configs/birdland_bav335b_defconfig index 0ac5b49..0eae440 100644 --- a/configs/birdland_bav335b_defconfig +++ b/configs/birdland_bav335b_defconfig @@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1" CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y +CONFIG_CMD_I2C=y diff --git a/configs/cairo_defconfig b/configs/cairo_defconfig index 0fe118d..95edf0d 100644 --- a/configs/cairo_defconfig +++ b/configs/cairo_defconfig @@ -11,3 +11,4 @@ CONFIG_SYS_PROMPT="Cairo # " CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NAND=y +CONFIG_CMD_I2C=y diff --git a/configs/cm_t335_defconfig b/configs/cm_t335_defconfig index ac7b7a0..7dd6e09 100644 --- a/configs/cm_t335_defconfig +++ b/configs/cm_t335_defconfig @@ -8,3 +8,4 @@ CONFIG_SYS_PROMPT="CM-T335 # " CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NAND=y +CONFIG_CMD_I2C=y diff --git a/configs/cm_t35_defconfig b/configs/cm_t35_defconfig index 6e100e4..0a5e03a 100644 --- a/configs/cm_t35_defconfig +++ b/configs/cm_t35_defconfig @@ -8,5 +8,6 @@ CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set CONFIG_CMD_NAND=y +CONFIG_CMD_I2C=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 0835b75..9ee6c1f 100644 --- a/configs/cm_t43_defconfig +++ b/configs/cm_t43_defconfig @@ -11,3 +11,4 @@ CONFIG_DM=y CONFIG_DM_GPIO=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NAND=y +CONFIG_CMD_I2C=y diff --git a/configs/cm_t54_defconfig b/configs/cm_t54_defconfig index af4c6c6..c840c15 100644 --- a/configs/cm_t54_defconfig +++ b/configs/cm_t54_defconfig @@ -9,3 +9,4 @@ CONFIG_SPL=y CONFIG_SYS_PROMPT="CM-T54 # " CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y +CONFIG_CMD_I2C=y diff --git a/configs/devkit8000_defconfig b/configs/devkit8000_defconfig index c011b1a..99bf124 100644 --- a/configs/devkit8000_defconfig +++ b/configs/devkit8000_defconfig @@ -9,3 +9,4 @@ CONFIG_SPL=y # CONFIG_CMD_SETEXPR is not set CONFIG_HUSH_PARSER=y CONFIG_CMD_NAND=y +CONFIG_CMD_I2C=y diff --git a/configs/dra72_evm_defconfig b/configs/dra72_evm_defconfig index 27345f6..6e54760 100644 --- a/configs/dra72_evm_defconfig +++ b/configs/dra72_evm_defconfig @@ -17,3 +17,4 @@ CONFIG_SPI_FLASH_BAR=y CONFIG_DM_GPIO=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y +CONFIG_CMD_I2C=y diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig index 9778959..0bc92de 100644 --- a/configs/dra7xx_evm_defconfig +++ b/configs/dra7xx_evm_defconfig @@ -12,3 +12,4 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y +CONFIG_CMD_I2C=y diff --git a/configs/dra7xx_evm_qspiboot_defconfig b/configs/dra7xx_evm_qspiboot_defconfig index f27fec8..6812bd8 100644 --- a/configs/dra7xx_evm_qspiboot_defconfig +++ b/configs/dra7xx_evm_qspiboot_defconfig @@ -12,3 +12,4 @@ CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT" CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y +CONFIG_CMD_I2C=y diff --git a/configs/dra7xx_evm_uart3_defconfig b/configs/dra7xx_evm_uart3_defconfig index 7434db0..b603c5c 100644 --- a/configs/dra7xx_evm_uart3_defconfig +++ b/configs/dra7xx_evm_uart3_defconfig @@ -13,3 +13,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SPL_YMODEM_SUPPORT" CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y +CONFIG_CMD_I2C=y diff --git a/configs/duovero_defconfig b/configs/duovero_defconfig index d0eaf05..d0aed0e 100644 --- a/configs/duovero_defconfig +++ b/configs/duovero_defconfig @@ -9,3 +9,4 @@ CONFIG_SPL=y CONFIG_SYS_PROMPT="duovero # " CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y +CONFIG_CMD_I2C=y diff --git a/configs/igep0020_defconfig b/configs/igep0020_defconfig index 245c0c2..bb961b8 100644 --- a/configs/igep0020_defconfig +++ b/configs/igep0020_defconfig @@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0020,BOOT_ONENAND" # CONFIG_CMD_SETEXPR is not set CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y +CONFIG_CMD_I2C=y diff --git a/configs/igep0020_nand_defconfig b/configs/igep0020_nand_defconfig index 9a8552f..b0c9dff 100644 --- a/configs/igep0020_nand_defconfig +++ b/configs/igep0020_nand_defconfig @@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0020,BOOT_NAND" CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NAND=y +CONFIG_CMD_I2C=y diff --git a/configs/igep0030_defconfig b/configs/igep0030_defconfig index 395540e..84b0ad3 100644 --- a/configs/igep0030_defconfig +++ b/configs/igep0030_defconfig @@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0030,BOOT_ONENAND" # CONFIG_CMD_SETEXPR is not set CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y +CONFIG_CMD_I2C=y diff --git a/configs/igep0030_nand_defconfig b/configs/igep0030_nand_defconfig index ad54a2e..da2f08b 100644 --- a/configs/igep0030_nand_defconfig +++ b/configs/igep0030_nand_defconfig @@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0030,BOOT_NAND" CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NAND=y +CONFIG_CMD_I2C=y diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig index 79d3b25..1c39ca7 100644 --- a/configs/igep0032_defconfig +++ b/configs/igep0032_defconfig @@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0032,BOOT_ONENAND" # CONFIG_CMD_SETEXPR is not set CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y +CONFIG_CMD_I2C=y diff --git a/configs/k2e_evm_defconfig b/configs/k2e_evm_defconfig index e12f82e..66fb304 100644 --- a/configs/k2e_evm_defconfig +++ b/configs/k2e_evm_defconfig @@ -9,3 +9,4 @@ CONFIG_SYS_PROMPT="K2E EVM # " # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y CONFIG_CMD_BOOTZ=y +CONFIG_CMD_I2C=y diff --git a/configs/k2hk_evm_defconfig b/configs/k2hk_evm_defconfig index d472f82..db41afb 100644 --- a/configs/k2hk_evm_defconfig +++ b/configs/k2hk_evm_defconfig @@ -9,3 +9,4 @@ CONFIG_SYS_PROMPT="K2HK EVM # " # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y CONFIG_CMD_BOOTZ=y +CONFIG_CMD_I2C=y diff --git a/configs/k2l_evm_defconfig b/configs/k2l_evm_defconfig index 2e7d754..ded5e1a 100644 --- a/configs/k2l_evm_defconfig +++ b/configs/k2l_evm_defconfig @@ -9,3 +9,4 @@ CONFIG_SYS_PROMPT="K2L EVM # " # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y CONFIG_CMD_BOOTZ=y +CONFIG_CMD_I2C=y diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig index 2c70c9e..2a5b387 100644 --- a/configs/omap3_beagle_defconfig +++ b/configs/omap3_beagle_defconfig @@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="NAND" CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NAND=y +CONFIG_CMD_I2C=y diff --git a/configs/omap3_overo_defconfig b/configs/omap3_overo_defconfig index 223d1fb..58aef94 100644 --- a/configs/omap3_overo_defconfig +++ b/configs/omap3_overo_defconfig @@ -12,3 +12,4 @@ CONFIG_SYS_PROMPT="Overo # " CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NAND=y +CONFIG_CMD_I2C=y diff --git a/configs/omap3_pandora_defconfig b/configs/omap3_pandora_defconfig index ede8667..f38560b 100644 --- a/configs/omap3_pandora_defconfig +++ b/configs/omap3_pandora_defconfig @@ -12,3 +12,4 @@ CONFIG_SYS_PROMPT="Pandora # " CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NAND=y +CONFIG_CMD_I2C=y diff --git a/configs/omap3_zoom1_defconfig b/configs/omap3_zoom1_defconfig index 412fa3a..ff3a5b7 100644 --- a/configs/omap3_zoom1_defconfig +++ b/configs/omap3_zoom1_defconfig @@ -9,3 +9,4 @@ CONFIG_TARGET_OMAP3_ZOOM1=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NAND=y +CONFIG_CMD_I2C=y diff --git a/configs/omap4_panda_defconfig b/configs/omap4_panda_defconfig index 3c95c05..51d4016 100644 --- a/configs/omap4_panda_defconfig +++ b/configs/omap4_panda_defconfig @@ -8,3 +8,4 @@ CONFIG_SPL=y # CONFIG_CMD_NFS is not set CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y +CONFIG_CMD_I2C=y diff --git a/configs/omap4_sdp4430_defconfig b/configs/omap4_sdp4430_defconfig index 81b3eb2..faec951 100644 --- a/configs/omap4_sdp4430_defconfig +++ b/configs/omap4_sdp4430_defconfig @@ -9,3 +9,4 @@ CONFIG_HUSH_PARSER=y # CONFIG_CMD_NET is not set # CONFIG_CMD_NFS is not set CONFIG_CMD_BOOTZ=y +CONFIG_CMD_I2C=y diff --git a/configs/omap5_uevm_defconfig b/configs/omap5_uevm_defconfig index 5cde3b0..6eccb2c 100644 --- a/configs/omap5_uevm_defconfig +++ b/configs/omap5_uevm_defconfig @@ -7,3 +7,4 @@ CONFIG_SPL=y # CONFIG_CMD_SETEXPR is not set CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y +CONFIG_CMD_I2C=y diff --git a/configs/pcm051_rev1_defconfig b/configs/pcm051_rev1_defconfig index 76662a2..10b9c4e 100644 --- a/configs/pcm051_rev1_defconfig +++ b/configs/pcm051_rev1_defconfig @@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="REV1" CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y +CONFIG_CMD_I2C=y diff --git a/configs/pcm051_rev3_defconfig b/configs/pcm051_rev3_defconfig index 1168ade..bc0dfba 100644 --- a/configs/pcm051_rev3_defconfig +++ b/configs/pcm051_rev3_defconfig @@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="REV3" CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y +CONFIG_CMD_I2C=y diff --git a/configs/pengwyn_defconfig b/configs/pengwyn_defconfig index 45ed9d9..ac63654 100644 --- a/configs/pengwyn_defconfig +++ b/configs/pengwyn_defconfig @@ -7,3 +7,4 @@ CONFIG_SPL=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NAND=y +CONFIG_CMD_I2C=y diff --git a/configs/pepper_defconfig b/configs/pepper_defconfig index a01a873..bdaf904 100644 --- a/configs/pepper_defconfig +++ b/configs/pepper_defconfig @@ -7,3 +7,4 @@ CONFIG_SPL=y CONFIG_SYS_PROMPT="pepper# " CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y +CONFIG_CMD_I2C=y diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 22d556c..d98ee40 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -121,7 +121,6 @@ "1920k(u-boot),256k(u-boot-env),"\ "4m(kernel),-(fs)"
-#define CONFIG_CMD_I2C /* I2C serial bus support */ #define CONFIG_CMD_MMC /* MMC support */ #define CONFIG_CMD_DHCP #define CONFIG_CMD_PING diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index 489c2fb..6924508 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -85,7 +85,6 @@
/* I2C IP block */ #define CONFIG_I2C -#define CONFIG_CMD_I2C #define CONFIG_SYS_I2C
/* MMC/SD IP block */
Make more use of the Kconfig and move CONFIG_BOOTDELAY 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: Felipe Balbi balbi@ti.com Cc: Gilles Gameiro gilles@gigadevices.com Cc: "Albert ARIBAUD (3ADEV)" albert.aribaud@3adev.fr Cc: Nikita Kiryanov nikita@compulab.co.il Cc: Dmitry Lifshitz lifshitz@compulab.co.il Cc: Thomas Weber weber@corscience.de Cc: Ash Charles ash@gumstix.com Cc: Vitaly Andrianov vitalya@ti.com Cc: Steve Sakoman sakoman@gmail.com Cc: Grazvydas Ignotas notasas@gmail.com Cc: Nishanth Menon nm@ti.com Cc: Lars Poeschel poeschel@lemonage.de Cc: Lothar Felten lothar.felten@gmail.com --- configs/am335x_baltos_defconfig | 2 ++ configs/am335x_evm_defconfig | 2 ++ configs/am335x_evm_nor_defconfig | 2 ++ configs/am335x_evm_norboot_defconfig | 2 ++ configs/am335x_evm_spiboot_defconfig | 2 ++ configs/am335x_evm_usbspl_defconfig | 2 ++ configs/am335x_gp_evm_defconfig | 2 ++ configs/am335x_igep0033_defconfig | 2 ++ configs/am43xx_evm_defconfig | 2 ++ configs/am43xx_evm_ethboot_defconfig | 2 ++ configs/am43xx_evm_qspiboot_defconfig | 2 ++ configs/am43xx_evm_usbhost_boot_defconfig | 2 ++ configs/beagle_x15_defconfig | 2 ++ configs/birdland_bav335a_defconfig | 2 ++ configs/birdland_bav335b_defconfig | 2 ++ configs/cairo_defconfig | 2 ++ configs/cm_t335_defconfig | 2 ++ configs/cm_t35_defconfig | 2 ++ configs/cm_t43_defconfig | 2 ++ configs/cm_t54_defconfig | 2 ++ configs/devkit8000_defconfig | 2 ++ configs/dra72_evm_defconfig | 2 ++ configs/dra7xx_evm_defconfig | 2 ++ configs/dra7xx_evm_qspiboot_defconfig | 2 ++ configs/dra7xx_evm_uart3_defconfig | 2 ++ configs/duovero_defconfig | 2 ++ configs/igep0020_defconfig | 2 ++ configs/igep0020_nand_defconfig | 2 ++ configs/igep0030_defconfig | 2 ++ configs/igep0030_nand_defconfig | 2 ++ configs/igep0032_defconfig | 2 ++ configs/k2e_evm_defconfig | 2 ++ configs/k2hk_evm_defconfig | 2 ++ configs/k2l_evm_defconfig | 2 ++ configs/omap3_beagle_defconfig | 2 ++ configs/omap3_overo_defconfig | 2 ++ configs/omap3_pandora_defconfig | 2 ++ configs/omap3_zoom1_defconfig | 2 ++ configs/omap4_panda_defconfig | 2 ++ configs/omap4_sdp4430_defconfig | 2 ++ configs/omap5_uevm_defconfig | 2 ++ configs/pcm051_rev1_defconfig | 2 ++ configs/pcm051_rev3_defconfig | 2 ++ configs/pengwyn_defconfig | 2 ++ configs/pepper_defconfig | 2 ++ include/config_distro_defaults.h | 2 ++ include/configs/cm_t35.h | 1 - include/configs/cm_t43.h | 1 - include/configs/cm_t54.h | 3 --- include/configs/omap3_cairo.h | 3 --- include/configs/ti_armv7_common.h | 5 ----- 51 files changed, 92 insertions(+), 13 deletions(-)
diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig index 6d0fe07..e7f8f27 100644 --- a/configs/am335x_baltos_defconfig +++ b/configs/am335x_baltos_defconfig @@ -13,3 +13,5 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NAND=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig index 21a9255..54e5190 100644 --- a/configs/am335x_evm_defconfig +++ b/configs/am335x_evm_defconfig @@ -12,3 +12,5 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NAND=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig index 30fa585..cacb111 100644 --- a/configs/am335x_evm_nor_defconfig +++ b/configs/am335x_evm_nor_defconfig @@ -12,3 +12,5 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NAND=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/am335x_evm_norboot_defconfig b/configs/am335x_evm_norboot_defconfig index f565851..fe00c82 100644 --- a/configs/am335x_evm_norboot_defconfig +++ b/configs/am335x_evm_norboot_defconfig @@ -8,3 +8,5 @@ CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/am335x_evm_spiboot_defconfig b/configs/am335x_evm_spiboot_defconfig index bb4dbc2..e10e3cb 100644 --- a/configs/am335x_evm_spiboot_defconfig +++ b/configs/am335x_evm_spiboot_defconfig @@ -11,3 +11,5 @@ CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig index e350e5d..a237dbf 100644 --- a/configs/am335x_evm_usbspl_defconfig +++ b/configs/am335x_evm_usbspl_defconfig @@ -12,3 +12,5 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NAND=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/am335x_gp_evm_defconfig b/configs/am335x_gp_evm_defconfig index facf419..0496bac 100644 --- a/configs/am335x_gp_evm_defconfig +++ b/configs/am335x_gp_evm_defconfig @@ -15,3 +15,5 @@ CONFIG_RSA=y CONFIG_HUSH_PARSER=y CONFIG_CMD_NAND=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/am335x_igep0033_defconfig b/configs/am335x_igep0033_defconfig index 991a3d2..8489d5d 100644 --- a/configs/am335x_igep0033_defconfig +++ b/configs/am335x_igep0033_defconfig @@ -10,3 +10,5 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NAND=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig index 39c148d..8dd0259 100644 --- a/configs/am43xx_evm_defconfig +++ b/configs/am43xx_evm_defconfig @@ -11,3 +11,5 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NAND=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/am43xx_evm_ethboot_defconfig b/configs/am43xx_evm_ethboot_defconfig index 5c696a9..ba0b96e 100644 --- a/configs/am43xx_evm_ethboot_defconfig +++ b/configs/am43xx_evm_ethboot_defconfig @@ -10,3 +10,5 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NAND=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/am43xx_evm_qspiboot_defconfig b/configs/am43xx_evm_qspiboot_defconfig index 0ea07a3..c6b2913 100644 --- a/configs/am43xx_evm_qspiboot_defconfig +++ b/configs/am43xx_evm_qspiboot_defconfig @@ -8,3 +8,5 @@ CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig index f00b064..b4ff861 100644 --- a/configs/am43xx_evm_usbhost_boot_defconfig +++ b/configs/am43xx_evm_usbhost_boot_defconfig @@ -10,3 +10,5 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NAND=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/beagle_x15_defconfig b/configs/beagle_x15_defconfig index c761fd5..8c7d63a 100644 --- a/configs/beagle_x15_defconfig +++ b/configs/beagle_x15_defconfig @@ -9,3 +9,5 @@ CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=3" CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/birdland_bav335a_defconfig b/configs/birdland_bav335a_defconfig index a33fbbf..6adde6c 100644 --- a/configs/birdland_bav335a_defconfig +++ b/configs/birdland_bav335a_defconfig @@ -10,3 +10,5 @@ CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/birdland_bav335b_defconfig b/configs/birdland_bav335b_defconfig index 0eae440..5f4b2ca 100644 --- a/configs/birdland_bav335b_defconfig +++ b/configs/birdland_bav335b_defconfig @@ -10,3 +10,5 @@ CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/cairo_defconfig b/configs/cairo_defconfig index 95edf0d..3ace5aa 100644 --- a/configs/cairo_defconfig +++ b/configs/cairo_defconfig @@ -12,3 +12,5 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NAND=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=0 diff --git a/configs/cm_t335_defconfig b/configs/cm_t335_defconfig index 7dd6e09..0df5b78 100644 --- a/configs/cm_t335_defconfig +++ b/configs/cm_t335_defconfig @@ -9,3 +9,5 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NAND=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=3 diff --git a/configs/cm_t35_defconfig b/configs/cm_t35_defconfig index 0a5e03a..8b4891f 100644 --- a/configs/cm_t35_defconfig +++ b/configs/cm_t35_defconfig @@ -4,6 +4,8 @@ CONFIG_TARGET_CM_T35=y CONFIG_SPL=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="CM-T3x # " +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=3 CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set diff --git a/configs/cm_t43_defconfig b/configs/cm_t43_defconfig index 9ee6c1f..2db596e 100644 --- a/configs/cm_t43_defconfig +++ b/configs/cm_t43_defconfig @@ -12,3 +12,5 @@ CONFIG_DM_GPIO=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NAND=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=3 diff --git a/configs/cm_t54_defconfig b/configs/cm_t54_defconfig index c840c15..ae5b276 100644 --- a/configs/cm_t54_defconfig +++ b/configs/cm_t54_defconfig @@ -10,3 +10,5 @@ CONFIG_SYS_PROMPT="CM-T54 # " CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=3 diff --git a/configs/devkit8000_defconfig b/configs/devkit8000_defconfig index 99bf124..a7cefa0 100644 --- a/configs/devkit8000_defconfig +++ b/configs/devkit8000_defconfig @@ -10,3 +10,5 @@ CONFIG_SPL=y CONFIG_HUSH_PARSER=y CONFIG_CMD_NAND=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/dra72_evm_defconfig b/configs/dra72_evm_defconfig index 6e54760..a3d3f5f 100644 --- a/configs/dra72_evm_defconfig +++ b/configs/dra72_evm_defconfig @@ -18,3 +18,5 @@ CONFIG_DM_GPIO=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig index 0bc92de..8125933 100644 --- a/configs/dra7xx_evm_defconfig +++ b/configs/dra7xx_evm_defconfig @@ -13,3 +13,5 @@ CONFIG_SPI_FLASH_BAR=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/dra7xx_evm_qspiboot_defconfig b/configs/dra7xx_evm_qspiboot_defconfig index 6812bd8..cb89293 100644 --- a/configs/dra7xx_evm_qspiboot_defconfig +++ b/configs/dra7xx_evm_qspiboot_defconfig @@ -13,3 +13,5 @@ CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/dra7xx_evm_uart3_defconfig b/configs/dra7xx_evm_uart3_defconfig index b603c5c..4e7d6d6 100644 --- a/configs/dra7xx_evm_uart3_defconfig +++ b/configs/dra7xx_evm_uart3_defconfig @@ -14,3 +14,5 @@ CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/duovero_defconfig b/configs/duovero_defconfig index d0aed0e..7e511b1 100644 --- a/configs/duovero_defconfig +++ b/configs/duovero_defconfig @@ -10,3 +10,5 @@ CONFIG_SYS_PROMPT="duovero # " CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/igep0020_defconfig b/configs/igep0020_defconfig index bb961b8..96051d0 100644 --- a/configs/igep0020_defconfig +++ b/configs/igep0020_defconfig @@ -9,3 +9,5 @@ CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0020,BOOT_ONENAND" CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/igep0020_nand_defconfig b/configs/igep0020_nand_defconfig index b0c9dff..9e0fbe4 100644 --- a/configs/igep0020_nand_defconfig +++ b/configs/igep0020_nand_defconfig @@ -10,3 +10,5 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NAND=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/igep0030_defconfig b/configs/igep0030_defconfig index 84b0ad3..3e6688f 100644 --- a/configs/igep0030_defconfig +++ b/configs/igep0030_defconfig @@ -9,3 +9,5 @@ CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0030,BOOT_ONENAND" CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/igep0030_nand_defconfig b/configs/igep0030_nand_defconfig index da2f08b..ce6a1f9 100644 --- a/configs/igep0030_nand_defconfig +++ b/configs/igep0030_nand_defconfig @@ -10,3 +10,5 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NAND=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig index 1c39ca7..decfc9b 100644 --- a/configs/igep0032_defconfig +++ b/configs/igep0032_defconfig @@ -9,3 +9,5 @@ CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0032,BOOT_ONENAND" CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/k2e_evm_defconfig b/configs/k2e_evm_defconfig index 66fb304..a619ebf 100644 --- a/configs/k2e_evm_defconfig +++ b/configs/k2e_evm_defconfig @@ -10,3 +10,5 @@ CONFIG_SYS_PROMPT="K2E EVM # " CONFIG_SPI_FLASH=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/k2hk_evm_defconfig b/configs/k2hk_evm_defconfig index db41afb..0af7b31 100644 --- a/configs/k2hk_evm_defconfig +++ b/configs/k2hk_evm_defconfig @@ -10,3 +10,5 @@ CONFIG_SYS_PROMPT="K2HK EVM # " CONFIG_SPI_FLASH=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/k2l_evm_defconfig b/configs/k2l_evm_defconfig index ded5e1a..7d14ad4 100644 --- a/configs/k2l_evm_defconfig +++ b/configs/k2l_evm_defconfig @@ -10,3 +10,5 @@ CONFIG_SYS_PROMPT="K2L EVM # " CONFIG_SPI_FLASH=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig index 2a5b387..c70138b 100644 --- a/configs/omap3_beagle_defconfig +++ b/configs/omap3_beagle_defconfig @@ -9,3 +9,5 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NAND=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/omap3_overo_defconfig b/configs/omap3_overo_defconfig index 58aef94..2febe18 100644 --- a/configs/omap3_overo_defconfig +++ b/configs/omap3_overo_defconfig @@ -13,3 +13,5 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NAND=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/omap3_pandora_defconfig b/configs/omap3_pandora_defconfig index f38560b..02460c5 100644 --- a/configs/omap3_pandora_defconfig +++ b/configs/omap3_pandora_defconfig @@ -13,3 +13,5 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NAND=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/omap3_zoom1_defconfig b/configs/omap3_zoom1_defconfig index ff3a5b7..5612daa 100644 --- a/configs/omap3_zoom1_defconfig +++ b/configs/omap3_zoom1_defconfig @@ -10,3 +10,5 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NAND=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/omap4_panda_defconfig b/configs/omap4_panda_defconfig index 51d4016..1d0286c 100644 --- a/configs/omap4_panda_defconfig +++ b/configs/omap4_panda_defconfig @@ -9,3 +9,5 @@ CONFIG_SPL=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/omap4_sdp4430_defconfig b/configs/omap4_sdp4430_defconfig index faec951..4147b50 100644 --- a/configs/omap4_sdp4430_defconfig +++ b/configs/omap4_sdp4430_defconfig @@ -10,3 +10,5 @@ CONFIG_HUSH_PARSER=y # CONFIG_CMD_NFS is not set CONFIG_CMD_BOOTZ=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/omap5_uevm_defconfig b/configs/omap5_uevm_defconfig index 6eccb2c..2044ad0 100644 --- a/configs/omap5_uevm_defconfig +++ b/configs/omap5_uevm_defconfig @@ -8,3 +8,5 @@ CONFIG_SPL=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/pcm051_rev1_defconfig b/configs/pcm051_rev1_defconfig index 10b9c4e..60e9e7f 100644 --- a/configs/pcm051_rev1_defconfig +++ b/configs/pcm051_rev1_defconfig @@ -9,3 +9,5 @@ CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/pcm051_rev3_defconfig b/configs/pcm051_rev3_defconfig index bc0dfba..8d5db36 100644 --- a/configs/pcm051_rev3_defconfig +++ b/configs/pcm051_rev3_defconfig @@ -9,3 +9,5 @@ CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/pengwyn_defconfig b/configs/pengwyn_defconfig index ac63654..397d80c 100644 --- a/configs/pengwyn_defconfig +++ b/configs/pengwyn_defconfig @@ -8,3 +8,5 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NAND=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/pepper_defconfig b/configs/pepper_defconfig index bdaf904..400d843 100644 --- a/configs/pepper_defconfig +++ b/configs/pepper_defconfig @@ -8,3 +8,5 @@ CONFIG_SYS_PROMPT="pepper# " CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/include/config_distro_defaults.h b/include/config_distro_defaults.h index e12dc4e..b7828b5 100644 --- a/include/config_distro_defaults.h +++ b/include/config_distro_defaults.h @@ -62,7 +62,9 @@
#define CONFIG_CMDLINE_EDITING #define CONFIG_AUTO_COMPLETE +#ifndef CONFIG_BOOTDELAY #define CONFIG_BOOTDELAY 2 +#endif #define CONFIG_SYS_LONGHELP #define CONFIG_MENU #define CONFIG_DOS_PARTITION diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index d98ee40..e68d033 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -155,7 +155,6 @@ /* devices */
/* Environment information */ -#define CONFIG_BOOTDELAY 3 #define CONFIG_ZERO_BOOTDELAY_CHECK
#define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h index c4d3b94..b6ed078 100644 --- a/include/configs/cm_t43.h +++ b/include/configs/cm_t43.h @@ -109,7 +109,6 @@ #undef CONFIG_SPL_GPIO_SUPPORT #undef CONFIG_SPL_NAND_SUPPORT #undef CONFIG_SPL_BOARD_INIT -#undef CONFIG_BOOTDELAY #include <config_distro_defaults.h> #define CONFIG_ZERO_BOOTDELAY_CHECK #undef CONFIG_CMD_IMLS diff --git a/include/configs/cm_t54.h b/include/configs/cm_t54.h index 95a5a60..0aba379 100644 --- a/include/configs/cm_t54.h +++ b/include/configs/cm_t54.h @@ -107,15 +107,12 @@ #undef CONFIG_SYS_AUTOLOAD #undef CONFIG_EXTRA_ENV_SETTINGS #undef CONFIG_BOOTCOMMAND -#undef CONFIG_BOOTDELAY
-#define CONFIG_BOOTDELAY 3 #define CONFIG_SYS_AUTOLOAD "no"
#define CONFIG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ "baudrate=115200\0" \ - "bootdelay=3\0" \ "autoload=no\0" \ "bootscr=bootscr.img\0" \ "fdtfile=omap5-sbc-t54.dtb\0" \ diff --git a/include/configs/omap3_cairo.h b/include/configs/omap3_cairo.h index 3f777b6..aaa7572 100644 --- a/include/configs/omap3_cairo.h +++ b/include/configs/omap3_cairo.h @@ -73,9 +73,6 @@ #define CONFIG_NAND_OMAP_GPMC #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */ /* devices */ -/* override default CONFIG_BOOTDELAY */ -#undef CONFIG_BOOTDELAY -#define CONFIG_BOOTDELAY 0
#define CONFIG_EXTRA_ENV_SETTINGS \ "machid=ffffffff\0" \ diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index 6924508..118381b 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -59,11 +59,6 @@ "bootm_size=0x10000000\0"
/* - * Default to a quick boot delay. - */ -#define CONFIG_BOOTDELAY 1 - -/* * DDR information. If the CONFIG_NR_DRAM_BANKS is not defined, * we say (for simplicity) that we have 1 bank, always, even when * we have more. We always start at 0x80000000, and we place the
Hi Tom,
On 08/26/15 17:54, Igor Grinberg wrote:
The patch set is aimed to transferring several config options from the old config.h configuration style to the new Kconfig framework and also move some of the existing (in Kconfig) ones from config.h style to the defconfig style in the ti-omap land.
It is based on the 7d31c6a (Merge git://git.denx.de/u-boot-pxa) commit upstream.
Igor Grinberg (10): configs: remove remnants of CONFIG_SYS_NAND_QUIET_TEST Kconfig: fix typo in CONFIG_FIT description
Can the above two be applied please? I'm going to rework the below ones (once I've got some time...), but above two can be applied.
Thanks!
Kconfig: add CONFIG_BOOTDELAY Kconfig: add CONFIG_CMD_BOOTZ ti: omap3: config: remove 1 from boolean define ti: omap/am: move CONFIG_HUSH_PARSER to defconfig ti: omap/am: move CONFIG_CMD_BOOTZ to defconfig ti: omap/am: move CONFIG_CMD_NAND to defconfig ti: omap/am: move CONFIG_CMD_I2C to defconfig ti: omap/am: move CONFIG_BOOTDELAY to defconfig
[...]
On Thu, Sep 24, 2015 at 12:53:32PM +0300, Igor Grinberg wrote:
Hi Tom,
On 08/26/15 17:54, Igor Grinberg wrote:
The patch set is aimed to transferring several config options from the old config.h configuration style to the new Kconfig framework and also move some of the existing (in Kconfig) ones from config.h style to the defconfig style in the ti-omap land.
It is based on the 7d31c6a (Merge git://git.denx.de/u-boot-pxa) commit upstream.
Igor Grinberg (10): configs: remove remnants of CONFIG_SYS_NAND_QUIET_TEST Kconfig: fix typo in CONFIG_FIT description
Can the above two be applied please? I'm going to rework the below ones (once I've got some time...), but above two can be applied.
OK, thanks!
participants (4)
-
Igor Grinberg -
Simon Glass -
Stefan Roese -
Tom Rini