Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 09308e8e4953886951a3b5921d6944584e997dc0

Authored by Otavio Salvador
Committed by Stefano Babic
1 parent 4d64050b06
Exists in master and in 50 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, 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

mx28evk: Add 'nandboot' environment command 

This reads the kernel, ftd and boot into ubifs filesystem. While on
that, the SD firmware filename definition has been moved next to the
other SD related commands.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Reviewed-by: Fabio Estevam <fabio.estevam@freescale.com>

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

include/configs/mx28evk.h
Diff comments   View file @ 09308e8
... ... @@ -162,7 +162,6 @@
162 162 #define CONFIG_EXTRA_ENV_SETTINGS \
163 163 "update_nand_full_filename=u-boot.nand\0" \
164 164 "update_nand_firmware_filename=u-boot.sb\0" \
165   - "update_sd_firmware_filename=u-boot.sd\0" \
166 165 "update_nand_firmware_maxsz=0x100000\0" \
167 166 "update_nand_stride=0x40\0" /* MX28 datasheet ch. 12.12 */ \
168 167 "update_nand_count=0x4\0" /* MX28 datasheet ch. 12.12 */ \
... ... @@ -190,6 +189,23 @@
190 189 "nand write ${loadaddr} ${fcb_sz} ${filesize} ; " \
191 190 "nand write ${loadaddr} ${fw_off} ${filesize} ; " \
192 191 "fi\0" \
  192 + "nandargs=setenv bootargs console=${console_mainline},${baudrate} " \
  193 + "rootfstype=ubifs ubi.mtd=6 root=ubi0_0 ${mtdparts}\0" \
  194 + "nandboot=" /* Boot from NAND */ \
  195 + "mtdparts default; " \
  196 + "run nandargs; " \
  197 + "nand read ${loadaddr} kernel 0x00400000; " \
  198 + "if test ${boot_fdt} = yes; then " \
  199 + "nand read ${fdt_addr} fdt 0x00080000; " \
  200 + "bootm ${loadaddr} - ${fdt_addr}; " \
  201 + "else " \
  202 + "if test ${boot_fdt} = no; then " \
  203 + "bootm; " \
  204 + "else " \
  205 + "echo \"ERROR: Set boot_fdt to yes or no.\"; " \
  206 + "fi; " \
  207 + "fi\0" \
  208 + "update_sd_firmware_filename=u-boot.sd\0" \
193 209 "update_sd_firmware=" /* Update the SD firmware partition */ \
194 210 "if mmc rescan ; then " \
195 211 "if tftp ${update_sd_firmware_filename} ; then " \