* [U-Boot] [UBOOT PATCH 1/2] ARM:Panda:Fix device tree loading for the panda-es
@ 2013-04-18 16:29 Dan Murphy
2013-04-18 16:29 ` [U-Boot] [UBOOT PATCH 2/2] ARM: Panda: Add flag to allow runtime enviroment varibale mods Dan Murphy
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Dan Murphy @ 2013-04-18 16:29 UTC (permalink / raw)
To: u-boot
Fix the device tree loading for panda(4430) and panda-es(4460)
Modify the board name if a 4460 panda or panda-es is detected
at run time.
In the findfdt add a check for the panda-es board name and load
the panda-es device tree blob.
Signed-off-by: Dan Murphy <dmurphy@ti.com>
---
board/ti/panda/panda.c | 6 ++++++
include/configs/omap4_common.h | 4 +++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/board/ti/panda/panda.c b/board/ti/panda/panda.c
index cab0598..2bbe392 100644
--- a/board/ti/panda/panda.c
+++ b/board/ti/panda/panda.c
@@ -82,6 +82,12 @@ int misc_init_r(void)
if (omap_revision() == OMAP4430_ES1_0)
return 0;
+#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
+ if (omap_revision() >= OMAP4460_ES1_0 ||
+ omap_revision() <= OMAP4460_ES1_1)
+ setenv("board_name", strcat(CONFIG_SYS_BOARD, "-es"));
+#endif
+
gpio_direction_input(PANDA_ULPI_PHY_TYPE_GPIO);
phy_type = gpio_get_value(PANDA_ULPI_PHY_TYPE_GPIO);
diff --git a/include/configs/omap4_common.h b/include/configs/omap4_common.h
index 1fd3097..68faeca 100644
--- a/include/configs/omap4_common.h
+++ b/include/configs/omap4_common.h
@@ -176,7 +176,9 @@
"if test $board_name = sdp4430; then " \
"setenv fdtfile omap4-sdp.dtb; fi; " \
"if test $board_name = panda; then " \
- "setenv fdtfile omap4-panda-es.dtb; fi\0" \
+ "setenv fdtfile omap4-panda.dtb; fi;" \
+ "if test $board_name = panda-es; then " \
+ "setenv fdtfile omap4-panda-es.dtb; fi; \0" \
"loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
#define CONFIG_BOOTCOMMAND \
--
1.7.9.5
^ permalink raw reply related [flat|nested] 7+ messages in thread* [U-Boot] [UBOOT PATCH 2/2] ARM: Panda: Add flag to allow runtime enviroment varibale mods
2013-04-18 16:29 [U-Boot] [UBOOT PATCH 1/2] ARM:Panda:Fix device tree loading for the panda-es Dan Murphy
@ 2013-04-18 16:29 ` Dan Murphy
2013-04-19 15:22 ` Dan Murphy
2013-04-19 15:21 ` [U-Boot] [UBOOT PATCH 1/2] ARM:Panda:Fix device tree loading for the panda-es Dan Murphy
2013-04-29 20:22 ` [U-Boot] [U-Boot, " Tom Rini
2 siblings, 1 reply; 7+ messages in thread
From: Dan Murphy @ 2013-04-18 16:29 UTC (permalink / raw)
To: u-boot
Add the flag to allow runtime enviroment variable modifications.
This is being added so that the board-name can be modified at runtime
to indicate either a panda(4430) or a panda-es(4460)
Signed-off-by: Dan Murphy <dmurphy@ti.com>
---
include/configs/omap4_panda.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/include/configs/omap4_panda.h b/include/configs/omap4_panda.h
index eacb5f5..abf586b 100644
--- a/include/configs/omap4_panda.h
+++ b/include/configs/omap4_panda.h
@@ -66,4 +66,6 @@
#define CONFIG_SYS_PROMPT "Panda # "
+#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
+
#endif /* __CONFIG_PANDA_H */
--
1.7.9.5
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [U-Boot] [UBOOT PATCH 2/2] ARM: Panda: Add flag to allow runtime enviroment varibale mods
2013-04-18 16:29 ` [U-Boot] [UBOOT PATCH 2/2] ARM: Panda: Add flag to allow runtime enviroment varibale mods Dan Murphy
@ 2013-04-19 15:22 ` Dan Murphy
2013-04-26 11:57 ` Dan Murphy
0 siblings, 1 reply; 7+ messages in thread
From: Dan Murphy @ 2013-04-19 15:22 UTC (permalink / raw)
To: u-boot
+ Sricharan
On 04/18/2013 11:29 AM, Dan Murphy wrote:
> Add the flag to allow runtime enviroment variable modifications.
> This is being added so that the board-name can be modified at runtime
> to indicate either a panda(4430) or a panda-es(4460)
>
> Signed-off-by: Dan Murphy <dmurphy@ti.com>
> ---
> include/configs/omap4_panda.h | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/include/configs/omap4_panda.h b/include/configs/omap4_panda.h
> index eacb5f5..abf586b 100644
> --- a/include/configs/omap4_panda.h
> +++ b/include/configs/omap4_panda.h
> @@ -66,4 +66,6 @@
>
> #define CONFIG_SYS_PROMPT "Panda # "
>
> +#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
> +
> #endif /* __CONFIG_PANDA_H */
^ permalink raw reply [flat|nested] 7+ messages in thread
* [U-Boot] [UBOOT PATCH 2/2] ARM: Panda: Add flag to allow runtime enviroment varibale mods
2013-04-19 15:22 ` Dan Murphy
@ 2013-04-26 11:57 ` Dan Murphy
0 siblings, 0 replies; 7+ messages in thread
From: Dan Murphy @ 2013-04-26 11:57 UTC (permalink / raw)
To: u-boot
Bump
On 04/19/2013 10:22 AM, Dan Murphy wrote:
> + Sricharan
> On 04/18/2013 11:29 AM, Dan Murphy wrote:
>> Add the flag to allow runtime enviroment variable modifications.
>> This is being added so that the board-name can be modified at runtime
>> to indicate either a panda(4430) or a panda-es(4460)
>>
>> Signed-off-by: Dan Murphy <dmurphy@ti.com>
>> ---
>> include/configs/omap4_panda.h | 2 ++
>> 1 file changed, 2 insertions(+)
>>
>> diff --git a/include/configs/omap4_panda.h b/include/configs/omap4_panda.h
>> index eacb5f5..abf586b 100644
>> --- a/include/configs/omap4_panda.h
>> +++ b/include/configs/omap4_panda.h
>> @@ -66,4 +66,6 @@
>>
>> #define CONFIG_SYS_PROMPT "Panda # "
>>
>> +#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
>> +
>> #endif /* __CONFIG_PANDA_H */
^ permalink raw reply [flat|nested] 7+ messages in thread
* [U-Boot] [UBOOT PATCH 1/2] ARM:Panda:Fix device tree loading for the panda-es
2013-04-18 16:29 [U-Boot] [UBOOT PATCH 1/2] ARM:Panda:Fix device tree loading for the panda-es Dan Murphy
2013-04-18 16:29 ` [U-Boot] [UBOOT PATCH 2/2] ARM: Panda: Add flag to allow runtime enviroment varibale mods Dan Murphy
@ 2013-04-19 15:21 ` Dan Murphy
2013-04-26 11:57 ` Dan Murphy
2013-04-29 20:22 ` [U-Boot] [U-Boot, " Tom Rini
2 siblings, 1 reply; 7+ messages in thread
From: Dan Murphy @ 2013-04-19 15:21 UTC (permalink / raw)
To: u-boot
+ Sricharan
On 04/18/2013 11:29 AM, Dan Murphy wrote:
> Fix the device tree loading for panda(4430) and panda-es(4460)
>
> Modify the board name if a 4460 panda or panda-es is detected
> at run time.
> In the findfdt add a check for the panda-es board name and load
> the panda-es device tree blob.
>
> Signed-off-by: Dan Murphy <dmurphy@ti.com>
> ---
> board/ti/panda/panda.c | 6 ++++++
> include/configs/omap4_common.h | 4 +++-
> 2 files changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/board/ti/panda/panda.c b/board/ti/panda/panda.c
> index cab0598..2bbe392 100644
> --- a/board/ti/panda/panda.c
> +++ b/board/ti/panda/panda.c
> @@ -82,6 +82,12 @@ int misc_init_r(void)
> if (omap_revision() == OMAP4430_ES1_0)
> return 0;
>
> +#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
> + if (omap_revision() >= OMAP4460_ES1_0 ||
> + omap_revision() <= OMAP4460_ES1_1)
> + setenv("board_name", strcat(CONFIG_SYS_BOARD, "-es"));
> +#endif
> +
> gpio_direction_input(PANDA_ULPI_PHY_TYPE_GPIO);
> phy_type = gpio_get_value(PANDA_ULPI_PHY_TYPE_GPIO);
>
> diff --git a/include/configs/omap4_common.h b/include/configs/omap4_common.h
> index 1fd3097..68faeca 100644
> --- a/include/configs/omap4_common.h
> +++ b/include/configs/omap4_common.h
> @@ -176,7 +176,9 @@
> "if test $board_name = sdp4430; then " \
> "setenv fdtfile omap4-sdp.dtb; fi; " \
> "if test $board_name = panda; then " \
> - "setenv fdtfile omap4-panda-es.dtb; fi\0" \
> + "setenv fdtfile omap4-panda.dtb; fi;" \
> + "if test $board_name = panda-es; then " \
> + "setenv fdtfile omap4-panda-es.dtb; fi; \0" \
> "loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
>
> #define CONFIG_BOOTCOMMAND \
^ permalink raw reply [flat|nested] 7+ messages in thread* [U-Boot] [UBOOT PATCH 1/2] ARM:Panda:Fix device tree loading for the panda-es
2013-04-19 15:21 ` [U-Boot] [UBOOT PATCH 1/2] ARM:Panda:Fix device tree loading for the panda-es Dan Murphy
@ 2013-04-26 11:57 ` Dan Murphy
0 siblings, 0 replies; 7+ messages in thread
From: Dan Murphy @ 2013-04-26 11:57 UTC (permalink / raw)
To: u-boot
Bump
On 04/19/2013 10:21 AM, Dan Murphy wrote:
> + Sricharan
> On 04/18/2013 11:29 AM, Dan Murphy wrote:
>> Fix the device tree loading for panda(4430) and panda-es(4460)
>>
>> Modify the board name if a 4460 panda or panda-es is detected
>> at run time.
>> In the findfdt add a check for the panda-es board name and load
>> the panda-es device tree blob.
>>
>> Signed-off-by: Dan Murphy <dmurphy@ti.com>
>> ---
>> board/ti/panda/panda.c | 6 ++++++
>> include/configs/omap4_common.h | 4 +++-
>> 2 files changed, 9 insertions(+), 1 deletion(-)
>>
>> diff --git a/board/ti/panda/panda.c b/board/ti/panda/panda.c
>> index cab0598..2bbe392 100644
>> --- a/board/ti/panda/panda.c
>> +++ b/board/ti/panda/panda.c
>> @@ -82,6 +82,12 @@ int misc_init_r(void)
>> if (omap_revision() == OMAP4430_ES1_0)
>> return 0;
>>
>> +#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
>> + if (omap_revision() >= OMAP4460_ES1_0 ||
>> + omap_revision() <= OMAP4460_ES1_1)
>> + setenv("board_name", strcat(CONFIG_SYS_BOARD, "-es"));
>> +#endif
>> +
>> gpio_direction_input(PANDA_ULPI_PHY_TYPE_GPIO);
>> phy_type = gpio_get_value(PANDA_ULPI_PHY_TYPE_GPIO);
>>
>> diff --git a/include/configs/omap4_common.h b/include/configs/omap4_common.h
>> index 1fd3097..68faeca 100644
>> --- a/include/configs/omap4_common.h
>> +++ b/include/configs/omap4_common.h
>> @@ -176,7 +176,9 @@
>> "if test $board_name = sdp4430; then " \
>> "setenv fdtfile omap4-sdp.dtb; fi; " \
>> "if test $board_name = panda; then " \
>> - "setenv fdtfile omap4-panda-es.dtb; fi\0" \
>> + "setenv fdtfile omap4-panda.dtb; fi;" \
>> + "if test $board_name = panda-es; then " \
>> + "setenv fdtfile omap4-panda-es.dtb; fi; \0" \
>> "loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
>>
>> #define CONFIG_BOOTCOMMAND \
^ permalink raw reply [flat|nested] 7+ messages in thread
* [U-Boot] [U-Boot, 1/2] ARM:Panda:Fix device tree loading for the panda-es
2013-04-18 16:29 [U-Boot] [UBOOT PATCH 1/2] ARM:Panda:Fix device tree loading for the panda-es Dan Murphy
2013-04-18 16:29 ` [U-Boot] [UBOOT PATCH 2/2] ARM: Panda: Add flag to allow runtime enviroment varibale mods Dan Murphy
2013-04-19 15:21 ` [U-Boot] [UBOOT PATCH 1/2] ARM:Panda:Fix device tree loading for the panda-es Dan Murphy
@ 2013-04-29 20:22 ` Tom Rini
2 siblings, 0 replies; 7+ messages in thread
From: Tom Rini @ 2013-04-29 20:22 UTC (permalink / raw)
To: u-boot
On Thu, Apr 18, 2013 at 06:29:53AM -0000, Dan Murphy wrote:
> Fix the device tree loading for panda(4430) and panda-es(4460)
>
> Modify the board name if a 4460 panda or panda-es is detected
> at run time.
> In the findfdt add a check for the panda-es board name and load
> the panda-es device tree blob.
>
> Signed-off-by: Dan Murphy <dmurphy@ti.com>
Along with 2/2, applied to u-boot-ti/master, 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/20130429/fc9c82f9/attachment.pgp>
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2013-04-29 20:22 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-18 16:29 [U-Boot] [UBOOT PATCH 1/2] ARM:Panda:Fix device tree loading for the panda-es Dan Murphy
2013-04-18 16:29 ` [U-Boot] [UBOOT PATCH 2/2] ARM: Panda: Add flag to allow runtime enviroment varibale mods Dan Murphy
2013-04-19 15:22 ` Dan Murphy
2013-04-26 11:57 ` Dan Murphy
2013-04-19 15:21 ` [U-Boot] [UBOOT PATCH 1/2] ARM:Panda:Fix device tree loading for the panda-es Dan Murphy
2013-04-26 11:57 ` Dan Murphy
2013-04-29 20:22 ` [U-Boot] [U-Boot, " Tom Rini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox