Kconfig and ti omap configs tidy up

PATCH New Igor Grinberg 4 participants 26 messages Aug 26, 2015 – Sep 30, 2015

Share & tools

Igor Grinberg

author

2015-08-26 14:54 UTC #0 lore raw

cover 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(-)

Signature · 1 line

2.4.6

Igor Grinberg

author

2015-08-26 14:54 UTC #1 lore raw

PATCH 1/10 configs: remove remnants of CONFIG_SYS_NAND_QUIET_TEST

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 <[email protected]>

Cc Matthias Fuchs <[email protected]>

Cc Stefan Roese <[email protected]>

Cc "Albert ARIBAUD (3ADEV)" <[email protected]>

Cc Peter Barada <[email protected]>

Cc Steve Sakoman <[email protected]>

Cc Peter Tyser <[email protected]>

Cc Joe Hershberger <[email protected]>

Cc Simon Glass <[email protected]>

---
 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(-)

include/configs/PMC440.h +0 -1

index 9ed6c61..17bd180 100644
@@ -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 */

include/configs/alpr.h +0 -1

index f113ebd..20165bc 100644
@@ -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

include/configs/cm_t35.h +0 -1

index 281d614..e5fb474 100644
@@ -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 */

include/configs/cm_t3517.h +0 -1

index 33b22a7..c91b7fa 100644
@@ -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 */

include/configs/omap3_beagle.h +0 -1

index f309b2e..bf986f8 100644
@@ -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 */

include/configs/omap3_cairo.h +0 -1

index 713df3c..3f777b6 100644
@@ -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 */

include/configs/omap3_logic.h +0 -1

index e09e617..8dfcb9e 100644
@@ -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 */

include/configs/omap3_overo.h +0 -1

index 53ff61d..3b1e5d7 100644
@@ -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 */

include/configs/spear-common.h +0 -1

index fb1bf66..edae831 100644
@@ -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

include/configs/tao3530.h +0 -1

index 408895f..bd1c07c 100644
@@ -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 */

include/configs/xpedite517x.h +0 -1

