Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 72638b02f4c380879b0f90b67bcb8d1081dd2eab

Authored by Stephen Warren
Committed by Tom Warren
1 parent 99dd16c60c
Exists in v2017.01-smarct4x and in 40 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-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_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, 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

ARM: tegra: fix extlinux.conf search location 

extlinux.conf is stored in /boot/extlinux/extlinux.conf rather than
/boot/extlinux.conf. Adjust Tegra's default boot scripts to use the
correct location. This change aligns Tegra's boot scripts with rpi_b.h
and also the location that the Fedora installer actually puts the file.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>

Showing 1 changed file with 3 additions and 4 deletions Side-by-side Diff

include/configs/tegra-common-post.h
Diff comments   View file @ 72638b0
... ... @@ -101,13 +101,12 @@
101 101 \
102 102 "do_sysboot_boot=" \
103 103 "sysboot ${devtype} ${devnum}:${rootpart} any " \
104   - "${scriptaddr} ${prefix}extlinux.conf\0" \
  104 + "${scriptaddr} ${prefix}extlinux/extlinux.conf\0" \
105 105 \
106 106 "sysboot_boot=" \
107 107 "if test -e ${devtype} ${devnum}:${rootpart} " \
108   - "${prefix}extlinux.conf; then " \
109   - "echo Found extlinux config " \
110   - "${prefix}extlinux.conf; " \
  108 + "${prefix}extlinux/extlinux.conf; then " \
  109 + "echo Found ${prefix}extlinux/extlinux.conf; " \
111 110 "run do_sysboot_boot; " \
112 111 "echo SCRIPT FAILED: continuing...; " \
113 112 "fi\0" \