All of lore.kernel.org
 help / color / mirror / Atom feed
* [U-Boot] [PATCH 00/08]: Config cleanups
@ 2012-04-13 22:19 Tom Rini
  2012-04-13 22:19 ` [U-Boot] [PATCH 01/08] omap4: Remove CONFIG_SYS_MMC_SET_DEV Tom Rini
                   ` (7 more replies)
  0 siblings, 8 replies; 15+ messages in thread
From: Tom Rini @ 2012-04-13 22:19 UTC (permalink / raw)
  To: u-boot

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.

-- 
Tom

^ permalink raw reply	[flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 01/08] omap4: Remove CONFIG_SYS_MMC_SET_DEV
  2012-04-13 22:19 [U-Boot] [PATCH 00/08]: Config cleanups Tom Rini
@ 2012-04-13 22:19 ` Tom Rini
  2012-04-13 22:20 ` [U-Boot] [PATCH 02/08] omap4+: Remove CONFIG_ARCH_CPU_INIT Tom Rini
                   ` (6 subsequent siblings)
  7 siblings, 0 replies; 15+ messages in thread
From: Tom Rini @ 2012-04-13 22:19 UTC (permalink / raw)
  To: u-boot

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

Signed-off-by: Tom Rini <trini@ti.com>
---
 include/configs/omap4_common.h |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/include/configs/omap4_common.h b/include/configs/omap4_common.h
index 01b4d6c..4ace07b 100644
--- a/include/configs/omap4_common.h
+++ b/include/configs/omap4_common.h
@@ -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
 
 
-- 
1.7.0.4

^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 02/08] omap4+: Remove CONFIG_ARCH_CPU_INIT
  2012-04-13 22:19 [U-Boot] [PATCH 00/08]: Config cleanups Tom Rini
  2012-04-13 22:19 ` [U-Boot] [PATCH 01/08] omap4: Remove CONFIG_SYS_MMC_SET_DEV Tom Rini
@ 2012-04-13 22:20 ` Tom Rini
  2012-04-13 22:20 ` [U-Boot] [PATCH 03/08] omap5912osk: Remove empty misc_init_r Tom Rini
                   ` (5 subsequent siblings)
  7 siblings, 0 replies; 15+ messages in thread
From: Tom Rini @ 2012-04-13 22:20 UTC (permalink / raw)
  To: u-boot

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

Signed-off-by: Tom Rini <trini@ti.com>
---
 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(-)

diff --git a/arch/arm/cpu/armv7/omap-common/hwinit-common.c b/arch/arm/cpu/armv7/omap-common/hwinit-common.c
index 10e7669..cf71ab4 100644
--- a/arch/arm/cpu/armv7/omap-common/hwinit-common.c
+++ b/arch/arm/cpu/armv7/omap-common/hwinit-common.c
@@ -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)
diff --git a/include/configs/omap4_common.h b/include/configs/omap4_common.h
index 4ace07b..5507c8f 100644
--- a/include/configs/omap4_common.h
+++ b/include/configs/omap4_common.h
@@ -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>
diff --git a/include/configs/omap5_evm.h b/include/configs/omap5_evm.h
index 6c91ee8..38b5028 100644
--- a/include/configs/omap5_evm.h
+++ b/include/configs/omap5_evm.h
@@ -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>
-- 
1.7.0.4

^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 03/08] omap5912osk: Remove empty misc_init_r
  2012-04-13 22:19 [U-Boot] [PATCH 00/08]: Config cleanups Tom Rini
  2012-04-13 22:19 ` [U-Boot] [PATCH 01/08] omap4: Remove CONFIG_SYS_MMC_SET_DEV Tom Rini
  2012-04-13 22:20 ` [U-Boot] [PATCH 02/08] omap4+: Remove CONFIG_ARCH_CPU_INIT Tom Rini
@ 2012-04-13 22:20 ` Tom Rini
  2012-04-13 22:20 ` [U-Boot] [PATCH 04/08] omap730p2: " Tom Rini
                   ` (4 subsequent siblings)
  7 siblings, 0 replies; 15+ messages in thread
From: Tom Rini @ 2012-04-13 22:20 UTC (permalink / raw)
  To: u-boot

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

Signed-off-by: Tom Rini <trini@ti.com>
---
 board/ti/omap5912osk/omap5912osk.c |    7 -------
 include/configs/omap5912osk.h      |    2 --
 2 files changed, 0 insertions(+), 9 deletions(-)

diff --git a/board/ti/omap5912osk/omap5912osk.c b/board/ti/omap5912osk/omap5912osk.c
index 6f0e763..fac683a 100644
--- a/board/ti/omap5912osk/omap5912osk.c
+++ b/board/ti/omap5912osk/omap5912osk.c
@@ -81,13 +81,6 @@ int board_init (void)
 	return 0;
 }
 
-
-int misc_init_r (void)
-{
-	/* currently empty */
-	return (0);
-}
-
 /******************************
  Routine:
  Description:
diff --git a/include/configs/omap5912osk.h b/include/configs/omap5912osk.h
index a8dfef3..d3a2438 100644
--- a/include/configs/omap5912osk.h
+++ b/include/configs/omap5912osk.h
@@ -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 */
-- 
1.7.0.4

^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 04/08] omap730p2: Remove empty misc_init_r
  2012-04-13 22:19 [U-Boot] [PATCH 00/08]: Config cleanups Tom Rini
                   ` (2 preceding siblings ...)
  2012-04-13 22:20 ` [U-Boot] [PATCH 03/08] omap5912osk: Remove empty misc_init_r Tom Rini
@ 2012-04-13 22:20 ` Tom Rini
  2012-04-13 22:20 ` [U-Boot] [PATCH 05/08] omap3: Introduce weak misc_init_r Tom Rini
                   ` (3 subsequent siblings)
  7 siblings, 0 replies; 15+ messages in thread
From: Tom Rini @ 2012-04-13 22:20 UTC (permalink / raw)
  To: u-boot

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

Signed-off-by: Tom Rini <trini@ti.com>
---
 board/ti/omap730p2/omap730p2.c |    6 ------
 include/configs/omap730p2.h    |    2 --
 2 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/board/ti/omap730p2/omap730p2.c b/board/ti/omap730p2/omap730p2.c
index 954ced5..36204b2 100644
--- a/board/ti/omap730p2/omap730p2.c
+++ b/board/ti/omap730p2/omap730p2.c
@@ -129,12 +129,6 @@ int board_init (void)
 	return 0;
 }
 
-int misc_init_r (void)
-{
-	/* currently empty */
-	return (0);
-}
-
 /******************************
  Routine:
  Description:
diff --git a/include/configs/omap730p2.h b/include/configs/omap730p2.h
index 26e7e1f..f7900e0 100644
--- a/include/configs/omap730p2.h
+++ b/include/configs/omap730p2.h
@@ -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
 
-- 
1.7.0.4

^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 05/08] omap3: Introduce weak misc_init_r
  2012-04-13 22:19 [U-Boot] [PATCH 00/08]: Config cleanups Tom Rini
                   ` (3 preceding siblings ...)
  2012-04-13 22:20 ` [U-Boot] [PATCH 04/08] omap730p2: " Tom Rini
@ 2012-04-13 22:20 ` Tom Rini
  2012-04-15  7:32   ` Igor Grinberg
  2012-04-15  8:48   ` stefano babic
  2012-04-13 22:20 ` [U-Boot] [PATCH 06/08] include/configs: Remove CONFIG_SYS_64BIT_VSPRINTF Tom Rini
                   ` (2 subsequent siblings)
  7 siblings, 2 replies; 15+ messages in thread
From: Tom Rini @ 2012-04-13 22:20 UTC (permalink / raw)
  To: u-boot

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 <grinberg@compulab.co.il>
Cc: Ilya Yanok <yanok@emcraft.com>
Cc: Peter Barada <peter.barada@logicpd.com>
Cc: Stefano Babic <sbabic@denx.de>
Signed-off-by: Tom Rini <trini@ti.com>
---
 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(-)

diff --git a/arch/arm/cpu/armv7/omap3/board.c b/arch/arm/cpu/armv7/omap3/board.c
index 1fee574..f2e52e9 100644
--- a/arch/arm/cpu/armv7/omap3/board.c
+++ b/arch/arm/cpu/armv7/omap3/board.c
@@ -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
diff --git a/board/cm_t35/cm_t35.c b/board/cm_t35/cm_t35.c
index 7a2fed7..b5d2800 100644
--- a/board/cm_t35/cm_t35.c
+++ b/board/cm_t35/cm_t35.c
@@ -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
diff --git a/board/htkw/mcx/mcx.c b/board/htkw/mcx/mcx.c
index 8f0b527..8f75af1 100644
--- a/board/htkw/mcx/mcx.c
+++ b/board/htkw/mcx/mcx.c
@@ -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
diff --git a/board/logicpd/omap3som/omap3logic.c b/board/logicpd/omap3som/omap3logic.c
index 89b114b..12bcfcb 100644
--- a/board/logicpd/omap3som/omap3logic.c
+++ b/board/logicpd/omap3som/omap3logic.c
@@ -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[] = {
diff --git a/board/teejet/mt_ventoux/mt_ventoux.c b/board/teejet/mt_ventoux/mt_ventoux.c
index c7aedc9..9fbaedd 100644
--- a/board/teejet/mt_ventoux/mt_ventoux.c
+++ b/board/teejet/mt_ventoux/mt_ventoux.c
@@ -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
-- 
1.7.0.4

^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 06/08] include/configs: Remove CONFIG_SYS_64BIT_VSPRINTF
  2012-04-13 22:19 [U-Boot] [PATCH 00/08]: Config cleanups Tom Rini
                   ` (4 preceding siblings ...)
  2012-04-13 22:20 ` [U-Boot] [PATCH 05/08] omap3: Introduce weak misc_init_r Tom Rini
@ 2012-04-13 22:20 ` Tom Rini
  2012-04-13 22:20 ` [U-Boot] [PATCH 07/08] include/configs: Remove CONFIG_SYS_64BIT_STRTOUL Tom Rini
  2012-04-13 22:20 ` [U-Boot] [PATCH 08/08] include/configs: Better utilize CONFIG_SYS_NO_FLASH Tom Rini
  7 siblings, 0 replies; 15+ messages in thread
From: Tom Rini @ 2012-04-13 22:20 UTC (permalink / raw)
  To: u-boot

This define does not control anything, remove it.

Signed-off-by: Tom Rini <trini@ti.com>
---
 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(-)

diff --git a/include/configs/P1023RDS.h b/include/configs/P1023RDS.h
index e057b1f..b7236b2 100644
--- a/include/configs/P1023RDS.h
+++ b/include/configs/P1023RDS.h
@@ -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 */
diff --git a/include/configs/P2020COME.h b/include/configs/P2020COME.h
index 365322c..12f9860 100644
--- a/include/configs/P2020COME.h
+++ b/include/configs/P2020COME.h
@@ -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
 
diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h
index b0dd2f0..71321f3 100644
--- a/include/configs/am3517_crane.h
+++ b/include/configs/am3517_crane.h
@@ -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 */
diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
index b5f75d1..bbd19de 100644
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -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"
diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
index 8399246..f424e5a 100644
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -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 */
diff --git a/include/configs/da830evm.h b/include/configs/da830evm.h
index 4532e4f..781878e 100644
--- a/include/configs/da830evm.h
+++ b/include/configs/da830evm.h
@@ -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 */
diff --git a/include/configs/ea20.h b/include/configs/ea20.h
index e059b30..04e7a2d 100644
--- a/include/configs/ea20.h
+++ b/include/configs/ea20.h
@@ -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 */
diff --git a/include/configs/eb_cpux9k2.h b/include/configs/eb_cpux9k2.h
index 9046cf0..1fcd0c8 100644
--- a/include/configs/eb_cpux9k2.h
+++ b/include/configs/eb_cpux9k2.h
@@ -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
diff --git a/include/configs/flea3.h b/include/configs/flea3.h
index 649e272..e860837 100644
--- a/include/configs/flea3.h
+++ b/include/configs/flea3.h
@@ -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
 
diff --git a/include/configs/hawkboard.h b/include/configs/hawkboard.h
index 50a1c17..959f9cf 100644
--- a/include/configs/hawkboard.h
+++ b/include/configs/hawkboard.h
@@ -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, }
diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h
index 2af4e7a..c1f1aa6 100644
--- a/include/configs/imx27lite-common.h
+++ b/include/configs/imx27lite-common.h
@@ -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
diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index 1315c3c..e190e3e 100644
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -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"
diff --git a/include/configs/meesc.h b/include/configs/meesc.h
index d6197bc..db1e87d 100644
--- a/include/configs/meesc.h
+++ b/include/configs/meesc.h
@@ -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 */
diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h
index 1a63791..27b4899 100644
--- a/include/configs/mv-common.h
+++ b/include/configs/mv-common.h
@@ -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
 
 /*
diff --git a/include/configs/mx25pdk.h b/include/configs/mx25pdk.h
index d1ba02b..7210b6e 100644
--- a/include/configs/mx25pdk.h
+++ b/include/configs/mx25pdk.h
@@ -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 > "
diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h
index 0c62b9f..07973f4 100644
--- a/include/configs/mx35pdk.h
+++ b/include/configs/mx35pdk.h
@@ -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
 
diff --git a/include/configs/otc570.h b/include/configs/otc570.h
index b322c77..8599378 100644
--- a/include/configs/otc570.h
+++ b/include/configs/otc570.h
@@ -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 */
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index 3098c5a..c52f070 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -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 */
diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h
index 5fef8cc..58d9fab 100644
--- a/include/configs/spear-common.h
+++ b/include/configs/spear-common.h
@@ -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
 
diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h
index 4c4321d..37eb87b 100644
--- a/include/configs/tam3517-common.h
+++ b/include/configs/tam3517-common.h
@@ -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
 
diff --git a/include/configs/tx25.h b/include/configs/tx25.h
index 87bd8a6..3dfafa5 100644
--- a/include/configs/tx25.h
+++ b/include/configs/tx25.h
@@ -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  */
diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h
index 599d5bb..d7ce6c6 100644
--- a/include/configs/zmx25.h
+++ b/include/configs/zmx25.h
@@ -93,8 +93,6 @@
 #define CONFIG_CMD_NET
 #define CONFIG_CMD_CACHE
 
-#define CONFIG_SYS_64BIT_VSPRINTF
-
 /*
  * Additional command
  */
-- 
1.7.0.4

^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 07/08] include/configs: Remove CONFIG_SYS_64BIT_STRTOUL
  2012-04-13 22:19 [U-Boot] [PATCH 00/08]: Config cleanups Tom Rini
                   ` (5 preceding siblings ...)
  2012-04-13 22:20 ` [U-Boot] [PATCH 06/08] include/configs: Remove CONFIG_SYS_64BIT_VSPRINTF Tom Rini
@ 2012-04-13 22:20 ` Tom Rini
  2012-04-13 22:20 ` [U-Boot] [PATCH 08/08] include/configs: Better utilize CONFIG_SYS_NO_FLASH Tom Rini
  7 siblings, 0 replies; 15+ messages in thread
From: Tom Rini @ 2012-04-13 22:20 UTC (permalink / raw)
  To: u-boot

This define does not control anything, remove it.

Signed-off-by: Tom Rini <trini@ti.com>
---
 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(-)

diff --git a/include/configs/P1023RDS.h b/include/configs/P1023RDS.h
index b7236b2..e632d1b 100644
--- a/include/configs/P1023RDS.h
+++ b/include/configs/P1023RDS.h
@@ -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}() */
diff --git a/include/configs/P2020COME.h b/include/configs/P2020COME.h
index 12f9860..28122ec 100644
--- a/include/configs/P2020COME.h
+++ b/include/configs/P2020COME.h
@@ -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
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index c52f070..2d68d2e 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -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}() */
-- 
1.7.0.4

^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 08/08] include/configs: Better utilize CONFIG_SYS_NO_FLASH
  2012-04-13 22:19 [U-Boot] [PATCH 00/08]: Config cleanups Tom Rini
                   ` (6 preceding siblings ...)
  2012-04-13 22:20 ` [U-Boot] [PATCH 07/08] include/configs: Remove CONFIG_SYS_64BIT_STRTOUL Tom Rini
@ 2012-04-13 22:20 ` Tom Rini
  2012-04-14  6:22   ` Wolfgang Denk
  7 siblings, 1 reply; 15+ messages in thread
From: Tom Rini @ 2012-04-13 22:20 UTC (permalink / raw)
  To: u-boot

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 <trini@ti.com>
---
 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(-)

diff --git a/include/configs/PN62.h b/include/configs/PN62.h
index dae4577..ddaffc1 100644
--- a/include/configs/PN62.h
+++ b/include/configs/PN62.h
@@ -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 */
diff --git a/include/configs/SIMPC8313.h b/include/configs/SIMPC8313.h
index 0976077..8b51f6c 100644
--- a/include/configs/SIMPC8313.h
+++ b/include/configs/SIMPC8313.h
@@ -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
diff --git a/include/configs/afeb9260.h b/include/configs/afeb9260.h
index 2adf8f9..23506af 100644
--- a/include/configs/afeb9260.h
+++ b/include/configs/afeb9260.h
@@ -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
diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h
index 71321f3..904e143 100644
--- a/include/configs/am3517_crane.h
+++ b/include/configs/am3517_crane.h
@@ -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
diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
index bbd19de..1cab76a 100644
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -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
diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
index db52ee6..7376e16 100644
--- a/include/configs/at91sam9260ek.h
+++ b/include/configs/at91sam9260ek.h
@@ -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
diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
index 5140b26..4dc617a 100644
--- a/include/configs/at91sam9261ek.h
+++ b/include/configs/at91sam9261ek.h
@@ -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
diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h
index 6a02188..c685573 100644
--- a/include/configs/at91sam9m10g45ek.h
+++ b/include/configs/at91sam9m10g45ek.h
@@ -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
diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h
index 79ea1f2..f502a6b 100644
--- a/include/configs/at91sam9rlek.h
+++ b/include/configs/at91sam9rlek.h
@@ -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
diff --git a/include/configs/bf525-ucr2.h b/include/configs/bf525-ucr2.h
index 1f65130..01af7bf 100644
--- a/include/configs/bf525-ucr2.h
+++ b/include/configs/bf525-ucr2.h
@@ -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
diff --git a/include/configs/bf537-minotaur.h b/include/configs/bf537-minotaur.h
index ef9d236..033125e 100644
--- a/include/configs/bf537-minotaur.h
+++ b/include/configs/bf537-minotaur.h
@@ -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"
diff --git a/include/configs/bf537-srv1.h b/include/configs/bf537-srv1.h
index 52d5d97..ffa195c 100644
--- a/include/configs/bf537-srv1.h
+++ b/include/configs/bf537-srv1.h
@@ -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"
diff --git a/include/configs/blackstamp.h b/include/configs/blackstamp.h
index 64fce30..ca1e237 100644
--- a/include/configs/blackstamp.h
+++ b/include/configs/blackstamp.h
@@ -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
diff --git a/include/configs/blackvme.h b/include/configs/blackvme.h
index f2dc6aa..6429413 100644
--- a/include/configs/blackvme.h
+++ b/include/configs/blackvme.h
@@ -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
diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h
index fe91c10..90af9db 100644
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@@ -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
diff --git a/include/configs/coreboot.h b/include/configs/coreboot.h
index 2c65d74..121f2cd 100644
--- a/include/configs/coreboot.h
+++ b/include/configs/coreboot.h
@@ -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
diff --git a/include/configs/davinci_schmoogie.h b/include/configs/davinci_schmoogie.h
index 949174a..19a185f 100644
--- a/include/configs/davinci_schmoogie.h
+++ b/include/configs/davinci_schmoogie.h
@@ -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
diff --git a/include/configs/davinci_sffsdr.h b/include/configs/davinci_sffsdr.h
index c931ede..2f95adc 100644
--- a/include/configs/davinci_sffsdr.h
+++ b/include/configs/davinci_sffsdr.h
@@ -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
diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h
index eb7c376..9f521c8 100644
--- a/include/configs/devkit8000.h
+++ b/include/configs/devkit8000.h
@@ -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			*/
diff --git a/include/configs/dig297.h b/include/configs/dig297.h
index 1626b0e..4e4b7a3 100644
--- a/include/configs/dig297.h
+++ b/include/configs/dig297.h
@@ -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
diff --git a/include/configs/igep00x0.h b/include/configs/igep00x0.h
index d2b4b84..37630e2 100644
--- a/include/configs/igep00x0.h
+++ b/include/configs/igep00x0.h
@@ -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
diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index e190e3e..c839030 100644
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -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
diff --git a/include/configs/meesc.h b/include/configs/meesc.h
index db1e87d..2f69995 100644
--- a/include/configs/meesc.h
+++ b/include/configs/meesc.h
@@ -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
diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h
index 49d440b..7e3ad93 100644
--- a/include/configs/mx31pdk.h
+++ b/include/configs/mx31pdk.h
@@ -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
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index 1477b21..537883f 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -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
diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h
index f48a41e..22d0af7 100644
--- a/include/configs/mx53ard.h
+++ b/include/configs/mx53ard.h
@@ -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
diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h
index a77e5b2..7174b5f 100644
--- a/include/configs/mx53evk.h
+++ b/include/configs/mx53evk.h
@@ -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
diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index 34a4edd..d02dff4 100644
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -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
diff --git a/include/configs/mx53smd.h b/include/configs/mx53smd.h
index a04db3f..d60d1a9 100644
--- a/include/configs/mx53smd.h
+++ b/include/configs/mx53smd.h
@@ -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
diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h
index 0962d3c..9570edb 100644
--- a/include/configs/mx6qarm2.h
+++ b/include/configs/mx6qarm2.h
@@ -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
diff --git a/include/configs/mx6qsabrelite.h b/include/configs/mx6qsabrelite.h
index 8bc8a83..0471394 100644
--- a/include/configs/mx6qsabrelite.h
+++ b/include/configs/mx6qsabrelite.h
@@ -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
diff --git a/include/configs/nhk8815.h b/include/configs/nhk8815.h
index 20db397..9e09b8c 100644
--- a/include/configs/nhk8815.h
+++ b/include/configs/nhk8815.h
@@ -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
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
index d3a0122..d1a9e41 100644
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -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
diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h
index 01360f6..d16a994 100644
--- a/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@ -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
diff --git a/include/configs/omap3_mvblx.h b/include/configs/omap3_mvblx.h
index b819d21..42665ba 100644
--- a/include/configs/omap3_mvblx.h
+++ b/include/configs/omap3_mvblx.h
@@ -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
diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h
index 64adc74..b3fcd9c 100644
--- a/include/configs/omap3_overo.h
+++ b/include/configs/omap3_overo.h
@@ -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
diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h
index d02f338..4fc131f 100644
--- a/include/configs/omap3_pandora.h
+++ b/include/configs/omap3_pandora.h
@@ -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
diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h
index 17608f5..f3c3b49 100644
--- a/include/configs/omap3_zoom1.h
+++ b/include/configs/omap3_zoom1.h
@@ -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
diff --git a/include/configs/omap3_zoom2.h b/include/configs/omap3_zoom2.h
index b60ece3..cf83201 100644
--- a/include/configs/omap3_zoom2.h
+++ b/include/configs/omap3_zoom2.h
@@ -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
diff --git a/include/configs/omap4_common.h b/include/configs/omap4_common.h
index 5507c8f..f00f2de 100644
--- a/include/configs/omap4_common.h
+++ b/include/configs/omap4_common.h
@@ -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
diff --git a/include/configs/omap5_evm.h b/include/configs/omap5_evm.h
index 38b5028..dc12e31 100644
--- a/include/configs/omap5_evm.h
+++ b/include/configs/omap5_evm.h
@@ -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
diff --git a/include/configs/origen.h b/include/configs/origen.h
index 8ede825..7baa2cf 100644
--- a/include/configs/origen.h
+++ b/include/configs/origen.h
@@ -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
diff --git a/include/configs/otc570.h b/include/configs/otc570.h
index 8599378..39fcd13 100644
--- a/include/configs/otc570.h
+++ b/include/configs/otc570.h
@@ -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
diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h
index 4779878..263a85b 100644
--- a/include/configs/pm9g45.h
+++ b/include/configs/pm9g45.h
@@ -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
diff --git a/include/configs/sbc35_a9g20.h b/include/configs/sbc35_a9g20.h
index cdf8659..1577e2a 100644
--- a/include/configs/sbc35_a9g20.h
+++ b/include/configs/sbc35_a9g20.h
@@ -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
diff --git a/include/configs/smdk5250.h b/include/configs/smdk5250.h
index 9659f9e..4977ba2 100644
--- a/include/configs/smdk5250.h
+++ b/include/configs/smdk5250.h
@@ -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
diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h
index 6663629..4d7b3ae 100644
--- a/include/configs/smdkc100.h
+++ b/include/configs/smdkc100.h
@@ -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"
 
diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h
index cb3c674..c5dc48a 100644
--- a/include/configs/snapper9260.h
+++ b/include/configs/snapper9260.h
@@ -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
 
diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h
index 37eb87b..0e03cf4 100644
--- a/include/configs/tam3517-common.h
+++ b/include/configs/tam3517-common.h
@@ -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
diff --git a/include/configs/tegra2-common.h b/include/configs/tegra2-common.h
index 837f859..ac5f05f 100644
--- a/include/configs/tegra2-common.h
+++ b/include/configs/tegra2-common.h
@@ -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" \
diff --git a/include/configs/tny_a9260.h b/include/configs/tny_a9260.h
index 0043926..078b9cc 100644
--- a/include/configs/tny_a9260.h
+++ b/include/configs/tny_a9260.h
@@ -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
 
diff --git a/include/configs/vct.h b/include/configs/vct.h
index 9ddc7b1..5116e18 100644
--- a/include/configs/vct.h
+++ b/include/configs/vct.h
@@ -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
diff --git a/include/configs/vision2.h b/include/configs/vision2.h
index f6904f3..946fe61 100644
--- a/include/configs/vision2.h
+++ b/include/configs/vision2.h
@@ -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
  */
diff --git a/include/configs/xilinx-ppc.h b/include/configs/xilinx-ppc.h
index bd7bac0..43308fd 100644
--- a/include/configs/xilinx-ppc.h
+++ b/include/configs/xilinx-ppc.h
@@ -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 */
-- 
1.7.0.4

^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 08/08] include/configs: Better utilize CONFIG_SYS_NO_FLASH
  2012-04-13 22:20 ` [U-Boot] [PATCH 08/08] include/configs: Better utilize CONFIG_SYS_NO_FLASH Tom Rini
@ 2012-04-14  6:22   ` Wolfgang Denk
  2012-04-16 15:09     ` Tom Rini
  0 siblings, 1 reply; 15+ messages in thread
From: Wolfgang Denk @ 2012-04-14  6:22 UTC (permalink / raw)
  To: u-boot

Dear Tom Rini,

In message <1334355606-16491-9-git-send-email-trini@ti.com> 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/ ?

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

> --- a/include/configs/PN62.h
> +++ b/include/configs/PN62.h
> @@ -56,13 +56,12 @@
>  /*
>   * Command line configuration.
>   */
> +#define CONFIG_SYS_NO_FLASH		/* There is no FLASH memory	*/
>  #include <config_cmd_default.h>
...
> -#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.


> diff --git a/include/configs/SIMPC8313.h b/include/configs/SIMPC8313.h
> index 0976077..8b51f6c 100644
> --- a/include/configs/SIMPC8313.h
> +++ b/include/configs/SIMPC8313.h
> @@ -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

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

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

^ permalink raw reply	[flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 05/08] omap3: Introduce weak misc_init_r
  2012-04-13 22:20 ` [U-Boot] [PATCH 05/08] omap3: Introduce weak misc_init_r Tom Rini
@ 2012-04-15  7:32   ` Igor Grinberg
  2012-04-15  8:48   ` stefano babic
  1 sibling, 0 replies; 15+ messages in thread
From: Igor Grinberg @ 2012-04-15  7:32 UTC (permalink / raw)
  To: u-boot

On 04/14/12 01:20, Tom Rini wrote:
> 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 <grinberg@compulab.co.il>
> Cc: Ilya Yanok <yanok@emcraft.com>
> Cc: Peter Barada <peter.barada@logicpd.com>
> Cc: Stefano Babic <sbabic@denx.de>
> Signed-off-by: Tom Rini <trini@ti.com>

Acked-by: Igor Grinberg <grinberg@compulab.co.il>

Thanks for the patch.

-- 
Regards,
Igor.

^ permalink raw reply	[flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 05/08] omap3: Introduce weak misc_init_r
  2012-04-13 22:20 ` [U-Boot] [PATCH 05/08] omap3: Introduce weak misc_init_r Tom Rini
  2012-04-15  7:32   ` Igor Grinberg
@ 2012-04-15  8:48   ` stefano babic
  1 sibling, 0 replies; 15+ messages in thread
From: stefano babic @ 2012-04-15  8:48 UTC (permalink / raw)
  To: u-boot

Am 14/04/2012 00:20, schrieb 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 <grinberg@compulab.co.il>
> Cc: Ilya Yanok <yanok@emcraft.com>
> Cc: Peter Barada <peter.barada@logicpd.com>
> Cc: Stefano Babic <sbabic@denx.de>
> Signed-off-by: Tom Rini <trini@ti.com>
> ---

Acked-by : Stefano Babic <sbabic@denx.de>

Best regards,
Stefano Babic

-- 
=====================================================================
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
=====================================================================

^ permalink raw reply	[flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 08/08] include/configs: Better utilize CONFIG_SYS_NO_FLASH
  2012-04-14  6:22   ` Wolfgang Denk
@ 2012-04-16 15:09     ` Tom Rini
  2012-04-16 20:56       ` Wolfgang Denk
  0 siblings, 1 reply; 15+ messages in thread
From: Tom Rini @ 2012-04-16 15:09 UTC (permalink / raw)
  To: u-boot

On 04/13/2012 11:22 PM, Wolfgang Denk wrote:
> Dear Tom Rini,
>
> In message<1334355606-16491-9-git-send-email-trini@ti.com>  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/ ?
>
>> (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.

>
>> --- a/include/configs/PN62.h
>> +++ b/include/configs/PN62.h
>> @@ -56,13 +56,12 @@
>>   /*
>>    * Command line configuration.
>>    */
>> +#define CONFIG_SYS_NO_FLASH		/* There is no FLASH memory	*/
>>   #include<config_cmd_default.h>
> ...
>> -#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,

>> diff --git a/include/configs/SIMPC8313.h b/include/configs/SIMPC8313.h
>> index 0976077..8b51f6c 100644
>> --- a/include/configs/SIMPC8313.h
>> +++ b/include/configs/SIMPC8313.h
>> @@ -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
>
> 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>

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

> 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!

-- 
Tom

^ permalink raw reply	[flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 08/08] include/configs: Better utilize CONFIG_SYS_NO_FLASH
  2012-04-16 15:09     ` Tom Rini
