Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 6a305f22c58b5cef595b2e004fc6b299934dd82a

Authored by Fabio Estevam
Committed by Stefano Babic
1 parent feb6cc5cb3
Exists in v2017.01-smarct4x and in 34 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-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_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-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, 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

mx6cuboxi: Use more standard namings for fdt variables 

README file suggests to use 'fdtfile' for the dtb file name and
'fdt_addr_r' for the dtb address in RAM, so do as suggested.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Reviewed-by: Tom Rini <trini@konsulko.com>

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

include/configs/mx6cuboxi.h
Diff comments   View file @ 6a305f2
... ... @@ -88,8 +88,8 @@
88 88 #define CONFIG_EXTRA_ENV_SETTINGS \
89 89 "script=boot.scr\0" \
90 90 "image=zImage\0" \
91   - "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
92   - "fdt_addr=0x18000000\0" \
  91 + "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
  92 + "fdt_addr_r=0x18000000\0" \
93 93 "boot_fdt=try\0" \
94 94 "ip_dyn=yes\0" \
95 95 "console=" CONFIG_CONSOLE_DEV "\0" \
96 96  
... ... @@ -117,12 +117,12 @@
117 117 "bootscript=echo Running bootscript from mmc ...; " \
118 118 "source\0" \
119 119 "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
120   - "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}file}\0" \" \
  120 + "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr_r} ${fdtfile}file}\0" \" \
121 121 "mmcboot=echo Booting from mmc ...; " \
122 122 "run mmcargs; " \
123 123 "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
124 124 "if run loadfdt; then " \
125   - "bootz ${loadaddr} - ${fdt_addr}; " \
  125 + "bootz ${loadaddr} - ${fdt_addr_r}; " \
126 126 "else " \
127 127 "if test ${boot_fdt} = try; then " \
128 128 "bootz; " \
... ... @@ -145,8 +145,8 @@
145 145 "fi; " \
146 146 "${get_cmd} ${image}; " \
147 147 "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
148   - "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
149   - "bootz ${loadaddr} - ${fdt_addr}; " \
  148 + "if ${get_cmd} ${fdt_addr_r} ${fdtfile}; then " \
  149 + "bootz ${loadaddr} - ${fdt_addr_r}; " \
150 150 "else " \
151 151 "if test ${boot_fdt} = try; then " \
152 152 "bootz; " \