: Config cleanups

PATCH New Tom Rini 4 participants 15 messages Apr 13, 2012 – Apr 16, 2012

Subsystems (5)

Arm (32-bit) Arm i.MX and Layerscape Tegra architecture support Arm/Microchip (AT91) SoC support +1 more subsystems

lore

Share & tools

lore

Tom Rini

author

2012-04-13 22:19 UTC #0 lore raw

cover : Config cleanups

Hey all,

As part of the RFC config cleanups I sent a while ago, I've come up with a number of related cleanups that should be done. This series does that. It's mostly OMAP* stuff except for the last one which fixes the case of using config_cmd_default.h and NOT setting CONFIG_SYS_NO_FLASH before then and having to manually undef CONFIG_CMD_(FLASH|IMLS). I can split that up if needed.

Signature · 1 line

Tom

Tom Rini

author

2012-04-13 22:19 UTC #1 lore raw

PATCH 1/8 omap4: Remove CONFIG_SYS_MMC_SET_DEV

This is only used on !CONFIG_GENERIC_MMC which is false here.

Signed-off-by Tom Rini <[email protected]>

---
 include/configs/omap4_common.h |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

include/configs/omap4_common.h +0 -1

index 01b4d6c..4ace07b 100644
@@ -106,7 +106,6 @@
 #define CONFIG_GENERIC_MMC		1
 #define CONFIG_MMC			1
 #define CONFIG_OMAP_HSMMC		1
-#define CONFIG_SYS_MMC_SET_DEV		1
 #define CONFIG_DOS_PARTITION		1

Signature · 1 line

1.7.0.4

Tom Rini

author

2012-04-13 22:20 UTC #2 lore raw

PATCH 2/8 omap4+: Remove CONFIG_ARCH_CPU_INIT

In reply to Tom Rini

OMAP4/5 had an empty arch_cpu_init() so drop that along with CONFIG_ARCH_CPU_INIT

Signed-off-by Tom Rini <[email protected]>

---
 arch/arm/cpu/armv7/omap-common/hwinit-common.c |   10 ----------
 include/configs/omap4_common.h                 |    1 -
 include/configs/omap5_evm.h                    |    1 -
 3 files changed, 0 insertions(+), 12 deletions(-)

arch/arm/cpu/armv7/omap-common/hwinit-common.c +0 ~~-10~~

index 10e7669..cf71ab4 100644
@@ -203,16 +203,6 @@ int checkboard(void)
 }
 
 /*
-* This function is called by start_armboot. You can reliably use static
-* data. Any boot-time function that require static data should be
-* called from here
-*/
-int arch_cpu_init(void)
-{
-	return 0;
-}
-
-/*
  *  get_device_type(): tell if GP/HS/EMU/TST
  */
 u32 get_device_type(void)

include/configs/omap4_common.h +0 -1

index 4ace07b..5507c8f 100644
@@ -35,7 +35,6 @@
 #define CONFIG_OMAP		1	/* in a TI OMAP core */
 #define CONFIG_OMAP44XX		1	/* which is a 44XX */
 #define CONFIG_OMAP4430		1	/* which is in a 4430 */
-#define CONFIG_ARCH_CPU_INIT
 
 /* Get CPU defs */
 #include <asm/arch/cpu.h>

include/configs/omap5_evm.h +0 -1

index 6c91ee8..38b5028 100644
@@ -38,7 +38,6 @@
 #define CONFIG_OMAP54XX	/* which is a 54XX */
 #define CONFIG_OMAP5430	/* which is in a 5430 */
 #define CONFIG_5430EVM	/* working with EVM */
-#define CONFIG_ARCH_CPU_INIT
 
 /* Get CPU defs */
 #include <asm/arch/cpu.h>

Signature · 1 line

1.7.0.4

Tom Rini

author

2012-04-13 22:20 UTC #3 lore raw

PATCH 3/8 omap5912osk: Remove empty misc_init_r

In reply to Tom Rini

We had a do-nothing misc_init_r, remove along with CONFIG_MISC_INIT_R

Signed-off-by Tom Rini <[email protected]>

---
 board/ti/omap5912osk/omap5912osk.c |    7 -------
 include/configs/omap5912osk.h      |    2 --
 2 files changed, 0 insertions(+), 9 deletions(-)

board/ti/omap5912osk/omap5912osk.c +0 -7

index 6f0e763..fac683a 100644
@@ -81,13 +81,6 @@ int board_init (void)
 	return 0;
 }
 
-
-int misc_init_r (void)
-{
-	/* currently empty */
-	return (0);
-}
-
 /******************************
  Routine:
  Description:

include/configs/omap5912osk.h +0 -2

index a8dfef3..d3a2438 100644
@@ -44,8 +44,6 @@
 
 #undef CONFIG_USE_IRQ	/* we don't need IRQ/FIQ stuff */
 
-#define CONFIG_MISC_INIT_R
-
 #define CONFIG_CMDLINE_TAG	1	/* enable passing of ATAGs  */
 #define CONFIG_SETUP_MEMORY_TAGS	1
 #define CONFIG_INITRD_TAG      1       /* Required for ramdisk support */

Signature · 1 line

1.7.0.4

Tom Rini

author

2012-04-13 22:20 UTC #4 lore raw

PATCH 4/8 omap730p2: Remove empty misc_init_r

In reply to Tom Rini

We had a do-nothing misc_init_r, remove along with CONFIG_MISC_INIT_R

Signed-off-by Tom Rini <[email protected]>

---
 board/ti/omap730p2/omap730p2.c |    6 ------
 include/configs/omap730p2.h    |    2 --
 2 files changed, 0 insertions(+), 8 deletions(-)

board/ti/omap730p2/omap730p2.c +0 -6

index 954ced5..36204b2 100644
@@ -129,12 +129,6 @@ int board_init (void)
 	return 0;
 }
 
-int misc_init_r (void)
-{
-	/* currently empty */
-	return (0);
-}
-
 /******************************
  Routine:
  Description:

include/configs/omap730p2.h +0 -2

index 26e7e1f..f7900e0 100644
@@ -49,8 +49,6 @@
 
 #undef CONFIG_USE_IRQ			     /* we don't need IRQ/FIQ stuff */
 
-#define CONFIG_MISC_INIT_R
-
 #define CONFIG_CMDLINE_TAG	   1	     /* enable passing of ATAGs	 */
 #define CONFIG_SETUP_MEMORY_TAGS   1

Signature · 1 line

1.7.0.4

Tom Rini

author

2012-04-13 22:20 UTC #5 lore raw

PATCH 5/8 omap3: Introduce weak misc_init_r

In reply to Tom Rini

Introduce a __weak misc_init_r function that just runs dieid_num_r(). Remove misc_init_r from cm_t35, mcx, omap3_logic and mt_ventoux as this was all they did for misc_init_r.

Cc Igor Grinberg <[email protected]>

Cc Ilya Yanok <[email protected]>

Cc Peter Barada <[email protected]>

Cc Stefano Babic <[email protected]>

Signed-off-by Tom Rini <[email protected]>

---
 arch/arm/cpu/armv7/omap3/board.c     |   12 ++++++++++++
 board/cm_t35/cm_t35.c                |   11 -----------
 board/htkw/mcx/mcx.c                 |   11 -----------
 board/logicpd/omap3som/omap3logic.c  |   11 -----------
 board/teejet/mt_ventoux/mt_ventoux.c |    7 -------
 5 files changed, 12 insertions(+), 40 deletions(-)

arch/arm/cpu/armv7/omap3/board.c +12 -0

index 1fee574..f2e52e9 100644
@@ -41,6 +41,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/omap_common.h>
 #include <i2c.h>
+#include <linux/compiler.h>
 
 /* Declarations */
 extern omap3_sysinfo sysinfo;

@@ -244,6 +245,17 @@ void s_init(void)
 		mem_init();
 }
 
+/*
+ * Routine: misc_init_r
+ * Description: A basic misc_init_r that just displays the die ID
+ */
+int __weak misc_init_r(void)
+{
+	dieid_num_r();
+
+	return 0;
+}
+
 /******************************************************************************
  * Routine: wait_for_command_complete
  * Description: Wait for posting to finish on watchdog

board/cm_t35/cm_t35.c +0 ~~-11~~

index 7a2fed7..b5d2800 100644
@@ -100,17 +100,6 @@ int board_init(void)
 }
 
 /*
- * Routine: misc_init_r
- * Description: display die ID
- */
-int misc_init_r(void)
-{
-	dieid_num_r();
-
-	return 0;
-}
-
-/*
  * Routine: set_muxconf_regs
  * Description: Setting up the configuration Mux registers specific to the
  *		hardware. Many pins need to be moved from protect to primary

board/htkw/mcx/mcx.c +0 ~~-11~~

index 8f0b527..8f75af1 100644
@@ -69,17 +69,6 @@ int board_init(void)
 }
 
 /*
- * Routine: misc_init_r
- * Description: late init.
- */
-int misc_init_r(void)
-{
-	dieid_num_r();
-
-	return 0;
-}
-
-/*
  * Routine: set_muxconf_regs
  * Description: Setting up the configuration Mux registers specific to the
  *		hardware. Many pins need to be moved from protect to primary

board/logicpd/omap3som/omap3logic.c +0 ~~-11~~

index 89b114b..12bcfcb 100644
@@ -144,17 +144,6 @@ int board_mmc_init(bd_t *bis)
 }
 #endif
 
-/*
- * Routine: misc_init_r
- * Description: display die ID register
- */
-int misc_init_r(void)
-{
-	dieid_num_r();
-
-	return 0;
-}
-
 #ifdef CONFIG_SMC911X
 /* GPMC CS1 settings for Logic SOM LV/Torpedo LAN92xx Ethernet chip */
 static const u32 gpmc_lan92xx_config[] = {

board/teejet/mt_ventoux/mt_ventoux.c +0 -7

index c7aedc9..9fbaedd 100644
@@ -196,13 +196,6 @@ int board_init(void)
 	return 0;
 }
 
-int misc_init_r(void)
-{
-	dieid_num_r();
-
-	return 0;
-}
-
 /*
  * Routine: set_muxconf_regs
  * Description: Setting up the configuration Mux registers specific to the

Signature · 1 line

1.7.0.4

Igor Grinberg

2012-04-15 07:32 UTC #6 lore raw

PATCH 5/8 omap3: Introduce weak misc_init_r

Quoted 9 lines · Tom Rini

Introduce a __weak misc_init_r function that just runs dieid_num_r(). Remove misc_init_r from cm_t35, mcx, omap3_logic and mt_ventoux as this was all they did for misc_init_r.
Cc Igor Grinberg <[email protected]>
Cc Ilya Yanok <[email protected]>
Cc Peter Barada <[email protected]>
Cc Stefano Babic <[email protected]>
Signed-off-by Tom Rini <[email protected]>

Acked-by Igor Grinberg <[email protected]>

Thanks for the patch.

Signature · 2 lines

Regards,
Igor.

stefano babic

2012-04-15 08:48 UTC #7 lore raw

PATCH 5/8 omap3: Introduce weak misc_init_r

In reply to Tom Rini

Am 14/04/2012 00:20, schrieb Tom Rini:

Quoted 10 lines

Introduce a __weak misc_init_r function that just runs dieid_num_r(). Remove misc_init_r from cm_t35, mcx, omap3_logic and mt_ventoux as this was all they did for misc_init_r.
Cc Igor Grinberg <[email protected]>
Cc Ilya Yanok <[email protected]>
Cc Peter Barada <[email protected]>
Cc Stefano Babic <[email protected]>
Signed-off-by Tom Rini <[email protected]>
---

Acked-by Stefano Babic <[email protected]>

Best regards,
Stefano Babic

Signature · 5 lines

=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================

Tom Rini

author

2012-04-13 22:20 UTC #8 lore raw

PATCH 6/8 include/configs: Remove CONFIG_SYS_64BIT_VSPRINTF

In reply to Tom Rini

This define does not control anything, remove it.

Signed-off-by Tom Rini <[email protected]>

---
 include/configs/P1023RDS.h         |    1 -
 include/configs/P2020COME.h        |    1 -
 include/configs/am3517_crane.h     |    1 -
 include/configs/am3517_evm.h       |    2 --
 include/configs/at91sam9263ek.h    |    2 --
 include/configs/da830evm.h         |    1 -
 include/configs/ea20.h             |    1 -
 include/configs/eb_cpux9k2.h       |    2 --
 include/configs/flea3.h            |    2 --
 include/configs/hawkboard.h        |    1 -
 include/configs/imx27lite-common.h |    1 -
 include/configs/mcx.h              |    2 --
 include/configs/meesc.h            |    1 -
 include/configs/mv-common.h        |    1 -
 include/configs/mx25pdk.h          |    1 -
 include/configs/mx35pdk.h          |    2 --
 include/configs/otc570.h           |    1 -
 include/configs/p1_p2_rdb_pc.h     |    1 -
 include/configs/spear-common.h     |    1 -
 include/configs/tam3517-common.h   |    1 -
 include/configs/tx25.h             |    2 --
 include/configs/zmx25.h            |    2 --
 22 files changed, 0 insertions(+), 30 deletions(-)

include/configs/P1023RDS.h +0 -1

index e057b1f..b7236b2 100644
@@ -310,7 +310,6 @@ extern unsigned long get_clock_freq(void);
 #define CONFIG_OF_BOARD_SETUP
 #define CONFIG_OF_STDOUT_VIA_ALIAS
 
-#define CONFIG_SYS_64BIT_VSPRINTF
 #define CONFIG_SYS_64BIT_STRTOUL
 
 /* new uImage format support */

include/configs/P2020COME.h +0 -1

index 365322c..12f9860 100644
@@ -416,7 +416,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 #endif
 
 /* Misc Extra Settings */
-#define CONFIG_SYS_64BIT_VSPRINTF	1
 #define CONFIG_SYS_64BIT_STRTOUL	1
 #define CONFIG_CMD_DHCP			1

include/configs/am3517_crane.h +0 -1

index b0dd2f0..71321f3 100644
@@ -174,7 +174,6 @@
 
 #define CONFIG_SYS_MAX_NAND_DEVICE	1		/* Max number of */
 							/* NAND devices */
-#define CONFIG_SYS_64BIT_VSPRINTF		/* needed for nand_util.c */
 
 #define CONFIG_JFFS2_NAND
 /* nand device jffs2 lives on */

include/configs/am3517_evm.h +0 -2

index b5f75d1..bbd19de 100644
@@ -173,8 +173,6 @@
 
 #define CONFIG_SYS_MAX_NAND_DEVICE	1		/* Max number of */
 							/* NAND devices */
-#define CONFIG_SYS_64BIT_VSPRINTF		/* needed for nand_util.c */
-
 #define CONFIG_JFFS2_NAND
 /* nand device jffs2 lives on */
 #define CONFIG_JFFS2_DEV		"nand0"

include/configs/at91sam9263ek.h +0 -2

index 8399246..f424e5a 100644
@@ -283,8 +283,6 @@
 #define CONFIG_SYS_NAND_MASK_CLE		(1 << 22)
 #define CONFIG_SYS_NAND_ENABLE_PIN		AT91_PIN_PD15
 #define CONFIG_SYS_NAND_READY_PIN		AT91_PIN_PA22
-
-#define CONFIG_SYS_64BIT_VSPRINTF		/* needed for nand_util.c */
 #endif
 
 /* Ethernet */

include/configs/da830evm.h +0 -1

index 4532e4f..781878e 100644
@@ -111,7 +111,6 @@
 #define CONFIG_SYS_NAND_CS		3
 #define CONFIG_SYS_NAND_BASE		DAVINCI_ASYNC_EMIF_DATA_CE3_BASE
 #define CONFIG_SYS_NAND_PAGE_2K
-#define CONFIG_SYS_64BIT_VSPRINTF	/* needed for nand_util.c */
 #define CONFIG_SYS_CLE_MASK		0x10
 #define CONFIG_SYS_ALE_MASK		0x8
 #define CONFIG_SYS_MAX_NAND_DEVICE	1 /* Max number of NAND devices */

include/configs/ea20.h +0 -1

index e059b30..04e7a2d 100644
@@ -203,7 +203,6 @@
 #define CONFIG_SYS_NAND_4BIT_HW_ECC_OOBFIRST
 #define	CONFIG_SYS_NAND_USE_FLASH_BBT
 #define CONFIG_SYS_MAX_NAND_DEVICE	1 /* Max number of NAND devices */
-#define CONFIG_SYS_64BIT_VSPRINTF	/* needed for nand_util.c */
 #endif
 
 /* SPI Flash */

include/configs/eb_cpux9k2.h +0 -2

index 9046cf0..1fcd0c8 100644
@@ -274,8 +274,6 @@
 #define CONFIG_SYS_NAND_BASE		0x40000000
 #define CONFIG_SYS_NAND_DBW_8		1
 
-#define CONFIG_SYS_64BIT_VSPRINTF	1
-
 /* Status LED's */
 
 #define CONFIG_STATUS_LED		1

include/configs/flea3.h +0 -2

index 649e272..e860837 100644
@@ -47,8 +47,6 @@
 /* Set TEXT@the beginning of the NOR flash */
 #define CONFIG_SYS_TEXT_BASE	0xA0000000
 
-#define CONFIG_SYS_64BIT_VSPRINTF
-
 /* This is required to setup the ESDC controller */
 #define CONFIG_BOARD_EARLY_INIT_F

include/configs/hawkboard.h +0 -1

index 50a1c17..959f9cf 100644
@@ -126,7 +126,6 @@
 #define CFG_DAVINCI_STD_NAND_LAYOUT
 #define CONFIG_SYS_NAND_CS		3
 #define CONFIG_SYS_NAND_PAGE_2K
-#define CONFIG_SYS_64BIT_VSPRINTF	/* needed for nand_util.c */
 /* Max number of NAND devices */
 #define CONFIG_SYS_MAX_NAND_DEVICE	1
 #define CONFIG_SYS_NAND_BASE_LIST	{ 0x62000000, }

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

index 2af4e7a..c1f1aa6 100644
@@ -153,7 +153,6 @@
 #define CONFIG_SYS_NAND_BASE		0xd8000000
 #define CONFIG_JFFS2_NAND
 #define CONFIG_MXC_NAND_HWECC
-#define CONFIG_SYS_64BIT_VSPRINTF	/* needed for nand_util.c */
 
 /*
  * SD/MMC

include/configs/mcx.h +0 -2

index 1315c3c..e190e3e 100644
@@ -171,8 +171,6 @@
 
 #define CONFIG_SYS_MAX_NAND_DEVICE	1		/* Max number of */
 							/* NAND devices */
-#define CONFIG_SYS_64BIT_VSPRINTF		/* needed for nand_util.c */
-
 #define CONFIG_JFFS2_NAND
 /* nand device jffs2 lives on */
 #define CONFIG_JFFS2_DEV		"nand0"

include/configs/meesc.h +0 -1

index d6197bc..db1e87d 100644
@@ -164,7 +164,6 @@
 # define CONFIG_SYS_NAND_MASK_CLE		(1 << 22)
 # define CONFIG_SYS_NAND_ENABLE_PIN		AT91_PIO_PORTD, 15
 # define CONFIG_SYS_NAND_READY_PIN		AT91_PIO_PORTA, 22
-# define CONFIG_SYS_64BIT_VSPRINTF		/* needed for nand_util.c */
 #endif
 
 /* Ethernet */

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

index 1a63791..27b4899 100644
@@ -132,7 +132,6 @@
  */
 #ifdef CONFIG_CMD_NAND
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
-#define CONFIG_SYS_64BIT_VSPRINTF      /* needed for nand_util.c */
 #endif
 
 /*

include/configs/mx25pdk.h +0 -1

index d1ba02b..7210b6e 100644
@@ -65,7 +65,6 @@
 #define CONFIG_ENV_IS_NOWHERE
 
 #define CONFIG_SYS_NO_FLASH
-#define CONFIG_SYS_64BIT_VSPRINTF
 
 /* U-Boot general configuration */
 #define CONFIG_SYS_PROMPT	"MX25PDK U-Boot > "

include/configs/mx35pdk.h +0 -2

index 0c62b9f..07973f4 100644
@@ -39,8 +39,6 @@
 /* Set TEXT at the beginning of the NOR flash */
 #define CONFIG_SYS_TEXT_BASE	0xA0000000
 
-#define CONFIG_SYS_64BIT_VSPRINTF
-
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_BOARD_LATE_INIT

include/configs/otc570.h +0 -1

index b322c77..8599378 100644
@@ -215,7 +215,6 @@
 # define CONFIG_SYS_NAND_MASK_CLE		(1 << 22)
 # define CONFIG_SYS_NAND_ENABLE_PIN		AT91_PIO_PORTD, 15
 # define CONFIG_SYS_NAND_READY_PIN		AT91_PIO_PORTA, 22
-# define CONFIG_SYS_64BIT_VSPRINTF		/* needed for nand_util.c */
 #endif
 
 /* Ethernet */

include/configs/p1_p2_rdb_pc.h +0 -1

index 3098c5a..c52f070 100644
@@ -534,7 +534,6 @@
 #define CONFIG_OF_BOARD_SETUP
 #define CONFIG_OF_STDOUT_VIA_ALIAS
 
-#define CONFIG_SYS_64BIT_VSPRINTF
 #define CONFIG_SYS_64BIT_STRTOUL
 
 /* new uImage format support */

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

index 5fef8cc..58d9fab 100644
@@ -196,7 +196,6 @@
 #define CONFIG_SYS_BARGSIZE			CONFIG_SYS_CBSIZE
 #define CONFIG_SYS_LOAD_ADDR			0x00800000
 #define CONFIG_SYS_CONSOLE_INFO_QUIET		1
-#define CONFIG_SYS_64BIT_VSPRINTF		1
 
 #define CONFIG_EXTRA_ENV_SETTINGS		CONFIG_EXTRA_ENV_USBTTY

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

index 4c4321d..37eb87b 100644
@@ -146,7 +146,6 @@
 
 #define CONFIG_SYS_MAX_NAND_DEVICE	1		/* Max number of */
 							/* NAND devices */
-#define CONFIG_SYS_64BIT_VSPRINTF		/* needed for nand_util.c */
 
 #define CONFIG_AUTO_COMPLETE

include/configs/tx25.h +0 -2

index 87bd8a6..3dfafa5 100644
@@ -117,8 +117,6 @@
 #define CONFIG_MXC_NAND_HWECC
 #define CONFIG_SYS_NAND_LARGEPAGE
 
-#define CONFIG_SYS_64BIT_VSPRINTF
-
 /* U-Boot general configuration */
 #define CONFIG_SYS_PROMPT	"=> "	/* Monitor Command Prompt */
 #define CONFIG_SYS_CBSIZE	1024	/* Console I/O Buffer Size  */

include/configs/zmx25.h +0 -2

index 599d5bb..d7ce6c6 100644
@@ -93,8 +93,6 @@
 #define CONFIG_CMD_NET
 #define CONFIG_CMD_CACHE
 
-#define CONFIG_SYS_64BIT_VSPRINTF
-
 /*
  * Additional command
  */

Signature · 1 line

1.7.0.4

Tom Rini

author

2012-04-13 22:20 UTC #9 lore raw

PATCH 7/8 include/configs: Remove CONFIG_SYS_64BIT_STRTOUL

In reply to Tom Rini

This define does not control anything, remove it.

Signed-off-by Tom Rini <[email protected]>

---
 include/configs/P1023RDS.h     |    2 --
 include/configs/P2020COME.h    |    1 -
 include/configs/p1_p2_rdb_pc.h |    2 --
 3 files changed, 0 insertions(+), 5 deletions(-)

include/configs/P1023RDS.h +0 -2

index b7236b2..e632d1b 100644
@@ -310,8 +310,6 @@ extern unsigned long get_clock_freq(void);
 #define CONFIG_OF_BOARD_SETUP
 #define CONFIG_OF_STDOUT_VIA_ALIAS
 
-#define CONFIG_SYS_64BIT_STRTOUL
-
 /* new uImage format support */
 #define CONFIG_FIT
 #define CONFIG_FIT_VERBOSE	/* enable fit_format_{error,warning}() */

include/configs/P2020COME.h +0 -1

index 12f9860..28122ec 100644
@@ -416,7 +416,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 #endif
 
 /* Misc Extra Settings */
-#define CONFIG_SYS_64BIT_STRTOUL	1
 #define CONFIG_CMD_DHCP			1
 
 #define CONFIG_CMD_DATE			1

include/configs/p1_p2_rdb_pc.h +0 -2

index c52f070..2d68d2e 100644
@@ -534,8 +534,6 @@
 #define CONFIG_OF_BOARD_SETUP
 #define CONFIG_OF_STDOUT_VIA_ALIAS
 
-#define CONFIG_SYS_64BIT_STRTOUL
-
 /* new uImage format support */
 #define CONFIG_FIT
 #define CONFIG_FIT_VERBOSE	/* enable fit_format_{error,warning}() */

Signature · 1 line

1.7.0.4

Tom Rini

author

2012-04-13 22:20 UTC #10 lore raw

PATCH 8/8 include/configs: Better utilize CONFIG_SYS_NO_FLASH

In reply to Tom Rini

In config files which it is clear when CONFIG_SYS_NO_FLASH will be set (either unconditionally or based on logic that can happen early in the config file), ensure that we set that _before_ we include config_cmd_default.h so that the logic in that file will not enable CONFIG_CMD_(FLASH|IMLS). This saves us from having to undef it in the board files.

Signed-off-by Tom Rini <[email protected]>

---
 include/configs/PN62.h              |    5 +---
 include/configs/SIMPC8313.h         |    5 +---
 include/configs/afeb9260.h          |    5 +---
 include/configs/am3517_crane.h      |    4 +--
 include/configs/am3517_evm.h        |    4 +--
 include/configs/at91sam9260ek.h     |    5 +---
 include/configs/at91sam9261ek.h     |    5 +---
 include/configs/at91sam9m10g45ek.h  |    5 +---
 include/configs/at91sam9rlek.h      |    5 +---
 include/configs/bf525-ucr2.h        |    5 +---
 include/configs/bf537-minotaur.h    |   11 +---------
 include/configs/bf537-srv1.h        |   11 +---------
 include/configs/blackstamp.h        |   15 +++++--------
 include/configs/blackvme.h          |   13 ++++-------
 include/configs/cm_t35.h            |    4 +--
 include/configs/coreboot.h          |   11 +---------
 include/configs/davinci_schmoogie.h |    2 -
 include/configs/davinci_sffsdr.h    |    2 -
 include/configs/devkit8000.h        |    2 +-
 include/configs/dig297.h            |    4 +--
 include/configs/igep00x0.h          |    5 +---
 include/configs/mcx.h               |    4 +--
 include/configs/meesc.h             |    5 +---
 include/configs/mx31pdk.h           |   10 +--------
 include/configs/mx51evk.h           |    6 +---
 include/configs/mx53ard.h           |    5 +---
 include/configs/mx53evk.h           |    5 +---
 include/configs/mx53loco.h          |    5 +---
 include/configs/mx53smd.h           |    5 +---
 include/configs/mx6qarm2.h          |    5 +---
 include/configs/mx6qsabrelite.h     |    5 +---
 include/configs/nhk8815.h           |    5 +---
 include/configs/omap3_beagle.h      |    4 +--
 include/configs/omap3_logic.h       |    5 +---
 include/configs/omap3_mvblx.h       |    5 +---
 include/configs/omap3_overo.h       |    4 +--
 include/configs/omap3_pandora.h     |    4 +--
 include/configs/omap3_zoom1.h       |    4 +--
 include/configs/omap3_zoom2.h       |    4 +--
 include/configs/omap4_common.h      |    5 +---
 include/configs/omap5_evm.h         |    5 +---
 include/configs/origen.h            |    3 +-
 include/configs/otc570.h            |    5 +---
 include/configs/pm9g45.h            |    6 +----
 include/configs/sbc35_a9g20.h       |    5 +---
 include/configs/smdk5250.h          |    3 +-
 include/configs/smdkc100.h          |    5 +---
 include/configs/snapper9260.h       |    1 -
 include/configs/tam3517-common.h    |    5 +---
 include/configs/tegra2-common.h     |    5 +---
 include/configs/tny_a9260.h         |    5 +---
 include/configs/vct.h               |    5 ----
 include/configs/vision2.h           |    4 +--
 include/configs/xilinx-ppc.h        |   38 ++++++++++++++++------------------
 54 files changed, 77 insertions(+), 241 deletions(-)

include/configs/PN62.h +1 -4

index dae4577..ddaffc1 100644
@@ -56,13 +56,12 @@
 /*
  * Command line configuration.
  */
+#define CONFIG_SYS_NO_FLASH		/* There is no FLASH memory	*/
 #include <config_cmd_default.h>
 
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_BSP
 
-#undef CONFIG_CMD_FLASH
-#undef CONFIG_CMD_IMLS
 #undef CONFIG_CMD_LOADS
 #undef CONFIG_CMD_SAVEENV
 #undef CONFIG_CMD_SOURCE

@@ -157,8 +156,6 @@
 #define CONFIG_SYS_GBL_DATA_OFFSET	(CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
 
 
-#define CONFIG_SYS_NO_FLASH		1		/* There is no FLASH memory	*/
-
 #define CONFIG_ENV_IS_NOWHERE	1		/* Store ENV in memory only	*/
 #define CONFIG_ENV_OFFSET		0x00004000	/* Offset of Environment Sector */
 #define CONFIG_ENV_SIZE		0x00002000	/* Total Size of Environment Sector */

include/configs/SIMPC8313.h +1 -4

index 0976077..8b51f6c 100644
@@ -105,8 +105,6 @@
 /*
  * FLASH on the Local Bus
  */
-#define CONFIG_SYS_NO_FLASH
-
 #if !defined(CONFIG_NAND_SPL)
 #define CONFIG_SYS_RAMBOOT
 #endif

@@ -347,9 +345,8 @@
 /*
  * Command line configuration.
  */
+#define CONFIG_SYS_NO_FLASH
 #include <config_cmd_default.h>
-#undef CONFIG_CMD_IMLS
-#undef CONFIG_CMD_FLASH
 
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_DHCP

include/configs/afeb9260.h +1 -4

index 2adf8f9..23506af 100644
@@ -72,11 +72,11 @@
 /*
  * Command line configuration.
  */
+#define CONFIG_SYS_NO_FLASH	/* NOR flash - no real flash on this board */
 #include <config_cmd_default.h>
 #undef CONFIG_CMD_BDI
 #undef CONFIG_CMD_FPGA
 #undef CONFIG_CMD_IMI
-#undef CONFIG_CMD_IMLS
 #undef CONFIG_CMD_LOADS
 #undef CONFIG_CMD_SOURCE

@@ -117,9 +117,6 @@
 
 #endif
 
-/* NOR flash - no real flash on this board */
-#define CONFIG_SYS_NO_FLASH
-
 /* Ethernet */
 #define CONFIG_MACB
 #define CONFIG_RESET_PHY_R

include/configs/am3517_crane.h +1 -3

index 71321f3..904e143 100644
@@ -136,6 +136,7 @@
 #endif /* CONFIG_USB_AM35X */
 
 /* commands to include */
+#define CONFIG_SYS_NO_FLASH	/* No CFI flash */
 #include <config_cmd_default.h>
 
 #define CONFIG_CMD_EXT2		/* EXT2 Support			*/

@@ -148,12 +149,9 @@
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_PING
 
-#undef CONFIG_CMD_FLASH		/* flinfo, erase, protect	*/
 #undef CONFIG_CMD_FPGA		/* FPGA configuration Support	*/
 #undef CONFIG_CMD_IMI		/* iminfo			*/
-#undef CONFIG_CMD_IMLS		/* List all found images	*/
 
-#define CONFIG_SYS_NO_FLASH
 #define CONFIG_HARD_I2C			1
 #define CONFIG_SYS_I2C_SPEED		100000
 #define CONFIG_SYS_I2C_SLAVE		1

include/configs/am3517_evm.h +1 -3

index bbd19de..1cab76a 100644
@@ -135,6 +135,7 @@
 #endif /* CONFIG_USB_AM35X */
 
 /* commands to include */
