From patchwork Fri May 3 10:19:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Fritz X-Patchwork-Id: 1094821 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=quarantine dis=none) header.from=googlemail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=googlemail.com header.i=@googlemail.com header.b="JuWCse1A"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44wV6r54Dyz9s4V for ; Fri, 3 May 2019 21:20:36 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 65381C21DE8; Fri, 3 May 2019 11:20:33 +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_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 F1859C21C29; Fri, 3 May 2019 11:20:30 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4D085C21C38; Fri, 3 May 2019 10:19:07 +0000 (UTC) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by lists.denx.de (Postfix) with ESMTPS id ECAFAC21C29 for ; Fri, 3 May 2019 10:19:06 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id k16so7165667wrn.5 for ; Fri, 03 May 2019 03:19:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=message-id:subject:from:reply-to:to:cc:date:mime-version :content-transfer-encoding; bh=oR40rKjCRabjehU7V/kV1dJAtUmpDbC8qKXQ0uqYkwQ=; b=JuWCse1APQsR934bWm0XcD+KGdIhjhkVJvPgAXat1pQkOCuqJvNzzS5wrVOfAWt/sy QjEukIrloa9CMrZn9yFN+M6iRBTyj9G5NvCaNFSqhAN+k4ZNDP5+k6TjNY9VgyFN1Luy fKHw8CEba0gsUveC/1nmNg7ZAMzbaGD6m3Dil4zTl0TDJ8yIpD30LwXKKPevYaaILEDZ CaFIhRCMUhkIIGtB8EA6pQaxMe8gW2I6xMjs97HR7vyy851U+400yIWQkdEP9s9rwcmG 5fXeHYwU+6CMNaePrC0dFF+J71atFEss55bemVMgNsFmoRhyQP+13JNNyzFliMfiFvTQ +DAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:subject:from:reply-to:to:cc:date :mime-version:content-transfer-encoding; bh=oR40rKjCRabjehU7V/kV1dJAtUmpDbC8qKXQ0uqYkwQ=; b=YaZYVnO2l6rE4yBde60VPZLVUX+RNL1SF9A0ZpNPjsWTUx9FDxiimShAwkORwK1AWM m6tjVrInSNdZllj1iMDG/V0UHUktOwTbNR8qB+okIcCQNQ8JSaJF00rYYnAPw0pu1NnP 5Q0o6cbBujxsd1ywR5ksPpwZnl727xi/A730YOmk2t0WkQ85FbwbrZ4/N2zlVxSGTvVs TYthukNbws3TBxsiopb4FOPYZWfUiTrntohmXhm6y5O5yc/PVDuGRINsW6pzGZqnaEo+ 2qL1fAjotI5EUZ1l+C1eTG6NnBkkUU/yPdR6yGRf9xlqa9cNi2Omg04MwICfbVlv7OZL Dw3g== X-Gm-Message-State: APjAAAUXhMyrwpwo2LnV1PDxa81sI1KgHovsK2qzkFmI4THelMcLyjde bL0T/JAJIIS6repBwCj3HvQ= X-Google-Smtp-Source: APXvYqxCPM+hRpDfhA8w8PWs+tqqjlRlSm40J+c9p7I3o2Ac8EZmqT0TdW3a41bjEYiSW1FFrUezrg== X-Received: by 2002:adf:b613:: with SMTP id f19mr856403wre.304.1556878746619; Fri, 03 May 2019 03:19:06 -0700 (PDT) Received: from [192.168.0.87] (HSI-KBW-109-192-114-146.hsi6.kabel-badenwuerttemberg.de. [109.192.114.146]) by smtp.gmail.com with ESMTPSA id q14sm1377328wrg.81.2019.05.03.03.19.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 May 2019 03:19:05 -0700 (PDT) Message-ID: <1556878745.2494.1.camel@googlemail.com> From: Christoph Fritz To: Tom Rini Date: Fri, 03 May 2019 12:19:05 +0200 X-Mailer: Evolution 3.12.9-1+b1 Mime-Version: 1.0 X-Mailman-Approved-At: Fri, 03 May 2019 11:20:29 +0000 Cc: U-Boot Mailing List Subject: [U-Boot] [PATCH] arm: zimage: add other-bootloader image magic number 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: , Reply-To: chf.fritz@googlemail.com Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" For chainboot configurations or test environments, this patch allows booting other-bootloader images by using command bootz. Signed-off-by: Christoph Fritz --- arch/arm/lib/zimage.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm/lib/zimage.c b/arch/arm/lib/zimage.c index 09ab331..bc2768b 100644 --- a/arch/arm/lib/zimage.c +++ b/arch/arm/lib/zimage.c @@ -9,6 +9,7 @@ #include #define LINUX_ARM_ZIMAGE_MAGIC 0x016f2818 +#define BAREBOX_IMAGE_MAGIC 0x00786f62 struct arm_z_header { uint32_t code[9]; @@ -21,9 +22,10 @@ int bootz_setup(ulong image, ulong *start, ulong *end) { struct arm_z_header *zi = (struct arm_z_header *)image; - if (zi->zi_magic != LINUX_ARM_ZIMAGE_MAGIC) { + if (zi->zi_magic != LINUX_ARM_ZIMAGE_MAGIC && + zi->zi_magic != BAREBOX_IMAGE_MAGICE) { #ifndef CONFIG_SPL_FRAMEWORK - puts("Bad Linux ARM zImage magic!\n"); + puts("zimage: Bad magic!\n"); #endif return 1; }