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

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

[Dan Murphy]

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@ti.com>
---
v4 - Remove check for undefined fdtfile and save for another patch - http://patchwork.ozlabs.org/patch/249084/
v3 - Updated based on comments - http://patchwork.ozlabs.org/patch/248687/
v2 - Updated with side bar maintainer comments.
 include/configs/dra7xx_evm.h   |    2 ++
 include/configs/omap5_common.h |    6 ++++--
 include/configs/omap5_uevm.h   |    1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h
index 28a306b..2db0fbd 100644
--- a/include/configs/dra7xx_evm.h
+++ b/include/configs/dra7xx_evm.h
@@ -35,4 +35,6 @@
 #define CONFIG_DRA7XX		/* in a TI DRA7XX core */
 #define CONFIG_SYS_PROMPT		"DRA752 EVM # "
 
+#define CONSOLEDEV		"ttyO0"
+
 #endif /* __CONFIG_DRA7XX_EVM_H */
diff --git a/include/configs/omap5_common.h b/include/configs/omap5_common.h
index deb5e9f..f160648 100644
--- a/include/configs/omap5_common.h
+++ b/include/configs/omap5_common.h
@@ -144,7 +144,7 @@
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"loadaddr=0x82000000\0" \
-	"console=ttyO2,115200n8\0" \
+	"console=" CONSOLEDEV ",115200n8\0" \
 	"fdt_high=0xffffffff\0" \
 	"fdtaddr=0x80f80000\0" \
 	"bootpart=0:2\0" \
@@ -174,7 +174,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; " \
 	"loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile};\0" \
 
 #define CONFIG_BOOTCOMMAND \
diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h
index 9e0339b..f2cbb02 100644
--- a/include/configs/omap5_uevm.h
+++ b/include/configs/omap5_uevm.h
@@ -55,6 +55,7 @@
 #define CONFIG_CMD_PART
 
 #define CONFIG_SYS_PROMPT		"OMAP5430 EVM # "
+#define CONSOLEDEV		"ttyO2"
 
 #define CONFIG_OMAP_PLATFORM_RESET_TIME_MAX_USEC	16296
 #endif /* __CONFIG_OMAP5_EVM_H */
-- 
1.7.5.4

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

[Lubomir Popov]

Hi Dan,

> 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@ti.com>
> ---
> v4 - Remove check for undefined fdtfile and save for another patch - http://patchwork.ozlabs.org/patch/249084/
> v3 - Updated based on comments - http://patchwork.ozlabs.org/patch/248687/
> v2 - Updated with side bar maintainer comments.
>  include/configs/dra7xx_evm.h   |    2 ++
>  include/configs/omap5_common.h |    6 ++++--
>  include/configs/omap5_uevm.h   |    1 +
>  3 files changed, 7 insertions(+), 2 deletions(-)
>
[snip]
>  #define CONFIG_SYS_PROMPT		"OMAP5430 EVM # "
Minor notice/question: why not take the opportunity and change
the uEVM prompt to 'OMAP5432 EVM #'? It's not a 5430 actually...
For the dra7xx board, for example, you are giving the particular
DRA752 type.

Best regards
Lubomir

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

[Dan Murphy]

On 06/06/2013 03:31 PM, Lubomir Popov wrote:
> Hi Dan,
>
>> 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@ti.com>
>> ---
>> v4 - Remove check for undefined fdtfile and save for another patch - http://patchwork.ozlabs.org/patch/249084/
>> v3 - Updated based on comments - http://patchwork.ozlabs.org/patch/248687/
>> v2 - Updated with side bar maintainer comments.
>>  include/configs/dra7xx_evm.h   |    2 ++
>>  include/configs/omap5_common.h |    6 ++++--
>>  include/configs/omap5_uevm.h   |    1 +
>>  3 files changed, 7 insertions(+), 2 deletions(-)
>>
> [snip]
>>  #define CONFIG_SYS_PROMPT		"OMAP5430 EVM # "
> Minor notice/question: why not take the opportunity and change
> the uEVM prompt to 'OMAP5432 EVM #'? It's not a 5430 actually...
> For the dra7xx board, for example, you are giving the particular
> DRA752 type.
>
> Best regards
> Lubomir
>

This is a patch for dra7xx.  I can submit a new patch for the console change.

Dan

-- 
------------------
Dan Murphy

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

[Tom Rini]

On Thu, Jun 06, 2013 at 01:30:05PM -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@ti.com>
[snip]
> -			"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; " \

Missing trailing \0 here to terminate the variable.

-- 
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/20130611/0e708a70/attachment.pgp>

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

[Dan Murphy]

On 06/11/2013 10:50 AM, Tom Rini wrote:
> On Thu, Jun 06, 2013 at 01:30:05PM -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@ti.com>
> [snip]
>> -			"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; " \
> Missing trailing \0 here to terminate the variable.
>
Fixed in next patch

-- 
------------------
Dan Murphy