Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit d17087cd010c25f88a9a9d4bb12d5f03c26b7cd5

Authored by Otavio Salvador
Committed by Stefano Babic
1 parent abbab70363
Exists in master and in 55 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, emb_lf_v2023.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, u-boot-2013.01.y, 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

mx6qsabrelite: Use tabs to environment setting 

This rework the environment to use tabs for environment setting as
done in other boards.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

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

include/configs/mx6qsabrelite.h
Diff comments   View file @ d17087c
... ... @@ -152,43 +152,43 @@
152 152 #define CONFIG_SYS_TEXT_BASE 0x17800000
153 153  
154 154 #define CONFIG_EXTRA_ENV_SETTINGS \
155   - "script=boot.scr\0" \
156   - "uimage=uImage\0" \
  155 + "script=boot.scr\0" \
  156 + "uimage=uImage\0" \
157 157 "console=ttymxc1\0" \
158   - "fdt_high=0xffffffff\0" \
  158 + "fdt_high=0xffffffff\0" \
159 159 "initrd_high=0xffffffff\0" \
160   - "mmcdev=0\0" \
161   - "mmcpart=2\0" \
162   - "mmcroot=/dev/mmcblk0p3 rootwait rw\0" \
163   - "mmcargs=setenv bootargs console=${console},${baudrate} " \
164   - "root=${mmcroot}\0" \
165   - "loadbootscript=" \
166   - "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
167   - "bootscript=echo Running bootscript from mmc ...; " \
168   - "source\0" \
169   - "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
170   - "mmcboot=echo Booting from mmc ...; " \
171   - "run mmcargs; " \
172   - "bootm\0" \
173   - "netargs=setenv bootargs console=${console},${baudrate} " \
174   - "root=/dev/nfs " \
175   - "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
176   - "netboot=echo Booting from net ...; " \
177   - "run netargs; " \
178   - "dhcp ${uimage}; bootm\0" \
  160 + "mmcdev=0\0" \
  161 + "mmcpart=2\0" \
  162 + "mmcroot=/dev/mmcblk0p3 rootwait rw\0" \
  163 + "mmcargs=setenv bootargs console=${console},${baudrate} " \
  164 + "root=${mmcroot}\0" \
  165 + "loadbootscript=" \
  166 + "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
  167 + "bootscript=echo Running bootscript from mmc ...; " \
  168 + "source\0" \
  169 + "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
  170 + "mmcboot=echo Booting from mmc ...; " \
  171 + "run mmcargs; " \
  172 + "bootm\0" \
  173 + "netargs=setenv bootargs console=${console},${baudrate} " \
  174 + "root=/dev/nfs " \
  175 + "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
  176 + "netboot=echo Booting from net ...; " \
  177 + "run netargs; " \
  178 + "dhcp ${uimage}; bootm\0"
179 179  
180 180 #define CONFIG_BOOTCOMMAND \
181   - "mmc dev ${mmcdev};" \
182   - "mmc dev ${mmcdev}; if mmc rescan; then " \
183   - "if run loadbootscript; then " \
184   - "run bootscript; " \
185   - "else " \
186   - "if run loaduimage; then " \
187   - "run mmcboot; " \
188   - "else run netboot; " \
189   - "fi; " \
190   - "fi; " \
191   - "else run netboot; fi"
  181 + "mmc dev ${mmcdev};" \
  182 + "mmc dev ${mmcdev}; if mmc rescan; then " \
  183 + "if run loadbootscript; then " \
  184 + "run bootscript; " \
  185 + "else " \
  186 + "if run loaduimage; then " \
  187 + "run mmcboot; " \
  188 + "else run netboot; " \
  189 + "fi; " \
  190 + "fi; " \
  191 + "else run netboot; fi"
192 192  
193 193 #define CONFIG_ARP_TIMEOUT 200UL
194 194