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 <michal.si...@xilinx.com> > Signed-off-by: Masahiro Yamada <yamada.masah...@socionext.com> > Reviewed-by: Simon Glass <s...@chromium.org>
Applied to u-boot/master, thanks! -- Tom
signature.asc
Description: Digital signature
_______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot