Skip to contentSkip to conversation

ARM:Panda:Fix device tree loading for the panda-es

PATCH New Dan Murphy 2 participants 7 messages Apr 18, 2013 – Apr 29, 2013

lore
Share & tools
lore

Dan Murphy

author
#0 lore raw

PATCH 1/2 ARM:Panda:Fix device tree loading for the panda-es

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.

---
 board/ti/panda/panda.c         |    6 ++++++
 include/configs/omap4_common.h |    4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)
board/ti/panda/panda.c +6 -0
index cab0598..2bbe392 100644
@@ -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);
 
include/configs/omap4_common.h +3 -1
index 1fd3097..68faeca 100644
@@ -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 \
Signature · 1 line
1.7.9.5
author
#1 lore raw

PATCH 1/2 ARM:Panda:Fix device tree loading for the panda-es

+ Sricharan

Quoted 45 lines · Dan Murphy

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.

---
 board/ti/panda/panda.c         |    6 ++++++
 include/configs/omap4_common.h |    4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)
board/ti/panda/panda.c +6 -0
index cab0598..2bbe392 100644
@@ -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);
 
include/configs/omap4_common.h +3 -1
index 1fd3097..68faeca 100644
@@ -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 \
author
#2 lore raw

PATCH 1/2 ARM:Panda:Fix device tree loading for the panda-es

Bump

Quoted 47 lines · Dan Murphy

+ Sricharan

Quoted 45 lines · Dan Murphy

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.

---
 board/ti/panda/panda.c         |    6 ++++++
 include/configs/omap4_common.h |    4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)
board/ti/panda/panda.c +6 -0
index cab0598..2bbe392 100644
@@ -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);
 
include/configs/omap4_common.h +3 -1
index 1fd3097..68faeca 100644
@@ -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 \
author
#3 lore raw

PATCH 2/2 ARM: Panda: Add flag to allow runtime enviroment varibale mods

In reply to Dan Murphy

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)

---
 include/configs/omap4_panda.h |    2 ++
 1 file changed, 2 insertions(+)
include/configs/omap4_panda.h +2 -0
index eacb5f5..abf586b 100644
@@ -66,4 +66,6 @@
 
 #define CONFIG_SYS_PROMPT		"Panda # "
 
+#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
+
 #endif /* __CONFIG_PANDA_H */
Signature · 1 line
1.7.9.5
author
#4 lore raw

PATCH 2/2 ARM: Panda: Add flag to allow runtime enviroment varibale mods

+ Sricharan

Quoted 20 lines · Dan Murphy

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)

---
 include/configs/omap4_panda.h |    2 ++
 1 file changed, 2 insertions(+)
include/configs/omap4_panda.h +2 -0
index eacb5f5..abf586b 100644
@@ -66,4 +66,6 @@
 
 #define CONFIG_SYS_PROMPT		"Panda # "
 
+#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
+
 #endif /* __CONFIG_PANDA_H */
author
#5 lore raw

PATCH 2/2 ARM: Panda: Add flag to allow runtime enviroment varibale mods

Bump

Quoted 22 lines · Dan Murphy

+ Sricharan

Quoted 20 lines · Dan Murphy

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)

---
 include/configs/omap4_panda.h |    2 ++
 1 file changed, 2 insertions(+)
include/configs/omap4_panda.h +2 -0
index eacb5f5..abf586b 100644
@@ -66,4 +66,6 @@
 
 #define CONFIG_SYS_PROMPT		"Panda # "
 
+#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
+
 #endif /* __CONFIG_PANDA_H */
#6 lore raw

PATCH 1/2 ARM:Panda:Fix device tree loading for the panda-es

In reply to Dan Murphy
Quoted 8 lines · Dan Murphy

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.

Along with 2/2, applied to u-boot-ti/master, thanks!

Signature · 8 lines
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>