[U-Boot] [PATCH v2] arm: dra7xx: Update the EXTRA_ENV_SETTINGS

[Tom Rini]

On Tue, Jun 04, 2013 at 10:26:06AM -0500, Dan Murphy wrote:
> Update the EXTRA_ENV_SETTING for the dra7xx.
> The console needs to be set to ttyO0 and the
> findfdt needs to be updated to load the
> dra7xx-evm.dtb file.
> 
> Signed-off-by: Dan Murphy <dmurphy at ti.com>
> ---
> v2 - Updated with side bar maintainer comments.
>  include/configs/omap5_common.h |   12 ++++++++++--
>  1 files changed, 10 insertions(+), 2 deletions(-)
> 
> diff --git a/include/configs/omap5_common.h b/include/configs/omap5_common.h
> index deb5e9f..c5061dd 100644
> --- a/include/configs/omap5_common.h
> +++ b/include/configs/omap5_common.h
> @@ -142,9 +142,15 @@
>  #define PARTS_DEFAULT
>  #endif
>  
> +#ifdef CONFIG_DRA7XX
> +#define CONFIG_CONSOLE_DEV		"ttyO0"
> +#else
> +#define CONFIG_CONSOLE_DEV		"ttyO2"
> +#endif
> +
>  #define CONFIG_EXTRA_ENV_SETTINGS \
>  	"loadaddr=0x82000000\0" \
> -	"console=ttyO2,115200n8\0" \
> +	"console=" CONFIG_CONSOLE_DEV ",115200n8\0" \

Sorry, when we chatted on IRC I was being a bit more literal than you
did.  I want dra7xx_evm.h to have '#define CONSOLEDEV "ttyO0"' and
omap5_uevm.h to have '#define CONSOLEDEV "ttyO2"' and omap5_common.h to
have:
"console=" CONSOLEDEV ",115200n8\0" \

> @@ -174,7 +180,9 @@
>  		"bootz ${loadaddr} - ${fdtaddr}\0" \
>  	"findfdt="\
>  		"if test $board_name = omap5_uevm; then " \
> -			"setenv fdtfile omap5-uevm.dtb; fi;\0 " \
> +			"setenv fdtfile omap5-uevm.dtb; fi; " \
> +		"if test $board_name = dra7xx; then " \
> +			"setenv fdtfile dra7-evm.dtb; fi;\0 " \

This part is fine, thanks.  If you've got time, add something like:
if test -z $fdtfile; then
  echo "WARNING: Could not determine device tree to use"
fi

After testing I got the syntax right, thanks!

-- 
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/20130604/be3171b7/attachment.pgp>