diff options
author | Dan Murphy | 2013-04-18 01:29:53 -0500 |
---|---|---|
committer | Tom Rini | 2013-05-10 07:25:55 -0500 |
commit | 34f667bbc4819607735dd56df17c8f1789af40d1 (patch) | |
tree | f8aa82b45688eadfbff598eaff5d03297b2222c0 | |
parent | 0b1b60c77954df19b5a601e2ba87614f2d0bbb8b (diff) | |
download | u-boot-34f667bbc4819607735dd56df17c8f1789af40d1.tar.gz u-boot-34f667bbc4819607735dd56df17c8f1789af40d1.tar.xz u-boot-34f667bbc4819607735dd56df17c8f1789af40d1.zip |
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.
Signed-off-by: Dan Murphy <dmurphy@ti.com>
-rw-r--r-- | board/ti/panda/panda.c | 6 | ||||
-rw-r--r-- | include/configs/omap4_common.h | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/board/ti/panda/panda.c b/board/ti/panda/panda.c index cab059863d..2bbe392d81 100644 --- a/board/ti/panda/panda.c +++ b/board/ti/panda/panda.c | |||
@@ -82,6 +82,12 @@ int misc_init_r(void) | |||
82 | if (omap_revision() == OMAP4430_ES1_0) | 82 | if (omap_revision() == OMAP4430_ES1_0) |
83 | return 0; | 83 | return 0; |
84 | 84 | ||
85 | #ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG | ||
86 | if (omap_revision() >= OMAP4460_ES1_0 || | ||
87 | omap_revision() <= OMAP4460_ES1_1) | ||
88 | setenv("board_name", strcat(CONFIG_SYS_BOARD, "-es")); | ||
89 | #endif | ||
90 | |||
85 | gpio_direction_input(PANDA_ULPI_PHY_TYPE_GPIO); | 91 | gpio_direction_input(PANDA_ULPI_PHY_TYPE_GPIO); |
86 | phy_type = gpio_get_value(PANDA_ULPI_PHY_TYPE_GPIO); | 92 | phy_type = gpio_get_value(PANDA_ULPI_PHY_TYPE_GPIO); |
87 | 93 | ||
diff --git a/include/configs/omap4_common.h b/include/configs/omap4_common.h index 1fd3097d75..68faecacec 100644 --- a/include/configs/omap4_common.h +++ b/include/configs/omap4_common.h | |||
@@ -176,7 +176,9 @@ | |||
176 | "if test $board_name = sdp4430; then " \ | 176 | "if test $board_name = sdp4430; then " \ |
177 | "setenv fdtfile omap4-sdp.dtb; fi; " \ | 177 | "setenv fdtfile omap4-sdp.dtb; fi; " \ |
178 | "if test $board_name = panda; then " \ | 178 | "if test $board_name = panda; then " \ |
179 | "setenv fdtfile omap4-panda-es.dtb; fi\0" \ | 179 | "setenv fdtfile omap4-panda.dtb; fi;" \ |
180 | "if test $board_name = panda-es; then " \ | ||
181 | "setenv fdtfile omap4-panda-es.dtb; fi; \0" \ | ||
180 | "loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \ | 182 | "loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \ |
181 | 183 | ||
182 | #define CONFIG_BOOTCOMMAND \ | 184 | #define CONFIG_BOOTCOMMAND \ |