From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tom Rini Date: Thu, 21 Jul 2016 10:47:22 -0400 Subject: [U-Boot] [PATCH v2] image: fix IH_ARCH_... values for uImage compatibility In-Reply-To: <1469081760-6537-1-git-send-email-yamada.masahiro@socionext.com> References: <1469081760-6537-1-git-send-email-yamada.masahiro@socionext.com> Message-ID: <20160721144722.GE1623@bill-the-cat> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Thu, Jul 21, 2016 at 03:16:00PM +0900, Masahiro Yamada wrote: > Commit 555f45d8f916 ("image: Convert the IH_... values to enums") > accidentally changed some IH_ARCH_... values. > > Prior to that commit, there existed a gap between IH_ARCH_M68K and > IH_ARCH_MICROBLAZE, like follows. > > #define IH_ARCH_SPARC64 11 /* Sparc 64 Bit */ > #define IH_ARCH_M68K 12 /* M68K */ > #define IH_ARCH_MICROBLAZE 14 /* MicroBlaze */ > #define IH_ARCH_NIOS2 15 /* Nios-II */ > > The enum conversion broke the compatibility with existing uImage > files. Reverting 555f45d8f916 will cause build error unfortunately, > so here is a more easy fix. > > I dug the git history and figured out the gap was introduced by > commit 1117cbf2adac ("nios: remove nios-32 arch"). So, I revived > IH_ARCH_NIOS just for filling the gap. > > I added comments to each enum block. Once we assign a value to > IH_... it is not allowed to change it. > > Acked-by: Michal Simek > Signed-off-by: Masahiro Yamada > Reviewed-by: Simon Glass Applied to u-boot/master, thanks! -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: