diff mbox series

[U-Boot] Restore compatibility of image type IDs

Message ID 20181214140408.9163-1-sbabic@denx.de
State Changes Requested
Delegated to: Tom Rini
Headers show
Series [U-Boot] Restore compatibility of image type IDs | expand

Commit Message

Stefano Babic Dec. 14, 2018, 2:04 p.m. UTC 
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>
---
 include/image.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Philipp Tomsich Dec. 14, 2018, 2:18 p.m. UTC | #1 
Stefano,

> On 14.12.2018, at 15:04, Stefano Babic <sbabic@denx.de> wrote:
> 
> 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.

Adding a clearer indication than the "Do not change values for backward
compatibility” (it might not be apparent to the casual reader that this refers
to integer value assigned to enum entries) in the comment above the enum
that this to be understood as “append-only” might avoid future issues.

Thanks,
Philipp.
Stefano Babic Dec. 14, 2018, 2:23 p.m. UTC | #2 
On 14/12/18 15:18, Philipp Tomsich wrote:
> Stefano,
> 
>> On 14.12.2018, at 15:04, Stefano Babic <sbabic@denx.de> wrote:
>>
>> 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.
> 
> Adding a clearer indication than the "Do not change values for backward
> compatibility” (it might not be apparent to the casual reader that this refers
> to integer value assigned to enum entries) in the comment above the enum
> that this to be understood as “append-only” might avoid future issues.

I'll do it in V2.

Regards,
Stefano
diff mbox series

Patch

diff --git a/include/image.h b/include/image.h
index 7ce9670c20..7360b0c7f9 100644
--- a/include/image.h
+++ b/include/image.h
@@ -252,7 +252,6 @@  enum {
 	IH_TYPE_FLATDT,			/* Binary Flat Device Tree Blob	*/
 	IH_TYPE_KWBIMAGE,		/* Kirkwood Boot Image		*/
 	IH_TYPE_IMXIMAGE,		/* Freescale IMXBoot Image	*/
-	IH_TYPE_IMX8IMAGE,		/* Freescale IMX8Boot Image	*/
 	IH_TYPE_UBLIMAGE,		/* Davinci UBL Image		*/
 	IH_TYPE_OMAPIMAGE,		/* TI OMAP Config Header Image	*/
 	IH_TYPE_AISIMAGE,		/* TI Davinci AIS Image		*/
@@ -280,6 +279,7 @@  enum {
 	IH_TYPE_STM32IMAGE,		/* STMicroelectronics STM32 Image */
 	IH_TYPE_SOCFPGAIMAGE_V1,	/* Altera SOCFPGA A10 Preloader	*/
 	IH_TYPE_IMX8MIMAGE,		/* Freescale IMX8MBoot Image	*/
+	IH_TYPE_IMX8IMAGE,		/* Freescale IMX8Boot Image	*/
 	IH_TYPE_MTKIMAGE,		/* MediaTek BootROM loadable Image */
 
 	IH_TYPE_COUNT,			/* Number of image types */