[U-Boot] [RFC v0 10/11] omap3: Consolidate NAND information in omap3_common.h

Tom Rini
2012-03-22T19:09:16Z

Add common NAND information to omap3_common.h. For boards that use
NAND, move CONFIG_CMD_NAND up to prior to <configs/omap3_common.h>

Signed-off-by: Tom Rini <trini@ti.com>
---
include/configs/am3517_crane.h | 16 +---------------
include/configs/am3517_evm.h | 16 +---------------
include/configs/cm_t35.h | 17 +----------------
include/configs/devkit8000.h | 13 +------------
include/configs/dig297.h | 16 +---------------
include/configs/igep00x0.h | 4 ++--
include/configs/mcx.h | 17 ++---------------
include/configs/omap3_beagle.h | 18 ++----------------
include/configs/omap3_common.h | 14 ++++++++++++++
include/configs/omap3_evm_common.h | 12 ------------
include/configs/omap3_logic.h | 18 +-----------------
include/configs/omap3_mvblx.h | 4 ++--
include/configs/omap3_overo.h | 17 +----------------
include/configs/omap3_pandora.h | 17 +----------------
include/configs/omap3_sdp3430.h | 5 ++---
include/configs/omap3_zoom1.h | 15 +--------------
include/configs/omap3_zoom2.h | 14 +-------------
include/configs/tam3517-common.h | 15 +--------------
include/configs/tricorder.h | 14 +-------------
19 files changed, 36 insertions(+), 226 deletions(-)

diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h
index d607c67..6b681e5 100644
--- a/include/configs/am3517_crane.h
+++ b/include/configs/am3517_crane.h
@@ -29,6 +29,7 @@
* Values that differ from platform defaults or are unspecified.
*/
#define CONFIG_EMIF4 /* The chip has EMIF4 controller */
+#define CONFIG_CMD_NAND /* NAND support */

/* Platform defaults */
#include <configs/omap3_common.h>
@@ -103,7 +104,6 @@

#define CONFIG_CMD_I2C /* I2C serial bus support */
#define CONFIG_CMD_MMC /* MMC support */
-#define CONFIG_CMD_NAND /* NAND support */
#define CONFIG_CMD_DHCP
#define CONFIG_CMD_PING

@@ -112,7 +112,6 @@
#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
@@ -122,17 +121,6 @@

#undef CONFIG_CMD_NET
#undef CONFIG_CMD_NFS
-/*
- * Board NAND Info.
- */
-#define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */
- /* to access nand */
-#define CONFIG_SYS_NAND_BASE NAND_BASE /* physical address */
- /* to access */
- /* nand at CS0 */
-
-#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of */
- /* NAND devices */

#define CONFIG_JFFS2_NAND
/* nand device jffs2 lives on */
@@ -249,8 +237,6 @@
/* Monitor at start of flash */
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE

-#define CONFIG_NAND_OMAP_GPMC
-#define GPMC_NAND_ECC_LP_x16_LAYOUT 1
#define CONFIG_ENV_IS_IN_NAND 1
#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */

diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
index eec85ce..6137730 100644
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -29,6 +29,7 @@
* Values that differ from platform defaults or are unspecified.
*/
#define CONFIG_EMIF4 /* The chip has EMIF4 controller */
+#define CONFIG_CMD_NAND /* NAND support */

/* Platform defaults */
#include <configs/omap3_common.h>
@@ -103,7 +104,6 @@

#define CONFIG_CMD_I2C /* I2C serial bus support */
#define CONFIG_CMD_MMC /* MMC support */
-#define CONFIG_CMD_NAND /* NAND support */
#define CONFIG_CMD_DHCP
#define CONFIG_CMD_PING

@@ -112,7 +112,6 @@
#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
@@ -122,17 +121,6 @@

#undef CONFIG_CMD_NET
#undef CONFIG_CMD_NFS
-/*
- * Board NAND Info.
- */
-#define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */
- /* to access nand */
-#define CONFIG_SYS_NAND_BASE NAND_BASE /* physical address */
- /* to access */
- /* nand at CS0 */
-
-#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of */
- /* NAND devices */
#define CONFIG_JFFS2_NAND
/* nand device jffs2 lives on */
#define CONFIG_JFFS2_DEV "nand0"
@@ -249,8 +237,6 @@
/* Monitor at start of flash */
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE

-#define CONFIG_NAND_OMAP_GPMC
-#define GPMC_NAND_ECC_LP_x16_LAYOUT 1
#define CONFIG_ENV_IS_IN_NAND 1
#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */

diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h
index f543e93..14c443c 100644
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@@ -37,6 +37,7 @@
*/
#define CONFIG_SDRC /* The chip has SDRC controller */
#define CONFIG_SERIAL_TAG /* Add SERIAL ATAG */
+#define CONFIG_CMD_NAND /* NAND support */

/* Platform defaults */
#include <configs/omap3_common.h>
@@ -95,7 +96,6 @@

#define CONFIG_CMD_I2C /* I2C serial bus support */
#define CONFIG_CMD_MMC /* MMC support */
-#define CONFIG_CMD_NAND /* NAND support */
#define CONFIG_CMD_DHCP
#define CONFIG_CMD_PING

@@ -103,7 +103,6 @@
#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
@@ -119,20 +118,6 @@
#define CONFIG_TWL4030_POWER
#define CONFIG_TWL4030_LED

-/*
- * Board NAND Info.
- */
-#define CONFIG_SYS_NAND_QUIET_TEST
-#define CONFIG_NAND_OMAP_GPMC
-#define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */
- /* to access nand */
-#define CONFIG_SYS_NAND_BASE NAND_BASE /* physical address */
- /* to access nand at */
- /* CS0 */
-#define GPMC_NAND_ECC_LP_x16_LAYOUT
-
-#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */
- /* devices */
#define CONFIG_JFFS2_NAND
/* nand device jffs2 lives on */
#define CONFIG_JFFS2_DEV "nand0"
diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h
index 68f0b00..91d976f 100644
--- a/include/configs/devkit8000.h
+++ b/include/configs/devkit8000.h
@@ -35,6 +35,7 @@
* Values that differ from platform defaults or are unspecified.
*/
#define CONFIG_SDRC /* The chip has SDRC controller */
+#define CONFIG_CMD_NAND /* NAND support */

/* Platform defaults */
#include <configs/omap3_common.h>
@@ -85,7 +86,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:" \
@@ -95,16 +95,6 @@
"4m(kernel)," \
"-(fs)"

-#define CONFIG_NAND_OMAP_GPMC
-#define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */
- /* to access nand */
-#define CONFIG_SYS_NAND_BASE NAND_BASE /* physical address */
- /* to access nand at */
- /* CS0 */
-#define GPMC_NAND_ECC_LP_x16_LAYOUT 1
-
-#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */
- /* devices */
#define CONFIG_JFFS2_NAND
/* nand device jffs2 lives on */
#define CONFIG_JFFS2_DEV "nand0"
@@ -123,7 +113,6 @@
#define CONFIG_CMD_JFFS2 /* JFFS2 Support */
#define CONFIG_CMD_MMC /* MMC support */
#define CONFIG_CMD_MTDPARTS /* Enable MTD parts commands */
-#define CONFIG_CMD_NAND /* NAND support */
#define CONFIG_CMD_NAND_LOCK_UNLOCK /* nand (un)lock commands */

#undef CONFIG_CMD_FPGA /* FPGA configuration Support */
diff --git a/include/configs/dig297.h b/include/configs/dig297.h
index 44a522a..792dff7 100644
--- a/include/configs/dig297.h
+++ b/include/configs/dig297.h
@@ -43,6 +43,7 @@
* Values that differ from platform defaults or are unspecified.
*/
#define CONFIG_SDRC /* The chip has SDRC controller */
+#define CONFIG_CMD_NAND /* NAND support */

/* Platform defaults */
#include <configs/omap3_common.h>
@@ -86,7 +87,6 @@

