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

> This patch adds support for NAND device connected to GPMC chip-select on
> following AM43xx EVM boards.
[snip]
> diff --git a/board/ti/am43xx/mux.c b/board/ti/am43xx/mux.c
> index 50967e1..172adcd 100644
> --- a/board/ti/am43xx/mux.c
> +++ b/board/ti/am43xx/mux.c
[snip]
> @@ -97,12 +128,23 @@ void enable_board_pin_mux(void)
>       if (board_is_gpevm()) {
>               configure_module_pin_mux(gpio5_7_pin_mux);
>               configure_module_pin_mux(rgmii1_pin_mux);
> +#if defined(CONFIG_NAND)
> +             configure_module_pin_mux(nand_pin_mux);
> +#endif
>       } else if (board_is_sk()) {
>               configure_module_pin_mux(rgmii1_pin_mux);
> +#if defined(CONFIG_NAND)
> +             pr_err("NAND flash is not present on this board\n");
> +#else
>               configure_module_pin_mux(qspi_pin_mux);
> +#endif

No, this breaks EVM-SK booting now in the normal case.

> diff --git a/boards.cfg b/boards.cfg
> index 8e2db82..52aeb7f 100644
> --- a/boards.cfg
> +++ b/boards.cfg
> @@ -274,7 +274,7 @@ Active  arm         armv7          am33xx      ti         
>      am335x
>  Active  arm         armv7          am33xx      ti              am335x        
>       am335x_evm_uart4                      
> am335x_evm:SERIAL5,CONS_INDEX=5,NAND                                          
>                                                     Tom Rini <tr...@ti.com>
>  Active  arm         armv7          am33xx      ti              am335x        
>       am335x_evm_uart5                      
> am335x_evm:SERIAL6,CONS_INDEX=6,NAND                                          
>                                                     Tom Rini <tr...@ti.com>
>  Active  arm         armv7          am33xx      ti              am335x        
>       am335x_evm_usbspl                     
> am335x_evm:SERIAL1,CONS_INDEX=1,NAND,SPL_USBETH_SUPPORT                       
>                                                     Tom Rini <tr...@ti.com>
> -Active  arm         armv7          am33xx      ti              am43xx        
>       am43xx_evm                            am43xx_evm:SERIAL1,CONS_INDEX=1   
>                                                                               
>                   Lokesh Vutla <lokeshvu...@ti.com>
> +Active  arm         armv7          am33xx      ti              am43xx        
>       am43xx_evm                            
> am43xx_evm:SERIAL1,CONS_INDEX=1,NAND                                          
>                                                     Lokesh Vutla 
> <lokeshvu...@ti.com>
>  Active  arm         armv7          am33xx      ti              am43xx        
>       am43xx_evm_qspiboot                   
> am43xx_evm:SERIAL1,CONS_INDEX=1,QSPI,QSPI_BOOT                                
>                                                     Lokesh Vutla 
> <lokeshvu...@ti.com>
>  Active  arm         armv7          am33xx      ti              ti814x        
>       ti814x_evm                            -                                 
>                                                                               
>                   Matt Porter <matt.por...@linaro.org>
>  Active  arm         armv7          am33xx      ti              ti816x        
>       ti816x_evm                            -                                 
>                                                                               
>                   -
I don't like this.  We're making the normal build only work on boards
with NAND, and defaulting to NAND being there, which is not the most
common case.

> diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h
> index 974ce98..22c9019 100644
> --- a/include/configs/am43xx_evm.h
> +++ b/include/configs/am43xx_evm.h
[snip]
> +#undef CONFIG_ENV_IS_NOWHERE
> +#define CONFIG_ENV_IS_IN_NAND

NAK.  I'd like to see us default to environment being a file in the FAT
filesystem on SD card and specific boot builds going elsewhere
(_qspiboot in QSPI, adding in a _nand build that assumes / requires
NAND, puts env there).

> +/* NAND: SPL related configs */
> +#if defined(CONFIG_SPL_NAND_SUPPORT)
> +  /* NAND: SPL falcon mode configs */
> +  #ifdef CONFIG_SPL_OS_BOOT
> +    #undef CONFIG_SPL_OS_BOOT
> +    #define CONFIG_CMD_SPL_NAND_OFS          0x00100000 /* os parameters */
> +    #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS  0x00300000 /* kernel offset */
> +    #define CONFIG_CMD_SPL_WRITE_SIZE                
> CONFIG_SYS_NAND_BLOCK_SIZE
> +  #endif
> +#endif
> +#endif /* !CONFIG_NAND */

No extra spacing, thanks.

-- 
Tom

Attachment: signature.asc
Description: Digital signature

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Reply via email to