From patchwork Tue Nov 7 14:48:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 162519 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:aa0b:0:b0:403:3b70:6f57 with SMTP id k11csp282941vqo; Tue, 7 Nov 2023 06:49:38 -0800 (PST) X-Google-Smtp-Source: AGHT+IFdi6T66lt0Crg2UuEd0KFr6t24tTrR+/yxmEFz9qp7sqB04mIdKEDYbZFtLp+0h9BICOj2 X-Received: by 2002:a05:6a21:9993:b0:181:6b3d:ca1c with SMTP id ve19-20020a056a21999300b001816b3dca1cmr4072753pzb.3.1699368577414; Tue, 07 Nov 2023 06:49:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699368577; cv=none; d=google.com; s=arc-20160816; b=xDtOOkcLi+vGciGD2ezefHIhZRBA0CMTROoRVrltxjZctZSHKZEzBWPXrjz6wNN06a /qmtaOzfJ9+ZK9Puu/TB4LEF9xCym21xdEea/xJReOCcdWdPoJHQyO6K81x7Ov5yts5b mxyzKaS1xiiXdCa1FTW1Bbyr5Ox1o3ITPY1zKQgG03cbAJSRENgNDspg4U3E1dg6PWJh lSCNBjSJ6z+W6t3ks3tqdfdVYnOyLjRejE+s/BHutI0ujdCVz6OLJJKWW2CX6rGyeMHN c+DsDTyFLRQ8PMQe0cRmDjH8RMZpa9nRpYrG9rZexEAmurEKllKLe6mzh7SqGz6f69I0 c0fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=mUczbla/3nICzQP9ZmDHPTBpFCCiTIH02+1QSP6Uf6s=; fh=+2WA7Grc9VRiVAdce+KBOM2OHH/h6JCb5mkdcbEwcg4=; b=z/Eoyz5dOxHApSnZcC8e8xH/FPsWo/VQrhd65BWzFXPAGqSabbzKdKtbpAxu7kO4Nd 0eUlmwC/JApp+8eRfALY67+NNTW/3HgzoEjw9hDKCf8XeVp8BX+UIzJ75nvNq2w6txqJ Gwl6iNBf3A4Zu+sOT6kOqgp5q7ovCjvkvgGKmmliGRkS9JXFPi1Pi4PJCdOVvx8oLQND FevSNZenvzLad1Ekkarrp3cOyecUDBkvDe7RtrZcYRxvUVOdJna/upu4PrMMOotsHKsj NmUvMb8a1HlzfOthIxAfADE2qIduD1I0J22fiGvwmsXKAjWEdYfevrKHewYAkQjC+3WK rg8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=YmFFeNUC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id h184-20020a6383c1000000b005bd65d48d1csi2205690pge.18.2023.11.07.06.49.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 06:49:37 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=YmFFeNUC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id B3DE082164C0; Tue, 7 Nov 2023 06:49:35 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230322AbjKGOtb (ORCPT + 32 others); Tue, 7 Nov 2023 09:49:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50440 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230092AbjKGOt1 (ORCPT ); Tue, 7 Nov 2023 09:49:27 -0500 Received: from mail-il1-x12b.google.com (mail-il1-x12b.google.com [IPv6:2607:f8b0:4864:20::12b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CC7A9102 for ; Tue, 7 Nov 2023 06:49:24 -0800 (PST) Received: by mail-il1-x12b.google.com with SMTP id e9e14a558f8ab-35957d77afcso12018225ab.0 for ; Tue, 07 Nov 2023 06:49:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1699368564; x=1699973364; darn=vger.kernel.org; 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=mUczbla/3nICzQP9ZmDHPTBpFCCiTIH02+1QSP6Uf6s=; b=YmFFeNUC5KZ7lzAMYl03QjdBl9onDbkVjOrSh7GMG4AgP9P8wXdbZVwgagkmY/Cpwd ELa2bEBBAfFnNaU6hG2Vn6hkPu3tijNfeKW6GRy5JfOPNNYvjFKbr/QtWagelBcRHDg8 88ErWDV/DV8stC/bFx34DcGWMFoxNULpXqWNI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699368564; x=1699973364; 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=mUczbla/3nICzQP9ZmDHPTBpFCCiTIH02+1QSP6Uf6s=; b=qbWHG+MaBAy1pFMgGQh/5nrstGqM7Pk3W2c82N5ZuQPcgNtmy75EsFEENbWsoffpg+ +ymULA04OKAWZUy6lZzsaWzHr7ulSZOqisNvIXXCo7JEmZM+cfDOWeuKV0iJGXfiJz9k 3TQEzv3hptFJwFOCWOBMB0SuYYF6/I7QsOvINbKigd7Exkx1tYzvysuUVtCkzOQde5+3 ee3v+M1r2pTZ0oP0bANUtFNxFYuJ2DHH+gXA2KMw1WT6VbTErEL6yvmTfUo01S+xJW37 ePWtwGC3ycjxjG708uI48Whkkx05aZMMoqhuempyEuJif4tKjVIvpUxm1eeGNCXL+j0L k8Jw== X-Gm-Message-State: AOJu0YzWZoEckbyMLW1rpWhWNdZPnuDTW+GVURa/teLHpQWLnNKX5EEL vxWz6wnLKWEPcNq9yG43de65KA== X-Received: by 2002:a05:6e02:1bc3:b0:359:3491:9042 with SMTP id x3-20020a056e021bc300b0035934919042mr3014205ilv.9.1699368564218; Tue, 07 Nov 2023 06:49:24 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id b16-20020a05663801b000b0045a66a26208sm2815200jaq.128.2023.11.07.06.49.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 06:49:24 -0800 (PST) From: Simon Glass To: linux-arm-kernel@lists.infradead.org Cc: U-Boot Mailing List , Tom Rini , Masahiro Yamada , Simon Glass , Catalin Marinas , Will Deacon , linux-kernel@vger.kernel.org Subject: [PATCH v4 1/3] kbuild: arm64: Add BOOT_TARGETS variable Date: Tue, 7 Nov 2023 07:48:49 -0700 Message-ID: <20231107144917.48304-2-sjg@chromium.org> X-Mailer: git-send-email 2.42.0.869.gea05f2083d-goog In-Reply-To: <20231107144917.48304-1-sjg@chromium.org> References: <20231107144917.48304-1-sjg@chromium.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Tue, 07 Nov 2023 06:49:35 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781917105323249164 X-GMAIL-MSGID: 1781917105323249164 Add a new variable containing a list of possible targets. Mark them as phony. This matches the approach taken for arch/arm Signed-off-by: Simon Glass --- (no changes since v1) arch/arm64/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile index 4bd85cc0d32b..7b77b63e978f 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -150,6 +150,10 @@ libs-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a # Default target when executing plain make boot := arch/arm64/boot +BOOT_TARGETS := Image.gz vmlinuz.efi + +PHONY += $(BOOT_TARGETS) + ifeq ($(CONFIG_EFI_ZBOOT),) KBUILD_IMAGE := $(boot)/Image.gz else @@ -159,7 +163,7 @@ endif all: $(notdir $(KBUILD_IMAGE)) -Image vmlinuz.efi: vmlinux +$(BOOT_TARGETS): vmlinux $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ Image.%: Image From patchwork Tue Nov 7 14:48:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 162520 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:aa0b:0:b0:403:3b70:6f57 with SMTP id k11csp282952vqo; Tue, 7 Nov 2023 06:49:39 -0800 (PST) X-Google-Smtp-Source: AGHT+IFHvpDDZRCW6r+pXyr4soNBW6N+Aowppc3zF2OCiFl36JoiT3vs30q6GWtLbf+NmAaf9bVK X-Received: by 2002:a05:6a20:da95:b0:17b:426f:829 with SMTP id iy21-20020a056a20da9500b0017b426f0829mr43548402pzb.37.1699368579390; Tue, 07 Nov 2023 06:49:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699368579; cv=none; d=google.com; s=arc-20160816; b=KpZTDo/ulZ7TbjJd+zXKqS9c9ZulNa/ntgcHDdXEDjnRzvLeSO99+SQVKQTo4nhzGH +w9d5ikeBB/PGb4RCWv4IKAkv8p+ROn1nGUWLBA+Br7MH2b1H8QV5Q1beLN7UFjJVZPe Z/i/zgEnCLau9jGDoPI/8R3PHSimWFa3TK1mNZqJoXC30duXW65D9i51/7KCx1wjRN/4 7B7Ni52semNwZWZlatO+Eir8/msUig9fg+qIn2Yd9hthM9G06K4SeVbtzbtCiOuGtnWL MwfsCA9M5wRVJpcZvTFUxzFyOdSeQc2yWcJl5Er2DhHd/3lyfj2vQmwdw4715PCfTyYa qOtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=PaV9Hs3+cyYm1Gr06GB3mxSuR25FjGRVsz8hlTL4IWg=; fh=ga9qGJDOEMp+1IM3d6kHFYmCBysRaZjBj4d3T47SzI8=; b=gCL4eR32Q1ocU6zH9+xxJXapa83FKAo2vc9BuscFmROtWI5AhodfJHDIJSrnZO2VWY bHPDHkkwrTDepy12McUsZuU0MhGrg5ubXPD4rdwifBZT1uuWSqM235BJ9GYykhf57G++ rteOvAG6tD1e873PLo6k8p+asKPh2PlBYH05RgAi+dl0jQqKBMIy+YOPa55vLQQEIU6n 9GOOBrXT42ZM/jKInUrWMzX96B+FweNSsmThT7nmxcZ6HOUiIr6LCi95jbhH4Rc4799v FaHrGOigjuv0ZfZoSp5wROF+wcHRFQX04WpqUYzFqaHZL35lCseImtF/4zhRskcb1QHm vzpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=SLmd6OCH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id pc2-20020a17090b3b8200b002802c4518d1si11644243pjb.148.2023.11.07.06.49.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 06:49:39 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=SLmd6OCH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 0384582164C5; Tue, 7 Nov 2023 06:49:38 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234651AbjKGOte (ORCPT + 32 others); Tue, 7 Nov 2023 09:49:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38652 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234175AbjKGOt3 (ORCPT ); Tue, 7 Nov 2023 09:49:29 -0500 Received: from mail-il1-x12b.google.com (mail-il1-x12b.google.com [IPv6:2607:f8b0:4864:20::12b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3C91B9E for ; Tue, 7 Nov 2023 06:49:26 -0800 (PST) Received: by mail-il1-x12b.google.com with SMTP id e9e14a558f8ab-35932aa21a3so21594495ab.2 for ; Tue, 07 Nov 2023 06:49:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1699368565; x=1699973365; darn=vger.kernel.org; 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=PaV9Hs3+cyYm1Gr06GB3mxSuR25FjGRVsz8hlTL4IWg=; b=SLmd6OCHmL8iRDmfLxrSNjWKgq6vGxWtl7F2tw6gso79aiPTjdeQBFiRACdYtEK+XX D8KUrIbt2KUrG2cle5XYYCPrchYUEi+a4O+G/VVgv5HO5TiOjtISjup8Clc7p2sPGjL0 KprcU66nsERduVKk63Egh09S3TM6Xq//awjV0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699368565; x=1699973365; 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=PaV9Hs3+cyYm1Gr06GB3mxSuR25FjGRVsz8hlTL4IWg=; b=SLv9VgG/hLD2yGe81oq1BRRGRC95knNpq1nsnwMJnmTW6ohND90F7Zgos2KvlLRGS5 iEEHQlawccVFDALHfIDQ5uv+Yp638oxobRM3zZUfTcMJw0IFN7e4/6WQgWZfKPl6IFqi kpcwqTp12UyAJhc2nmpy1ZRUhxy4KuqSs6h+ydDXKtaNjZpuioAFAMGpmb7DKCCzG+1r i3PZpCuZ6o+TojLpgmhI5gm9jhO8yOJYzBUGJtR9uKMp2bX3p4Q7OHRpuOLEFerQce+R M+lGvyxSm2IzozFIglj6aE4exKSMz/YOSHZ7l7aiq3qLlpHGsW2A0gwgXrK5PbBpho3M dH6w== X-Gm-Message-State: AOJu0Yx9tDwwryX3u3cX1k5RA4Ai8uwT1OJHFrVfbxJoawTF5UhnkR5m iOhHPDMFIg6ViTy/7kh4rXvcTwlBIHb6PifcbVndAQ== X-Received: by 2002:a05:6e02:1c0e:b0:350:ef09:ff82 with SMTP id l14-20020a056e021c0e00b00350ef09ff82mr3481236ilh.24.1699368565654; Tue, 07 Nov 2023 06:49:25 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id b16-20020a05663801b000b0045a66a26208sm2815200jaq.128.2023.11.07.06.49.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 06:49:24 -0800 (PST) From: Simon Glass To: linux-arm-kernel@lists.infradead.org Cc: U-Boot Mailing List , Tom Rini , Masahiro Yamada , Simon Glass , Nathan Chancellor , Nick Desaulniers , Nicolas Schier , linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 2/3] arm: boot: Move the single quotes for image name Date: Tue, 7 Nov 2023 07:48:50 -0700 Message-ID: <20231107144917.48304-3-sjg@chromium.org> X-Mailer: git-send-email 2.42.0.869.gea05f2083d-goog In-Reply-To: <20231107144917.48304-1-sjg@chromium.org> References: <20231107144917.48304-1-sjg@chromium.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Tue, 07 Nov 2023 06:49:38 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781917107353270842 X-GMAIL-MSGID: 1781917107353270842 Add quotes where UIMAGE_NAME is used, rather than where it is defined. This allows the UIMAGE_NAME variable to be set by the user. Signed-off-by: Simon Glass --- Changes in v4: - Add a patch to move the single quotes for image name scripts/Makefile.lib | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 68d0134bdbf9..1a965fe68e01 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -487,14 +487,14 @@ UIMAGE_OPTS-y ?= UIMAGE_TYPE ?= kernel UIMAGE_LOADADDR ?= arch_must_set_this UIMAGE_ENTRYADDR ?= $(UIMAGE_LOADADDR) -UIMAGE_NAME ?= 'Linux-$(KERNELRELEASE)' +UIMAGE_NAME ?= Linux-$(KERNELRELEASE) quiet_cmd_uimage = UIMAGE $@ cmd_uimage = $(BASH) $(MKIMAGE) -A $(UIMAGE_ARCH) -O linux \ -C $(UIMAGE_COMPRESSION) $(UIMAGE_OPTS-y) \ -T $(UIMAGE_TYPE) \ -a $(UIMAGE_LOADADDR) -e $(UIMAGE_ENTRYADDR) \ - -n $(UIMAGE_NAME) -d $< $@ + -n '$(UIMAGE_NAME)' -d $< $@ # XZ # --------------------------------------------------------------------------- From patchwork Tue Nov 7 14:48:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 162521 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:aa0b:0:b0:403:3b70:6f57 with SMTP id k11csp282986vqo; Tue, 7 Nov 2023 06:49:43 -0800 (PST) X-Google-Smtp-Source: AGHT+IE2TqbOWC+ld5c2sh/1cI2gVIVcI/zKhaM1JfyaEVyyirEqoEE9R9OBm9Y2t9GgrLozmEgK X-Received: by 2002:a05:6808:1ce:b0:3b2:f557:666e with SMTP id x14-20020a05680801ce00b003b2f557666emr32904975oic.19.1699368583551; Tue, 07 Nov 2023 06:49:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699368583; cv=none; d=google.com; s=arc-20160816; b=lZCVYkUotkcoGMW1/ESC0t7QXtiRU9LMqvd1sbPfdRFcsVoSLYjTjg6NtPwJndybDY 78kR9ctNixh2bCluk4q7vZVXFsyLO5x8/nWixdmMhUHlu5A6ghAzpbgn5HXmoO7Juqfd 86snbAMP7P7S35iFlUHePUD86gr8zzLAnGpHHxX5Spife8XwfoUmdtJHrW6n2Iyp89FV vZLLh4eybl5CltYGwOG0J+u+n4tHl0uheKNJ80/INaJVd4YW2oadN37JirDrXO3aZQBI 5AaLgz3QVpIrucIMmnKzrOECofvrLKDjrtR0XHTHRuY5GwzLov8kWCNEbTysnG0/fnUT XOew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=5i38nyv6SBhQeBrakWzEFuUv8swe5ZS+pQR7Bz3bw4k=; fh=gMYtiOnikXPU57D4E0yjzqpcGVTKtIdXI7et5S29+d4=; b=BrX+yo1bcPltNvdK351jDIxIv+SrTrKg7FEMU+dbWQltRGw7iKMY5BS6eZrxpyFh+W lwsfBxMpp7ZNdh/LcQsvziGEGZS+ZnMRgjkc8QXktvyXLQFyqJQ2aX5l+bI1Uolkns9l WsNKgUIjv596doJ/TtHmiB2SGYGgEC1WtDIEjuABpaNkZ4YLK+M9KrGtpYcedtR5OtFq XasQeW3vlHByfHBCiBFW8psL+kIM7TVLkbJjSTqMIGHFJH/oCZP4Xw5kTG3TNL+Zx6jE FrMPmXeLq4tyID76WSVH9kxoByvy1wWra4t1xkosDDBqMo04TnCyWB1D4abIb0r+gxNl yrSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=KQl4xMJJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id g9-20020a63dd49000000b005b7ce261d0dsi2287218pgj.402.2023.11.07.06.49.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 06:49:43 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=KQl4xMJJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 95A1782164CF; Tue, 7 Nov 2023 06:49:42 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234700AbjKGOth (ORCPT + 32 others); Tue, 7 Nov 2023 09:49:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38704 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234578AbjKGOtc (ORCPT ); Tue, 7 Nov 2023 09:49:32 -0500 Received: from mail-io1-xd34.google.com (mail-io1-xd34.google.com [IPv6:2607:f8b0:4864:20::d34]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1DA96113 for ; Tue, 7 Nov 2023 06:49:28 -0800 (PST) Received: by mail-io1-xd34.google.com with SMTP id ca18e2360f4ac-7a94c550cc8so178026839f.0 for ; Tue, 07 Nov 2023 06:49:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1699368567; x=1699973367; darn=vger.kernel.org; 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=5i38nyv6SBhQeBrakWzEFuUv8swe5ZS+pQR7Bz3bw4k=; b=KQl4xMJJzGuOwYSkqvBUF6x1I8EC0ATMg/1+uELLBLGP3EQtUG6YWxKwkf8SzL8HjM 0PoJxvep5MdzqEiGbcOKmjF1XbhWhUbnNZFYEMxutxkqAfC142KUEtJOxn/C6AQjNgG2 fT5vmfPDuw8MU6YIMuJBKOQlj0/6a3T84jbUw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699368567; x=1699973367; 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=5i38nyv6SBhQeBrakWzEFuUv8swe5ZS+pQR7Bz3bw4k=; b=L+zC52qkdJom4yiBN1SOP0OXqGExebHi6cAktZLyQFhoz0in8qsJq3ehfh3Lqvp1X5 7ndcXfbb2+D65d0Lve48EBdB3kVBOfoMpRJdZbpoZAltvYj6abnVwi3DcZbnbc2ZafvR FWp/8BsBNKDLOsYNBG0MNlzXI1tcUpRmSk61PS4TQsbJXz0v1b0fGhm2gE8xYlF5t8C5 I/rexxubYnfwzknOb+cRvzEDsu+6tvr4Vr3U40dApWksR9ntkNOkiO0W6J2ACi+oGFuM beUnU05ps5KUjxp3LwwlcIZOrG+2aUAIc3fV1VOwdYcCXrulXDihf+M8y/PW91SBNCjq odpg== X-Gm-Message-State: AOJu0YxGWvs36O4Pofq4FAtLjVLkvpR7w2RyflFVMc3IT0R8CsoQxIsC 1DeJhDYw5kNRfI4dwOLMTT7weA== X-Received: by 2002:a05:6602:1504:b0:792:792e:6619 with SMTP id g4-20020a056602150400b00792792e6619mr41182823iow.2.1699368567000; Tue, 07 Nov 2023 06:49:27 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id b16-20020a05663801b000b0045a66a26208sm2815200jaq.128.2023.11.07.06.49.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 06:49:26 -0800 (PST) From: Simon Glass To: linux-arm-kernel@lists.infradead.org Cc: U-Boot Mailing List , Tom Rini , Masahiro Yamada , Simon Glass , Catalin Marinas , Nathan Chancellor , Nick Desaulniers , Nick Terrell , Nicolas Schier , Will Deacon , linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 3/3] arm64: boot: Support Flat Image Tree Date: Tue, 7 Nov 2023 07:48:51 -0700 Message-ID: <20231107144917.48304-4-sjg@chromium.org> X-Mailer: git-send-email 2.42.0.869.gea05f2083d-goog In-Reply-To: <20231107144917.48304-1-sjg@chromium.org> References: <20231107144917.48304-1-sjg@chromium.org> MIME-Version: 1.0 X-Spam-Status: No, score=-0.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_PDS_OTHER_BAD_TLD, T_SCC_BODY_TEXT_LINE,URIBL_BLACK autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Tue, 07 Nov 2023 06:49:42 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781917111553497345 X-GMAIL-MSGID: 1781917111553497345 Add a script which produces a Flat Image Tree (FIT), a single file containing the built kernel and associated devicetree files. Compression defaults to gzip which gives a good balance of size and performance. The files compress from about 86MB to 24MB using this approach. The FIT can be used by bootloaders which support it, such as U-Boot and Linuxboot. It permits automatic selection of the correct devicetree, matching the compatible string of the running board with the closest compatible string in the FIT. There is no need for filenames or other workarounds. Add a 'make image.fit' build target for arm64, as well. The FIT can be examined using 'dumpimage -l'. This features requires pylibfdt (use 'pip install libfdt'). It also requires compression utilities for the algorithm being used. Supported compression options are the same as the Image.xxx files. For now there is no way to change the compression other than by editing the rule for $(obj)/image.fit While FIT supports a ramdisk / initrd, no attempt is made to support this here, since it must be built separately from the Linux build. Signed-off-by: Simon Glass --- Changes in v4: - Use single quotes for UIMAGE_NAME Changes in v3: - Drop temporary file image.itk - Drop patch 'Use double quotes for image name' - Drop double quotes in use of UIMAGE_NAME - Drop unnecessary CONFIG_EFI_ZBOOT condition for help - Avoid hard-coding "arm64" for the DT architecture Changes in v2: - Drop patch previously applied - Add .gitignore file - Move fit rule to Makefile.lib using an intermediate file - Drop dependency on CONFIG_EFI_ZBOOT - Pick up .dtb files separately from the kernel - Correct pylint too-many-args warning for write_kernel() - Include the kernel image in the file count - Add a pointer to the FIT spec and mention of its wide industry usage - Mention the kernel version in the FIT description MAINTAINERS | 7 + arch/arm64/Makefile | 3 +- arch/arm64/boot/.gitignore | 1 + arch/arm64/boot/Makefile | 6 +- scripts/Makefile.lib | 16 ++ scripts/make_fit.py | 289 +++++++++++++++++++++++++++++++++++++ 6 files changed, 320 insertions(+), 2 deletions(-) create mode 100755 scripts/make_fit.py diff --git a/MAINTAINERS b/MAINTAINERS index 466298fe9f65..d260ccb847e5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1577,6 +1577,13 @@ F: Documentation/process/maintainer-soc*.rst F: arch/arm/boot/dts/Makefile F: arch/arm64/boot/dts/Makefile +ARM64 FIT SUPPORT +M: Simon Glass +L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) +S: Maintained +F: arch/arm64/boot/Makefile +F: scripts/make_fit.py + ARM ARCHITECTED TIMER DRIVER M: Mark Rutland M: Marc Zyngier diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile index 7b77b63e978f..9ebd7612b181 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -150,7 +150,7 @@ libs-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a # Default target when executing plain make boot := arch/arm64/boot -BOOT_TARGETS := Image.gz vmlinuz.efi +BOOT_TARGETS := Image.gz vmlinuz.efi image.fit PHONY += $(BOOT_TARGETS) @@ -215,6 +215,7 @@ virtconfig: define archhelp echo '* Image.gz - Compressed kernel image (arch/$(ARCH)/boot/Image.gz)' echo ' Image - Uncompressed kernel image (arch/$(ARCH)/boot/Image)' + echo ' image.fit - Flat Image Tree (arch/$(ARCH)/boot/image.fit)' echo ' install - Install uncompressed kernel' echo ' zinstall - Install compressed kernel' echo ' Install using (your) ~/bin/installkernel or' diff --git a/arch/arm64/boot/.gitignore b/arch/arm64/boot/.gitignore index af5dc61f8b43..abaae9de1bdd 100644 --- a/arch/arm64/boot/.gitignore +++ b/arch/arm64/boot/.gitignore @@ -2,3 +2,4 @@ Image Image.gz vmlinuz* +image.fit diff --git a/arch/arm64/boot/Makefile b/arch/arm64/boot/Makefile index 1761f5972443..b835c0880d1c 100644 --- a/arch/arm64/boot/Makefile +++ b/arch/arm64/boot/Makefile @@ -16,7 +16,8 @@ OBJCOPYFLAGS_Image :=-O binary -R .note -R .note.gnu.build-id -R .comment -S -targets := Image Image.bz2 Image.gz Image.lz4 Image.lzma Image.lzo Image.zst +targets := Image Image.bz2 Image.gz Image.lz4 Image.lzma Image.lzo \ + Image.zst image.fit $(obj)/Image: vmlinux FORCE $(call if_changed,objcopy) @@ -39,6 +40,9 @@ $(obj)/Image.lzo: $(obj)/Image FORCE $(obj)/Image.zst: $(obj)/Image FORCE $(call if_changed,zstd) +$(obj)/image.fit: $(obj)/Image FORCE + $(call cmd,fit) + EFI_ZBOOT_PAYLOAD := Image EFI_ZBOOT_BFD_TARGET := elf64-littleaarch64 EFI_ZBOOT_MACH_TYPE := ARM64 diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 1a965fe68e01..2a354b597846 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -496,6 +496,22 @@ quiet_cmd_uimage = UIMAGE $@ -a $(UIMAGE_LOADADDR) -e $(UIMAGE_ENTRYADDR) \ -n '$(UIMAGE_NAME)' -d $< $@ +# Flat Image Tree (FIT) +# This allows for packaging of a kernel and all devicetrees files, using +# compression. +# --------------------------------------------------------------------------- + +MAKE_FIT := $(srctree)/scripts/make_fit.py + +quiet_cmd_fit = FIT $@ + cmd_fit = $(MAKE_FIT) -f $@ --arch $(UIMAGE_ARCH) --os linux \ + --name '$(UIMAGE_NAME)' \ + --compress $(UIMAGE_COMPRESSION) -k $< \ + $(dir $<)/dts + +$(obj)/%.fit: $(obj)/%.itk $(MAKE_FIT) FORCE + $(call if_changed,fit,gzip) + # XZ # --------------------------------------------------------------------------- # Use xzkern to compress the kernel image and xzmisc to compress other things. diff --git a/scripts/make_fit.py b/scripts/make_fit.py new file mode 100755 index 000000000000..e1059825de9c --- /dev/null +++ b/scripts/make_fit.py @@ -0,0 +1,289 @@ +#!/usr/bin/env python3 +# SPDX-License-Identifier: GPL-2.0+ +# +# Copyright 2023 Google LLC +# Written by Simon Glass +# + +"""Build a FIT containing a lot of devicetree files + +Usage: + make_fit.py -A arm64 -n 'Linux-6.6' -O linux + -f arch/arm64/boot/image.fit -k /tmp/kern/arch/arm64/boot/image.itk + /tmp/kern/arch/arm64/boot/dts/ -E -c gzip + +Creates a FIT containing the supplied kernel and a directory containing the +devicetree files. + +Use -E to generate an external FIT (where the data is placed after the +FIT data structure). This allows parsing of the data without loading +the entire FIT. + +Use -c to compress the data, using bzip2, gzip, lz4, lzma, lzo and +zstd + +The resulting FIT can be booted by bootloaders which support FIT, such +as U-Boot, Linuxboot, Tianocore, etc. + +Note that this tool does not yet support adding a ramdisk / initrd. +""" + +import argparse +import collections +import os +import subprocess +import sys +import tempfile +import time + +import libfdt + + +# Tool extension and the name of the command-line tools +CompTool = collections.namedtuple('CompTool', 'ext,tools') + +COMP_TOOLS = { + 'bzip2': CompTool('.bz2', 'bzip2'), + 'gzip': CompTool('.gz', 'pigz,gzip'), + 'lz4': CompTool('.lz4', 'lz4'), + 'lzma': CompTool('.lzma', 'lzma'), + 'lzo': CompTool('.lzo', 'lzop'), + 'zstd': CompTool('.zstd', 'zstd'), +} + +def parse_args(): + """Parse the program ArgumentParser + + Returns: + Namespace object containing the arguments + """ + epilog = 'Build a FIT from a directory tree containing .dtb files' + parser = argparse.ArgumentParser(epilog=epilog) + parser.add_argument('-A', '--arch', type=str, required=True, + help='Specifies the architecture') + parser.add_argument('-c', '--compress', type=str, default='none', + help='Specifies the compression') + parser.add_argument('-E', '--external', action='store_true', + help='Convert the FIT to use external data') + parser.add_argument('-n', '--name', type=str, required=True, + help='Specifies the name') + parser.add_argument('-O', '--os', type=str, required=True, + help='Specifies the operating system') + parser.add_argument('-f', '--fit', type=str, required=True, + help='Specifies the output file (.fit)') + parser.add_argument('-k', '--kernel', type=str, required=True, + help='Specifies the (uncompressed) kernel input file (.itk)') + parser.add_argument('srcdir', type=str, nargs='*', + help='Specifies the directory tree that contains .dtb files') + + return parser.parse_args() + +def setup_fit(fsw, name): + """Make a start on writing the FIT + + Outputs the root properties and the 'images' node + + Args: + fsw (libfdt.FdtSw): Object to use for writing + name (str): Name of kernel image + """ + fsw.INC_SIZE = 65536 + fsw.finish_reservemap() + fsw.begin_node('') + fsw.property_string('description', f'{name} with devicetree set') + fsw.property_u32('#address-cells', 1) + + fsw.property_u32('timestamp', int(time.time())) + fsw.begin_node('images') + + +def write_kernel(fsw, data, args): + """Write out the kernel image + + Writes a kernel node along with the required properties + + Args: + fsw (libfdt.FdtSw): Object to use for writing + data (bytes): Data to write (possibly compressed) + args (Namespace): Contains necessary strings: + arch: FIT architecture, e.g. 'arm64' + fit_os: Operating Systems, e.g. 'linux' + name: Name of OS, e.g. 'Linux-6.6.0-rc7' + compress: Compression algorithm to use, e.g. 'gzip' + """ + with fsw.add_node('kernel'): + fsw.property_string('description', args.name) + fsw.property_string('type', 'kernel_noload') + fsw.property_string('arch', args.arch) + fsw.property_string('os', args.os) + fsw.property_string('compression', args.compress) + fsw.property('data', data) + fsw.property_u32('load', 0) + fsw.property_u32('entry', 0) + + +def finish_fit(fsw, entries): + """Finish the FIT ready for use + + Writes the /configurations node and subnodes + + Args: + fsw (libfdt.FdtSw): Object to use for writing + entries (list of tuple): List of configurations: + str: Description of model + str: Compatible stringlist + """ + fsw.end_node() + seq = 0 + with fsw.add_node('configurations'): + for model, compat in entries: + seq += 1 + with fsw.add_node(f'conf-{seq}'): + fsw.property('compatible', bytes(compat)) + fsw.property_string('description', model) + fsw.property_string('fdt', f'fdt-{seq}') + fsw.property_string('kernel', 'kernel') + fsw.end_node() + + +def compress_data(inf, compress): + """Compress data using a selected algorithm + + Args: + inf (IOBase): Filename containing the data to compress + compress (str): Compression algorithm, e.g. 'gzip' + + Return: + bytes: Compressed data + """ + if compress == 'none': + return inf.read() + + comp = COMP_TOOLS.get(compress) + if not comp: + raise ValueError(f"Unknown compression algorithm '{compress}'") + + with tempfile.NamedTemporaryFile() as comp_fname: + with open(comp_fname.name, 'wb') as outf: + done = False + for tool in comp.tools.split(','): + try: + subprocess.call([tool, '-c'], stdin=inf, stdout=outf) + done = True + break + except FileNotFoundError: + pass + if not done: + raise ValueError(f'Missing tool(s): {comp.tools}\n') + with open(comp_fname.name, 'rb') as compf: + comp_data = compf.read() + return comp_data + + +def output_dtb(fsw, seq, fname, arch, compress): + """Write out a single devicetree to the FIT + + Args: + fsw (libfdt.FdtSw): Object to use for writing + seq (int): Sequence number (1 for first) + fmame (str): Filename containing the DTB + arch: FIT architecture, e.g. 'arm64' + compress (str): Compressed algorithm, e.g. 'gzip' + + Returns: + tuple: + str: Model name + bytes: Compatible stringlist + """ + with fsw.add_node(f'fdt-{seq}'): + # Get the compatible / model information + with open(fname, 'rb') as inf: + data = inf.read() + fdt = libfdt.FdtRo(data) + model = fdt.getprop(0, 'model').as_str() + compat = fdt.getprop(0, 'compatible') + + fsw.property_string('description', model) + fsw.property_string('type', 'flat_dt') + fsw.property_string('arch', arch) + fsw.property_string('compression', compress) + fsw.property('compatible', bytes(compat)) + + with open(fname, 'rb') as inf: + compressed = compress_data(inf, compress) + fsw.property('data', compressed) + return model, compat + + +def build_fit(args): + """Build the FIT from the provided files and arguments + + Args: + args (Namespace): Program arguments + + Returns: + tuple: + bytes: FIT data + int: Number of configurations generated + size: Total uncompressed size of data + """ + fsw = libfdt.FdtSw() + setup_fit(fsw, args.name) + seq = 0 + size = 0 + entries = [] + + # Handle the kernel + with open(args.kernel, 'rb') as inf: + comp_data = compress_data(inf, args.compress) + size += os.path.getsize(args.kernel) + write_kernel(fsw, comp_data, args) + + for path in args.srcdir: + # Handle devicetree files + if os.path.isdir(path): + for dirpath, _, fnames in os.walk(path): + for fname in fnames: + if os.path.splitext(fname)[1] != '.dtb': + continue + pathname = os.path.join(dirpath, fname) + seq += 1 + size += os.path.getsize(pathname) + model, compat = output_dtb(fsw, seq, pathname, + args.arch, args.compress) + entries.append([model, compat]) + + finish_fit(fsw, entries) + + # Include the kernel itself in the returned file count + return fsw.as_fdt().as_bytearray(), seq + 1, size + + +def run_make_fit(): + """Run the tool's main logic""" + args = parse_args() + + out_data, count, size = build_fit(args) + with open(args.fit, 'wb') as outf: + outf.write(out_data) + + ext_fit_size = None + if args.external: + mkimage = os.environ.get('MKIMAGE', 'mkimage') + subprocess.check_call([mkimage, '-E', '-F', args.fit], + stdout=subprocess.DEVNULL) + + with open(args.fit, 'rb') as inf: + data = inf.read() + ext_fit = libfdt.FdtRo(data) + ext_fit_size = ext_fit.totalsize() + + comp_size = len(out_data) + print(f'FIT size {comp_size:#x}/{comp_size / 1024 / 1024:.1f} MB', end='') + if ext_fit_size: + print(f', header {ext_fit_size:#x}/{ext_fit_size / 1024:.1f} KB', end='') + print(f', {count} files, uncompressed {size / 1024 / 1024:.1f} MB') + + +if __name__ == "__main__": + sys.exit(run_make_fit())