From patchwork Mon May 14 21:33:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ramon Fried X-Patchwork-Id: 913250 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="nEIv0JmA"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40lDVC0TDjz9s0q for ; Tue, 15 May 2018 07:34:11 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id B712CC220A3; Mon, 14 May 2018 21:34:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 7FB6CC2202B; Mon, 14 May 2018 21:34:04 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 1BD01C2202B; Mon, 14 May 2018 21:34:03 +0000 (UTC) Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by lists.denx.de (Postfix) with ESMTPS id AF634C21DCA for ; Mon, 14 May 2018 21:34:02 +0000 (UTC) Received: by mail-wr0-f193.google.com with SMTP id i14-v6so13831855wre.2 for ; Mon, 14 May 2018 14:34:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=XK1zeDiWAHlnYBgt3VsWRL7/5aQsLJgWQWEE9916yps=; b=nEIv0JmAyK0XtYydA4SOYucKZROC9YZX9Rg13wRGLH8ctbpda0/YKnzLbfOaJfjNG1 QR3cOY+73FCwWmp6FO2S9vyt+2O7wauW3/IeJi1oY/wR00Xxvq//5VsLjd6DTo+8ZsH2 UrC41JFdbr3viTn0GbCFn23P96Jyl556WJiRGALE83sjOxhkZo69Puw/PyUklVihxSVZ cTrE29+mNxgoZhNffSrWe6kntGsM03t4O4UY27QWWVjNOHtA/VP7xV4yiKirWs/aoeBZ /kmpI1FJTtiSWTa+ejEdv9dvCOtCiLF+1pW7J0AJgnFWjQAellbfNLe6gtV1Os15e4P3 828w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=XK1zeDiWAHlnYBgt3VsWRL7/5aQsLJgWQWEE9916yps=; b=L/AXiyP8iviQ1bkUJA5+kRX7uvW5zbjr/QL3eLxSYE8D/6AjlKGXrhS4bIHwtyuG83 U3HOPdQM9T29qdweGugUaOurFU4JMU8Y+4nBNn9EzMU+07cWIcyTppnORrq+gtHKcXkE /OTGaZU63zBRcxOKnyeZ7XOx+PCbOMX/4JGizDq9PzrFXGMbDD2HmjsMN+TiUFM7q1U1 oaD5Ug/IpEu8zBrtYnuz/uRnXH0H92+9PynDPAPp8/5TBQyioOiPjMTM1BLOuIQsuSRY ScbFCRgxGEUOWVvoZHkbOAIk7S1HNuR7dXsAknUkU659Nvn+LKaV80hABWFF4khGVhC/ XD1A== X-Gm-Message-State: ALKqPwdL/P1DigvpVk/MjSEiNN0Phf9RcND1F7ePjquLLJARsXSwRc0q fZMfElXS59qCy9m7fz85Zns= X-Google-Smtp-Source: AB8JxZoA5pGRkJKwODLcOi15GHgsbksY/5EItoT+w5a+Q4IVlXXHnLYUzXMUSbaoCnEyqU1qjHouTg== X-Received: by 2002:adf:a4d3:: with SMTP id h19-v6mr8146323wrb.7.1526333642237; Mon, 14 May 2018 14:34:02 -0700 (PDT) Received: from localhost.localdomain ([141.226.166.38]) by smtp.gmail.com with ESMTPSA id b10-v6sm16436796wrn.42.2018.05.14.14.34.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 May 2018 14:34:01 -0700 (PDT) From: Ramon Fried To: sjg@chromium.org, jun.nie@linaro.org, pantelis.antoniou@konsulko.com, michal.simek@xilinx.com, tomas.melin@vaisala.com, andre.przywara@arm.com, peng.fan@nxp.com Date: Tue, 15 May 2018 00:33:43 +0300 Message-Id: <20180514213343.19865-1-ramon.fried@gmail.com> X-Mailer: git-send-email 2.17.0 Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH] image: fit: Allow booting Aarch64 from arm X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" Snapdragon bootloader needs to jump from 32bit to 64bit Allow booting in these cases when CONFIG_AARCH32_SUPPORT_ARM64 is defined. Signed-off-by: Ramon Fried --- common/image-fit.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/common/image-fit.c b/common/image-fit.c index 5b93dceae1..62dbfbdd3d 100644 --- a/common/image-fit.c +++ b/common/image-fit.c @@ -1253,17 +1253,24 @@ int fit_image_check_arch(const void *fit, int noffset, uint8_t arch) { uint8_t image_arch; int aarch32_support = 0; + int aarch64_support = 0; #ifdef CONFIG_ARM64_SUPPORT_AARCH32 aarch32_support = 1; #endif +#ifdef CONFIG_AARCH32_SUPPORT_ARM64 + aarch64_support = 1; +#endif + if (fit_image_get_arch(fit, noffset, &image_arch)) return 0; return (arch == image_arch) || (arch == IH_ARCH_I386 && image_arch == IH_ARCH_X86_64) || (arch == IH_ARCH_ARM64 && image_arch == IH_ARCH_ARM && - aarch32_support); + aarch32_support) || + (arch == IH_ARCH_ARM && image_arch == IH_ARCH_ARM64 && + aarch64_support); } /**