#define CONFIG_CMD_I2C /* I2C serial bus support */
#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 */
@@ -95,7 +95,6 @@
#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
@@ -109,19 +108,6 @@
#define CONFIG_TWL4030_POWER
#define CONFIG_TWL4030_LED

-/*
- * Board NAND Info.
- */
-#define CONFIG_NAND_OMAP_GPMC
-#define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */
- /* to access nand */
-#define CONFIG_SYS_NAND_BASE NAND_BASE /* physical address */
- /* to access nand at */
- /* CS0 */
-#define GPMC_NAND_ECC_LP_x16_LAYOUT
-
-#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */
-
#if defined(CONFIG_CMD_NET)
/*
* SMSC9220 Ethernet
diff --git a/include/configs/igep00x0.h b/include/configs/igep00x0.h
index c4c0fb0..d7136ef 100644
--- a/include/configs/igep00x0.h
+++ b/include/configs/igep00x0.h
@@ -27,6 +27,7 @@
* Values that differ from platform defaults or are unspecified.
*/
#define CONFIG_SDRC /* The chip has SDRC controller */
+#define CONFIG_ENV_SIZE (512 << 10) /* Total Size Environment */

/* Platform defaults */
#include <configs/omap3_common.h>
@@ -79,7 +80,6 @@
#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
@@ -204,6 +204,7 @@
* FLASH and environment organization
*/

+#define CONFIG_SYS_NO_FLASH
#define PISMO1_ONEN_SIZE GPMC_SIZE_128M /* Configure the PISMO */

#define CONFIG_SYS_ONENAND_BASE ONENAND_MAP
@@ -211,7 +212,6 @@
#define ONENAND_ENV_OFFSET 0x260000 /* environment starts here */

#define CONFIG_ENV_IS_IN_ONENAND 1
-#define CONFIG_ENV_SIZE (512 << 10) /* Total Size Environment */
#define CONFIG_ENV_ADDR ONENAND_ENV_OFFSET

/*
diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index 9f95958..9d3b443 100644
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -25,6 +25,7 @@
* Values that differ from platform defaults or are unspecified.
*/
#define CONFIG_EMIF4 /* The chip has EMIF4 controller */
+#define CONFIG_CMD_NAND /* NAND support */

/* Platform defaults */
#include <configs/omap3_common.h>
@@ -88,7 +89,6 @@
#define CONFIG_CMD_MMC /* MMC support */
#define CONFIG_CMD_FAT /* FAT support */
#define CONFIG_CMD_USB
-#define CONFIG_CMD_NAND /* NAND support */
#define CONFIG_CMD_DHCP
#define CONFIG_CMD_PING
#define CONFIG_CMD_CACHE
@@ -105,7 +105,6 @@
#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
@@ -119,17 +118,7 @@
#define CONFIG_CMD_NET
#define CONFIG_CMD_MII
#define CONFIG_CMD_NFS
-/*
- * Board NAND Info.
- */
-#define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */
- /* to access nand */
-#define CONFIG_SYS_NAND_BASE NAND_BASE /* physical address */
- /* to access */
- /* nand at CS0 */
-
-#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of */
- /* NAND devices */
+
#define CONFIG_JFFS2_NAND
/* nand device jffs2 lives on */
#define CONFIG_JFFS2_DEV "nand0"
@@ -236,8 +225,6 @@
/* Configure the PISMO */
#define PISMO1_NAND_SIZE GPMC_SIZE_128M

-#define CONFIG_NAND_OMAP_GPMC
-#define GPMC_NAND_ECC_LP_x16_LAYOUT
#define CONFIG_ENV_IS_IN_NAND
#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */

diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
index 0857666..ec1856d 100644
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -32,6 +32,7 @@
* Values that differ from platform defaults or are unspecified.
*/
#define CONFIG_SDRC /* The chip has SDRC controller */
+#define CONFIG_CMD_NAND /* NAND support */

/* Platform defaults */
#include <configs/omap3_common.h>
@@ -116,7 +117,6 @@
#define CONFIG_CMD_I2C /* I2C serial bus support */
#define CONFIG_CMD_MMC /* MMC support */
#define CONFIG_USB_STORAGE /* USB storage support */
-#define CONFIG_CMD_NAND /* NAND support */
#define CONFIG_CMD_LED /* LED support */
#define CONFIG_CMD_NET /* bootp, tftpboot, rarpboot */
#define CONFIG_CMD_NFS /* NFS support */
@@ -129,7 +129,6 @@
#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
@@ -145,20 +144,7 @@
#define CONFIG_TWL4030_POWER 1
#define CONFIG_TWL4030_LED 1

-/*
- * Board NAND Info.
- */
-#define CONFIG_SYS_NAND_QUIET_TEST 1
-#define CONFIG_NAND_OMAP_GPMC
-#define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */
- /* to access nand */
-#define CONFIG_SYS_NAND_BASE NAND_BASE /* physical address */
- /* to access nand at */
- /* CS0 */
-#define GPMC_NAND_ECC_LP_x16_LAYOUT 1
-
-#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */
- /* devices */
+
#define CONFIG_JFFS2_NAND
/* nand device jffs2 lives on */
#define CONFIG_JFFS2_DEV "nand0"
diff --git a/include/configs/omap3_common.h b/include/configs/omap3_common.h
index 023dc53..6fc93b8 100644
--- a/include/configs/omap3_common.h
+++ b/include/configs/omap3_common.h
@@ -99,6 +99,20 @@
#endif

/*
+ * Default NAND information.
+ */
+#if defined(CONFIG_CMD_NAND)
+#define CONFIG_SYS_NO_FLASH
+#define CONFIG_SYS_NAND_QUIET_TEST
+#define CONFIG_NAND_OMAP_GPMC
+#define CONFIG_SYS_NAND_ADDR NAND_BASE
+#define CONFIG_SYS_NAND_BASE NAND_BASE
+#define GPMC_NAND_ECC_LP_x16_LAYOUT
+/* At most, one NAND device will be supported. */
+#define CONFIG_SYS_MAX_NAND_DEVICE 1
+#endif
+
+/*
* Environmnet
*/
#define CONFIG_ENV_OVERWRITE /* Allow to overwrite serial and ethaddr */
diff --git a/include/configs/omap3_evm_common.h b/include/configs/omap3_evm_common.h
index 8ee5e83..c96a881 100644
--- a/include/configs/omap3_evm_common.h
+++ b/include/configs/omap3_evm_common.h
@@ -108,15 +108,6 @@
/*
* NAND
*/
-/* Physical address to access NAND */
-#define CONFIG_SYS_NAND_ADDR NAND_BASE
-
-/* Physical address to access NAND at CS0 */
-#define CONFIG_SYS_NAND_BASE NAND_BASE
-
-/* Max number of NAND devices */
-#define CONFIG_SYS_MAX_NAND_DEVICE 1
-
/* Timeout values (in ticks) */
#define CONFIG_SYS_FLASH_ERASE_TOUT (100 * CONFIG_SYS_HZ)
#define CONFIG_SYS_FLASH_WRITE_TOUT (100 * CONFIG_SYS_HZ)
@@ -196,9 +187,6 @@
*/
#if defined(CONFIG_CMD_NAND)
#define CONFIG_SYS_FLASH_BASE PISMO1_NAND_BASE
-
-#define CONFIG_NAND_OMAP_GPMC
-#define GPMC_NAND_ECC_LP_x16_LAYOUT
#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET
#elif defined(CONFIG_CMD_ONENAND)
#define CONFIG_SYS_FLASH_BASE PISMO1_ONEN_BASE
diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h
index db5b7b1..e9415a7 100644
--- a/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@ -31,6 +31,7 @@
* Values that differ from platform defaults or are unspecified.
*/
#define CONFIG_SDRC /* The chip has SDRC controller */
+#define CONFIG_CMD_NAND /* NAND support */

/* Platform defaults */
#include <configs/omap3_common.h>
@@ -74,7 +75,6 @@

#define CONFIG_CMD_I2C /* I2C serial bus support */
#define CONFIG_CMD_MMC /* MMC support */
-#define CONFIG_CMD_NAND /* NAND support */
#define CONFIG_CMD_NAND_LOCK_UNLOCK /* nand (un)lock commands */
#define CONFIG_CMD_NET /* bootp, tftpboot, rarpboot */
#define CONFIG_CMD_PING
@@ -86,7 +86,6 @@
#undef CONFIG_CMD_IMI /* iminfo */
#undef CONFIG_CMD_IMLS /* List all found images */

-#define CONFIG_SYS_NO_FLASH

/*
* I2C
@@ -105,19 +104,6 @@
*/
#define CONFIG_TWL4030_POWER

-/*
- * Board NAND Info.
- */
-#define CONFIG_SYS_NAND_QUIET_TEST
-#define CONFIG_NAND_OMAP_GPMC
-#define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */
- /* to access nand */
-#define CONFIG_SYS_NAND_BASE NAND_BASE /* physical address */
- /* to access nand at */
- /* CS0 */
-
-#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of */
- /* NAND devices */
#define CONFIG_JFFS2_NAND
/* nand device jffs2 lives on */
#define CONFIG_JFFS2_DEV "nand0"
@@ -280,8 +266,6 @@
#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */

#if defined(CONFIG_CMD_NAND)
-#define CONFIG_NAND_OMAP_GPMC
-#define GPMC_NAND_ECC_LP_x16_LAYOUT 1
#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET
#endif
diff --git a/include/configs/omap3_mvblx.h b/include/configs/omap3_mvblx.h
index d9e4b53..6199eca 100644
--- a/include/configs/omap3_mvblx.h
+++ b/include/configs/omap3_mvblx.h
@@ -36,6 +36,8 @@
*/
#define CONFIG_SDRC /* The chip has SDRC controller */
#define CONFIG_SERIAL_TAG /* Add SERIAL ATAG */
+/* We have a 2KiB sector size */
+#define CONFIG_ENV_SIZE (2 << 10)

/* Platform defaults */
#include <configs/omap3_common.h>
@@ -53,8 +55,6 @@
#define CONFIG_MVBLX /* working with mvBlueLYNX-X */
#define CONFIG_MACH_TYPE MACH_TYPE_MVBLX

-/* We have a 2KiB sector size */
-#define CONFIG_ENV_SIZE (2 << 10)

/*
* Hardware drivers
diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h
index 1cfc333..71bb1a3 100644
--- a/include/configs/omap3_overo.h
+++ b/include/configs/omap3_overo.h
@@ -23,6 +23,7 @@
* Values that differ from platform defaults or are unspecified.
*/
#define CONFIG_SDRC /* The chip has SDRC controller */
+#define CONFIG_CMD_NAND /* NAND support */

/* Platform defaults */
#include <configs/omap3_common.h>
@@ -55,7 +56,6 @@

#define CONFIG_CMD_I2C /* I2C serial bus support */
#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 */
@@ -64,7 +64,6 @@
#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
@@ -77,20 +76,6 @@
#define CONFIG_TWL4030_POWER
#define CONFIG_TWL4030_LED

-/*
- * Board NAND Info.
- */
-#define CONFIG_SYS_NAND_QUIET_TEST
-#define CONFIG_NAND_OMAP_GPMC
-#define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */
- /* to access nand */
-#define CONFIG_SYS_NAND_BASE NAND_BASE /* physical address */
- /* to access nand */
- /* at CS0 */
-#define GPMC_NAND_ECC_LP_x16_LAYOUT
-
-#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */
- /* devices */
#define CONFIG_JFFS2_NAND
/* nand device jffs2 lives on */
#define CONFIG_JFFS2_DEV "nand0"
diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h
index e364253..7b22c83 100644
--- a/include/configs/omap3_pandora.h
+++ b/include/configs/omap3_pandora.h
@@ -27,6 +27,7 @@
* Values that differ from platform defaults or are unspecified.
*/
#define CONFIG_SDRC /* The chip has SDRC controller */
+#define CONFIG_CMD_NAND /* NAND support */

/* Platform defaults */
#include <configs/omap3_common.h>
@@ -69,7 +70,6 @@

#define CONFIG_CMD_I2C /* I2C serial bus support */
#define CONFIG_CMD_MMC /* MMC support */
-#define CONFIG_CMD_NAND /* NAND support */
#define CONFIG_CMD_CACHE /* Cache control */

#undef CONFIG_CMD_FLASH /* flinfo, erase, protect */
@@ -79,7 +79,6 @@
#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
@@ -93,20 +92,6 @@
#define CONFIG_TWL4030_POWER 1
#define CONFIG_TWL4030_LED 1

-/*
- * Board NAND Info.
- */
-#define CONFIG_NAND_OMAP_GPMC
-#define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */
- /* to access nand */
-#define CONFIG_SYS_NAND_BASE NAND_BASE /* physical address */
- /* to access nand */
- /* at CS0 */
-#define GPMC_NAND_ECC_LP_x16_LAYOUT 1
-
-#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */
- /* devices */
-
#ifdef CONFIG_CMD_NAND
#define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_PARTITIONS
diff --git a/include/configs/omap3_sdp3430.h b/include/configs/omap3_sdp3430.h
index 2434d93..b082f30 100644
--- a/include/configs/omap3_sdp3430.h
+++ b/include/configs/omap3_sdp3430.h
@@ -43,6 +43,8 @@
* Values that differ from platform defaults or are unspecified.
*/
#define CONFIG_SDRC /* The chip has SDRC controller */
+/* We have 256KiB for environment. */
+#define CONFIG_ENV_SIZE (256 << 10)

/* Platform defaults */
#include <configs/omap3_common.h>
@@ -56,9 +58,6 @@
*/
#define CONFIG_OMAP3_3430SDP /* working with SDP Rev2 */

-/* We have 256KiB for environment. */
-#define CONFIG_ENV_SIZE (256 << 10)
-
/*
* Hardware drivers
*/
diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h
index 3121d67..13ef802 100644
--- a/include/configs/omap3_zoom1.h
+++ b/include/configs/omap3_zoom1.h
@@ -33,6 +33,7 @@
* Values that differ from platform defaults or are unspecified.
*/
#define CONFIG_SDRC /* The chip has SDRC controller */
+#define CONFIG_CMD_NAND /* NAND support */

/* Platform defaults */
#include <configs/omap3_common.h>
@@ -79,7 +80,6 @@

#define CONFIG_CMD_I2C /* I2C serial bus support */
#define CONFIG_CMD_MMC /* MMC support */
-#define CONFIG_CMD_NAND /* NAND support */
#define CONFIG_CMD_NAND_LOCK_UNLOCK /* Enable lock/unlock support */

#undef CONFIG_CMD_FLASH /* flinfo, erase, protect */
@@ -103,19 +103,6 @@
#define CONFIG_TWL4030_POWER 1
#define CONFIG_TWL4030_LED 1

-/*
- * Board NAND Info.
- */
-#define CONFIG_NAND_OMAP_GPMC
-#define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */
- /* to access nand */
-#define CONFIG_SYS_NAND_BASE NAND_BASE /* physical address */
- /* to access nand at */
- /* CS0 */
-#define GPMC_NAND_ECC_LP_x16_LAYOUT 1
-
-#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */
- /* devices */
#define CONFIG_JFFS2_NAND
/* nand device jffs2 lives on */
#define CONFIG_JFFS2_DEV "nand0"
diff --git a/include/configs/omap3_zoom2.h b/include/configs/omap3_zoom2.h
index 2a8f88c..806854b 100644
--- a/include/configs/omap3_zoom2.h
+++ b/include/configs/omap3_zoom2.h
@@ -35,6 +35,7 @@
*/
#define CONFIG_SDRC /* The chip has SDRC controller */
#define CONFIG_SERIAL_MULTI
+#define CONFIG_CMD_NAND /* NAND support */

/* Platform defaults */
#include <configs/omap3_common.h>
@@ -111,7 +112,6 @@
#define CONFIG_CMD_FAT /* FAT support */
#define CONFIG_CMD_I2C /* I2C serial bus support */
#define CONFIG_CMD_MMC /* MMC support */
-#define CONFIG_CMD_NAND /* NAND support */
#define CONFIG_CMD_NAND_LOCK_UNLOCK /* Enable lock/unlock support */

#undef CONFIG_CMD_FLASH /* flinfo, erase, protect */
@@ -135,18 +135,6 @@
#define CONFIG_TWL4030_POWER 1
#define CONFIG_TWL4030_LED 1

-/*
- * Board NAND Info.
- */
-#define CONFIG_NAND_OMAP_GPMC
-#define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */
- /* to access nand */
-#define CONFIG_SYS_NAND_BASE NAND_BASE /* physical address */
- /* to access nand at */
- /* CS0 */
-#define GPMC_NAND_ECC_LP_x16_LAYOUT 1
-#define CONFIG_SYS_MAX_NAND_DEVICE 1
-
/* Environment information */
#define CONFIG_BOOTDELAY 10

diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h
index 0a53f7f..392b660 100644
--- a/include/configs/tam3517-common.h
+++ b/include/configs/tam3517-common.h
@@ -26,6 +26,7 @@
* Values that differ from platform defaults or are unspecified.
*/
#define CONFIG_EMIF4 /* The chip has EMIF4 controller */
+#define CONFIG_CMD_NAND /* NAND support */

/* Platform defaults */
#include <configs/omap3_common.h>
@@ -82,14 +83,12 @@
#define CONFIG_CMD_MMC /* MMC support */
#define CONFIG_CMD_NET
#define CONFIG_CMD_NFS
-#define CONFIG_CMD_NAND /* NAND support */
#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
@@ -98,16 +97,6 @@
#define CONFIG_DRIVER_OMAP34XX_I2C

-/*
- * Board NAND Info.
- */
-#define CONFIG_SYS_NAND_BASE NAND_BASE /* physical address */
- /* to access */
- /* nand at CS0 */
-
-#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of */
- /* NAND devices */
-
#define CONFIG_AUTO_COMPLETE

/*
@@ -167,8 +156,6 @@
/* Configure the PISMO */
#define PISMO1_NAND_SIZE GPMC_SIZE_128M

-#define CONFIG_NAND_OMAP_GPMC
-#define GPMC_NAND_ECC_LP_x16_LAYOUT
#define CONFIG_ENV_IS_IN_NAND
#define SMNAND_ENV_OFFSET 0x180000 /* environment starts here */

diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h
index 787a9a6..41e1aae 100644
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -36,6 +36,7 @@
* Values that differ from platform defaults or are unspecified.
*/
#define CONFIG_SDRC /* The chip has SDRC controller */
+#define CONFIG_CMD_NAND /* NAND support */

/* Platform defaults */
#include <configs/omap3_common.h>
@@ -78,7 +79,6 @@
#define CONFIG_TWL4030_LED

/* 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:" \
@@ -88,17 +88,6 @@
"4m(kernel)," \
"-(fs)"

-#define CONFIG_NAND_OMAP_GPMC
-#define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */
- /* to access nand */
-#define CONFIG_SYS_NAND_BASE NAND_BASE /* physical address */
- /* to access nand at */
- /* CS0 */
-#define GPMC_NAND_ECC_LP_x16_LAYOUT 1
-
-#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */
- /* devices */
-
/* commands to include */
#include <config_cmd_default.h>

@@ -107,7 +96,6 @@
#define CONFIG_CMD_I2C /* I2C serial bus support */
#define CONFIG_CMD_MMC /* MMC support */
#define CONFIG_CMD_MTDPARTS /* Enable MTD parts commands */
-#define CONFIG_CMD_NAND /* NAND support */
#define CONFIG_CMD_NAND_LOCK_UNLOCK /* nand (un)lock commands */
#define CONFIG_CMD_UBI /* UBIFS commands */

--
1.7.0.4