am33xx: add CONFIG_SYS_NAND_DEVICE_WIDTH to determine NAND device bus-width
Subsystems (2)
PATCH 1/1 am33xx: add CONFIG_SYS_NAND_DEVICE_WIDTH to determine NAND device bus-width
NAND driver needs to know bus-width of the connected NAND device, in order to perform proper I/O and initialize itself. Currently there is no CONFIG option to provide this information to NAND driver.
- SPL NAND driver does not have framework to parse ONFI parameter page.
- NAND drivers which cannot self initialize !defined(CONFIG_SYS_NAND_SELF_INIT) do not have any information about device bus-width during board_nand_init(), So, any device-width specific configurations are not possible there.
- There should be some mechanism to pass device bus-width information for non-ONFI compliant devices.
This patch
(1) adds CONFIG_SYS_NAND_DEVICE_WIDTH which can take following value 16: NAND device with x16 bus-width
8: NAND device with x8 bus-width
(2) removes GPMC_NAND_ECC_LP_x16_LAYOUT, as NAND layout is determined based on ecc-scheme and oobsize during initialization in board_nand_init(). Thus this config is redundant.
--- doc/README.nand | 9 +++++++++ drivers/mtd/nand/omap_gpmc.c | 18 +++++++++++------- include/configs/am335x_evm.h | 2 +- include/configs/am3517_crane.h | 2 +- include/configs/am3517_evm.h | 2 +- include/configs/cm_t35.h | 2 -- include/configs/devkit8000.h | 3 +-- include/configs/dig297.h | 2 -- include/configs/igep0033.h | 8 ++++---- include/configs/igep00x0.h | 2 +- include/configs/mcx.h | 2 +- include/configs/omap3_beagle.h | 3 +-- include/configs/omap3_evm_common.h | 1 - include/configs/omap3_logic.h | 1 - include/configs/omap3_overo.h | 3 +-- include/configs/omap3_pandora.h | 2 -- include/configs/omap3_zoom1.h | 2 -- include/configs/omap3_zoom2.h | 1 - include/configs/siemens-am33x-common.h | 8 ++++---- include/configs/tam3517-common.h | 2 +- include/configs/tricorder.h | 3 +-- 21 files changed, 38 insertions(+), 40 deletions(-)
doc/README.nand +9 -0
@@ -179,6 +179,15 @@ Configuration Options: This is used by SoC platforms which do not have built-in ELM hardware engine required for BCH ECC correction. + CONFIG_SYS_NAND_DEVICE_WIDTH + Specifies bus-width of the default NAND device connected to SoC. + This config is useful for driver which cannot self initialize or + parse ONFI parameter (like SPL drivers), or for supporting non-ONFI + compliant devices. + This config can take following values: + - 8: NAND devices has bus-width=x8 + - 16: NAND device has bus-width=x16 + Platform specific options =========================
drivers/mtd/nand/omap_gpmc.c +11 -7
@@ -214,11 +214,7 @@ static void omap_enable_hwecc(struct mtd_info *mtd, int32_t mode)unsigned int eccsize1 =0x00 , eccsize0 =0x00 , bch_wrapmode =0x00 ;u32 ecc_size_config_val =0 ;u32 ecc_config_val =0 ; -u32 cs_config1_val; -/* reconfigure GPMC device-width */ - cs_config1_val =readl (&gpmc_cfg->cs[cs].config1); -writel ((cs_config1_val | dev_width <<12 ), &gpmc_cfg->cs[cs].config1);/* configure GPMC for specific ecc-scheme */ switch (bch->ecc_scheme) {case OMAP_ECC_HAM1_CODE_SW :
@@ -772,10 +768,10 @@ int board_nand_init(struct nand_chip *nand) nand->priv = &bch_priv; nand->cmd_ctrl = omap_nand_hwcontrol; nand->options |=NAND_NO_PADDING |NAND_CACHEPRG ; -/* If we are 16 bit dev, our gpmc config tells us that */ -if ((readl (&gpmc_cfg->cs[cs].config1) &0x3000 ) ==0x1000 ) +if (CONFIG_SYS_NAND_DEVICE_WIDTH ==16 ) nand->options |=NAND_BUSWIDTH_16 ; - +else + nand->options &= ~NAND_BUSWIDTH_16 ; nand->chip_delay =100 ; nand->ecc.layout = &omap_ecclayout;
@@ -795,5 +791,13 @@ int board_nand_init(struct nand_chip *nand) nand->dev_ready = omap_spl_dev_ready;#endif +/* reconfigure GPMC.CONFIG1 register with correct device-width */ + gpmc_config =readl (&gpmc_cfg->cs[cs].config1); +if (nand->options &NAND_BUSWIDTH_16 ) + gpmc_config |= (0x1 <<12 ); +else + gpmc_config &= ~(0x1 <<12 ); +writel (gpmc_config, &gpmc_cfg->cs[cs].config1); +return 0 ; }
include/configs/am335x_evm.h +1 -1
@@ -216,6 +216,7 @@#ifdef CONFIG_NAND #define CONFIG_SYS_NAND_5_ADDR_CYCLE +#define CONFIG_SYS_NAND_DEVICE_WIDTH 8#define CONFIG_SYS_NAND_BLOCK_SIZE 131072#define CONFIG_SYS_NAND_PAGE_SIZE 2048#define CONFIG_SYS_NAND_OOBSIZE 64
@@ -366,7 +367,6 @@/* NAND support */ #ifdef CONFIG_NAND #define CONFIG_CMD_NAND -#define GPMC_NAND_ECC_LP_x16_LAYOUT 1#if !defined(CONFIG_SPI_BOOT ) && !defined(CONFIG_NOR_BOOT )#define MTDIDS_DEFAULT "nand0=omap2-nand.0"#define MTDPARTS_DEFAULT "mtdparts=omap2-nand.0:128k(SPL)," \
include/configs/am3517_crane.h +1 -1
@@ -269,7 +269,6 @@#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 */
@@ -332,6 +331,7 @@/* NAND boot config */ #define CONFIG_SYS_NAND_5_ADDR_CYCLE +#define CONFIG_SYS_NAND_DEVICE_WIDTH 8#define CONFIG_SYS_NAND_PAGE_COUNT 64#define CONFIG_SYS_NAND_PAGE_SIZE 2048#define CONFIG_SYS_NAND_OOBSIZE 64
include/configs/am3517_evm.h +1 -1
@@ -263,7 +263,6 @@#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 */
@@ -326,6 +325,7 @@/* NAND boot config */ #define CONFIG_SYS_NAND_5_ADDR_CYCLE +#define CONFIG_SYS_NAND_DEVICE_WIDTH 8#define CONFIG_SYS_NAND_PAGE_COUNT 64#define CONFIG_SYS_NAND_PAGE_SIZE 2048#define CONFIG_SYS_NAND_OOBSIZE 64
include/configs/cm_t35.h +0 -2
@@ -164,8 +164,6 @@#define CONFIG_SYS_NAND_BASE NAND_BASE/* physical address */ /* to access nand at */ /* CS0 */ -#define GPMC_NAND_ECC_LP_x8_LAYOUT -#define CONFIG_SYS_MAX_NAND_DEVICE 1/* Max number of NAND */ /* devices */ /* Environment information */
include/configs/devkit8000.h +1 -2
@@ -116,8 +116,6 @@#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
@@ -318,6 +316,7 @@/* NAND boot config */ #define CONFIG_SYS_NAND_5_ADDR_CYCLE +#define CONFIG_SYS_NAND_DEVICE_WIDTH 8#define CONFIG_SYS_NAND_PAGE_COUNT 64#define CONFIG_SYS_NAND_PAGE_SIZE 2048#define CONFIG_SYS_NAND_OOBSIZE 64
include/configs/dig297.h +0 -2
@@ -143,8 +143,6 @@#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 )
include/configs/igep0033.h +4 -4
@@ -188,7 +188,6 @@/* NAND support */ #define CONFIG_NAND #define CONFIG_NAND_OMAP_GPMC -#define GPMC_NAND_ECC_LP_x16_LAYOUT 1#define CONFIG_SYS_NAND_BASE (0x08000000)/* phys address CS0 */ #define CONFIG_SYS_MAX_NAND_DEVICE 1#define CONFIG_SYS_NAND_ONFI_DETECTION 1
@@ -248,11 +247,12 @@#define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_ECC #define CONFIG_SYS_NAND_5_ADDR_CYCLE -#define CONFIG_SYS_NAND_PAGE_COUNT (CONFIG_SYS_NAND_BLOCK_SIZE / \ - CONFIG_SYS_NAND_PAGE_SIZE) +#define CONFIG_SYS_NAND_DEVICE_WIDTH 8 +#define CONFIG_SYS_NAND_BLOCK_SIZE (128*1024)#define CONFIG_SYS_NAND_PAGE_SIZE 2048#define CONFIG_SYS_NAND_OOBSIZE 64 -#define CONFIG_SYS_NAND_BLOCK_SIZE (128*1024) +#define CONFIG_SYS_NAND_PAGE_COUNT (CONFIG_SYS_NAND_BLOCK_SIZE / \ + CONFIG_SYS_NAND_PAGE_SIZE)#define CONFIG_SYS_NAND_BAD_BLOCK_POS NAND_LARGE_BADBLOCK_POS#define CONFIG_SYS_NAND_ECCPOS { 2, 3, 4, 5, 6, 7, 8, 9, \ 10, 11, 12, 13, 14, 15, 16, 17, \
include/configs/igep00x0.h +1 -1
@@ -268,7 +268,6 @@#define PISMO1_NAND_SIZE GPMC_SIZE_128M/* Configure the PISMO */ #define CONFIG_NAND_OMAP_GPMC #define CONFIG_SYS_NAND_BASE NAND_BASE -#define GPMC_NAND_ECC_LP_x16_LAYOUT 1#define CONFIG_ENV_OFFSET 0x260000/* environment starts here */ #define CONFIG_ENV_IS_IN_NAND 1#define CONFIG_ENV_SIZE (512 << 10)/* Total Size Environment */
@@ -354,6 +353,7 @@/* NAND boot config */ #define CONFIG_SYS_NAND_5_ADDR_CYCLE +#define CONFIG_SYS_NAND_DEVICE_WIDTH 8#define CONFIG_SYS_NAND_PAGE_COUNT 64#define CONFIG_SYS_NAND_PAGE_SIZE 2048#define CONFIG_SYS_NAND_OOBSIZE 64
include/configs/mcx.h +1 -1
@@ -322,7 +322,6 @@#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 */
@@ -385,6 +384,7 @@#define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME "u-boot.img"/* NAND boot config */ +#define CONFIG_SYS_NAND_DEVICE_WIDTH 8#define CONFIG_SYS_NAND_PAGE_COUNT 64#define CONFIG_SYS_NAND_PAGE_SIZE 2048#define CONFIG_SYS_NAND_OOBSIZE 64
include/configs/omap3_beagle.h +1 -2
@@ -184,8 +184,6 @@#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 */
@@ -424,6 +422,7 @@/* NAND boot config */ #define CONFIG_SYS_NAND_5_ADDR_CYCLE +#define CONFIG_SYS_NAND_DEVICE_WIDTH 8#define CONFIG_SYS_NAND_PAGE_COUNT 64#define CONFIG_SYS_NAND_PAGE_SIZE 2048#define CONFIG_SYS_NAND_OOBSIZE 64
include/configs/omap3_evm_common.h +0 -1
@@ -210,7 +210,6 @@#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
include/configs/omap3_logic.h +0 -1
@@ -298,7 +298,6 @@#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
include/configs/omap3_overo.h +1 -2
@@ -120,8 +120,6 @@#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
@@ -317,6 +315,7 @@/* NAND boot config */ #define CONFIG_SYS_NAND_5_ADDR_CYCLE +#define CONFIG_SYS_NAND_DEVICE_WIDTH 8#define CONFIG_SYS_NAND_PAGE_COUNT 64#define CONFIG_SYS_NAND_PAGE_SIZE 2048#define CONFIG_SYS_NAND_OOBSIZE 64
include/configs/omap3_pandora.h +0 -2
@@ -131,8 +131,6 @@#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 */
include/configs/omap3_zoom1.h +0 -2
@@ -138,8 +138,6 @@#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
include/configs/omap3_zoom2.h +0 -1
@@ -158,7 +158,6 @@#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 */
include/configs/siemens-am33x-common.h +4 -4
@@ -182,11 +182,12 @@#define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_ECC #define CONFIG_SYS_NAND_5_ADDR_CYCLE -#define CONFIG_SYS_NAND_PAGE_COUNT (CONFIG_SYS_NAND_BLOCK_SIZE / \ - CONFIG_SYS_NAND_PAGE_SIZE) +#define CONFIG_SYS_NAND_DEVICE_WIDTH 8 +#define CONFIG_SYS_NAND_BLOCK_SIZE (128*1024)#define CONFIG_SYS_NAND_PAGE_SIZE 2048#define CONFIG_SYS_NAND_OOBSIZE 64 -#define CONFIG_SYS_NAND_BLOCK_SIZE (128*1024) +#define CONFIG_SYS_NAND_PAGE_COUNT (CONFIG_SYS_NAND_BLOCK_SIZE / \ + CONFIG_SYS_NAND_PAGE_SIZE)#define CONFIG_SYS_NAND_BAD_BLOCK_POS NAND_LARGE_BADBLOCK_POS#define CONFIG_SYS_NAND_ECCPOS { 2, 3, 4, 5, 6, 7, 8, 9, \ 10, 11, 12, 13, 14, 15, 16, 17, \
@@ -433,7 +434,6 @@ "\0"#define CONFIG_NAND_OMAP_GPMC -#define GPMC_NAND_ECC_LP_x16_LAYOUT 1#define CONFIG_SYS_NAND_BASE (0x08000000)/* physical address */ /* to access nand at */ /* CS0 */
include/configs/tam3517-common.h +1 -1
@@ -188,7 +188,6 @@#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 */
@@ -252,6 +251,7 @@#define CONFIG_SPL_BSS_MAX_SIZE 0x80000/* NAND boot config */ +#define CONFIG_SYS_NAND_DEVICE_WIDTH 8#define CONFIG_SYS_NAND_PAGE_COUNT 64#define CONFIG_SYS_NAND_PAGE_SIZE 2048#define CONFIG_SYS_NAND_OOBSIZE 64
include/configs/tricorder.h +1 -2
@@ -106,8 +106,6 @@#define CONFIG_SYS_NAND_BASE NAND_BASE/* physical address */ /* to access nand@*/ /* CS0 */ -#define GPMC_NAND_ECC_LP_x16_LAYOUT 1 -#define CONFIG_SYS_MAX_NAND_DEVICE 1/* Max number of NAND */ /* devices */ #define CONFIG_BCH
@@ -284,6 +282,7 @@/* NAND boot config */ #define CONFIG_SYS_NAND_5_ADDR_CYCLE +#define CONFIG_SYS_NAND_DEVICE_WIDTH 8#define CONFIG_SYS_NAND_PAGE_COUNT 64#define CONFIG_SYS_NAND_PAGE_SIZE 2048#define CONFIG_SYS_NAND_OOBSIZE 64
Signature · 1 line
1.8.1
PATCH 1/1 am33xx: add CONFIG_SYS_NAND_DEVICE_WIDTH to determine NAND device bus-width
Quoted 19 lines · Pekon Gupta
NAND driver needs to know bus-width of the connected NAND device, in order to perform proper I/O and initialize itself. Currently there is no CONFIG option to provide this information to NAND driver.
- SPL NAND driver does not have framework to parse ONFI parameter page.
- NAND drivers which cannot self initialize !defined(CONFIG_SYS_NAND_SELF_INIT) do not have any information about device bus-width duringboard_nand_init(), So, any device-width specific configurations are not possible there.
- There should be some mechanism to pass device bus-width information for non-ONFI compliant devices.This patch
(1) addsCONFIG_SYS_NAND_DEVICE_WIDTHwhich can take following value 16: NAND device with x16 bus-width
8: NAND device with x8 bus-width
(2) removesGPMC_NAND_ECC_LP_x16_LAYOUT, as NAND layout is determined based on ecc-scheme and oobsize during initialization inboard_nand_init(). Thus this config is redundant.Signed-off-by Pekon Gupta <[email protected]>
<snip>
include/configs/am335x_evm.h line 219
Quoted 9 lines
include/configs/am335x_evm.h +1
-0@@ -216,6 +216,7 @@#ifdef CONFIG_NAND #define CONFIG_SYS_NAND_5_ADDR_CYCLE +#define CONFIG_SYS_NAND_DEVICE_WIDTH 8
This new setting ...
include/configs/am335x_evm.h line 369
Quoted 8 lines
include/configs/am335x_evm.h +0
-1#define CONFIG_SYS_NAND_BLOCK_SIZE 131072#define CONFIG_SYS_NAND_PAGE_SIZE 2048#define CONFIG_SYS_NAND_OOBSIZE 64@@ -366,7 +367,6 @@/* NAND support */ #ifdef CONFIG_NAND #define CONFIG_CMD_NAND -#define GPMC_NAND_ECC_LP_x16_LAYOUT 1
... does *not* match with what you're taking out here !!
include/configs/am3517_crane.h line 272
Quoted 12 lines
include/configs/am335x_evm.h +0
-0#if !defined(CONFIG_SPI_BOOT ) && !defined(CONFIG_NOR_BOOT )#define MTDIDS_DEFAULT "nand0=omap2-nand.0"#define MTDPARTS_DEFAULT "mtdparts=omap2-nand.0:128k(SPL)," \include/configs/am3517_crane.h +0
-1@@ -269,7 +269,6 @@#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE#define CONFIG_NAND_OMAP_GPMC -#define GPMC_NAND_ECC_LP_x16_LAYOUT 1
Same here ...
include/configs/am3517_crane.h line 334
Quoted 8 lines
include/configs/am3517_crane.h +1
-0#define CONFIG_ENV_IS_IN_NAND 1#define SMNAND_ENV_OFFSET 0x260000/* environment starts here */ @@ -332,6 +331,7 @@/* NAND boot config */ #define CONFIG_SYS_NAND_5_ADDR_CYCLE +#define CONFIG_SYS_NAND_DEVICE_WIDTH 8
... !!
include/configs/am3517_evm.h line 266
Quoted 12 lines
include/configs/am3517_crane.h +0
-0#define CONFIG_SYS_NAND_PAGE_COUNT 64#define CONFIG_SYS_NAND_PAGE_SIZE 2048#define CONFIG_SYS_NAND_OOBSIZE 64include/configs/am3517_evm.h +0
-1@@ -263,7 +263,6 @@#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE#define CONFIG_NAND_OMAP_GPMC -#define GPMC_NAND_ECC_LP_x16_LAYOUT 1
Again ...
include/configs/am3517_evm.h line 328
Quoted 8 lines
include/configs/am3517_evm.h +1
-0#define CONFIG_ENV_IS_IN_NAND 1#define SMNAND_ENV_OFFSET 0x260000/* environment starts here */ @@ -326,6 +325,7 @@/* NAND boot config */ #define CONFIG_SYS_NAND_5_ADDR_CYCLE +#define CONFIG_SYS_NAND_DEVICE_WIDTH 8
... !!
include/configs/cm_t35.h line 168
Quoted 13 lines
include/configs/am3517_evm.h +0
-0#define CONFIG_SYS_NAND_PAGE_COUNT 64#define CONFIG_SYS_NAND_PAGE_SIZE 2048#define CONFIG_SYS_NAND_OOBSIZE 64include/configs/cm_t35.h +0
-2@@ -164,8 +164,6 @@#define CONFIG_SYS_NAND_BASE NAND_BASE/* physical address */ /* to access nand at */ /* CS0 */ -#define GPMC_NAND_ECC_LP_x8_LAYOUT -
And here you don't specify the new setting at all.
include/configs/cm_t35.h line 169
Quoted 3 lines
include/configs/cm_t35.h +0
-0#define CONFIG_SYS_MAX_NAND_DEVICE 1/* Max number of NAND */ /* devices */ /* Environment information */
<snip>
There's several other instances of the same issue through the whole patch.
Mark J.
Gupta
PATCH 1/1 am33xx: add CONFIG_SYS_NAND_DEVICE_WIDTH to determine NAND device bus-width
Hi Mark,
Quoted 19 lines
From: Mark Jackson [mailto:mpfj-list at newflow.co.uk]
To: Gupta, Pekon; scottwood at freescale.com; Rini, Tom<snip>
Review
Quoted 1 line
(quoted diff) +0
-0
b/include/configs/am335x_evm.hinclude/configs/am335x_evm.h line 219
Quoted 8 lines
index 978bca7..c92cb2f 100644
include/configs/am335x_evm.h +1
-0@@ -216,6 +216,7 @@#ifdef CONFIG_NAND #define CONFIG_SYS_NAND_5_ADDR_CYCLE +#define CONFIG_SYS_NAND_DEVICE_WIDTH 8This new setting ...
Quoted 11 lines
include/configs/am335x_evm.h line 369
Quoted 8 lines
include/configs/am335x_evm.h +0
-1#define CONFIG_SYS_NAND_BLOCK_SIZE 131072#define CONFIG_SYS_NAND_PAGE_SIZE 2048#define CONFIG_SYS_NAND_OOBSIZE 64@@ -366,7 +367,6 @@/* NAND support */ #ifdef CONFIG_NAND #define CONFIG_CMD_NAND -#define GPMC_NAND_ECC_LP_x16_LAYOUT 1... does *not* match with what you're taking out here !!
This CONFIG was used to define the layout based on
(1) large-page of small-page NAND, and
(2) BADBLOCK_MARKER position based on x16 or x8 device.
Now this define is no more used, as ecc.layout is configured based on ecc-scheme. Please refer following patch.
http://lists.denx.de/pipermail/u-boot/2013-September/163867.html
Yes, I can put these into independent patch sets. However, if you can please test these patches on your system, This would at-least confirm whether these changes work, then I can re-send this series, with other comments.
*Patch Series to test*
http://lists.denx.de/pipermail/u-boot/2013-September/163865.html
http://lists.denx.de/pipermail/u-boot/2013-September/163878.html
with regards, pekon
Quoted 87 lines
include/configs/am335x_evm.h
Quoted 3 lines
include/configs/am335x_evm.h +0
-0#if !defined(CONFIG_SPI_BOOT ) && !defined(CONFIG_NOR_BOOT )#define MTDIDS_DEFAULT "nand0=omap2-nand.0"#define MTDPARTS_DEFAULT "mtdparts=omap2-nand.0:128k(SPL)," \
Review
Quoted 1 line
(quoted diff) +0
-0
b/include/configs/am3517_crane.hinclude/configs/am3517_crane.h line 269
Quoted 5 lines
index 1fd2508..0985221 100644
include/configs/am3517_crane.h +0
-0@@ -269,7 +269,6 @@#define CONFIG_SYS_MONITOR_BASE
CONFIG_SYS_FLASH_BASEinclude/configs/am3517_crane.h line 271
Quoted 3 lines
include/configs/am3517_crane.h +0
-1#define CONFIG_NAND_OMAP_GPMC -#define GPMC_NAND_ECC_LP_x16_LAYOUT 1Same here ...
include/configs/am3517_crane.h line 272
Quoted 2 lines
include/configs/am3517_crane.h +0
-0#define CONFIG_ENV_IS_IN_NAND 1#define SMNAND_ENV_OFFSET 0x260000/* environment starts here */
include/configs/am3517_crane.h line 334
Quoted 6 lines
include/configs/am3517_crane.h +1
-0@@ -332,6 +331,7 @@/* NAND boot config */ #define CONFIG_SYS_NAND_5_ADDR_CYCLE +#define CONFIG_SYS_NAND_DEVICE_WIDTH 8... !!
Review
Quoted 4 lines
include/configs/am3517_crane.h +0
-0#define CONFIG_SYS_NAND_PAGE_COUNT 64#define CONFIG_SYS_NAND_PAGE_SIZE 2048#define CONFIG_SYS_NAND_OOBSIZE 64(quoted diff) +0
-0
b/include/configs/am3517_evm.hinclude/configs/am3517_evm.h line 263
Quoted 5 lines
index 6500878..8593d44 100644
include/configs/am3517_evm.h +0
-0@@ -263,7 +263,6 @@#define CONFIG_SYS_MONITOR_BASE
CONFIG_SYS_FLASH_BASEinclude/configs/am3517_evm.h line 265
Quoted 3 lines
include/configs/am3517_evm.h +0
-1#define CONFIG_NAND_OMAP_GPMC -#define GPMC_NAND_ECC_LP_x16_LAYOUT 1Again ...
include/configs/am3517_evm.h line 266
Quoted 2 lines
include/configs/am3517_evm.h +0
-0#define CONFIG_ENV_IS_IN_NAND 1#define SMNAND_ENV_OFFSET 0x260000/* environment starts here */
include/configs/am3517_evm.h line 328
Quoted 6 lines
include/configs/am3517_evm.h +1
-0@@ -326,6 +325,7 @@/* NAND boot config */ #define CONFIG_SYS_NAND_5_ADDR_CYCLE +#define CONFIG_SYS_NAND_DEVICE_WIDTH 8... !!
include/configs/cm_t35.h line 164
Quoted 9 lines
include/configs/am3517_evm.h +0
-0#define CONFIG_SYS_NAND_PAGE_COUNT 64#define CONFIG_SYS_NAND_PAGE_SIZE 2048#define CONFIG_SYS_NAND_OOBSIZE 64include/configs/cm_t35.h +0
-0@@ -164,8 +164,6 @@#define CONFIG_SYS_NAND_BASE NAND_BASE/* physical address */
include/configs/cm_t35.h line 165
Quoted 1 line
include/configs/cm_t35.h +0
-0/* to access nand at */
include/configs/cm_t35.h line 168
Quoted 3 lines
include/configs/cm_t35.h +0
-2/* CS0 */ -#define GPMC_NAND_ECC_LP_x8_LAYOUT -And here you don't specify the new setting at all.
include/configs/cm_t35.h line 167
Quoted 1 line
include/configs/cm_t35.h +0
-0#define CONFIG_SYS_MAX_NAND_DEVICE 1/* Max number of NAND */
include/configs/cm_t35.h line 169
Quoted 2 lines
include/configs/cm_t35.h +0
-0/* devices */ /* Environment information */ <snip>
There's several other instances of the same issue through the whole patch.
Mark J.