index 669aa53..b5d1126 100644
@@ -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
 
 /*

include/configs/xpedite537x.h +0 -1

index 58ace2c..0d24234 100644
@@ -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
 
 /*

include/configs/xpedite550x.h +0 -1

index 765aaad..f30d199 100644
@@ -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
 
 /*

Signature · 1 line

2.4.6

Stefan Roese

2015-08-27 04:53 UTC #2 lore raw

PATCH 1/10 configs: remove remnants of CONFIG_SYS_NAND_QUIET_TEST

Quoted 6 lines · Igor Grinberg

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.

Quoted 9 lines

Signed-off-by Igor Grinberg <[email protected]>
Cc Matthias Fuchs <[email protected]>
Cc Stefan Roese <[email protected]>
Cc "Albert ARIBAUD (3ADEV)" <[email protected]>
Cc Peter Barada <[email protected]>
Cc Steve Sakoman <[email protected]>
Cc Peter Tyser <[email protected]>
Cc Joe Hershberger <[email protected]>
Cc Simon Glass <[email protected]>

Acked-by Stefan Roese <[email protected]>

Thanks,
Stefan

Tom Rini

2015-09-28 21:07 UTC #3 lore raw

PATCH 1/10 configs: remove remnants of CONFIG_SYS_NAND_QUIET_TEST

In reply to Igor Grinberg

Quoted 6 lines · Igor Grinberg

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.

Quoted 10 lines

Signed-off-by Igor Grinberg <[email protected]>
Cc Matthias Fuchs <[email protected]>
Cc Stefan Roese <[email protected]>
Cc "Albert ARIBAUD (3ADEV)" <[email protected]>
Cc Peter Barada <[email protected]>
Cc Steve Sakoman <[email protected]>
Cc Peter Tyser <[email protected]>
Cc Joe Hershberger <[email protected]>
Cc Simon Glass <[email protected]>
Acked-by Stefan Roese <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150928/5f8ec478/attachment.sig>

Igor Grinberg

author

2015-08-26 14:54 UTC #4 lore raw

PATCH 2/10 Kconfig: fix typo in CONFIG_FIT description

In reply to Igor Grinberg

Fix typo in CONFIG_FIT description - remove the accidentially added redundand 'the'.

Signed-off-by Igor Grinberg <[email protected]>

Cc Masahiro Yamada <[email protected]>

Cc Simon Glass <[email protected]>

---
 Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Kconfig +1 -1

index 05a34f7..f364a7a 100644
@@ -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"

Signature · 1 line

2.4.6

Simon Glass

2015-08-28 17:58 UTC #5 lore raw

PATCH 2/10 Kconfig: fix typo in CONFIG_FIT description

Quoted 9 lines · Igor Grinberg

Fix typo in CONFIG_FIT description - remove the accidentially added redundand 'the'.
Signed-off-by Igor Grinberg <[email protected]>
Cc Masahiro Yamada <[email protected]>
Cc Simon Glass <[email protected]>
---
 Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by Simon Glass <[email protected]>

Tom Rini

2015-09-28 21:07 UTC #6 lore raw

PATCH 2/10 Kconfig: fix typo in CONFIG_FIT description

In reply to Igor Grinberg

Quoted 7 lines · Igor Grinberg

Fix typo in CONFIG_FIT description - remove the accidentially added redundand 'the'.
Signed-off-by Igor Grinberg <[email protected]>
Cc Masahiro Yamada <[email protected]>
Cc Simon Glass <[email protected]>
Reviewed-by Simon Glass <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150928/901ce840/attachment.sig>

Igor Grinberg

author

2015-08-26 14:54 UTC #7 lore raw

PATCH 3/10 Kconfig: add CONFIG_BOOTDELAY

In reply to Igor Grinberg

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 <[email protected]>

Cc Simon Glass <[email protected]>

Cc Masahiro Yamada <[email protected]>

---
 common/Kconfig | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

common/Kconfig +17 -0

index 88dc016..ecbf6cb 100644
@@ -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"

Signature · 1 line

2.4.6

Simon Glass

2015-08-28 17:58 UTC #8 lore raw

PATCH 3/10 Kconfig: add CONFIG_BOOTDELAY

Hi Igor,

Quoted 31 lines · Igor Grinberg

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 <[email protected]>
Cc Simon Glass <[email protected]>
Cc Masahiro Yamada <[email protected]>
---
 common/Kconfig | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
common/Kconfig +10 -0
index 88dc016..ecbf6cb 100644
@@ -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

common/Kconfig config AUTOBOOT_STOP_STR_SHA256 · line 122

Quoted 10 lines

common/Kconfig +7 -0

+       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"

How about using the moveconfig tool to move all boards to Kconfig for the option you add?

Regards,
Simon

Igor Grinberg

author

2015-08-26 14:54 UTC #9 lore raw

PATCH 4/10 Kconfig: add CONFIG_CMD_BOOTZ

In reply to Igor Grinberg

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 <[email protected]>

Cc Masahiro Yamada <[email protected]>

Cc Simon Glass <[email protected]>

---
 common/Kconfig | 6 ++++++
 1 file changed, 6 insertions(+)

common/Kconfig +6 -0

index ecbf6cb..b7791bd 100644
@@ -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

Signature · 1 line

2.4.6

Igor Grinberg

author

2015-09-24 09:57 UTC #10 lore raw

PATCH 4/10 Kconfig: add CONFIG_CMD_BOOTZ

ping.

Quoted 29 lines · Igor Grinberg

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 <[email protected]>
Cc Masahiro Yamada <[email protected]>
Cc Simon Glass <[email protected]>
---
 common/Kconfig | 6 ++++++
 1 file changed, 6 insertions(+)
common/Kconfig +6 -0
index ecbf6cb..b7791bd 100644
@@ -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

Signature · 2 lines

Regards,
Igor.

Igor Grinberg

author

2015-09-29 16:25 UTC #11 lore raw

PATCH 4/10 Kconfig: add CONFIG_CMD_BOOTZ

ping x2

Quoted 33 lines · Igor Grinberg

ping.
Quoted 29 lines · Igor Grinberg
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 <[email protected]>
Cc Masahiro Yamada <[email protected]>
Cc Simon Glass <[email protected]>
---
 common/Kconfig | 6 ++++++
 1 file changed, 6 insertions(+)
common/Kconfig +6 -0
index ecbf6cb..b7791bd 100644
@@ -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

Signature · 2 lines

Regards,
Igor.

Tom Rini

2015-09-29 17:11 UTC #12 lore raw

PATCH 4/10 Kconfig: add CONFIG_CMD_BOOTZ

Quoted 25 lines · Igor Grinberg

ping x2
Quoted 22 lines · Igor Grinberg
ping.
Quoted 19 lines · Igor Grinberg
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 <[email protected]>
Cc Masahiro Yamada <[email protected]>
Cc Simon Glass <[email protected]>
---
 common/Kconfig | 6 ++++++
 1 file changed, 6 insertions(+)
common/Kconfig +0 -0
index ecbf6cb..b7791bd 100644
@@ -165,6 +165,12 @@ config CMD_BOOTM
 	help
 	  Boot an application image from the memory.
 

Quoted 9 lines

Quoted 9 lines
common/Kconfig config CMD_BOOTM · line 176
Quoted 9 lines
common/Kconfig +6 -0
+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?

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150929/6a522fa5/attachment.sig>

Igor Grinberg

author

2015-09-30 07:52 UTC #13 lore raw

PATCH 4/10 Kconfig: add CONFIG_CMD_BOOTZ

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Quoted 26 lines · Tom Rini

Quoted 25 lines · Igor Grinberg
ping x2
Quoted 22 lines · Igor Grinberg
ping.
Quoted 19 lines · Igor Grinberg
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 <[email protected]>
Cc Masahiro Yamada <[email protected]>
Cc Simon Glass <[email protected]>
---
 common/Kconfig | 6 ++++++
 1 file changed, 6 insertions(+)
common/Kconfig +0 -0
index ecbf6cb..b7791bd 100644
@@ -165,6 +165,12 @@ config CMD_BOOTM
 	help
 	  Boot an application image from the memory.
 

Quoted 11 lines

Quoted 9 lines
Quoted 9 lines
common/Kconfig config CMD_BOOTM · line 176
Quoted 9 lines
common/Kconfig +6 -0
+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.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBCAAGBQJWC5S1AAoJEBDE8YO64Efal6QQAI1/cg7ftNL0Kcyvkp7QMBKy +KyLmJZQ+dVLjATzXJWLScaSQp3AuHfJgvoEfPIALZMxZmyXPuAWroP/hoBgNJdA koo6Mk2x0ckMfqR4VVk0xF7peIUq528R9b+OVMrXCnum2RwOyz5+4IvWuVVmzUKa B4a+7YACjO74M33V+FhQLMP4NJwtmBA+2Jwb09kitR26uGV/nenYDxCtSVHClO2F 4vZWYMw36Ex0H2nZP3PY7U2mDIyEqBFuCgEgve/g0HIz0BIKbxP8viRq5zVQMLcg edJpn2/9eRKLfCBcDuZxMXqtx7Ox3fGK22OanhE3IGGvQk3EWu0zUWlmmnagb5Ja 8VwR2MwVCtQj+hCAY76dqcD9Dzv5iH/vygPvnHnwTjCEDXGH1FyVuI5emIWFqa8S RvYVQyB8qMImYAI60oFwrIeg5D848fIwhJ3Gon1ydkZCA/eWE1KDb0Q/V7OgWuZq rJGPWtGpJWezuUIelU4GoN0QLKhPnuhREpa3Bgtb1JvN72r0LMlVEq15GHSn3w1a IRlIGSMkajtRO2l9ljfi0L0FghLBfdcMCoW0bsKp3eEdux3WX3AQs4+26jfZVd4L E9uC5Si5YYdE3R4TSkjEYTVsVwDaSzzQdf3q6HqAfc62lD0fXFYYUMYnN0pHdH5b S0W0cgxgtCs3yTzXiQIE
=DhyG
-----END PGP SIGNATURE-----

Igor Grinberg

author

2015-08-26 14:54 UTC #14 lore raw

PATCH 5/10 ti: omap3: config: remove 1 from boolean define

In reply to Igor Grinberg

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 <[email protected]>

---
 include/configs/ti_omap3_common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

include/configs/ti_omap3_common.h +1 -1

index be231a5..e399a87 100644
@@ -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

Signature · 1 line

2.4.6

Igor Grinberg

author

2015-09-24 09:56 UTC #15 lore raw

PATCH 5/10 ti: omap3: config: remove 1 from boolean define

Hi Tom,

Quoted 5 lines · Igor Grinberg

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 <[email protected]>

I think this one can also be applied, no?

Quoted 18 lines

---
 include/configs/ti_omap3_common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

include/configs/ti_omap3_common.h +1 -1

index be231a5..e399a87 100644
@@ -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

Signature · 2 lines

Regards,
Igor.

Igor Grinberg

author

2015-09-29 16:25 UTC #16 lore raw

PATCH 5/10 ti: omap3: config: remove 1 from boolean define

ping

Quoted 30 lines · Igor Grinberg

Hi Tom,
Quoted 5 lines · Igor Grinberg
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 <[email protected]>
I think this one can also be applied, no?
Quoted 18 lines
---
 include/configs/ti_omap3_common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/configs/ti_omap3_common.h +1 -1
index be231a5..e399a87 100644
@@ -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

Signature · 2 lines

Regards,
Igor.

Tom Rini

2015-09-29 17:12 UTC #17 lore raw

PATCH 5/10 ti: omap3: config: remove 1 from boolean define

Quoted 25 lines · Igor Grinberg

ping
Quoted 22 lines · Igor Grinberg
Hi Tom,
Quoted 5 lines · Igor Grinberg
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 <[email protected]>
I think this one can also be applied, no?
Quoted 11 lines
---
 include/configs/ti_omap3_common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/configs/ti_omap3_common.h +0 -0
index be231a5..e399a87 100644
@@ -66,7 +66,7 @@
 #define CONFIG_SYS_MONITOR_LEN		(256 << 10)
 

Quoted 6 lines

Quoted 6 lines
include/configs/ti_omap3_common.h line 72
Quoted 6 lines
include/configs/ti_omap3_common.h +1 -1
 /* TWL4030 */
