Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 24431adc366c67c7755c0c6a956978f3b66ad550

Authored by Stefano Babic
Committed by Tom Rini
1 parent d597b26d51
Exists in smarc_8mq_lf_v2020.04 and in 11 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_8m-imx_v2019.04_4.19.35_1.1.0, 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

Restore compatibility of image type IDs 

Commit a2b96ece5be146f4995d737f047e5bbb76079b8f breaks the enumeration
of the Image Types. New image types can be appended, but they cannot be
inserted in the list else backward compatibility is broken.

This restores the images types as before 2018.11 and move i.MX8 related
images at the end.

Signed-off-by: Robert Berger <robert.berger@ReliableEmbeddedSystems.com>
Signed-off-by: Stefano Babic <sbabic@denx.de>
CC: Tom Rini <trini@konsulko.com>

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

... ... @@ -126,7 +126,8 @@
126 126 * Operating System Codes
127 127 *
128 128 * The following are exposed to uImage header.
129   - * Do not change values for backward compatibility.
  129 + * New IDs *MUST* be appended at the end of the list and *NEVER*
  130 + * inserted for backward compatibility.
130 131 */
131 132 enum {
132 133 IH_OS_INVALID = 0, /* Invalid OS */
... ... @@ -164,7 +165,8 @@
164 165 * CPU Architecture Codes (supported by Linux)
165 166 *
166 167 * The following are exposed to uImage header.
167   - * Do not change values for backward compatibility.
  168 + * New IDs *MUST* be appended at the end of the list and *NEVER*
  169 + * inserted for backward compatibility.
168 170 */
169 171 enum {
170 172 IH_ARCH_INVALID = 0, /* Invalid CPU */
... ... @@ -237,7 +239,8 @@
237 239 * as command interpreter (=> Shell Scripts).
238 240 *
239 241 * The following are exposed to uImage header.
240   - * Do not change values for backward compatibility.
  242 + * New IDs *MUST* be appended at the end of the list and *NEVER*
  243 + * inserted for backward compatibility.
241 244 */
242 245  
243 246 enum {
... ... @@ -252,7 +255,6 @@
252 255 IH_TYPE_FLATDT, /* Binary Flat Device Tree Blob */
253 256 IH_TYPE_KWBIMAGE, /* Kirkwood Boot Image */
254 257 IH_TYPE_IMXIMAGE, /* Freescale IMXBoot Image */
255   - IH_TYPE_IMX8IMAGE, /* Freescale IMX8Boot Image */
256 258 IH_TYPE_UBLIMAGE, /* Davinci UBL Image */
257 259 IH_TYPE_OMAPIMAGE, /* TI OMAP Config Header Image */
258 260 IH_TYPE_AISIMAGE, /* TI Davinci AIS Image */
... ... @@ -280,6 +282,8 @@
280 282 IH_TYPE_STM32IMAGE, /* STMicroelectronics STM32 Image */
281 283 IH_TYPE_SOCFPGAIMAGE_V1, /* Altera SOCFPGA A10 Preloader */
282 284 IH_TYPE_MTKIMAGE, /* MediaTek BootROM loadable Image */
  285 + IH_TYPE_IMX8MIMAGE, /* Freescale IMX8MBoot Image */
  286 + IH_TYPE_IMX8IMAGE, /* Freescale IMX8Boot Image */
283 287  
284 288 IH_TYPE_COUNT, /* Number of image types */
285 289 };
... ... @@ -288,7 +292,8 @@
288 292 * Compression Types
289 293 *
290 294 * The following are exposed to uImage header.
291   - * Do not change values for backward compatibility.
  295 + * New IDs *MUST* be appended at the end of the list and *NEVER*
  296 + * inserted for backward compatibility.
292 297 */
293 298 enum {
294 299 IH_COMP_NONE = 0, /* No Compression Used */