From patchwork Wed Jul 20 13:09:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 72422 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp644459qga; Wed, 20 Jul 2016 06:08:40 -0700 (PDT) X-Received: by 10.194.167.7 with SMTP id zk7mr1466633wjb.113.1469020119986; Wed, 20 Jul 2016 06:08:39 -0700 (PDT) Return-Path: Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id i196si25736428wmg.24.2016.07.20.06.08.39; Wed, 20 Jul 2016 06:08:39 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) client-ip=85.214.87.163; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0D765A751C; Wed, 20 Jul 2016 15:08:39 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id il0WLF5CxmZA; Wed, 20 Jul 2016 15:08:38 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 79BF4A7516; Wed, 20 Jul 2016 15:08:38 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id BBDA6A7516 for ; Wed, 20 Jul 2016 15:08:34 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id okF-TmXcorTi for ; Wed, 20 Jul 2016 15:08:34 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from conuserg-12.nifty.com (conuserg-12.nifty.com [210.131.2.79]) by theia.denx.de (Postfix) with ESMTPS id 0E23BA74FF for ; Wed, 20 Jul 2016 15:08:30 +0200 (CEST) Received: from beagle.diag.org (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id u6KD7ejA023628; Wed, 20 Jul 2016 22:07:41 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com u6KD7ejA023628 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1469020061; bh=OthJNmzof0unTv806yJ54JNv6OMDC55xPytr2Whuy6g=; h=From:To:Cc:Subject:Date:From; b=gClfk2Ud0ddxh+CU737vnPXiwwmvEJCCAc1htQok2IyD7HvqKXQacC9m6CS/oT3vk UENRDQno35LwWjcw5bKPRZZYrzgc0AmJIjnwydtj+gK3nTTwhP6gI7xPKX6eJ2q218 df69KjweSQXvGtF9uB2hiDnsKppi2rCgL98OgfzktHSPGQK8glbdewCoye7HVxzeky WTqfFXMYwEF4DLPqGYBlLqlBKV5f/Sv9I6Pes2R7GnZxZGgFfxbVKDlLSTjAk/hvV7 r5LyKFCUkerCJeLViWCYSKa5k81YDLHQia0wFHr3sUXtN/M+QAf0a1fsq8kdSG6zvE 5U1eD4Zv9oaYw== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Wed, 20 Jul 2016 22:09:14 +0900 Message-Id: <1469020154-1277-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 1.9.1 Cc: Michal Simek , Daniel Allred Subject: [U-Boot] [PATCH] image: fix IH_ARCH_... values for uImage compatibility X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Commit 555f45d8f916 ("image: Convert the IH_... values to enums") accidentally changed some IH_ARCH_... values. Originally, 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 another way to fix it more easily. Signed-off-by: Masahiro Yamada --- include/image.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 1.9.1 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot diff --git a/include/image.h b/include/image.h index 2a5b560..b43b179 100644 --- a/include/image.h +++ b/include/image.h @@ -182,7 +182,7 @@ enum { IH_ARCH_SPARC, /* Sparc */ IH_ARCH_SPARC64, /* Sparc 64 Bit */ IH_ARCH_M68K, /* M68K */ - IH_ARCH_MICROBLAZE, /* MicroBlaze */ + IH_ARCH_MICROBLAZE = 14, /* MicroBlaze */ IH_ARCH_NIOS2, /* Nios-II */ IH_ARCH_BLACKFIN, /* Blackfin */ IH_ARCH_AVR32, /* AVR32 */