From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id AC749C433F5 for ; Mon, 28 Feb 2022 19:09:52 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 20A8B8312A; Mon, 28 Feb 2022 20:09:35 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="GV/Mp+/c"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 36B7D83A9D; Mon, 28 Feb 2022 20:09:15 +0100 (CET) Received: from mail-oo1-xc2f.google.com (mail-oo1-xc2f.google.com [IPv6:2607:f8b0:4864:20::c2f]) (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 DB5ED83BDE for ; Mon, 28 Feb 2022 20:09:05 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-oo1-xc2f.google.com with SMTP id j7-20020a4ad6c7000000b0031c690e4123so19937416oot.11 for ; Mon, 28 Feb 2022 11:09:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LYT6uaBY4qlHDoY8ab6YniAWgGIUV4+rR+E3PQ/y0XA=; b=GV/Mp+/cALtrZ+MdNit3EkdVfZvAf/CUpfaCmUvMIicFEV+ujTNOKnySp4fiisX6ZU fMLMDz1XIXhP+Y9tjs3FwxmoAQ2HveESZmPzn3Nx8jn/PEyDSfawSsOx6lJkeYhYzHLc aReaAQJgGn8HPn9bIM1RL7h2OVZ3qSTYjJFWM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LYT6uaBY4qlHDoY8ab6YniAWgGIUV4+rR+E3PQ/y0XA=; b=3hzmejqUDAelcaHb+GVE5dVcoz7niD1VE5FBq4Bggv3PzTTmS5Bs5a0v52ibTKZm0X J56udel3xhKusPS7lYQ9x/3p7xEh9CxX1nybfuZE2Ztw50gYeECIxhFyuQpEb2oXjUM2 PfnXGBNs5eRQ5wBsMbThlOQwRDks8arXILU7XLC2vAtvCSF5u160IAzRToVJJklBl9Dk YjlZN/XsWztiX+BOhD2ttg5C5RYAycJcu4V4U/v8tDrBNAkPzBXc/07hOZa8wSiPdomZ n5ruIZwDIkUz14CQ+Oe4aQuDp94HBszvEtVxA9eMJ1mfqI7E6WCS6SfPaVkBVAvE3jAU H17Q== X-Gm-Message-State: AOAM531yRQhsUiSEZltLbc5e53lBt29UGxcVFpndRZqRpuQw4ldFJc4t oy1zA6zvnUHFtjs+GIlszeeQLn4Thysp+Q== X-Google-Smtp-Source: ABdhPJwoX+83+ESUZDrtS8MdgURxB/x6kYFSFKzQ8TIgH5+pcSwvdWr3qtW/ZSOIa/R8U14dDlTSqQ== X-Received: by 2002:a05:6870:a991:b0:d2:170f:d8a6 with SMTP id ep17-20020a056870a99100b000d2170fd8a6mr8935157oab.100.1646075344384; Mon, 28 Feb 2022 11:09:04 -0800 (PST) Received: from kiwi.bld.corp.google.com (c-67-190-101-114.hsd1.co.comcast.net. [67.190.101.114]) by smtp.gmail.com with ESMTPSA id f188-20020a4a58c5000000b0031ccb8272f1sm5290577oob.33.2022.02.28.11.09.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Feb 2022 11:09:04 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH 03/18] binman: Correct Chromium OS entry types Date: Mon, 28 Feb 2022 12:08:20 -0700 Message-Id: <20220228190835.1480772-4-sjg@chromium.org> X-Mailer: git-send-email 2.35.1.574.g5d30c73bfb-goog In-Reply-To: <20220228190835.1480772-1-sjg@chromium.org> References: <20220228190835.1480772-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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.5 at phobos.denx.de X-Virus-Status: Clean The conversion to bintools broke the invocation of the utility, since the arguments are not correct. Fix it. Signed-off-by: Simon Glass --- tools/binman/btool/futility.py | 4 ++-- tools/binman/etype/vblock.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/binman/btool/futility.py b/tools/binman/btool/futility.py index 614daaade4..8d00966a9d 100644 --- a/tools/binman/btool/futility.py +++ b/tools/binman/btool/futility.py @@ -106,7 +106,7 @@ class Bintoolfutility(bintool.Bintool): Returns: str: Tool output """ - args = ['gbb_utility' + args = ['gbb_utility', '-s', f'--hwid={hwid}', f'--rootkey={rootkey}', @@ -139,7 +139,7 @@ class Bintoolfutility(bintool.Bintool): '--keyblock', keyblock, '--signprivate', signprivate, '--version', version, - '--fw', firmware, + '--fv', firmware, '--kernelkey', kernelkey, '--flags', flags ] diff --git a/tools/binman/etype/vblock.py b/tools/binman/etype/vblock.py index a1de98290b..0074c577a2 100644 --- a/tools/binman/etype/vblock.py +++ b/tools/binman/etype/vblock.py @@ -73,7 +73,7 @@ class Entry_vblock(Entry_collection): vblock=output_fname, keyblock=prefix + self.keyblock, signprivate=prefix + self.signprivate, - version=f'{self.version,}', + version=f'{self.version:d}', firmware=input_fname, kernelkey=prefix + self.kernelkey, flags=f'{self.preamble_flags}') -- 2.35.1.574.g5d30c73bfb-goog