@ 2012-04-16 20:56       ` Wolfgang Denk
  2012-04-16 23:52         ` Tom Rini
  0 siblings, 1 reply; 15+ messages in thread
From: Wolfgang Denk @ 2012-04-16 20:56 UTC (permalink / raw)
  To: u-boot

Dear Tom Rini,

In message <4F8C3615.9040401@ti.com> you wrote:
>
> > 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
:-)

> 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

-- 
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.

^ permalink raw reply	[flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 08/08] include/configs: Better utilize CONFIG_SYS_NO_FLASH
  2012-04-16 20:56       ` Wolfgang Denk
@ 2012-04-16 23:52         ` Tom Rini
  0 siblings, 0 replies; 15+ messages in thread
From: Tom Rini @ 2012-04-16 23:52 UTC (permalink / raw)
  To: u-boot

On 04/16/2012 01:56 PM, Wolfgang Denk wrote:
> Dear Tom Rini,
>
> In message<4F8C3615.9040401@ti.com>  you wrote:
>>
>>> 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?

-- 
Tom

^ permalink raw reply	[flat|nested] 15+ messages in thread
end of thread, other threads:[~2012-04-16 23:52 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-04-13 22:19 [U-Boot] [PATCH 00/08]: Config cleanups Tom Rini
2012-04-13 22:19 ` [U-Boot] [PATCH 01/08] omap4: Remove CONFIG_SYS_MMC_SET_DEV Tom Rini
2012-04-13 22:20 ` [U-Boot] [PATCH 02/08] omap4+: Remove CONFIG_ARCH_CPU_INIT Tom Rini
2012-04-13 22:20 ` [U-Boot] [PATCH 03/08] omap5912osk: Remove empty misc_init_r Tom Rini
2012-04-13 22:20 ` [U-Boot] [PATCH 04/08] omap730p2: " Tom Rini
2012-04-13 22:20 ` [U-Boot] [PATCH 05/08] omap3: Introduce weak misc_init_r Tom Rini
2012-04-15  7:32   ` Igor Grinberg
2012-04-15  8:48   ` stefano babic
2012-04-13 22:20 ` [U-Boot] [PATCH 06/08] include/configs: Remove CONFIG_SYS_64BIT_VSPRINTF Tom Rini
2012-04-13 22:20 ` [U-Boot] [PATCH 07/08] include/configs: Remove CONFIG_SYS_64BIT_STRTOUL Tom Rini
2012-04-13 22:20 ` [U-Boot] [PATCH 08/08] include/configs: Better utilize CONFIG_SYS_NO_FLASH Tom Rini
2012-04-14  6:22   ` Wolfgang Denk
2012-04-16 15:09     ` Tom Rini
2012-04-16 20:56       ` Wolfgang Denk
2012-04-16 23:52         ` Tom Rini

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.