Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 34f667bbc4819607735dd56df17c8f1789af40d1

Authored by Dan Murphy
Committed by Tom Rini
1 parent 0b1b60c779
Exists in master and in 53 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

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>

Showing 2 changed files with 9 additions and 1 deletions Side-by-side Diff

board/ti/panda/panda.c
Diff comments   View file @ 34f667b
... ... @@ -82,6 +82,12 @@
82 82 if (omap_revision() == OMAP4430_ES1_0)
83 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 91 gpio_direction_input(PANDA_ULPI_PHY_TYPE_GPIO);
86 92 phy_type = gpio_get_value(PANDA_ULPI_PHY_TYPE_GPIO);
87 93  
include/configs/omap4_common.h
Diff comments   View file @ 34f667b
... ... @@ -176,7 +176,9 @@
176 176 "if test $board_name = sdp4430; then " \
177 177 "setenv fdtfile omap4-sdp.dtb; fi; " \
178 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 182 "loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
181 183  
182 184 #define CONFIG_BOOTCOMMAND \