From patchwork Sat Nov 26 16:59:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Safae Ouajih X-Patchwork-Id: 1709242 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=baylibre-com.20210112.gappssmtp.com header.i=@baylibre-com.20210112.gappssmtp.com header.a=rsa-sha256 header.s=20210112 header.b=jk8tznk0; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NKJQH6JJJz23nj for ; Sun, 27 Nov 2022 04:20:07 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3621385296; Sat, 26 Nov 2022 18:18:38 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=baylibre-com.20210112.gappssmtp.com header.i=@baylibre-com.20210112.gappssmtp.com header.b="jk8tznk0"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E70F98504C; Sat, 26 Nov 2022 17:59:50 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id D2B83850BD for ; Sat, 26 Nov 2022 17:59:48 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=souajih@baylibre.com Received: by mail-wr1-x430.google.com with SMTP id i12so10882037wrb.0 for ; Sat, 26 Nov 2022 08:59:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nVDy5FMbOr7Q3sIJzQYAr9JPmUsuH01oiHkly6g8HI4=; b=jk8tznk0EKi9Zdt1DpAm/7ku0XF7FVoJPY1pxpyMG37kqoYvWXDo7T0UYhVe4Fdv77 md8b8OANd7PxVqV30xOLPrdVvtniuiFlnLZP4jRImFAcSwjVcfssoE2p/1EC+tbUlg/b dywVNxNfwYoWQvVgfwTEF0OigrTLM198GQxTR5nPns4emDJWe6yszi0L1FlLVkwzenp/ MbDDtBmop6YuGQJHZX0OPkejxxDyNxjjFtWv0Uio0wvtOKM04QDwA0HbXzyTH3etwXFS czywREcWt6IdateRkPSzl/4H8astm6Qrkmqn+phHgSIu+/BDKUuXOVA2CXtEdpoB7LUW 6fTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nVDy5FMbOr7Q3sIJzQYAr9JPmUsuH01oiHkly6g8HI4=; b=Wc9gsMq1Te3TLnwCeOmMmH5JP8dTEST8SQT1sjhjRjjpMrZqSxo+htHx7Laqz9ZPsk 4kkpLCsXe9YJ5Kg9z8PglNKoP5VMo+Ha24PqdXuXsUSWEox1DSxiCMod6hs9TsKEWP6S 6gB9uUmX2LDL/flB5L1QIob/elBFtUYnzQwJQXu7w3KOK2E3zsqiv6hDpKwzou1+iEql +gvs+i6+gkzTzdKHJZ8gGXFL+XMThAg2u/MjR1h65L13x5s5cXAwABPSo+0wbkwnLSXs 2eQebuKlMkKcZ+BBDcr3HJQ7pIb5MgEUmAvcPDttWBMy+c1tPk/iBIDcFmVcW4GTHuhW U7Ig== X-Gm-Message-State: ANoB5pljoBY5ey26H9hiaotHGMbXIuJczvfOZu5rm8PDHPaSJVi4P8rP 0C7CA+y5jucDw5+ICAtR6upjsDtjSfS2BQ== X-Google-Smtp-Source: AA0mqf76A8xctC9pJ17nSag234ovI0j8mesD/2aJ5PTG6vmogcaefMRF4jHLeyTOFSPplSBckAF2lw== X-Received: by 2002:a5d:5648:0:b0:241:dd78:d16d with SMTP id j8-20020a5d5648000000b00241dd78d16dmr16640206wrw.155.1669481988307; Sat, 26 Nov 2022 08:59:48 -0800 (PST) Received: from safae.baylibre.local ([2a04:cec0:11b5:4031:7588:eb2c:a5c2:aa6d]) by smtp.gmail.com with ESMTPSA id c15-20020adfe70f000000b00241e8d00b79sm7462408wrm.54.2022.11.26.08.59.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Nov 2022 08:59:48 -0800 (PST) From: Safae Ouajih To: sjg@chromium.org Cc: u-boot@lists.denx.de, sean.anderson@seco.com, r.stratiienko@gmail.com, mkorpershoek@baylibre.com, glaroque@baylibre.com, khilman@baylibre.com Subject: [PATCH 09/17] android: boot: boot image header v3, v4 do not support recovery DTBO Date: Sat, 26 Nov 2022 17:59:23 +0100 Message-Id: <20221126165931.197607-10-souajih@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221126165931.197607-1-souajih@baylibre.com> References: <20221126165931.197607-1-souajih@baylibre.com> MIME-Version: 1.0 X-Mailman-Approved-At: Sat, 26 Nov 2022 18:18:14 +0100 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean android_image_get_dtbo() is used to get recovery DTBO via abootimg cmd. This is not supported in boot image header v3 and v4. Thus, we print an error message when v1,v2 header version are not used. Signed-off-by: Safae Ouajih --- boot/image-android.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/image-android.c b/boot/image-android.c index d6476904f35e..daf51a7e3b8b 100644 --- a/boot/image-android.c +++ b/boot/image-android.c @@ -315,8 +315,8 @@ bool android_image_get_dtbo(ulong hdr_addr, ulong *addr, u32 *size) goto exit; } - if (hdr->header_version < 1) { - printf("Error: header_version must be >= 1 to get dtbo\n"); + if (hdr->header_version != 1 && hdr->header_version != 2) { + printf("Error: header version must be >= 1 and <= 2 to get dtbo\n"); ret = false; goto exit; }