-#define CONFIG_TWL4030_POWER		1
+#define CONFIG_TWL4030_POWER
 
 /* SPL */
 #define CONFIG_SPL_TEXT_BASE		0x40200800

Reviewed-by Tom Rini <[email protected]>

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.

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150929/b35fd2a4/attachment.sig>

Igor Grinberg

author

2015-09-30 07:54 UTC #18 lore raw

PATCH 5/10 ti: omap3: config: remove 1 from boolean define

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Quoted 31 lines · Tom Rini

Quoted 29 lines · Igor Grinberg
ping
Quoted 26 lines · Igor Grinberg
Hi Tom,
Quoted 5 lines · Igor Grinberg
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 <[email protected]>
I think this one can also be applied, no?
Quoted 15 lines
---
 include/configs/ti_omap3_common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/configs/ti_omap3_common.h +1 -1
index be231a5..e399a87 100644
@@ -66,7 +66,7 @@
 #define CONFIG_SYS_MONITOR_LEN		(256 << 10)
 
 /* TWL4030 */
-#define CONFIG_TWL4030_POWER		1
+#define CONFIG_TWL4030_POWER
 

Quoted 7 lines

Quoted 2 lines
Quoted 2 lines
include/configs/ti_omap3_common.h line 72
Quoted 2 lines
include/configs/ti_omap3_common.h +0 -0
 /* SPL */
 #define CONFIG_SPL_TEXT_BASE		0x40200800
Reviewed-by Tom Rini <[email protected]>
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.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBCAAGBQJWC5U9AAoJEBDE8YO64EfaguIP/00wC4X6lL89yIlHpWM6qGZ9 p60KzPvbmfXoa86UyWNrmGBNKkP1i86ECNnRk8CRyzTWKt9f7o9RlceLWfqIYK0G wkAEk724G+FpYAqgTgkVB/BBF/mimm9JbjdoA5Tx58MDaK3bP5zKQ4J4a1mReZa9 fW/remBNgOtV++QGQBZMzPUWowAc4YQNZ9ZlXN0ZhSqoGprVQAsuQdJybfIIyF+i GSctjK77ObGpwf7NLS+ft8290f1eo/Jd+KMXFs7m3OHXo+yFvjq9FbET8DGYSy2N pANLDbxmd3Mgc1PA4XZNnGt6BJ04vNlFhWUW9I2+FZTMldegyblUSc1Fug5mWqWa DtxgE8YSlEjLbrrgEUlZ6zk6Xmfb5Nz9ndBiNUfduOt3YOUdnR5SJThF7bjq3UXz LN+fO6K1HK/EY8jc9qMb7Jme4hx1/pHcy4Vzx7Zh/9m4u9mZkRXJnqITxcS2+hhs H00v3XuhTfjNybgmrunvclPFlxvicb8P7BBTDKhmPzb2mV19g+AhrmmHjIbPhvVh QBMv0mkQsG+KYqD9ruj+OLT3xMQ99skipX3uUUY3z90u6RGMjRWKvlSrLSmr56SE AdmnZw6Al/WTLuvi66S3WE3jmjF0f5TKBPa6uIVLyxgdC9jDJZNA1iSDIAX9s5wZ LDwX8bcLf32c7BPKBe1/
=M25l
-----END PGP SIGNATURE-----

Igor Grinberg

author

2015-08-26 14:54 UTC #19 lore raw

PATCH 6/10 ti: omap/am: move CONFIG_HUSH_PARSER to defconfig

In reply to Igor Grinberg

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 <[email protected]>

Cc Yegor Yefremov <[email protected]>

Cc Enric Balletbo i Serra <[email protected]>

Cc Lokesh Vutla <[email protected]>

Cc Felipe Balbi <[email protected]>

Cc Gilles Gameiro <[email protected]>

Cc "Albert ARIBAUD (3ADEV)" <[email protected]>

Cc Nikita Kiryanov <[email protected]>

Cc Dmitry Lifshitz <[email protected]>

Cc Thomas Weber <[email protected]>

Cc Ash Charles <[email protected]>

Cc Vitaly Andrianov <[email protected]>

Cc Steve Sakoman <[email protected]>

Cc Grazvydas Ignotas <[email protected]>

Cc Nishanth Menon <[email protected]>

Cc Lars Poeschel <[email protected]>

Cc Lothar Felten <[email protected]>

---
 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(-)

configs/am335x_baltos_defconfig +1 -0

index 8e8a897..884fdf5 100644
@@ -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

configs/am335x_evm_defconfig +1 -0

index 96599c6..3358cf8 100644
@@ -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

configs/am335x_evm_nor_defconfig +1 -0

index 6a39041..d42ce40 100644
@@ -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

configs/am335x_evm_norboot_defconfig +1 -0

index 9fdffca..3584763 100644
@@ -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

