From patchwork Mon May 14 21:43:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ramon Fried X-Patchwork-Id: 913251 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="aNM83bPT"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40lDjh4BMXz9s0q for ; Tue, 15 May 2018 07:44:07 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 6DC57C220A3; Mon, 14 May 2018 21:44:03 +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_BLOCKED, 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 1E1F7C22033; Mon, 14 May 2018 21:44:01 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4C823C22033; Mon, 14 May 2018 21:43:59 +0000 (UTC) Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by lists.denx.de (Postfix) with ESMTPS id EB90FC21DCA for ; Mon, 14 May 2018 21:43:58 +0000 (UTC) Received: by mail-wr0-f196.google.com with SMTP id 94-v6so13845623wrf.5 for ; Mon, 14 May 2018 14:43:58 -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=wfKQSDPBhRoT7q8dkln/rf3gI/8bX8NKYYCTqArt0oA=; b=aNM83bPTyksHQ6Q5U32VDCPtKgy7QrrEOYfVnRel70lghTppJPrBxULNNa6XJQRhB4 bIQKvUYk3ObAeGd7XT4fBJ2CSaU4+AX1KGKXE3XNPXh2e7RGrvewvEIuZjHnmyoNAmhC Fq/Mqklx24kMcMkCUmlq7lscV+xA25LAewHv3L13vEZcVxOW1dc+O31nBzZyiCo7lj/t 4KvYj9BzAg4zGO0QAc1BSo5d+ajh67jLw6aaQEtcWuRkRWpbGkZjwU4z4JSQFUpufuvV 3rAoVkAYkm4cmu1UBfH92bAV2/B87NY81gTA464wzLOWwvqOAWdaQwY0koKuFJFcUNNW mAOA== 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=wfKQSDPBhRoT7q8dkln/rf3gI/8bX8NKYYCTqArt0oA=; b=Gf/SC6z+/Vjek85ixBhNVu+uqaRIUmG4r74vGT7FCBc9kbTF2ILcqEwNg7GZyeQICg e5wyd3I0uQObb13UhimCQCTMuGjt+2xPqbbCJreBbN/ogHrPkFT+yTEhHK+x10lG6kd3 tOw/MQL0baZvSg1uZOkh3353pvDPSwsPDFtzMaFK4eulnSFgqeLJmQtt+DBY3lwwmCby w4I1b0gVbuGpUUI3eVx3V32/QNMY5PsnH0NQ+TtReS97LxXVcyGaMM62133sPmp2zthB FZj0jT+EjCn3p2xqT+QOAYkIjd4zEK3CzHNvyBws0nmEjhLf8nu3aq1AUNPtZoirv6+F 2wQw== X-Gm-Message-State: ALKqPwfQ8jbZQw/9K75naw88q0juQbgre7Jxrp/S3n/iTnB3MTmrn9Mx eXaWHD04TicE76WB3yocd2M= X-Google-Smtp-Source: AB8JxZrfl80e/7VoXa6QgCUuUzF3hZHSkj49l0v1cNZ2TOfnroWssx9ls2MFHflTlCnS5Enut8XkGQ== X-Received: by 2002:adf:e802:: with SMTP id o2-v6mr9066648wrm.123.1526334238641; Mon, 14 May 2018 14:43:58 -0700 (PDT) Received: from localhost.localdomain ([141.226.166.38]) by smtp.gmail.com with ESMTPSA id x63-v6sm10581822wma.25.2018.05.14.14.43.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 May 2018 14:43:57 -0700 (PDT) From: Ramon Fried To: sjg@chromium.org Date: Tue, 15 May 2018 00:43:55 +0300 Message-Id: <20180514214355.21239-1-ramon.fried@gmail.com> X-Mailer: git-send-email 2.17.0 Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH] image.h 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 Reviewed-by: Simon Glass --- include/image.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/image.h b/include/image.h index df701e3470..598c66177d 100644 --- a/include/image.h +++ b/include/image.h @@ -817,7 +817,13 @@ static inline int image_check_type(const image_header_t *hdr, uint8_t type) static inline int image_check_arch(const image_header_t *hdr, uint8_t arch) { return (image_get_arch(hdr) == arch) || +#ifndef CONFIG_AARCH32_SUPPORT_ARM64 (image_get_arch(hdr) == IH_ARCH_ARM && arch == IH_ARCH_ARM64); +#else + (image_get_arch(hdr) == IH_ARCH_ARM && arch == IH_ARCH_ARM64) || + (image_get_arch(hdr) == IH_ARCH_ARM64 && arch == IH_ARCH_ARM); +#endif + } static inline int image_check_os(const image_header_t *hdr, uint8_t os) {