Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 84b2ee3abd247988228e3b32b2ac6a9d857ef0d0

Authored by Bhuvanchandra DV
Committed by Stefano Babic
1 parent 52084bfc80
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

colibri_imx6: switch to zimage 

Switch to the generic compressed Kernel image type (zImage) instead of
the U-Boot specific uImage format.

While at it also fix device tree naming for MMC DFU.

Signed-off-by: Bhuvanchandra DV <bhuvanchandra.dv@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>

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

include/configs/colibri_imx6.h
Diff comments   View file @ 84b2ee3
... ... @@ -108,17 +108,17 @@
108 108 #include <config_distro_bootcmd.h>
109 109 #undef BOOTENV_RUN_NET_USB_START
110 110 #define BOOTENV_RUN_NET_USB_START ""
111   -#else
  111 +#else /* CONFIG_SPL_BUILD */
112 112 #define BOOTENV
113   -#endif
  113 +#endif /* CONFIG_SPL_BUILD */
114 114  
115 115 #define DFU_ALT_EMMC_INFO \
116 116 "u-boot.imx raw 0x2 0x3ff mmcpart 0;" \
117 117 "boot part 0 1;" \
118 118 "rootfs part 0 2;" \
119   - "uImage fat 0 1;" \
120   - "imx6q-colibri-eval-v3.dtb fat 0 1;" \
121   - "imx6q-colibri-cam-eval-v3.dtb fat 0 1"
  119 + "zImage fat 0 1;" \
  120 + "imx6dl-colibri-eval-v3.dtb fat 0 1;" \
  121 + "imx6dl-colibri-cam-eval-v3.dtb fat 0 1"
122 122  
123 123 #define EMMC_BOOTCMD \
124 124 "emmcargs=ip=off root=/dev/mmcblk0p2 rw,noatime rootfstype=ext4 " \
... ... @@ -128,7 +128,7 @@
128 128 "${vidargs}; echo Booting from internal eMMC chip...; " \
129 129 "run emmcdtbload; load mmc 0:1 ${kernel_addr_r} " \
130 130 "${boot_file} && run fdt_fixup && " \
131   - "bootm ${kernel_addr_r} ${dtbparam} ${kernel_addr_r} ${dtbparam}\0" \" \
  131 + "bootz ${kernel_addr_r} ${dtbparam} ${kernel_addr_r} ${dtbparam}\0" \" \
132 132 "emmcdtbload=setenv dtbparam; load mmc 0:1 ${fdt_addr_r} " \
133 133 "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
134 134  
135 135  
... ... @@ -148,11 +148,11 @@
148 148 "setenv bootargs ${defargs} ${nfsargs} ${setupargs} " \
149 149 "${vidargs}; echo Booting via DHCP/TFTP/NFS...; " \
150 150 "run nfsdtbload; dhcp ${kernel_addr_r} " \
151   - "&& run fdt_fixup && bootm ${kernel_addr_r} ${dtbparam} ${kernel_addr_r} ${dtbparam}\0" \" \
  151 + "&& run fdt_fixup && bootz ${kernel_addr_r} ${dtbparam} ${kernel_addr_r} ${dtbparam}\0" \" \
152 152 "nfsdtbload=setenv dtbparam; tftp ${fdt_addr_r} ${fdt_file} " \
153 153 "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
154 154  
155   -#define SD_BOOTCMD \
  155 +#define SD_BOOTCMD \
156 156 "sdargs=ip=off root=/dev/mmcblk1p2 rw,noatime rootfstype=ext4 " \
157 157 "rootwait\0" \
158 158 "sdboot=run setup; " \
... ... @@ -160,7 +160,7 @@
160 160 "${vidargs}; echo Booting from SD card; " \
161 161 "run sddtbload; load mmc 1:1 ${kernel_addr_r} " \
162 162 "${boot_file} && run fdt_fixup && " \
163   - "bootm ${kernel_addr_r} ${dtbparam} ${kernel_addr_r} ${dtbparam}\0" \" \
  163 + "bootz ${kernel_addr_r} ${dtbparam} ${kernel_addr_r} ${dtbparam}\0" \" \
164 164 "sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \
165 165 "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
166 166  
... ... @@ -171,7 +171,7 @@
171 171 "${usbargs} ${vidargs}; echo Booting from USB stick...; " \
172 172 "usb start && run usbdtbload; load usb 0:1 ${kernel_addr_r} " \
173 173 "${boot_file} && run fdt_fixup && " \
174   - "bootm ${kernel_addr_r} ${dtbparam} ${kernel_addr_r} ${dtbparam}\0" \" \
  174 + "bootz ${kernel_addr_r} ${dtbparam} ${kernel_addr_r} ${dtbparam}\0" \" \
175 175 "usbdtbload=setenv dtbparam; load usb 0:1 ${fdt_addr_r} " \
176 176 "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
177 177  
... ... @@ -182,7 +182,7 @@
182 182 "run distro_bootcmd ; " \
183 183 "usb start ; " \
184 184 "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \
185   - "boot_file=uImageImage\0" \" \
  185 + "boot_file=zImageImage\0" \" \
186 186 "console=ttymxc0\0" \
187 187 "defargs=enable_wait_mode=off galcore.contiguousSize=50331648\0" \
188 188 "dfu_alt_info=" DFU_ALT_EMMC_INFO "\0" \