configs/am335x_evm_spiboot_defconfig +1 -0

index bbeb3c9..cb96ed3 100644
@@ -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

configs/am335x_evm_usbspl_defconfig +1 -0

index c6109f1..85667f3 100644
@@ -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

configs/am335x_gp_evm_defconfig +1 -0

index 62d3b6b..3cfc521 100644
@@ -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

configs/am335x_igep0033_defconfig +1 -0

index a31982a..fc2f79b 100644
@@ -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

configs/am43xx_evm_defconfig +1 -0

index f84f57d..a44df2d 100644
@@ -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

configs/am43xx_evm_ethboot_defconfig +1 -0

index 2d1a301..393dbe9 100644
@@ -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

configs/am43xx_evm_qspiboot_defconfig +1 -0

index ff0109f..d4ae25f 100644
@@ -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

configs/am43xx_evm_usbhost_boot_defconfig +1 -0

index 2a6c3dc..ae8ac44 100644
@@ -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

configs/beagle_x15_defconfig +1 -0

index 3b3c027..d8344f0 100644
@@ -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

configs/birdland_bav335a_defconfig +1 -0

index 244c770..37e8180 100644
@@ -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

configs/birdland_bav335b_defconfig +1 -0

index a86b203..05bcc26 100644
@@ -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

configs/cairo_defconfig +1 -0

index 756457c..b5a66ce 100644
@@ -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

configs/cm_t335_defconfig +1 -0

index 4f4bd0b..81aa52d 100644
@@ -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

configs/cm_t35_defconfig +2 -1

index 99dd2f4..966b81f 100644
@@ -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 # "

configs/cm_t43_defconfig +2 -1

index 19ac18a..242b8c7 100644
@@ -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

configs/cm_t54_defconfig +1 -0

index fc72ffa..fd4b3f3 100644
@@ -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

configs/devkit8000_defconfig +1 -0

index 60ead72..cdb7b99 100644
@@ -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

configs/dra72_evm_defconfig +1 -0

index 3205e72..fa06116 100644
@@ -15,3 +15,4 @@ CONFIG_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_DM_GPIO=y
+CONFIG_HUSH_PARSER=y

configs/dra7xx_evm_defconfig +1 -0

index f98e7b7..952d146 100644
@@ -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

configs/dra7xx_evm_qspiboot_defconfig +1 -0

index f14fa62..6de333a 100644
@@ -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

configs/dra7xx_evm_uart3_defconfig +1 -0

index 8882260..f4ba4ac 100644
@@ -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

configs/duovero_defconfig +1 -0

index d3de28a..58d86e1 100644
@@ -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

configs/igep0020_defconfig +1 -0

index e45e83c..d1dd75e 100644
@@ -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

configs/igep0020_nand_defconfig +1 -0

index 75fabef..4bda465 100644
@@ -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

configs/igep0030_defconfig +1 -0

index 1bb7a6f..ebaff74 100644
@@ -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

configs/igep0030_nand_defconfig +1 -0

index ed01766..85ef454 100644
@@ -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

configs/igep0032_defconfig +1 -0

index bfa15d7..37937dc 100644
@@ -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

configs/k2e_evm_defconfig +2 -1

index c4cbadd..e1bec71 100644
@@ -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 # "

configs/k2hk_evm_defconfig +2 -1

index a604939..6e62326 100644
@@ -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 # "

configs/k2l_evm_defconfig +2 -1

index a687e0c..8a3f447 100644
@@ -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 # "

configs/omap3_beagle_defconfig +1 -0

index dde076a..e0b8f4f 100644
@@ -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

configs/omap3_overo_defconfig +1 -0

index 5d03485..8f7b4de 100644
@@ -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

configs/omap3_pandora_defconfig +1 -0

index 4fb7899..93dde54 100644
@@ -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

configs/omap3_zoom1_defconfig +1 -0

index 9efd6de..654d94b 100644
@@ -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

configs/omap4_panda_defconfig +1 -0

index 1be285d..0683fe2 100644
@@ -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

configs/omap4_sdp4430_defconfig +1 -0

index b369d1d..248863f 100644
@@ -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

configs/omap5_uevm_defconfig +1 -0

index 15221ad..338d62c 100644
@@ -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

configs/pcm051_rev1_defconfig +1 -0

index 2f1022c..aaf4632 100644
@@ -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

configs/pcm051_rev3_defconfig +1 -0

index 61d94b8..e02780c 100644
@@ -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

configs/pengwyn_defconfig +1 -0

index 38add54..3fdadde 100644
@@ -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

configs/pepper_defconfig +1 -0

index 787c5f9..300c147 100644
@@ -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

include/config_distro_defaults.h +2 -0

index d8165cc..7503bff 100644
@@ -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 */

include/configs/cm_t35.h +0 -1

index e5fb474..3ff138f 100644
@@ -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 + \

include/configs/ti_armv7_common.h +0 -1

index 18fca02..6dde989 100644
@@ -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 */

Signature · 1 line

2.4.6

Igor Grinberg

author

2015-08-26 14:54 UTC #20 lore raw

PATCH 7/10 ti: omap/am: move CONFIG_CMD_BOOTZ to defconfig

In reply to Igor Grinberg

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 <[email protected]>

Cc Yegor Yefremov <[email protected]>

Cc Enric Balletbo i Serra <[email protected]>

Cc Lokesh Vutla <[email protected]>

Cc Felipe Balbi <[email protected]>

Cc Gilles Gameiro <[email protected]>

Cc "Albert ARIBAUD (3ADEV)" <[email protected]>

Cc Nikita Kiryanov <[email protected]>

Cc Dmitry Lifshitz <[email protected]>

Cc Roger Meier <[email protected]>

Cc Thomas Weber <[email protected]>

Cc Ash Charles <[email protected]>

Cc Vitaly Andrianov <[email protected]>

Cc Steve Sakoman <[email protected]>

Cc Grazvydas Ignotas <[email protected]>

Cc Nishanth Menon <[email protected]>

Cc Lars Poeschel <[email protected]>

Cc Lothar Felten <[email protected]>

---
 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(-)

configs/am335x_baltos_defconfig +1 -0

index 884fdf5..c20af0e 100644
@@ -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

configs/am335x_evm_defconfig +1 -0

index 3358cf8..396f082 100644
@@ -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

configs/am335x_evm_nor_defconfig +1 -0

index d42ce40..2cbb73d 100644
@@ -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

configs/am335x_evm_norboot_defconfig +1 -0

index 3584763..c5655ca 100644
@@ -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

configs/am335x_evm_spiboot_defconfig +1 -0

index cb96ed3..e0d4c83 100644
@@ -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

configs/am335x_evm_usbspl_defconfig +1 -0

index 85667f3..710c1bd 100644
@@ -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

configs/am335x_igep0033_defconfig +1 -0

index fc2f79b..d89af42 100644
@@ -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

configs/am43xx_evm_defconfig +1 -0

index a44df2d..526373f 100644
@@ -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

configs/am43xx_evm_ethboot_defconfig +1 -0

index 393dbe9..4ebe3ef 100644
@@ -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

configs/am43xx_evm_qspiboot_defconfig +1 -0

index d4ae25f..c105ff6 100644
@@ -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

configs/am43xx_evm_usbhost_boot_defconfig +1 -0

index ae8ac44..392747d 100644
@@ -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

configs/beagle_x15_defconfig +1 -0

index d8344f0..b6abfba 100644
@@ -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

configs/birdland_bav335a_defconfig +1 -0

index 37e8180..0e37edf 100644
@@ -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

configs/birdland_bav335b_defconfig +1 -0

index 05bcc26..0ac5b49 100644
@@ -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

configs/cairo_defconfig +1 -0

index b5a66ce..a972ad7 100644
@@ -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

configs/cm_t335_defconfig +1 -0

index 81aa52d..ad1b008 100644
@@ -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

configs/cm_t35_defconfig +1 -0

index 966b81f..c94882a 100644
@@ -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

configs/cm_t43_defconfig +1 -0

index 242b8c7..04fd46f 100644
@@ -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

configs/cm_t54_defconfig +1 -0

index fd4b3f3..af4c6c6 100644
@@ -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

configs/dra72_evm_defconfig +1 -0

index fa06116..27345f6 100644
@@ -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

configs/dra7xx_evm_defconfig +1 -0

index 952d146..9778959 100644
@@ -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

configs/dra7xx_evm_qspiboot_defconfig +1 -0

index 6de333a..f27fec8 100644
@@ -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

configs/dra7xx_evm_uart3_defconfig +1 -0

index f4ba4ac..7434db0 100644
@@ -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

configs/draco_defconfig +1 -0

index d2fc98d..955c983 100644
@@ -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

configs/duovero_defconfig +1 -0

index 58d86e1..d0eaf05 100644
@@ -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

configs/igep0020_defconfig +1 -0

index d1dd75e..245c0c2 100644
@@ -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

configs/igep0020_nand_defconfig +1 -0

index 4bda465..a0451ac 100644
@@ -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

configs/igep0030_defconfig +1 -0

index ebaff74..395540e 100644
@@ -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

configs/igep0030_nand_defconfig +1 -0

index 85ef454..a7669c5 100644
@@ -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

configs/igep0032_defconfig +1 -0

index 37937dc..79d3b25 100644
@@ -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

configs/k2e_evm_defconfig +1 -0

index e1bec71..e12f82e 100644
@@ -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

configs/k2hk_evm_defconfig +1 -0

index 6e62326..d472f82 100644
@@ -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

configs/k2l_evm_defconfig +1 -0

index 8a3f447..2e7d754 100644
@@ -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

configs/omap3_beagle_defconfig +1 -0

index e0b8f4f..83adb07 100644
@@ -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

configs/omap3_overo_defconfig +1 -0

index 8f7b4de..9f50060 100644
@@ -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

configs/omap3_pandora_defconfig +1 -0

index 93dde54..eac4490 100644
@@ -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

configs/omap3_zoom1_defconfig +1 -0

index 654d94b..da5ed47 100644
@@ -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

configs/omap4_panda_defconfig +1 -0

index 0683fe2..3c95c05 100644
@@ -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

configs/omap4_sdp4430_defconfig +1 -0

index 248863f..81b3eb2 100644
@@ -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

configs/omap5_uevm_defconfig +1 -0

index 338d62c..5cde3b0 100644
@@ -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

configs/pcm051_rev1_defconfig +1 -0

index aaf4632..76662a2 100644
@@ -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

configs/pcm051_rev3_defconfig +1 -0

index e02780c..1168ade 100644
@@ -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

configs/pengwyn_defconfig +1 -0

index 3fdadde..7322be7 100644
@@ -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

configs/pepper_defconfig +1 -0

index 300c147..a01a873 100644
@@ -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

configs/pxm2_defconfig +1 -0

index 41c2849..c0d54d4 100644
@@ -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

configs/rastaban_defconfig +1 -0

index 7a3ac70..19d0905 100644
@@ -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

configs/rut_defconfig +1 -0

index 774957c..9639a26 100644
@@ -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

configs/thuban_defconfig +1 -0

index e2a6b0c..8a42645 100644
@@ -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

include/config_distro_defaults.h +2 -0

index 7503bff..e12dc4e 100644
@@ -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

include/configs/cm_t35.h +0 -1

index 3ff138f..e9370ab 100644
@@ -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 " \

include/configs/devkit8000.h +0 -1

index 6d2c22e..6665f6f 100644
@@ -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

include/configs/ti_armv7_common.h +0 -1

index 6dde989..489c2fb 100644
@@ -147,7 +147,6 @@
 #endif
 
 #define CONFIG_CMD_ASKENV
-#define CONFIG_CMD_BOOTZ
 #define CONFIG_SUPPORT_RAW_INITRD
 
 /*

Signature · 1 line

2.4.6

Igor Grinberg

author

2015-08-26 14:54 UTC #21 lore raw

PATCH 8/10 ti: omap/am: move CONFIG_CMD_NAND to defconfig

In reply to Igor Grinberg

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 <[email protected]>

Cc Yegor Yefremov <[email protected]>

Cc Enric Balletbo i Serra <[email protected]>

Cc Lokesh Vutla <[email protected]>

Cc "Albert ARIBAUD (3ADEV)" <[email protected]>

Cc Nikita Kiryanov <[email protected]>

Cc Thomas Weber <[email protected]>

Cc Steve Sakoman <[email protected]>

Cc Grazvydas Ignotas <[email protected]>

Cc Nishanth Menon <[email protected]>

Cc Lothar Felten <[email protected]>

---
 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(-)

configs/am335x_baltos_defconfig +1 -0

index c20af0e..c0b0797 100644
@@ -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

configs/am335x_evm_defconfig +1 -0

index 396f082..2740553 100644
@@ -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

configs/am335x_evm_nor_defconfig +1 -0

index 2cbb73d..9c55145 100644
@@ -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

configs/am335x_evm_usbspl_defconfig +1 -0

index 710c1bd..c2e8c05 100644
@@ -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

configs/am335x_gp_evm_defconfig +1 -0

index 3cfc521..542e12c 100644
@@ -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

configs/am335x_igep0033_defconfig +1 -0

index d89af42..9a0ad77 100644
@@ -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

configs/am43xx_evm_defconfig +1 -0

index 526373f..f30fc90 100644
@@ -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

configs/am43xx_evm_ethboot_defconfig +1 -0

index 4ebe3ef..909529c 100644
@@ -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

configs/am43xx_evm_usbhost_boot_defconfig +1 -0

index 392747d..cf789c6 100644
@@ -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

configs/cairo_defconfig +1 -0

index a972ad7..0fe118d 100644
@@ -10,3 +10,4 @@ CONFIG_SPL=y
 CONFIG_SYS_PROMPT="Cairo # "
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_NAND=y

configs/cm_t335_defconfig +1 -0

index ad1b008..ac7b7a0 100644
@@ -7,3 +7,4 @@ CONFIG_SPL=y
 CONFIG_SYS_PROMPT="CM-T335 # "
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_NAND=y

configs/cm_t35_defconfig +1 -0

index c94882a..6e100e4 100644
@@ -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

configs/cm_t43_defconfig +1 -0

index 04fd46f..0835b75 100644
@@ -10,3 +10,4 @@ CONFIG_CMD_USB=y
 CONFIG_DM=y
 CONFIG_DM_GPIO=y
 CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_NAND=y

configs/devkit8000_defconfig +1 -0

index cdb7b99..c011b1a 100644
@@ -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

configs/igep0020_nand_defconfig +1 -0

index a0451ac..9a8552f 100644
@@ -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

configs/igep0030_nand_defconfig +1 -0

index a7669c5..ad54a2e 100644
@@ -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

configs/omap3_beagle_defconfig +1 -0

index 83adb07..2c70c9e 100644
@@ -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

configs/omap3_overo_defconfig +1 -0

index 9f50060..223d1fb 100644
@@ -11,3 +11,4 @@ CONFIG_SPL=y
 CONFIG_SYS_PROMPT="Overo # "
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_NAND=y

configs/omap3_pandora_defconfig +1 -0

index eac4490..ede8667 100644
@@ -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

configs/omap3_zoom1_defconfig +1 -0

index da5ed47..412fa3a 100644
@@ -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

configs/pengwyn_defconfig +1 -0

index 7322be7..45ed9d9 100644
@@ -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

include/configs/cm_t335.h +0 -1

index adf05b1..0b74f8d 100644
@@ -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)," \

include/configs/cm_t35.h +0 -1

index e9370ab..22d556c 100644
@@ -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

include/configs/omap3_beagle.h +0 -1

index bf986f8..e6cd135 100644
@@ -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

include/configs/ti_armv7_omap.h +0 -1

index 7548170..0bc713c 100644
@@ -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 */

Signature · 1 line

2.4.6

Igor Grinberg

author

2015-08-26 14:54 UTC #22 lore raw

PATCH 9/10 ti: omap/am: move CONFIG_CMD_I2C to defconfig

In reply to Igor Grinberg

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 <[email protected]>

Cc Yegor Yefremov <[email protected]>

Cc Enric Balletbo i Serra <[email protected]>

Cc Lokesh Vutla <[email protected]>

Cc Felipe Balbi <[email protected]>

Cc Gilles Gameiro <[email protected]>

Cc "Albert ARIBAUD (3ADEV)" <[email protected]>

Cc Nikita Kiryanov <[email protected]>

Cc Dmitry Lifshitz <[email protected]>

Cc Thomas Weber <[email protected]>

Cc Ash Charles <[email protected]>

Cc Vitaly Andrianov <[email protected]>

Cc Steve Sakoman <[email protected]>

Cc Grazvydas Ignotas <[email protected]>

Cc Nishanth Menon <[email protected]>

Cc Lars Poeschel <[email protected]>

Cc Lothar Felten <[email protected]>

---
 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(-)

configs/am335x_baltos_defconfig +1 -0

index c0b0797..6d0fe07 100644
@@ -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

configs/am335x_evm_defconfig +1 -0

index 2740553..21a9255 100644
@@ -11,3 +11,4 @@ CONFIG_SPI_FLASH=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_NAND=y
+CONFIG_CMD_I2C=y

configs/am335x_evm_nor_defconfig +1 -0

index 9c55145..30fa585 100644
@@ -11,3 +11,4 @@ CONFIG_SPI_FLASH=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_NAND=y
+CONFIG_CMD_I2C=y

configs/am335x_evm_norboot_defconfig +1 -0

index c5655ca..f565851 100644
@@ -7,3 +7,4 @@ CONFIG_NOR_BOOT=y
 CONFIG_SPI_FLASH=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_I2C=y

configs/am335x_evm_spiboot_defconfig +1 -0

index e0d4c83..bb4dbc2 100644
@@ -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

configs/am335x_evm_usbspl_defconfig +1 -0

index c2e8c05..e350e5d 100644
@@ -11,3 +11,4 @@ CONFIG_SPI_FLASH=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_NAND=y
+CONFIG_CMD_I2C=y

configs/am335x_gp_evm_defconfig +1 -0

index 542e12c..facf419 100644
@@ -14,3 +14,4 @@ CONFIG_SPI_FLASH=y
 CONFIG_RSA=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_NAND=y
+CONFIG_CMD_I2C=y

configs/am335x_igep0033_defconfig +1 -0

index 9a0ad77..991a3d2 100644
@@ -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

configs/am43xx_evm_defconfig +1 -0

index f30fc90..39c148d 100644
@@ -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

configs/am43xx_evm_ethboot_defconfig +1 -0

index 909529c..5c696a9 100644
@@ -9,3 +9,4 @@ CONFIG_SPI_FLASH=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_NAND=y
+CONFIG_CMD_I2C=y

configs/am43xx_evm_qspiboot_defconfig +1 -0

index c105ff6..0ea07a3 100644
@@ -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

configs/am43xx_evm_usbhost_boot_defconfig +1 -0

