* [U-Boot] [PATCH v2] arm: dra7xx: Update the EXTRA_ENV_SETTINGS
@ 2013-06-04 15:26 Dan Murphy
2013-06-04 21:35 ` Tom Rini
0 siblings, 1 reply; 4+ messages in thread
From: Dan Murphy @ 2013-06-04 15:26 UTC (permalink / raw)
To: u-boot
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>
---
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" \
"fdt_high=0xffffffff\0" \
"fdtaddr=0x80f80000\0" \
"bootpart=0:2\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 " \
"loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile};\0" \
#define CONFIG_BOOTCOMMAND \
--
1.7.5.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH v2] arm: dra7xx: Update the EXTRA_ENV_SETTINGS
2013-06-04 15:26 [U-Boot] [PATCH v2] arm: dra7xx: Update the EXTRA_ENV_SETTINGS Dan Murphy
@ 2013-06-04 21:35 ` Tom Rini
2013-06-05 12:27 ` Dan Murphy
0 siblings, 1 reply; 4+ messages in thread
From: Tom Rini @ 2013-06-04 21:35 UTC (permalink / raw)
To: u-boot
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@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>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH v2] arm: dra7xx: Update the EXTRA_ENV_SETTINGS
2013-06-04 21:35 ` Tom Rini
@ 2013-06-05 12:27 ` Dan Murphy
2013-06-05 12:39 ` Tom Rini
0 siblings, 1 reply; 4+ messages in thread
From: Dan Murphy @ 2013-06-05 12:27 UTC (permalink / raw)
To: u-boot
On 06/04/2013 04:35 PM, Tom Rini wrote:
> 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@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" \
OK I got it. Change a comin.
>> @@ -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!
>
What does the -z do? Could not find any info on that.
--
------------------
Dan Murphy
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH v2] arm: dra7xx: Update the EXTRA_ENV_SETTINGS
2013-06-05 12:27 ` Dan Murphy
@ 2013-06-05 12:39 ` Tom Rini
0 siblings, 0 replies; 4+ messages in thread
From: Tom Rini @ 2013-06-05 12:39 UTC (permalink / raw)
To: u-boot
On Wed, Jun 05, 2013 at 07:27:05AM -0500, Dan Murphy wrote:
> On 06/04/2013 04:35 PM, Tom Rini wrote:
> > 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@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" \
> OK I got it. Change a comin.
> >> @@ -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!
> >
>
> What does the -z do? Could not find any info on that.
If it works, it's like regular shell scripts, and we test that the
contents are empty (so, I forgot quotes, after double checking fedora's
arm-boot-config, if test -z "$fdtfile" ...)
--
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/20130605/3883c974/attachment.pgp>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-06-05 12:39 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-04 15:26 [U-Boot] [PATCH v2] arm: dra7xx: Update the EXTRA_ENV_SETTINGS Dan Murphy
2013-06-04 21:35 ` Tom Rini
2013-06-05 12:27 ` Dan Murphy
2013-06-05 12:39 ` Tom Rini
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.