+#define CONFIG_SYS_NO_FLASH	/* No CFI flash */
 #include <config_cmd_default.h>
 
 #define CONFIG_CMD_EXT2		/* EXT2 Support			*/

@@ -147,12 +148,9 @@
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_PING
 
-#undef CONFIG_CMD_FLASH		/* flinfo, erase, protect	*/
 #undef CONFIG_CMD_FPGA		/* FPGA configuration Support	*/
 #undef CONFIG_CMD_IMI		/* iminfo			*/
-#undef CONFIG_CMD_IMLS		/* List all found images	*/
 
-#define CONFIG_SYS_NO_FLASH
 #define CONFIG_HARD_I2C			1
 #define CONFIG_SYS_I2C_SPEED		100000
 #define CONFIG_SYS_I2C_SLAVE		1

include/configs/at91sam9260ek.h +1 -4

index db52ee6..7376e16 100644
@@ -93,11 +93,11 @@
 /*
  * Command line configuration.
  */
+#define CONFIG_SYS_NO_FLASH	/* NOR flash - no real flash on this board */
 #include <config_cmd_default.h>
 #undef CONFIG_CMD_BDI
 #undef CONFIG_CMD_FPGA
 #undef CONFIG_CMD_IMI
-#undef CONFIG_CMD_IMLS
 #undef CONFIG_CMD_LOADS
 #undef CONFIG_CMD_SOURCE

@@ -155,9 +155,6 @@
 #define CONFIG_SYS_NAND_READY_PIN	AT91_PIN_PC13
 #endif
 
-/* NOR flash - no real flash on this board */
-#define CONFIG_SYS_NO_FLASH			1
-
 /* Ethernet */
 #define CONFIG_MACB			1
 #define CONFIG_RMII			1

include/configs/at91sam9261ek.h +1 -4

index 5140b26..4dc617a 100644
@@ -103,11 +103,11 @@
 /*
  * Command line configuration.
  */
+#define CONFIG_SYS_NO_FLASH	/* NOR flash - no real flash on this board */
 #include <config_cmd_default.h>
 #undef CONFIG_CMD_BDI
 #undef CONFIG_CMD_FPGA
 #undef CONFIG_CMD_IMI
-#undef CONFIG_CMD_IMLS
 #undef CONFIG_CMD_LOADS
 #undef CONFIG_CMD_SOURCE

@@ -149,9 +149,6 @@
 
 #endif
 
-/* NOR flash - no real flash on this board */
-#define CONFIG_SYS_NO_FLASH
-
 /* Ethernet */
 #define CONFIG_DRIVER_DM9000
 #define CONFIG_DM9000_BASE		0x30000000

include/configs/at91sam9m10g45ek.h +1 -4

index 6a02188..c685573 100644
@@ -102,11 +102,11 @@
 /*
  * Command line configuration.
  */
+#define CONFIG_SYS_NO_FLASH		/* No NOR flash */
 #include <config_cmd_default.h>
 #undef CONFIG_CMD_BDI
 #undef CONFIG_CMD_FPGA
 #undef CONFIG_CMD_IMI
-#undef CONFIG_CMD_IMLS
 #undef CONFIG_CMD_AUTOSCRIPT
 #undef CONFIG_CMD_LOADS

@@ -123,9 +123,6 @@
 #define CONFIG_SYS_INIT_SP_ADDR \
 	(CONFIG_SYS_SDRAM_BASE + 4 * 1024 - GENERATED_GBL_DATA_SIZE)
 
-/* No NOR flash */
-#define CONFIG_SYS_NO_FLASH
-
 /* NAND flash */
 #ifdef CONFIG_CMD_NAND
 #define CONFIG_NAND_ATMEL

include/configs/at91sam9rlek.h +1 -4

index 79ea1f2..f502a6b 100644
@@ -90,11 +90,11 @@
 /*
  * Command line configuration.
  */
+#define CONFIG_SYS_NO_FLASH			/* NOR flash - not present */
 #include <config_cmd_default.h>
 #undef CONFIG_CMD_BDI
 #undef CONFIG_CMD_FPGA
 #undef CONFIG_CMD_IMI
-#undef CONFIG_CMD_IMLS
 #undef CONFIG_CMD_LOADS
 #undef CONFIG_CMD_NET
 #undef CONFIG_CMD_NFS

@@ -121,9 +121,6 @@
 #define DATAFLASH_TCSS				(0x1a << 16)
 #define DATAFLASH_TCHS				(0x1 << 24)
 
-/* NOR flash - not present */
-#define CONFIG_SYS_NO_FLASH			1
-
 /* NAND flash */
 #ifdef CONFIG_CMD_NAND
 #define CONFIG_NAND_ATMEL

include/configs/bf525-ucr2.h +1 -4

index 1f65130..01af7bf 100644
@@ -62,9 +62,6 @@
 #define CONFIG_SYS_MONITOR_LEN	(320 * 1024)
 #define CONFIG_SYS_MALLOC_LEN	(320 * 1024)
 
-/* We don't have a parallel flash chip */
-#define CONFIG_SYS_NO_FLASH
-
 /* support for serial flash */
 #define CONFIG_BFIN_SPI
 #define CONFIG_SPI_FLASH

@@ -94,9 +91,9 @@
 		"bootm 0x1000000\0"
 
 /* this sets up the default list of enabled commands */
+#define CONFIG_SYS_NO_FLASH	/* We don't have a parallel flash chip */
 #include <config_cmd_default.h>
 #undef CONFIG_CMD_NET	/* bootp, tftpboot, rarpboot */
 #undef CONFIG_CMD_NFS
-#undef CONFIG_CMD_IMLS
 
 #endif

include/configs/bf537-minotaur.h +1 ~~-10~~

index ef9d236..033125e 100644
@@ -89,14 +89,6 @@
 /* Uncomment next line to use fixed MAC address */
 /* #define CONFIG_ETHADDR	02:80:ad:20:31:42 */
 
-
-/*
- * Flash Settings
- */
-/* We don't have a parallel flash chip there */
-#define CONFIG_SYS_NO_FLASH
-
-
 /*
  * SPI Settings
  */

@@ -148,6 +140,7 @@
 # define CONFIG_BOOTDELAY	5
 #endif
 
+#define CONFIG_SYS_NO_FLASH	/* We don't have a parallel flash chip there */
 #include <config_cmd_default.h>
 
 #ifdef CONFIG_BFIN_MAC

@@ -162,9 +155,7 @@
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_ELF
-#undef CONFIG_CMD_FLASH
 #define CONFIG_CMD_I2C
-#undef CONFIG_CMD_IMLS
 #define CONFIG_CMD_SF
 
 #define CONFIG_BOOTCOMMAND	"run ramboot"

include/configs/bf537-srv1.h +1 ~~-10~~

index 52d5d97..ffa195c 100644
@@ -89,14 +89,6 @@
 /* Uncomment next line to use fixed MAC address */
 /* #define CONFIG_ETHADDR	02:80:ad:20:31:42 */
 
-
-/*
- * Flash Settings
- */
-/* We don't have a parallel flash chip there */
-#define CONFIG_SYS_NO_FLASH
-
-
 /*
  * SPI Settings
  */

@@ -148,6 +140,7 @@
 # define CONFIG_BOOTDELAY	5
 #endif
 
+#define CONFIG_SYS_NO_FLASH	/* We don't have a parallel flash chip there */
 #include <config_cmd_default.h>
 
 #ifdef CONFIG_BFIN_MAC

@@ -162,9 +155,7 @@
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_ELF
-#undef CONFIG_CMD_FLASH
 #define CONFIG_CMD_I2C
-#undef CONFIG_CMD_IMLS
 #define CONFIG_CMD_SF
 
 #define CONFIG_BOOTCOMMAND	"run flashboot"

include/configs/blackstamp.h +6 -9

index 64fce30..ca1e237 100644
@@ -106,6 +106,12 @@
 #define CONFIG_AUTO_COMPLETE	1
 #define CONFIG_ENV_OVERWRITE	1
 
+/* Even though Rev C boards have Parallel Flash
+ * We aren't supporting it. Newer versions of the
+ * hardware don't support Parallel Flash at all.
+ */
+#define CONFIG_SYS_NO_FLASH
+
 #include <config_cmd_default.h>
 
 #ifdef CONFIG_SMC91111

@@ -236,13 +242,4 @@
 #define CONFIG_EBIU_SDRRC_VAL		0x268
 #define CONFIG_EBIU_SDGCTL_VAL		0x911109
 
-/* Even though Rev C boards have Parallel Flash
- * We aren't supporting it. Newer versions of the
- * hardware don't support Parallel Flash at all.
- */
-#define CONFIG_SYS_NO_FLASH
-#undef CONFIG_CMD_IMLS
-#undef CONFIG_CMD_JFFS2
-#undef CONFIG_CMD_FLASH
-
 #endif

include/configs/blackvme.h +5 -8

index f2dc6aa..6429413 100644
@@ -156,6 +156,11 @@
 #define CONFIG_CMDLINE_EDITING	1
 #define CONFIG_AUTO_COMPLETE	1
 
+/*
+ * No Parallel Flash on this board
+ */
+#define CONFIG_SYS_NO_FLASH
+
 #include <config_cmd_default.h>
 
 #define CONFIG_CMD_BOOTLDR

@@ -232,12 +237,4 @@
 # define CONFIG_SYS_I2C_SLAVE		0xFE
 #endif
 
-/*
- * No Parallel Flash on this board
- */
-#define CONFIG_SYS_NO_FLASH
-#undef CONFIG_CMD_IMLS
-#undef CONFIG_CMD_JFFS2
-#undef CONFIG_CMD_FLASH
-
 #endif

include/configs/cm_t35.h +1 -3

index fe91c10..90af9db 100644
@@ -124,6 +124,7 @@
 #define CONFIG_SYS_CONSOLE_IS_IN_ENV
 
 /* commands to include */
+#define CONFIG_SYS_NO_FLASH	/* No CFI flash */
 #include <config_cmd_default.h>
 
 #define CONFIG_CMD_CACHE

@@ -143,11 +144,8 @@
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_PING
 
-#undef CONFIG_CMD_FLASH		/* flinfo, erase, protect	*/
 #undef CONFIG_CMD_FPGA		/* FPGA configuration Support	*/
-#undef CONFIG_CMD_IMLS		/* List all found images	*/
 
-#define CONFIG_SYS_NO_FLASH
 #define CONFIG_HARD_I2C
 #define CONFIG_SYS_I2C_SPEED		100000
 #define CONFIG_SYS_I2C_SLAVE		1

include/configs/coreboot.h +1 ~~-10~~

index 2c65d74..121f2cd 100644
@@ -103,6 +103,7 @@
 /*-----------------------------------------------------------------------
  * Command line configuration.
  */
+#define CONFIG_SYS_NO_FLASH
 #include <config_cmd_default.h>
 
 #define CONFIG_CMD_BDI

@@ -110,10 +111,8 @@
 #define CONFIG_CMD_CONSOLE
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_ECHO
-#undef CONFIG_CMD_FLASH
 #define CONFIG_CMD_FPGA
 #define CONFIG_CMD_IMI
-#undef CONFIG_CMD_IMLS
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_ITEST
 #define CONFIG_CMD_LOADB

@@ -198,14 +197,6 @@
 #define CONFIG_ENV_OVERWRITE
 
 /*-----------------------------------------------------------------------
- * FLASH configuration
- */
-#define CONFIG_SYS_NO_FLASH
-#undef CONFIG_FLASH_CFI_DRIVER
-#define CONFIG_SYS_MAX_FLASH_SECT		1
-#define CONFIG_SYS_MAX_FLASH_BANKS		1
-
-/*-----------------------------------------------------------------------
  * Environment configuration
  */
 #define CONFIG_ENV_IS_NOWHERE

include/configs/davinci_schmoogie.h +0 -2

index 949174a..19a185f 100644
@@ -145,8 +145,6 @@
 #undef CONFIG_CMD_BDI
 #undef CONFIG_CMD_FPGA
 #undef CONFIG_CMD_SETGETDCR
-#undef CONFIG_CMD_FLASH
-#undef CONFIG_CMD_IMLS
 
 #ifdef CONFIG_CMD_BDI
 #define CONFIG_CLOCKS

include/configs/davinci_sffsdr.h +0 -2

index c931ede..2f95adc 100644
@@ -138,8 +138,6 @@
 #undef CONFIG_CMD_BDI
 #undef CONFIG_CMD_FPGA
 #undef CONFIG_CMD_SETGETDCR
-#undef CONFIG_CMD_FLASH
-#undef CONFIG_CMD_IMLS
 
 #ifdef CONFIG_CMD_BDI
 #define CONFIG_CLOCKS

include/configs/devkit8000.h +1 -1

index eb7c376..9f521c8 100644
@@ -116,7 +116,6 @@
 #define CONFIG_TWL4030_LED		1
 
 /* Board NAND Info */
-#define CONFIG_SYS_NO_FLASH		/* no NOR flash */
 #define CONFIG_MTD_DEVICE		/* needed for mtdparts commands */
 #define MTDIDS_DEFAULT			"nand0=nand"
 #define MTDPARTS_DEFAULT		"mtdparts=nand:" \

@@ -145,6 +144,7 @@
 							/* partition */
 
 /* commands to include */
+#define CONFIG_SYS_NO_FLASH		/* no NOR flash */
 #include <config_cmd_default.h>
 
 #define CONFIG_CMD_DHCP			/* DHCP support			*/

include/configs/dig297.h +1 -3

index 1626b0e..4e4b7a3 100644
@@ -115,6 +115,7 @@
 #define CONFIG_LZO
 
 /* commands to include */
+#define CONFIG_SYS_NO_FLASH	/* No CFI flash */
 #include <config_cmd_default.h>
 
 #define CONFIG_CMD_FAT		/* FAT support			*/

@@ -130,14 +131,11 @@
 #define CONFIG_CMD_MMC		/* MMC support			*/
 #define CONFIG_CMD_NAND		/* NAND support			*/
 
-#undef CONFIG_CMD_FLASH		/* flinfo, erase, protect	*/
 #undef CONFIG_CMD_FPGA		/* FPGA configuration Support	*/
 #undef CONFIG_CMD_IMI		/* iminfo			*/
-#undef CONFIG_CMD_IMLS		/* List all found images	*/
 #define CONFIG_CMD_NET		/* bootp, tftpboot, rarpboot	*/
 #undef CONFIG_CMD_NFS		/* NFS support			*/
 
-#define CONFIG_SYS_NO_FLASH
 #define CONFIG_HARD_I2C
 #define CONFIG_SYS_I2C_SPEED		100000
 #define CONFIG_SYS_I2C_SLAVE		1

include/configs/igep00x0.h +1 -4

index d2b4b84..37630e2 100644
@@ -98,6 +98,7 @@
 #define CONFIG_USBD_PRODUCT_NAME	"IGEP"
 
 /* commands to include */
+#define CONFIG_SYS_NO_FLASH	/* No CFI flash */
 #include <config_cmd_default.h>
 
 #define CONFIG_CMD_CACHE

@@ -113,10 +114,6 @@
 #define CONFIG_CMD_MTDPARTS	/* Enable MTD parts commands	*/
 #define CONFIG_MTD_DEVICE
 
-#undef CONFIG_CMD_FLASH		/* flinfo, erase, protect	*/
-#undef CONFIG_CMD_IMLS		/* List all found images	*/
-
-#define CONFIG_SYS_NO_FLASH
 #define CONFIG_HARD_I2C			1
 #define CONFIG_SYS_I2C_SPEED		100000
 #define CONFIG_SYS_I2C_SLAVE		1

include/configs/mcx.h +1 -3

index e190e3e..c839030 100644
@@ -118,6 +118,7 @@
 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
 
 /* commands to include */
+#define CONFIG_SYS_NO_FLASH	/* No CFI flash */
 #include <config_cmd_default.h>
 
 #define CONFIG_CMD_EXT2		/* EXT2 Support			*/

@@ -141,12 +142,9 @@
 #define CONFIG_MTD_DEVICE
 #define CONFIG_CMD_MTDPARTS
 
-#undef CONFIG_CMD_FLASH		/* flinfo, erase, protect	*/
 #undef CONFIG_CMD_FPGA		/* FPGA configuration Support	*/
 #undef CONFIG_CMD_IMI		/* iminfo			*/
-#undef CONFIG_CMD_IMLS		/* List all found images	*/
 
-#define CONFIG_SYS_NO_FLASH
 #define CONFIG_HARD_I2C
 #define CONFIG_SYS_I2C_SPEED		100000
 #define CONFIG_SYS_I2C_SLAVE		1

include/configs/meesc.h +1 -4

index db1e87d..2f69995 100644
@@ -105,11 +105,11 @@
 /*
  * Command line configuration.
  */
+#define CONFIG_SYS_NO_FLASH	/* NOR flash is not populated, disable it */
 #include <config_cmd_default.h>
 #undef CONFIG_CMD_BDI
 #undef CONFIG_CMD_FPGA
 #undef CONFIG_CMD_LOADS
-#undef CONFIG_CMD_IMLS
 
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_DHCP

@@ -151,9 +151,6 @@
 # define DATAFLASH_TCHS				(0x1 << 24)
 #endif
 
-/* NOR flash is not populated, disable it */
-#define CONFIG_SYS_NO_FLASH
-
 /* NAND flash */
 #ifdef CONFIG_CMD_NAND
 # define CONFIG_NAND_ATMEL

include/configs/mx31pdk.h +1 -9

index 49d440b..7e3ad93 100644
@@ -91,6 +91,7 @@
  * Command definition
  ***********************************************************/
 
+#define CONFIG_SYS_NO_FLASH		/* No NOR flash present */
 #include <config_cmd_default.h>
 
 #define CONFIG_CMD_MII

@@ -100,12 +101,6 @@
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_NAND
 
-/*
- * Disabled due to compilation errors in cmd_bootm.c (IMLS seems to require
- * that CFG_NO_FLASH is undefined).
- */
-#undef CONFIG_CMD_IMLS
-
 #define CONFIG_BOARD_LATE_INIT
 
 #define CONFIG_BOOTDELAY	3

@@ -176,9 +171,6 @@
 /*-----------------------------------------------------------------------
  * FLASH and environment organization
  */
-/* No NOR flash present */
-#define CONFIG_SYS_NO_FLASH
-
 #define CONFIG_ENV_IS_IN_NAND
 #define CONFIG_ENV_OFFSET		0x40000
 #define CONFIG_ENV_OFFSET_REDUND	0x60000

include/configs/mx51evk.h +2 -4

index 1477b21..537883f 100644
@@ -133,9 +133,9 @@
  * Command definition
  ***********************************************************/
 
-#include <config_cmd_default.h>
+#define CONFIG_SYS_NO_FLASH
 
-#undef CONFIG_CMD_IMLS
+#include <config_cmd_default.h>
 
 #define CONFIG_CMD_DATE

@@ -237,8 +237,6 @@
 /*-----------------------------------------------------------------------
  * FLASH and environment organization
  */
-#define CONFIG_SYS_NO_FLASH
-
 #define CONFIG_ENV_OFFSET      (6 * 64 * 1024)
 #define CONFIG_ENV_SIZE        (8 * 1024)
 #define CONFIG_ENV_IS_IN_MMC

include/configs/mx53ard.h +1 -4

index f48a41e..22d0af7 100644
@@ -83,10 +83,9 @@
 #define CONFIG_SYS_BAUDRATE_TABLE	{9600, 19200, 38400, 57600, 115200}
 
 /* Command definition */
+#define CONFIG_SYS_NO_FLASH
 #include <config_cmd_default.h>
 
-#undef CONFIG_CMD_IMLS
-
 #define CONFIG_BOOTDELAY	3
 
 #define CONFIG_ETHPRIME		"smc911x"

@@ -179,8 +178,6 @@
 	(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
 /* FLASH and environment organization */
-#define CONFIG_SYS_NO_FLASH
-
 #define CONFIG_ENV_OFFSET      (6 * 64 * 1024)
 #define CONFIG_ENV_SIZE        (8 * 1024)
 #define CONFIG_ENV_IS_IN_MMC

include/configs/mx53evk.h +1 -4

index a77e5b2..7174b5f 100644
@@ -97,10 +97,9 @@
 #define CONFIG_SYS_BAUDRATE_TABLE	{9600, 19200, 38400, 57600, 115200}
 
 /* Command definition */
+#define CONFIG_SYS_NO_FLASH
 #include <config_cmd_default.h>
 
-#undef CONFIG_CMD_IMLS
-
 #define CONFIG_BOOTDELAY	3
 
 #define CONFIG_ETHPRIME		"FEC0"

@@ -186,8 +185,6 @@
 	(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
 /* FLASH and environment organization */
-#define CONFIG_SYS_NO_FLASH
-
 #define CONFIG_ENV_OFFSET      (6 * 64 * 1024)
 #define CONFIG_ENV_SIZE        (8 * 1024)
 #define CONFIG_ENV_IS_IN_MMC

include/configs/mx53loco.h +1 -4

index 34a4edd..d02dff4 100644
@@ -92,10 +92,9 @@
 #define CONFIG_SYS_BAUDRATE_TABLE	{9600, 19200, 38400, 57600, 115200}
 
 /* Command definition */
+#define CONFIG_SYS_NO_FLASH
 #include <config_cmd_default.h>
 
-#undef CONFIG_CMD_IMLS
-
 #define CONFIG_BOOTDELAY	3
 
 #define CONFIG_ETHPRIME		"FEC0"

@@ -184,8 +183,6 @@
 	(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
 /* FLASH and environment organization */
-#define CONFIG_SYS_NO_FLASH
-
 #define CONFIG_ENV_OFFSET      (6 * 64 * 1024)
 #define CONFIG_ENV_SIZE        (8 * 1024)
 #define CONFIG_ENV_IS_IN_MMC

include/configs/mx53smd.h +1 -4

index a04db3f..d60d1a9 100644
@@ -86,10 +86,9 @@
 #define CONFIG_SYS_BAUDRATE_TABLE	{9600, 19200, 38400, 57600, 115200}
 
 /* Command definition */
+#define CONFIG_SYS_NO_FLASH
 #include <config_cmd_default.h>
 
-#undef CONFIG_CMD_IMLS
-
 #define CONFIG_BOOTDELAY	3
 
 #define CONFIG_ETHPRIME		"FEC0"

@@ -177,8 +176,6 @@
 	(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
 /* FLASH and environment organization */
-#define CONFIG_SYS_NO_FLASH
-
 #define CONFIG_ENV_OFFSET      (6 * 64 * 1024)
 #define CONFIG_ENV_SIZE        (8 * 1024)
 #define CONFIG_ENV_IS_IN_MMC

include/configs/mx6qarm2.h +1 -4

index 0962d3c..9570edb 100644
@@ -73,10 +73,9 @@
 #define CONFIG_SYS_BAUDRATE_TABLE	{9600, 19200, 38400, 57600, 115200}
 
 /* Command definition */
+#define CONFIG_SYS_NO_FLASH
 #include <config_cmd_default.h>
 
-#undef CONFIG_CMD_IMLS
-
 #define CONFIG_BOOTDELAY		3
 
 #define CONFIG_LOADADDR			0x10800000

@@ -160,8 +159,6 @@
 	(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
 /* FLASH and environment organization */
-#define CONFIG_SYS_NO_FLASH
-
 #define CONFIG_ENV_OFFSET		(6 * 64 * 1024)
 #define CONFIG_ENV_SIZE			(8 * 1024)
 #define CONFIG_ENV_IS_IN_MMC

include/configs/mx6qsabrelite.h +1 -4

index 8bc8a83..0471394 100644
@@ -104,10 +104,9 @@
 #define CONFIG_SYS_BAUDRATE_TABLE      {9600, 19200, 38400, 57600, 115200}
 
 /* Command definition */
+#define CONFIG_SYS_NO_FLASH
 #include <config_cmd_default.h>
 
-#undef CONFIG_CMD_IMLS
-
 #define CONFIG_BOOTDELAY               3
 
 #define CONFIG_LOADADDR                        0x10800000

@@ -191,8 +190,6 @@
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
 /* FLASH and environment organization */
-#define CONFIG_SYS_NO_FLASH
-
 #define CONFIG_ENV_SIZE			(8 * 1024)
 
 #define CONFIG_ENV_IS_IN_MMC

include/configs/nhk8815.h +1 -4

index 20db397..9e09b8c 100644
@@ -36,16 +36,13 @@
 #define CONFIG_SKIP_LOWLEVEL_INIT /* we have already been loaded to RAM */
 
 /* commands */
+#define CONFIG_SYS_NO_FLASH		/* There is no NOR flash */
 #include <config_cmd_default.h>
 
 #define CONFIG_CMD_NET
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_NFS
-/* There is no NOR flash, so undefine these commands */
-#undef CONFIG_CMD_FLASH
-#undef CONFIG_CMD_IMLS
-#define CONFIG_SYS_NO_FLASH
 /* There is NAND storage */
 #define CONFIG_NAND_NOMADIK
 #define CONFIG_CMD_JFFS2

include/configs/omap3_beagle.h +1 -3

index d3a0122..d1a9e41 100644
@@ -144,6 +144,7 @@
 
 
 /* commands to include */
+#define CONFIG_SYS_NO_FLASH	/* No CFI flash */
 #include <config_cmd_default.h>
 
 #define CONFIG_CMD_CACHE

@@ -168,12 +169,9 @@
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_SETEXPR	/* Evaluate expressions		*/
 
-#undef CONFIG_CMD_FLASH		/* flinfo, erase, protect	*/
 #undef CONFIG_CMD_FPGA		/* FPGA configuration Support	*/
 #undef CONFIG_CMD_IMI		/* iminfo			*/
-#undef CONFIG_CMD_IMLS		/* List all found images	*/
 
-#define CONFIG_SYS_NO_FLASH
 #define CONFIG_HARD_I2C			1
 #define CONFIG_SYS_I2C_SPEED		100000
 #define CONFIG_SYS_I2C_SLAVE		1

include/configs/omap3_logic.h +1 -4

index 01360f6..d16a994 100644
@@ -102,6 +102,7 @@
 #define CONFIG_DOS_PARTITION
 
 /* commands to include */
+#define CONFIG_SYS_NO_FLASH	/* No CFI flash */
 #include <config_cmd_default.h>
 
 #define CONFIG_CMD_CACHE

@@ -124,12 +125,8 @@
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_SETECPR	/* Evaluate expressions		*/
 
-#undef CONFIG_CMD_FLASH		/* flinfo, erase, protect	*/
 #undef CONFIG_CMD_FPGA		/* FPGA configuration Support	*/
 #undef CONFIG_CMD_IMI		/* iminfo			*/
-#undef CONFIG_CMD_IMLS		/* List all found images	*/
-
-#define CONFIG_SYS_NO_FLASH
 
 /*
  * I2C

include/configs/omap3_mvblx.h +1 -4

index b819d21..42665ba 100644
@@ -119,10 +119,8 @@
 #define CONFIG_USBD_MANUFACTURER		"MATRIX VISION GmbH"
 #define CONFIG_USBD_PRODUCT_NAME		"mvBlueLYNX-X"
 
-/* no FLASH available */
-#define CONFIG_SYS_NO_FLASH
-
 /* commands to include */
+#define CONFIG_SYS_NO_FLASH	/* No CFI flash */
 #include <config_cmd_default.h>
 
 #define CONFIG_CMD_CACHE

@@ -132,7 +130,6 @@
 #define CONFIG_CMD_MMC		/* MMC support			*/
 #define CONFIG_CMD_EEPROM
 #define CONFIG_CMD_IMI		/* iminfo			*/
-#undef CONFIG_CMD_IMLS		/* List all found images	*/
 #define CONFIG_CMD_NET		/* bootp, tftpboot, rarpboot	*/
 #define CONFIG_CMD_NFS		/* NFS support			*/
 #define CONFIG_CMD_DHCP

include/configs/omap3_overo.h +1 -3

index 64adc74..b3fcd9c 100644
@@ -90,6 +90,7 @@
 #define CONFIG_DOS_PARTITION
 
 /* commands to include */
+#define CONFIG_SYS_NO_FLASH	/* No CFI flash */
 #include <config_cmd_default.h>
 
 #define CONFIG_CMD_CACHE

@@ -101,14 +102,11 @@
 #define CONFIG_CMD_MMC		/* MMC support			*/
 #define CONFIG_CMD_NAND		/* NAND support			*/
 
-#undef CONFIG_CMD_FLASH		/* flinfo, erase, protect	*/
 #undef CONFIG_CMD_FPGA		/* FPGA configuration Support	*/
 #undef CONFIG_CMD_IMI		/* iminfo			*/
-#undef CONFIG_CMD_IMLS		/* List all found images	*/
 #undef CONFIG_CMD_NFS		/* NFS support			*/
 #define CONFIG_CMD_NET		/* bootp, tftpboot, rarpboot	*/
 
-#define CONFIG_SYS_NO_FLASH
 #define CONFIG_HARD_I2C
 #define CONFIG_SYS_I2C_SPEED		100000
 #define CONFIG_SYS_I2C_SLAVE		1

include/configs/omap3_pandora.h +1 -3

index d02f338..4fc131f 100644
@@ -105,6 +105,7 @@
 #define CONFIG_DOS_PARTITION		1
 
 /* commands to include */
+#define CONFIG_SYS_NO_FLASH	/* No CFI flash */
 #include <config_cmd_default.h>
 
 #define CONFIG_CMD_EXT2		/* EXT2 Support			*/

@@ -115,14 +116,11 @@
 #define CONFIG_CMD_NAND		/* NAND support			*/
 #define CONFIG_CMD_CACHE	/* Cache control		*/
 
-#undef CONFIG_CMD_FLASH		/* flinfo, erase, protect	*/
 #undef CONFIG_CMD_FPGA		/* FPGA configuration Support	*/
 #undef CONFIG_CMD_IMI		/* iminfo			*/
-#undef CONFIG_CMD_IMLS		/* List all found images	*/
 #undef CONFIG_CMD_NET		/* bootp, tftpboot, rarpboot	*/
 #undef CONFIG_CMD_NFS		/* NFS support			*/
 
-#define CONFIG_SYS_NO_FLASH
 #define CONFIG_HARD_I2C			1
 #define CONFIG_SYS_I2C_SPEED		100000
 #define CONFIG_SYS_I2C_SLAVE		1

include/configs/omap3_zoom1.h +1 -3

index 17608f5..f3c3b49 100644
@@ -115,6 +115,7 @@
 #define CONFIG_USBD_PRODUCT_NAME	"Zoom1"
 
 /* commands to include */
+#define CONFIG_SYS_NO_FLASH
 #include <config_cmd_default.h>
 
 #define CONFIG_CMD_EXT2		/* EXT2 Support			*/

@@ -126,14 +127,11 @@
 #define CONFIG_CMD_NAND		/* NAND support			*/
 #define CONFIG_CMD_NAND_LOCK_UNLOCK /* Enable lock/unlock support */
 
-#undef CONFIG_CMD_FLASH		/* flinfo, erase, protect	*/
 #undef CONFIG_CMD_FPGA		/* FPGA configuration Support	*/
 #undef CONFIG_CMD_IMI		/* iminfo			*/
-#undef CONFIG_CMD_IMLS		/* List all found images	*/
 #undef CONFIG_CMD_NET		/* bootp, tftpboot, rarpboot	*/
 #undef CONFIG_CMD_NFS		/* NFS support			*/
 
-#define CONFIG_SYS_NO_FLASH
 #define CONFIG_HARD_I2C			1
 #define CONFIG_SYS_I2C_SPEED		100000
 #define CONFIG_SYS_I2C_SLAVE		1

include/configs/omap3_zoom2.h +1 -3

index b60ece3..cf83201 100644
@@ -138,6 +138,7 @@
 #define CONFIG_USBD_PRODUCT_NAME	"Zoom2"
 
 /* commands to include */
+#define CONFIG_SYS_NO_FLASH		/* No CFI flash */
 #include <config_cmd_default.h>
 
 #define CONFIG_CMD_FAT			/* FAT support			*/

@@ -146,14 +147,11 @@
 #define CONFIG_CMD_NAND			/* NAND support			*/
 #define CONFIG_CMD_NAND_LOCK_UNLOCK	/* Enable lock/unlock support	*/
 
-#undef CONFIG_CMD_FLASH			/* flinfo, erase, protect	*/
 #undef CONFIG_CMD_FPGA			/* FPGA configuration Support	*/
 #undef CONFIG_CMD_IMI			/* iminfo			*/
-#undef CONFIG_CMD_IMLS			/* List all found images	*/
 #undef CONFIG_CMD_NET			/* bootp, tftpboot, rarpboot	*/
 #undef CONFIG_CMD_NFS			/* NFS support			*/
 
-#define CONFIG_SYS_NO_FLASH
 #define CONFIG_HARD_I2C			1
 #define CONFIG_SYS_I2C_SPEED		100000
 #define CONFIG_SYS_I2C_SLAVE		1

include/configs/omap4_common.h +1 -4

index 5507c8f..f00f2de 100644
@@ -117,13 +117,11 @@
 #define CONFIG_USB_TTY			1
 #define CONFIG_SYS_CONSOLE_IS_IN_ENV	1
 
-/* Flash */
-#define CONFIG_SYS_NO_FLASH	1
-
 /* clocks */
 #define CONFIG_SYS_CLOCKS_ENABLE_ALL
 
 /* commands to include */
+#define CONFIG_SYS_NO_FLASH	/* No CFI flash */
 #include <config_cmd_default.h>
 
 /* Enabled commands */

@@ -136,7 +134,6 @@
 #undef CONFIG_CMD_NET
 #undef CONFIG_CMD_NFS
 #undef CONFIG_CMD_FPGA		/* FPGA configuration Support   */
-#undef CONFIG_CMD_IMLS		/* List all found images        */
 
 /*
  * Environment setup

include/configs/omap5_evm.h +1 -4

index 38b5028..dc12e31 100644
@@ -117,14 +117,12 @@
 
 #define CONFIG_SYS_CONSOLE_IS_IN_ENV
 
-/* Flash */
-#define CONFIG_SYS_NO_FLASH
-
 /* Cache */
 #define CONFIG_SYS_CACHELINE_SIZE	64
 #define CONFIG_SYS_CACHELINE_SHIFT	6
 
 /* commands to include */
+#define CONFIG_SYS_NO_FLASH	/* No CFI flash */
 #include <config_cmd_default.h>
 
 /* Enabled commands */

@@ -138,7 +136,6 @@
 #undef CONFIG_CMD_NET
 #undef CONFIG_CMD_NFS
 #undef CONFIG_CMD_FPGA		/* FPGA configuration Support   */
-#undef CONFIG_CMD_IMLS		/* List all found images        */
 
 /*
  * Environment setup

include/configs/origen.h +1 -2

index 8ede825..7baa2cf 100644
@@ -80,6 +80,7 @@
 #define CONFIG_ENV_OVERWRITE
 
 /* Command definition*/
+#define CONFIG_SYS_NO_FLASH
 #include <config_cmd_default.h>
 
 #define CONFIG_CMD_PING

@@ -135,8 +136,6 @@
 #define PHYS_SDRAM_4_SIZE	SDRAM_BANK_SIZE
 
 /* FLASH and environment organization */
-#define CONFIG_SYS_NO_FLASH		1
-#undef CONFIG_CMD_IMLS
 #define CONFIG_IDENT_STRING		" for ORIGEN"
 
 #ifdef CONFIG_USE_IRQ

include/configs/otc570.h +1 -4

index 8599378..39fcd13 100644
@@ -155,10 +155,10 @@
 /*
  * Command line configuration.
  */
+#define CONFIG_SYS_NO_FLASH			/* NOR flash is not populated */
 #include <config_cmd_default.h>
 #undef CONFIG_CMD_FPGA
 #undef CONFIG_CMD_LOADS
-#undef CONFIG_CMD_IMLS
 
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_DHCP

@@ -202,9 +202,6 @@
 # define DATAFLASH_TCHS				(0x1 << 24)
 #endif
 
-/* NOR flash is not populated, disable it */
-#define CONFIG_SYS_NO_FLASH
-
 /* NAND flash */
 #ifdef CONFIG_CMD_NAND
 # define CONFIG_NAND_ATMEL

include/configs/pm9g45.h +1 -5

index 4779878..263a85b 100644
@@ -87,9 +87,9 @@
 /*
  * Command line configuration.
  */
+#define CONFIG_SYS_NO_FLASH		/* NOR flash is not available */
 #include <config_cmd_default.h>
 #undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_IMLS
 
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_PING		1

@@ -109,10 +109,6 @@
 #define PHYS_SDRAM			0x70000000
 #define PHYS_SDRAM_SIZE			0x08000000	/* 128 megs */
 
-/* NOR flash, not available */
-#define CONFIG_SYS_NO_FLASH		1
-#undef CONFIG_CMD_FLASH
-
 /* NAND flash */
 #ifdef CONFIG_CMD_NAND
 #define CONFIG_NAND_ATMEL

include/configs/sbc35_a9g20.h +1 -4

index cdf8659..1577e2a 100644
@@ -76,11 +76,11 @@
 /*
  * Command line configuration.
  */
+#define CONFIG_SYS_NO_FLASH			/* No NOR flash */
 #include <config_cmd_default.h>
 #undef CONFIG_CMD_BDI
 #undef CONFIG_CMD_FPGA
 #undef CONFIG_CMD_IMI
-#undef CONFIG_CMD_IMLS
 #undef CONFIG_CMD_LOADS
 #undef CONFIG_CMD_SOURCE

@@ -125,9 +125,6 @@
 #define CONFIG_SYS_NAND_ENABLE_PIN		AT91_PIN_PC14
 #define CONFIG_SYS_NAND_READY_PIN		AT91_PIN_PC13
 
-/* NOR flash - no real flash on this board */
-#define CONFIG_SYS_NO_FLASH			1
-
 /* Ethernet */
 #define CONFIG_MACB
 #define CONFIG_RMII

include/configs/smdk5250.h +1 -2

index 9659f9e..4977ba2 100644
@@ -89,6 +89,7 @@
 #define CONFIG_ENV_OVERWRITE
 
 /* Command definition*/
+#define CONFIG_SYS_NO_FLASH
 #include <config_cmd_default.h>
 
 #define CONFIG_CMD_PING

@@ -155,8 +156,6 @@
 #define CONFIG_SYS_MONITOR_BASE	0x00000000
 
 /* FLASH and environment organization */
-#define CONFIG_SYS_NO_FLASH
-#undef CONFIG_CMD_IMLS
 #define CONFIG_IDENT_STRING		" for SMDK5250"
 
 #define CONFIG_ENV_IS_IN_MMC

include/configs/smdkc100.h +1 -4

index 6663629..4d7b3ae 100644
@@ -76,10 +76,9 @@
 /***********************************************************
  * Command definition
  ***********************************************************/
+#define CONFIG_SYS_NO_FLASH
 #include <config_cmd_default.h>
 
-#undef CONFIG_CMD_FLASH
-#undef CONFIG_CMD_IMLS
 #undef CONFIG_CMD_NAND
 
 #define CONFIG_CMD_CACHE

@@ -203,8 +202,6 @@
 /*-----------------------------------------------------------------------
  * FLASH and environment organization
  */
-#define CONFIG_SYS_NO_FLASH		1
-
 #define CONFIG_SYS_MONITOR_LEN		(256 << 10)	/* 256 KiB */
 #define CONFIG_IDENT_STRING		" for SMDKC100"

include/configs/snapper9260.h +0 -1

index cb3c674..c5dc48a 100644
@@ -172,7 +172,6 @@
 #undef CONFIG_CMD_BDI
 #undef CONFIG_CMD_FPGA
 #undef CONFIG_CMD_IMI
-#undef CONFIG_CMD_IMLS
 #undef CONFIG_CMD_LOADS
 #undef CONFIG_CMD_SOURCE

include/configs/tam3517-common.h +1 -4

index 37eb87b..0e03cf4 100644
@@ -109,6 +109,7 @@
 /* #define CONFIG_EHCI_DCACHE */
 
 /* commands to include */
+#define CONFIG_SYS_NO_FLASH	/* No CFI flash */
 #include <config_cmd_default.h>
 
 #define CONFIG_CMD_CACHE

@@ -125,10 +126,6 @@
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_USB
 
-#undef CONFIG_CMD_FLASH		/* only NAND on the SOM */
-#undef CONFIG_CMD_IMLS
-
-#define CONFIG_SYS_NO_FLASH
 #define CONFIG_HARD_I2C
 #define CONFIG_SYS_I2C_SPEED		400000
 #define CONFIG_SYS_I2C_SLAVE		1

include/configs/tegra2-common.h +1 -4

index 837f859..ac5f05f 100644
@@ -98,13 +98,12 @@
 #define TEGRA_I2C_NUM_CONTROLLERS	4
 
 /* include default commands */
+#define CONFIG_SYS_NO_FLASH
 #include <config_cmd_default.h>
 
 /* remove unused commands */
-#undef CONFIG_CMD_FLASH		/* flinfo, erase, protect */
 #undef CONFIG_CMD_FPGA		/* FPGA configuration support */
 #undef CONFIG_CMD_IMI
-#undef CONFIG_CMD_IMLS
 #undef CONFIG_CMD_NFS		/* NFS support */
 #undef CONFIG_CMD_NET		/* network support */

@@ -113,8 +112,6 @@
 #define CONFIG_COMMAND_HISTORY
 #define CONFIG_AUTO_COMPLETE
 
-#define CONFIG_SYS_NO_FLASH
-
 /* Environment information */
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"console=ttyS0,115200n8\0" \

include/configs/tny_a9260.h +1 -4

index 0043926..078b9cc 100644
@@ -82,11 +82,11 @@
 /*
  * Command line configuration.
  */
+#define CONFIG_SYS_NO_FLASH			/* No NOR flash */
 #include <config_cmd_default.h>
 #undef CONFIG_CMD_BDI
 #undef CONFIG_CMD_FPGA
 #undef CONFIG_CMD_IMI
-#undef CONFIG_CMD_IMLS
 #undef CONFIG_CMD_LOADS
 #undef CONFIG_CMD_NET
 #undef CONFIG_CMD_NFS

@@ -124,9 +124,6 @@
 #define CONFIG_SYS_NAND_ENABLE_PIN		AT91_PIN_PC14
 #define CONFIG_SYS_NAND_READY_PIN		AT91_PIN_PC13
 
-/* NOR flash - no real flash on this board */
-#define CONFIG_SYS_NO_FLASH
-
 #define CONFIG_DOS_PARTITION
 #define CONFIG_CMD_FAT

include/configs/vct.h +0 -5

index 9ddc7b1..5116e18 100644
@@ -145,11 +145,6 @@
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET /* re-init HCD after CMD_RESET */
 #endif /* CONFIG_CMD_USB */
 
-#if !defined(CONFIG_VCT_NOR)
-#undef CONFIG_CMD_FLASH
-#undef CONFIG_CMD_IMLS
-#endif
-
 #if defined(CONFIG_VCT_NAND)
 #define CONFIG_CMD_NAND
 #endif

include/configs/vision2.h +1 -3

index f6904f3..946fe61 100644
@@ -142,10 +142,10 @@
  * Command definition
  ***********************************************************/
 
+#define CONFIG_SYS_NO_FLASH
 #include <config_cmd_default.h>
 
 #define CONFIG_CMD_SPI
-#undef CONFIG_CMD_IMLS
 
 #define CONFIG_BOOTDELAY        3

@@ -207,8 +207,6 @@
 #define CONFIG_SYS_DDR_CLKSEL		0
 #define CONFIG_SYS_CLKTL_CBCDR		0x19239100
 
-#define CONFIG_SYS_NO_FLASH
-
 /*
  * Framebuffer and LCD
  */

include/configs/xilinx-ppc.h +18 ~~-20~~

index bd7bac0..43308fd 100644
@@ -32,26 +32,6 @@
 #define CONFIG_SYS_MONITOR_LEN		(192 * 1024)
 #define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 128 * 1024)
 
-/*Cmd*/
-#include <config_cmd_default.h>
-#define CONFIG_CMD_ASKENV
-#define CONFIG_CMD_CACHE
-#define CONFIG_CMD_DIAG
-#define CONFIG_CMD_ELF
-#define CONFIG_CMD_IRQ
-#define CONFIG_CMD_REGINFO
-#undef CONFIG_CMD_JFFS2
-#undef CONFIG_CMD_MTDPARTS
-#undef CONFIG_CMD_SPI
-#undef CONFIG_CMD_I2C
-#undef CONFIG_CMD_DTT
-#undef CONFIG_CMD_NET
-#undef CONFIG_CMD_PING
-#undef CONFIG_CMD_DHCP
-#undef CONFIG_CMD_EEPROM
-#undef CONFIG_CMD_IMLS
-#undef CONFIG_CMD_NFS
-
 /*Misc*/
 #define CONFIG_BOOTDELAY		5/* autoboot after 5 seconds     */
 #define CONFIG_SYS_LONGHELP		/* undef to save memory         */

@@ -135,4 +115,22 @@
 #endif
 #endif
 
+/*Cmd*/
+#include <config_cmd_default.h>
+#define CONFIG_CMD_ASKENV
+#define CONFIG_CMD_CACHE
+#define CONFIG_CMD_DIAG
+#define CONFIG_CMD_ELF
+#define CONFIG_CMD_IRQ
+#define CONFIG_CMD_REGINFO
+#undef CONFIG_CMD_MTDPARTS
+#undef CONFIG_CMD_SPI
+#undef CONFIG_CMD_I2C
+#undef CONFIG_CMD_DTT
+#undef CONFIG_CMD_NET
+#undef CONFIG_CMD_PING
+#undef CONFIG_CMD_DHCP
+#undef CONFIG_CMD_EEPROM
+#undef CONFIG_CMD_NFS
+
 #endif						/* __CONFIG_H */

Signature · 1 line

1.7.0.4

Wolfgang Denk

2012-04-14 06:22 UTC #11 lore raw

PATCH 8/8 include/configs: Better utilize CONFIG_SYS_NO_FLASH

Dear Tom Rini,

Quoted 1 line · In message <[email protected]> you wrote:

In config files which it is clear when CONFIG_SYS_NO_FLASH will be set

s/which it is clear when/where it is clear that/ ?

Quoted 5 lines

(either unconditionally or based on logic that can happen early in the config file), ensure that we set that _before_ we include config_cmd_default.h so that the logic in that file will not enable CONFIG_CMD_(FLASH|IMLS). This saves us from having to undef it in the board files.

I'm not sure if I like that. It makes the code not easier to understand, but actually less obvious.

Quoted 8 lines

include/configs/PN62.h +1 -0

@@ -56,13 +56,12 @@
 /*
  * Command line configuration.
  */
+#define CONFIG_SYS_NO_FLASH		/* There is no FLASH memory	*/
 #include <config_cmd_default.h>

...

include/configs/PN62.h line 161

Quoted 5 lines

include/configs/PN62.h +0 -2

-#define CONFIG_SYS_NO_FLASH		1		/* There is no FLASH memory	*/
-
 #define CONFIG_ENV_IS_NOWHERE	1		/* Store ENV in memory only	*/
 #define CONFIG_ENV_OFFSET		0x00004000	/* Offset of Environment Sector */
 #define CONFIG_ENV_SIZE		0x00002000	/* Total Size of Environment Sector */

Logically, it makes more sense to me to look for the NO_FLASH setting close to where we are dfinging such things - the relation to the "Command line configuration" is pretty obscure.

Quoted 14 lines

include/configs/SIMPC8313.h +0 -2

index 0976077..8b51f6c 100644
@@ -105,8 +105,6 @@
 /*
  * FLASH on the Local Bus
  */
-#define CONFIG_SYS_NO_FLASH
-
 #if !defined(CONFIG_NAND_SPL)
 #define CONFIG_SYS_RAMBOOT
 #endif

include/configs/SIMPC8313.h line 352

Quoted 7 lines

include/configs/SIMPC8313.h +1 -2

@@ -347,9 +345,8 @@
 /*
  * Command line configuration.
  */
+#define CONFIG_SYS_NO_FLASH
 #include <config_cmd_default.h>
-#undef CONFIG_CMD_IMLS
-#undef CONFIG_CMD_FLASH

That's even worse here.

I actually tend to believe it is a bad idea to have the #ifdef for CONFIG_SYS_NO_FLASH in <config_cmd_default.h>

Sorry, but I don't think this patch is a good idea.

Best regards,

Wolfgang Denk

Signature · 4 lines

DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"Wish not to seem, but to be, the best."                  - Aeschylus

Tom Rini

author

2012-04-16 15:09 UTC #12 lore raw

PATCH 8/8 include/configs: Better utilize CONFIG_SYS_NO_FLASH

Quoted 7 lines · Wolfgang Denk

Dear Tom Rini,
Quoted 1 line · In message<[email protected]> you wrote:
In config files which it is clear when CONFIG_SYS_NO_FLASH will be set
s/which it is clear when/where it is clear that/ ?

Quoted 8 lines

Quoted 5 lines
(either unconditionally or based on logic that can happen early in the config file), ensure that we set that _before_ we include config_cmd_default.h so that the logic in that file will not enable CONFIG_CMD_(FLASH|IMLS). This saves us from having to undef it in the board files.
I'm not sure if I like that. It makes the code not easier to understand, but actually less obvious.

So, at the end of the day it's an artifact of using cpp to make our configs rather than something like Kconfig.

Quoted 10 lines

Quoted 9 lines

include/configs/PN62.h +1 -0

@@ -56,13 +56,12 @@
  /*
   * Command line configuration.
   */
+#define CONFIG_SYS_NO_FLASH		/* There is no FLASH memory	*/
  #include<config_cmd_default.h>

...

Quoted 9 lines

include/configs/PN62.h line 161
Quoted 5 lines
include/configs/PN62.h +0 -2
-#define CONFIG_SYS_NO_FLASH		1		/* There is no FLASH memory	*/
-
  #define CONFIG_ENV_IS_NOWHERE	1		/* Store ENV in memory only	*/
  #define CONFIG_ENV_OFFSET		0x00004000	/* Offset of Environment Sector */
  #define CONFIG_ENV_SIZE		0x00002000	/* Total Size of Environment Sector */
Logically, it makes more sense to me to look for the NO_FLASH setting close to where we are dfinging such things - the relation to the "Command line configuration" is pretty obscure.

I agree. Some boards are laid out like this already, and in my re-factoring of some of the TI parts config files,

Quoted 24 lines

Quoted 14 lines

include/configs/SIMPC8313.h +0 -2

index 0976077..8b51f6c 100644
@@ -105,8 +105,6 @@
  /*
   * FLASH on the Local Bus
   */
-#define CONFIG_SYS_NO_FLASH
-
  #if !defined(CONFIG_NAND_SPL)
  #define CONFIG_SYS_RAMBOOT
  #endif

include/configs/SIMPC8313.h line 352

Quoted 7 lines

include/configs/SIMPC8313.h +1 -2

@@ -347,9 +345,8 @@
  /*
   * Command line configuration.
   */
+#define CONFIG_SYS_NO_FLASH
  #include<config_cmd_default.h>
-#undef CONFIG_CMD_IMLS
-#undef CONFIG_CMD_FLASH

That's even worse here.

Quoted 2 lines

I actually tend to believe it is a bad idea to have the #ifdef for CONFIG_SYS_NO_FLASH in<config_cmd_default.h>

And perhaps we should drop IMLS/FLASH from config_cmd_default these days?

Quoted 1 line

Sorry, but I don't think this patch is a good idea.

OK, I'll drop it from the general clean-ups and re-factor the configs I'm focusing on to have cmds done near the end. Thanks!

Signature · 1 line

Tom

Wolfgang Denk

2012-04-16 20:56 UTC #13 lore raw

PATCH 8/8 include/configs: Better utilize CONFIG_SYS_NO_FLASH

Dear Tom Rini,

Quoted 5 lines · In message <[email protected]> you wrote:

Quoted 3 lines
I actually tend to believe it is a bad idea to have the #ifdef for CONFIG_SYS_NO_FLASH in<config_cmd_default.h>
And perhaps we should drop IMLS/FLASH from config_cmd_default these days?

No. Rather I'd like to see "imls" extended to support NAND as well :-)

Quoted 2 lines

OK, I'll drop it from the general clean-ups and re-factor the configs I'm focusing on to have cmds done near the end. Thanks!

Thank you for all the work!

Best regards,

Wolfgang Denk

Signature · 5 lines

DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
While money can't buy happiness, it certainly lets  you  choose  your
own form of misery.

Tom Rini

author

2012-04-16 23:52 UTC #14 lore raw

PATCH 8/8 include/configs: Better utilize CONFIG_SYS_NO_FLASH

Quoted 11 lines · Wolfgang Denk

Dear Tom Rini,
Quoted 5 lines · In message<[email protected]> you wrote:
Quoted 3 lines
I actually tend to believe it is a bad idea to have the #ifdef for CONFIG_SYS_NO_FLASH in<config_cmd_default.h>
And perhaps we should drop IMLS/FLASH from config_cmd_default these days?
No. Rather I'd like to see "imls" extended to support NAND as well :-)

To be a little serious, with NAND shouldn't one be using ubifs/ubiload?

Signature · 1 line

Tom