index cf789c6..f00b064 100644
@@ -9,3 +9,4 @@ CONFIG_SPI_FLASH=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_NAND=y
+CONFIG_CMD_I2C=y

configs/beagle_x15_defconfig +1 -0

index b6abfba..c761fd5 100644
@@ -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

configs/birdland_bav335a_defconfig +1 -0

index 0e37edf..a33fbbf 100644
@@ -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

configs/birdland_bav335b_defconfig +1 -0

index 0ac5b49..0eae440 100644
@@ -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

configs/cairo_defconfig +1 -0

index 0fe118d..95edf0d 100644
@@ -11,3 +11,4 @@ CONFIG_SYS_PROMPT="Cairo # "
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_NAND=y
+CONFIG_CMD_I2C=y

configs/cm_t335_defconfig +1 -0

index ac7b7a0..7dd6e09 100644
@@ -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

configs/cm_t35_defconfig +1 -0

index 6e100e4..0a5e03a 100644
@@ -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

configs/cm_t43_defconfig +1 -0

index 0835b75..9ee6c1f 100644
@@ -11,3 +11,4 @@ CONFIG_DM=y
 CONFIG_DM_GPIO=y
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_NAND=y
+CONFIG_CMD_I2C=y

configs/cm_t54_defconfig +1 -0

index af4c6c6..c840c15 100644
@@ -9,3 +9,4 @@ CONFIG_SPL=y
 CONFIG_SYS_PROMPT="CM-T54 # "
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_I2C=y

configs/devkit8000_defconfig +1 -0

index c011b1a..99bf124 100644
@@ -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

configs/dra72_evm_defconfig +1 -0

index 27345f6..6e54760 100644
@@ -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

configs/dra7xx_evm_defconfig +1 -0

index 9778959..0bc92de 100644
@@ -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

configs/dra7xx_evm_qspiboot_defconfig +1 -0

index f27fec8..6812bd8 100644
@@ -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

configs/dra7xx_evm_uart3_defconfig +1 -0

index 7434db0..b603c5c 100644
@@ -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

configs/duovero_defconfig +1 -0

index d0eaf05..d0aed0e 100644
@@ -9,3 +9,4 @@ CONFIG_SPL=y
 CONFIG_SYS_PROMPT="duovero # "
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_I2C=y

configs/igep0020_defconfig +1 -0

index 245c0c2..bb961b8 100644
@@ -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

configs/igep0020_nand_defconfig +1 -0

index 9a8552f..b0c9dff 100644
@@ -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

configs/igep0030_defconfig +1 -0

index 395540e..84b0ad3 100644
@@ -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

configs/igep0030_nand_defconfig +1 -0

index ad54a2e..da2f08b 100644
@@ -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

configs/igep0032_defconfig +1 -0

index 79d3b25..1c39ca7 100644
@@ -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

configs/k2e_evm_defconfig +1 -0

index e12f82e..66fb304 100644
@@ -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

configs/k2hk_evm_defconfig +1 -0

index d472f82..db41afb 100644
@@ -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

configs/k2l_evm_defconfig +1 -0

index 2e7d754..ded5e1a 100644
@@ -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

configs/omap3_beagle_defconfig +1 -0

index 2c70c9e..2a5b387 100644
@@ -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

configs/omap3_overo_defconfig +1 -0

index 223d1fb..58aef94 100644
@@ -12,3 +12,4 @@ CONFIG_SYS_PROMPT="Overo # "
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_NAND=y
+CONFIG_CMD_I2C=y

configs/omap3_pandora_defconfig +1 -0

index ede8667..f38560b 100644
@@ -12,3 +12,4 @@ CONFIG_SYS_PROMPT="Pandora # "
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_NAND=y
+CONFIG_CMD_I2C=y

configs/omap3_zoom1_defconfig +1 -0

index 412fa3a..ff3a5b7 100644
@@ -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

configs/omap4_panda_defconfig +1 -0

index 3c95c05..51d4016 100644
@@ -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

configs/omap4_sdp4430_defconfig +1 -0

index 81b3eb2..faec951 100644
@@ -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

configs/omap5_uevm_defconfig +1 -0

index 5cde3b0..6eccb2c 100644
@@ -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

configs/pcm051_rev1_defconfig +1 -0

index 76662a2..10b9c4e 100644
@@ -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

configs/pcm051_rev3_defconfig +1 -0

index 1168ade..bc0dfba 100644
@@ -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

configs/pengwyn_defconfig +1 -0

index 45ed9d9..ac63654 100644
@@ -7,3 +7,4 @@ CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_NAND=y
+CONFIG_CMD_I2C=y

configs/pepper_defconfig +1 -0

index a01a873..bdaf904 100644
@@ -7,3 +7,4 @@ CONFIG_SPL=y
 CONFIG_SYS_PROMPT="pepper# "
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_I2C=y

include/configs/cm_t35.h +0 -1

index 22d556c..d98ee40 100644
@@ -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

include/configs/ti_armv7_common.h +0 -1

index 489c2fb..6924508 100644
@@ -85,7 +85,6 @@
 
 /* I2C IP block */
 #define CONFIG_I2C
-#define CONFIG_CMD_I2C
 #define CONFIG_SYS_I2C
 
 /* MMC/SD IP block */

Signature · 1 line

2.4.6

Igor Grinberg

author

2015-08-26 14:54 UTC #23 lore raw

PATCH 10/10 ti: omap/am: move CONFIG_BOOTDELAY to defconfig

In reply to Igor Grinberg

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 <[email protected]>

Cc Yegor Yefremov <[email protected]>

Cc Enric Balletbo i Serra <[email protected]>

Cc Lokesh Vutla <[email protected]>

Cc Felipe Balbi <[email protected]>

Cc Gilles Gameiro <[email protected]>

Cc "Albert ARIBAUD (3ADEV)" <[email protected]>

Cc Nikita Kiryanov <[email protected]>

Cc Dmitry Lifshitz <[email protected]>

Cc Thomas Weber <[email protected]>

Cc Ash Charles <[email protected]>

Cc Vitaly Andrianov <[email protected]>

Cc Steve Sakoman <[email protected]>

Cc Grazvydas Ignotas <[email protected]>

Cc Nishanth Menon <[email protected]>

Cc Lars Poeschel <[email protected]>

Cc Lothar Felten <[email protected]>

---
 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(-)

configs/am335x_baltos_defconfig +2 -0

index 6d0fe07..e7f8f27 100644
@@ -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

configs/am335x_evm_defconfig +2 -0

index 21a9255..54e5190 100644
@@ -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

configs/am335x_evm_nor_defconfig +2 -0

index 30fa585..cacb111 100644
@@ -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

configs/am335x_evm_norboot_defconfig +2 -0

index f565851..fe00c82 100644
@@ -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

configs/am335x_evm_spiboot_defconfig +2 -0

index bb4dbc2..e10e3cb 100644
@@ -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

configs/am335x_evm_usbspl_defconfig +2 -0

index e350e5d..a237dbf 100644
@@ -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

configs/am335x_gp_evm_defconfig +2 -0

index facf419..0496bac 100644
@@ -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

configs/am335x_igep0033_defconfig +2 -0

index 991a3d2..8489d5d 100644
@@ -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

configs/am43xx_evm_defconfig +2 -0

index 39c148d..8dd0259 100644
@@ -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

configs/am43xx_evm_ethboot_defconfig +2 -0

index 5c696a9..ba0b96e 100644
@@ -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

configs/am43xx_evm_qspiboot_defconfig +2 -0

index 0ea07a3..c6b2913 100644
@@ -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

configs/am43xx_evm_usbhost_boot_defconfig +2 -0

index f00b064..b4ff861 100644
@@ -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

configs/beagle_x15_defconfig +2 -0

index c761fd5..8c7d63a 100644
@@ -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

configs/birdland_bav335a_defconfig +2 -0

index a33fbbf..6adde6c 100644
@@ -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

configs/birdland_bav335b_defconfig +2 -0

index 0eae440..5f4b2ca 100644
@@ -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

configs/cairo_defconfig +2 -0

index 95edf0d..3ace5aa 100644
@@ -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

configs/cm_t335_defconfig +2 -0

index 7dd6e09..0df5b78 100644
@@ -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

configs/cm_t35_defconfig +2 -0

index 0a5e03a..8b4891f 100644
@@ -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

configs/cm_t43_defconfig +2 -0

index 9ee6c1f..2db596e 100644
@@ -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

configs/cm_t54_defconfig +2 -0

index c840c15..ae5b276 100644
@@ -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

configs/devkit8000_defconfig +2 -0

index 99bf124..a7cefa0 100644
@@ -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

configs/dra72_evm_defconfig +2 -0

index 6e54760..a3d3f5f 100644
@@ -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

configs/dra7xx_evm_defconfig +2 -0

index 0bc92de..8125933 100644
@@ -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

configs/dra7xx_evm_qspiboot_defconfig +2 -0

index 6812bd8..cb89293 100644
@@ -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

configs/dra7xx_evm_uart3_defconfig +2 -0

index b603c5c..4e7d6d6 100644
@@ -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

configs/duovero_defconfig +2 -0

index d0aed0e..7e511b1 100644
@@ -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

configs/igep0020_defconfig +2 -0

index bb961b8..96051d0 100644
@@ -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

configs/igep0020_nand_defconfig +2 -0

index b0c9dff..9e0fbe4 100644
@@ -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

configs/igep0030_defconfig +2 -0

index 84b0ad3..3e6688f 100644
@@ -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

configs/igep0030_nand_defconfig +2 -0

index da2f08b..ce6a1f9 100644
@@ -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

configs/igep0032_defconfig +2 -0

index 1c39ca7..decfc9b 100644
@@ -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

configs/k2e_evm_defconfig +2 -0

index 66fb304..a619ebf 100644
@@ -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

configs/k2hk_evm_defconfig +2 -0

index db41afb..0af7b31 100644
@@ -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

configs/k2l_evm_defconfig +2 -0

index ded5e1a..7d14ad4 100644
@@ -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

configs/omap3_beagle_defconfig +2 -0

index 2a5b387..c70138b 100644
@@ -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

configs/omap3_overo_defconfig +2 -0

index 58aef94..2febe18 100644
@@ -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

configs/omap3_pandora_defconfig +2 -0

index f38560b..02460c5 100644
@@ -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

configs/omap3_zoom1_defconfig +2 -0

index ff3a5b7..5612daa 100644
@@ -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

configs/omap4_panda_defconfig +2 -0

index 51d4016..1d0286c 100644
@@ -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

configs/omap4_sdp4430_defconfig +2 -0

index faec951..4147b50 100644
@@ -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

configs/omap5_uevm_defconfig +2 -0

index 6eccb2c..2044ad0 100644
@@ -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

configs/pcm051_rev1_defconfig +2 -0

index 10b9c4e..60e9e7f 100644
@@ -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

configs/pcm051_rev3_defconfig +2 -0

index bc0dfba..8d5db36 100644
@@ -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

configs/pengwyn_defconfig +2 -0

index ac63654..397d80c 100644
@@ -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

configs/pepper_defconfig +2 -0

index bdaf904..400d843 100644
@@ -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

include/config_distro_defaults.h +2 -0

index e12dc4e..b7828b5 100644
@@ -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

include/configs/cm_t35.h +0 -1

index d98ee40..e68d033 100644
@@ -155,7 +155,6 @@
 							/* devices */
 
 /* Environment information */
-#define CONFIG_BOOTDELAY		3
 #define CONFIG_ZERO_BOOTDELAY_CHECK
 
 #define CONFIG_EXTRA_ENV_SETTINGS \

include/configs/cm_t43.h +0 -1

index c4d3b94..b6ed078 100644
@@ -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

include/configs/cm_t54.h +0 -3

index 95a5a60..0aba379 100644
@@ -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" \

include/configs/omap3_cairo.h +0 -3

index 3f777b6..aaa7572 100644
@@ -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" \

include/configs/ti_armv7_common.h +0 -5

index 6924508..118381b 100644
@@ -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

Signature · 1 line

2.4.6

Igor Grinberg

author

2015-09-24 09:53 UTC #24 lore raw

cover Kconfig and ti omap configs tidy up

In reply to Igor Grinberg

Hi Tom,

Quoted 11 lines · Igor Grinberg

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!

Quoted 8 lines

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

[...]

Signature · 2 lines

Regards,
Igor.

Tom Rini

2015-09-25 17:37 UTC #25 lore raw

cover Kconfig and ti omap configs tidy up

Quoted 11 lines · Igor Grinberg

Hi Tom,
Quoted 8 lines · Igor Grinberg
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.

Quoted 7 lines

Quoted 3 lines
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!

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150925/b0df310d/attachment.sig>