Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit a9bcf937c9809d3a5e664f851543269812d8864f

Authored by Adam Ford
Committed by Stefano Babic
1 parent 6d277fb0ed
Exists in smarc_8mq_lf_v2020.04 and in 9 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, 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_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

ARM: imx6logic: Stop overwriting fdt_file if manually set 

The board file uses the processor type to determine what dtb file
is set.  Unfortunately, if the user wants to manually set this,
it get gets overwritten upon boot.  This patch adds a check to
see if the value is already set and only changes it if the value
is empty.

Signed-off-by: Adam Ford <aford173@gmail.com>

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

board/logicpd/imx6/imx6logic.c
Diff comments   View file @ a9bcf93
... ... @@ -152,7 +152,8 @@
152 152  
153 153 if (is_mx6dq()) {
154 154 env_set("board_rev", "MX6DQ");
155   - env_set("fdt_file", "imx6q-logicpd.dtb");
  155 + if (!env_get("fdt_file"))
  156 + env_set("fdt_file", "imx6q-logicpd.dtb");
156 157 }
157 158  
158 159 return 0;