[U-Boot] [PATCH V2 1/3] omap3: fix NAND support for mcx board

mcx was not updated according to changes in NAND driver.
Signed-off-by: Stefano Babic sbabic@denx.de --- include/configs/mcx.h | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/include/configs/mcx.h b/include/configs/mcx.h index 0a7b7cf..8a2005d 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -309,7 +309,10 @@ */
/* **** PISMO SUPPORT *** */ +#define CONFIG_NAND +#define CONFIG_SYS_NAND_BUSWIDTH_16BIT #define CONFIG_NAND_OMAP_GPMC +#define CONFIG_NAND_OMAP_GPMC_PREFETCH #define CONFIG_ENV_IS_IN_NAND #define SMNAND_ENV_OFFSET 0x180000 /* environment starts here */

Signed-off-by: Stefano Babic sbabic@denx.de --- include/configs/mcx.h | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/include/configs/mcx.h b/include/configs/mcx.h index 8a2005d..0b26404 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -111,6 +111,9 @@ #define CONFIG_USB_ULPI_VIEWPORT_OMAP #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 57 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3 +#define CONFIG_USB_HOST_ETHER +#define CONFIG_USB_ETHER_ASIX +#define CONFIG_USB_ETHER_MCS7830
/* commands to include */ #define CONFIG_CMD_EXT2 /* EXT2 Support */

On Sun, Jul 26, 2015 at 03:18:14PM +0200, Stefano Babic wrote:
Signed-off-by: Stefano Babic sbabic@denx.de
Reviewed-by: Tom Rini trini@konsulko.com

On Sun, Jul 26, 2015 at 03:18:14PM +0200, Stefano Babic wrote:
Signed-off-by: Stefano Babic sbabic@denx.de Reviewed-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!

Signed-off-by: Stefano Babic sbabic@denx.de --- include/configs/am3517_crane.h | 2 +- include/configs/devkit8000.h | 2 +- include/configs/dig297.h | 2 +- include/configs/omap3_beagle.h | 2 +- include/configs/omap3_evm_common.h | 2 +- include/configs/omap3_igep00x0.h | 2 +- include/configs/omap3_logic.h | 2 +- include/configs/omap3_overo.h | 2 +- include/configs/omap3_pandora.h | 2 +- include/configs/omap3_zoom1.h | 2 +- include/configs/tam3517-common.h | 2 +- include/configs/tao3530.h | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index 6a0240b..f013d02 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -318,7 +318,7 @@ #define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/omap-common/u-boot-spl.lds"
/* NAND boot config */ -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT 16 +#define CONFIG_SYS_NAND_BUSWIDTH_16BIT #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_PAGE_COUNT 64 #define CONFIG_SYS_NAND_PAGE_SIZE 2048 diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index 215dc30..6d2c22e 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -213,7 +213,7 @@ #define CONFIG_SPL_TEXT_BASE 0x40200000 /*CONFIG_SYS_SRAM_START*/
/* NAND boot config */ -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT 16 +#define CONFIG_SYS_NAND_BUSWIDTH_16BIT #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_PAGE_COUNT 64 #define CONFIG_SYS_NAND_PAGE_SIZE 2048 diff --git a/include/configs/dig297.h b/include/configs/dig297.h index f6d7ec4..2e16ca7 100644 --- a/include/configs/dig297.h +++ b/include/configs/dig297.h @@ -132,7 +132,7 @@ * Board NAND Info. */ #define CONFIG_NAND_OMAP_GPMC -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT 16 +#define CONFIG_SYS_NAND_BUSWIDTH_16BIT #define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */ /* to access nand */ #define CONFIG_SYS_NAND_BASE NAND_BASE /* physical address */ diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index e574742..36f1ad7 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -295,7 +295,7 @@ #define CONFIG_SPL_OMAP3_ID_NAND
/* NAND boot config */ -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT 16 +#define CONFIG_SYS_NAND_BUSWIDTH_16BIT #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_PAGE_COUNT 64 #define CONFIG_SYS_NAND_PAGE_SIZE 2048 diff --git a/include/configs/omap3_evm_common.h b/include/configs/omap3_evm_common.h index 370f21e..8a45b33 100644 --- a/include/configs/omap3_evm_common.h +++ b/include/configs/omap3_evm_common.h @@ -120,7 +120,7 @@
/* Max number of NAND devices */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT 16 +#define CONFIG_SYS_NAND_BUSWIDTH_16BIT /* Timeout values (in ticks) */ #define CONFIG_SYS_FLASH_ERASE_TOUT (100 * CONFIG_SYS_HZ) #define CONFIG_SYS_FLASH_WRITE_TOUT (100 * CONFIG_SYS_HZ) diff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h index 89ec73c..8789928 100644 --- a/include/configs/omap3_igep00x0.h +++ b/include/configs/omap3_igep00x0.h @@ -193,7 +193,7 @@
/* NAND boot config */ #ifdef CONFIG_NAND -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT 16 +#define CONFIG_SYS_NAND_BUSWIDTH_16BIT #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_PAGE_COUNT 64 #define CONFIG_SYS_NAND_PAGE_SIZE 2048 diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index af6ae73..7457324 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -135,7 +135,7 @@
#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of */ /* NAND devices */ -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT 16 +#define CONFIG_SYS_NAND_BUSWIDTH_16BIT #define CONFIG_JFFS2_NAND /* nand device jffs2 lives on */ #define CONFIG_JFFS2_DEV "nand0" diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index 76bf3b6..6286b10 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -227,7 +227,7 @@ #define CONFIG_SYS_CACHELINE_SIZE 64
/* NAND boot config */ -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT 16 +#define CONFIG_SYS_NAND_BUSWIDTH_16BIT #define CONFIG_SYS_NAND_MAX_ECCPOS 56 #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_PAGE_COUNT 64 diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h index 49467c9..26adfba 100644 --- a/include/configs/omap3_pandora.h +++ b/include/configs/omap3_pandora.h @@ -64,7 +64,7 @@ */ #define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */ /* to access nand */ -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT 16 +#define CONFIG_SYS_NAND_BUSWIDTH_16BIT #define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_HAM1_CODE_SW #define CONFIG_SYS_NAND_PAGE_SIZE 2048 #define CONFIG_SYS_NAND_OOBSIZE 64 diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index d90cc42..3dcea61 100644 --- a/include/configs/omap3_zoom1.h +++ b/include/configs/omap3_zoom1.h @@ -97,7 +97,7 @@ #define CONFIG_SYS_NAND_BASE NAND_BASE /* physical address */ /* to access nand at */ /* CS0 */ -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT 16 +#define CONFIG_SYS_NAND_BUSWIDTH_16BIT
/* Environment information */
diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index 34f1228..801220a 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -241,7 +241,7 @@ #define CONFIG_SPL_BSS_MAX_SIZE 0x80000
/* NAND boot config */ -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT 16 +#define CONFIG_SYS_NAND_BUSWIDTH_16BIT #define CONFIG_SYS_NAND_PAGE_COUNT 64 #define CONFIG_SYS_NAND_PAGE_SIZE 2048 #define CONFIG_SYS_NAND_OOBSIZE 64 diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index c8ec79b..3eacfa7 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -136,7 +136,7 @@
#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */ /* devices */ -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT 16 +#define CONFIG_SYS_NAND_BUSWIDTH_16BIT /* Environment information */ #define CONFIG_BOOTDELAY 3

On Sun, Jul 26, 2015 at 03:18:15PM +0200, Stefano Babic wrote:
Signed-off-by: Stefano Babic sbabic@denx.de
Reviewed-by: Tom Rini trini@konsulko.com

On Sun, Jul 26, 2015 at 03:18:15PM +0200, Stefano Babic wrote:
Signed-off-by: Stefano Babic sbabic@denx.de Reviewed-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!

On Sun, Jul 26, 2015 at 03:18:13PM +0200, Stefano Babic wrote:
mcx was not updated according to changes in NAND driver.
Signed-off-by: Stefano Babic sbabic@denx.de
Reviewed-by: Tom Rini trini@konsulko.com

On Sun, Jul 26, 2015 at 03:18:13PM +0200, Stefano Babic wrote:
mcx was not updated according to changes in NAND driver.
Signed-off-by: Stefano Babic sbabic@denx.de Reviewed-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
participants (2)
-
Stefano Babic
-
Tom Rini