[U-Boot] [PATCH v1 1/7] TI: armv7: move board specific NAND configs out from ti_armv7_common.h and ti_am335x_common.h

[Tom Rini]

On Sat, Jul 05, 2014 at 12:35:11AM +0530, Pekon Gupta wrote:

> This patch moves some board specific NAND configs:
> - FROM: generic config files like 'ti_armv7_common.h' and 'ti_am335x_common.h'
> - TO:   individual board config files using these configs.
> So that each board can independently set the value as per its design.

I don't know.  I intentionally merged these as they were all the same
based on the reference layout.  Maybe it should be in the
ti_soc_common.h file rather than ti_armv7_common.h

> @@ -254,6 +256,11 @@
>  #define CONFIG_NAND_OMAP_ECCSCHEME	OMAP_ECC_BCH8_CODE_HW
>  #define CONFIG_SYS_NAND_U_BOOT_START	CONFIG_SYS_TEXT_BASE
>  #define CONFIG_SYS_NAND_U_BOOT_OFFS	0x80000
> +#ifdef CONFIG_SPL_OS_BOOT
> +  #define CONFIG_CMD_SPL_NAND_OFS	0x00080000 /* os parameters */
> +  #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS	0x00200000 /* kernel offset */
> +  #define CONFIG_CMD_SPL_WRITE_SIZE	0x2000
> +#endif

No leading spaces please.

> diff --git a/include/configs/ti_am335x_common.h b/include/configs/ti_am335x_common.h
> index 80976e7..12fceb7 100644
> --- a/include/configs/ti_am335x_common.h
> +++ b/include/configs/ti_am335x_common.h
> @@ -84,10 +84,6 @@
>  #define CONFIG_BOARD_EARLY_INIT_F
>  #endif
>  
> -#ifdef CONFIG_NAND
> -#define CONFIG_SPL_NAND_AM33XX_BCH	/* ELM support */
> -#endif

This highlights a problem, this _is_ a SoC feature not a board feature.

> diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
> index 6e0bf09..c901522 100644
> --- a/include/configs/ti_armv7_common.h
> +++ b/include/configs/ti_armv7_common.h
> @@ -110,7 +110,6 @@
>   * access CS0 at is 0x8000000.
>   */
>  #ifdef CONFIG_NAND
> -#define CONFIG_NAND_OMAP_GPMC
>  #ifndef CONFIG_SYS_NAND_BASE
>  #define CONFIG_SYS_NAND_BASE		0x8000000
>  #endif

And given keystone this should move to ti_{am335x,omap*}_common.h again
as a SoC feature.

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140714/e0b6beda/attachment.pgp>