From patchwork Sat Nov 4 19:42:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 161600 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp1816524vqu; Sat, 4 Nov 2023 12:42:57 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF2YLe43wWN62evlO6IiVRZKHHHBwgeJsjcgjgsT9utjJX3MTOIy/8PsId6uhXRmrVDbja7 X-Received: by 2002:a05:6a20:4422:b0:13d:8876:4c97 with SMTP id ce34-20020a056a20442200b0013d88764c97mr26435504pzb.16.1699126977130; Sat, 04 Nov 2023 12:42:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1699126977; cv=none; d=google.com; s=arc-20160816; b=UEer/1DbKfTNluiWMGi3W0q2blBQxkPku7G3RPyrPjhD148Er4lDa/dM+Ua/c+TwPZ V0s019Law6vay6urT/nLKINA4RhFTVB7LJZVjyCF7UnWNJ2YjiqZvbBnz70rVsKfV06K 1JTNi8MJd6d6x299/znpRdqG+dZ5Z9n2Zym2QXzuewlRRfxycBldYyfaXebQPN2HqkLT IunEMF1fAxrKLS7RSpOgTLwJQXwER7lAImYloQnUvAUIdS9gKi+uj8yo58QP8WcuHk9J lLmNXxVBvMbtCZwBep0jiU/pRO7OW0dT4Gq2PtIE2gsq/tur80g9DW+cT9+DLEDRSoqx Scew== 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=oNxt443FC5TM8S3RuiCFghZqcpQfJ7XyNvuU5lUxtOLKAbnH2sQyciHP+BOl4+T+fc DiLljnX7rSUk5nZOC5ZpAM3C7ba8jLRNeVV2ul36jhqNkkUvEonzlv5zY/4xdS58P2+C wnSYDdV3WBu9Z7ncGbhobG21+9RRWie2HkEZaGSbQpmznGuZeuo8B0qpHtp8xrrul7+w ei3W5dc8NH9qKS/KdxmyYY80+I66cnMj0//AZDyvKkr9QqXOExWXCqglGXHUrlk7Vy6g XtqHxPXDTxWL+loTxB3JhTjpjh8XjgD3z1Bo4UexXUAEBBOrvIm93hXbF1cv1S2FNriR Bwew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=JuuEgsV6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id kf7-20020a17090305c700b001c9af7debb2si4383086plb.525.2023.11.04.12.42.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Nov 2023 12:42:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=JuuEgsV6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 lipwig.vger.email (Postfix) with ESMTP id 1CF248051A84; Sat, 4 Nov 2023 12:42:55 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232233AbjKDTmf (ORCPT + 35 others); Sat, 4 Nov 2023 15:42:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42130 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231150AbjKDTmd (ORCPT ); Sat, 4 Nov 2023 15:42:33 -0400 Received: from mail-io1-xd2e.google.com (mail-io1-xd2e.google.com [IPv6:2607:f8b0:4864:20::d2e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C0A5B1BC for ; Sat, 4 Nov 2023 12:42:30 -0700 (PDT) Received: by mail-io1-xd2e.google.com with SMTP id ca18e2360f4ac-7aca968a063so116896939f.0 for ; Sat, 04 Nov 2023 12:42:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1699126950; x=1699731750; 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=JuuEgsV6qW+QChu9bexGZ7OLp+YfIShJ5hC9hzqyOTt9hyLodlODeL3TGk3ro8V/wG cWgQbGArskn9UePiW87pjOcPZ8qrmGgeUHBsZKQIlL8Ft7ix3Dd2iWO8EeCtMSjZlZLJ zR+/La44r9iodDfL6nt4LYsTeWrEC7yFNan0s= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699126950; x=1699731750; 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=dH2C8qZmh6tVdmiSo/iYyr3TUAUhIjnBL+v3sS2vXNtM0Cb4+UrnscX/WjR3zBcoDm aTR0UDmVxBByIz5Fgt+vLYKq90t06AZT3Ni4+3q3dGkaDHaKCn0jQGyKF2A2rRJ+B02I 9+GDYULvkZZ0vetdbXR2/cBuIJrAF5MsFtuZC2cEL/Ca4b+ZAlPqhFAHar/tTvuN9tta icbSXjEtTdTS17wiA7xYTe0FPYoG7EZ+7+TTx8h3doiwjtYnZ+IBF3ZPcIU5gkr2GLz2 5IjRbH/2P+xtSaGs6PE6CVgqbl8EmenODCZsaZWtHhaUn1tdMgixxcu/hu/H98mZvqNg jnEQ== X-Gm-Message-State: AOJu0YxjccLfy5H1XUWHLdLZTBglZADurG3pND4fVYmvudvwqYa4sEv4 fsY3s2O/fqZZZCjo7lDkM2QG/Q== X-Received: by 2002:a05:6602:1592:b0:790:a073:f122 with SMTP id e18-20020a056602159200b00790a073f122mr37121229iow.2.1699126950221; Sat, 04 Nov 2023 12:42:30 -0700 (PDT) Received: from sjg1.united_club.lax.united.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o4-20020a6b5a04000000b0079fbb834232sm1293318iob.19.2023.11.04.12.42.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Nov 2023 12:42:29 -0700 (PDT) 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 v2 1/3] kbuild: arm64: Add BOOT_TARGETS variable Date: Sat, 4 Nov 2023 13:42:02 -0600 Message-ID: <20231104194207.3370542-2-sjg@chromium.org> X-Mailer: git-send-email 2.42.0.869.gea05f2083d-goog In-Reply-To: <20231104194207.3370542-1-sjg@chromium.org> References: <20231104194207.3370542-1-sjg@chromium.org> MIME-Version: 1.0 X-Spam-Status: No, score=-1.4 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email 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 (lipwig.vger.email [0.0.0.0]); Sat, 04 Nov 2023 12:42:55 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781663769535446236 X-GMAIL-MSGID: 1781663769535446236 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 Sat Nov 4 19:42:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 161598 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp1816460vqu; Sat, 4 Nov 2023 12:42:41 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFgEq5otvnGg/aHsIXfPWPQaIrk17xpZvnksKhkFBrPXVhMLUxIgu0oJJDjS7bMuuC8jfav X-Received: by 2002:a17:902:e84b:b0:1cc:4559:f5 with SMTP id t11-20020a170902e84b00b001cc455900f5mr22560368plg.14.1699126960744; Sat, 04 Nov 2023 12:42:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1699126960; cv=none; d=google.com; s=arc-20160816; b=kpKezkaB45gS+9tT5e3/Aj24wS+S5SfiTktdWwpR+7dujhMXQabUykRx78YO90xuie oiz7/OyhMCom6Tg9ivHllyskQSjh92p4PWQPwWRIXGcj0S8pqajfMpVNxTj8DARx1rmH ru0/3VB0zVlzExhBg8EwyQxiCqPIHcOrQOG6gFkb330YyoUWmRxKfcqB/zX2dXFFwtaG 3i32ZwN3hjsL/Y5+3EN1IWZxM0ikl6rdjNjCwDGKbmB8Nx30LKZ2Wcf+jDDdHjI0edJ0 QL77/98wcJ67gQiyOmvAdSEkpT1PQXmZinPkCFrDuGhecHYf+lh/PNp2TOXWMAa7ksHO 0Qfw== 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=BDtk6Lut1ZOMIQsv1zjp0Y23IQKARp0A3/De87KmLgY=; fh=ga9qGJDOEMp+1IM3d6kHFYmCBysRaZjBj4d3T47SzI8=; b=Z59jKISsfcgxiJk3Szd4I/ExRqYiuM1lXKYrNPjCyTvQBHW+cb379OmEwi2+0l0XXC lwCJd+te4rC+RFO7O4pbkd52LlMxTdnY+AfiYHzioOJ01hFAsczHZ2i97ETIz3Sjg1X0 R7vMyGBK5g4S3Hm0J+cSnaABaTUZli77BRRFi9ctLbLgzhx0Iah0bosGh4QlXxXfvZjx g4ZlAkBDWZ86IntP9bWWi7Zm+mdac/M8gdSBeMkwXs/WIoVMMNorMKkTlpX50OmR6S42 Z8KELwh1wfRAxMdwSBakiJhSs8T3eH33SyXYkGfdqDMqRCwf6QjqFhdCGvUOANdw5Kud r01g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b="GT/y38S4"; 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 a11-20020a170902eccb00b001c1e1fe16cbsi4669180plh.255.2023.11.04.12.42.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Nov 2023 12:42:40 -0700 (PDT) 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="GT/y38S4"; 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 DAFB280ACB46; Sat, 4 Nov 2023 12:42:38 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232469AbjKDTmh (ORCPT + 35 others); Sat, 4 Nov 2023 15:42:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42150 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232244AbjKDTme (ORCPT ); Sat, 4 Nov 2023 15:42:34 -0400 Received: from mail-il1-x135.google.com (mail-il1-x135.google.com [IPv6:2607:f8b0:4864:20::135]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B2546D45 for ; Sat, 4 Nov 2023 12:42:31 -0700 (PDT) Received: by mail-il1-x135.google.com with SMTP id e9e14a558f8ab-35961c61febso7335755ab.1 for ; Sat, 04 Nov 2023 12:42:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1699126951; x=1699731751; 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=BDtk6Lut1ZOMIQsv1zjp0Y23IQKARp0A3/De87KmLgY=; b=GT/y38S4KK1N3UIzHTx+VBrYwMYcqYpNqYG7BaLfSW+LXyPV0g1z9z9TkTaMRBm5xL ZtA6Sf0SDfKWL/WOBPSQSpUQTlqJknXi30K1c/Al4J2mRav9HoWoROJLO8xFiWrFNpJx O5Cd55WJmNnCWqPWEOWqOcklHTFqLcKZyKcHM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699126951; x=1699731751; 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=BDtk6Lut1ZOMIQsv1zjp0Y23IQKARp0A3/De87KmLgY=; b=FZdXPt1n8riIUdt2ttbv8ghXOFWYRiELAqxCDo1PpVm5DnE1bnFWQt9xvIhZNVvKMD UYhLxSjQdUS8SzgRVyES5O06TDc1FKQ4R0m3Keozby2BRp74bp+8XVVv/8D7q6tDfZLi WvSv3yahJdcUJR7btCV92JyYPAShWF5umGnS1YR3dKsxyDLlyaGD3YQH/2mSaU9y9YB0 K7smYFGUbarhkCBz4bEAqMnUxXvX7S5Cm7XpH2Aeqhe2Us31xIa+1BMANbghktHDONC5 GkAnxuPkCR07aP3ujXQP3ZppndILKVauDA5EknBwD22dFp7NhlNVTciNkug6xo/3mBYm hMMQ== X-Gm-Message-State: AOJu0YyXViqMYUvdhzkPsLKXAS1SbtM4A98UComyCPGSDovCJsgpFwxx x7LMzKZeGDZF5enf4J3CTaXnbg== X-Received: by 2002:a05:6602:2d87:b0:783:4bc6:636e with SMTP id k7-20020a0566022d8700b007834bc6636emr31219991iow.21.1699126951160; Sat, 04 Nov 2023 12:42:31 -0700 (PDT) Received: from sjg1.united_club.lax.united.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o4-20020a6b5a04000000b0079fbb834232sm1293318iob.19.2023.11.04.12.42.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Nov 2023 12:42:30 -0700 (PDT) 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 v2 2/3] arm: boot: Use double quotes for image name Date: Sat, 4 Nov 2023 13:42:03 -0600 Message-ID: <20231104194207.3370542-3-sjg@chromium.org> X-Mailer: git-send-email 2.42.0.869.gea05f2083d-goog In-Reply-To: <20231104194207.3370542-1-sjg@chromium.org> References: <20231104194207.3370542-1-sjg@chromium.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.7 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, URIBL_BLOCKED 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]); Sat, 04 Nov 2023 12:42:38 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781663752248005816 X-GMAIL-MSGID: 1781663752248005816 The use of single quotes in the image name causes them to appear in the image description when the uImage is created. Use double quotes, to avoid this. Signed-off-by: Simon Glass --- Changes in v2: - Split double-quote change out into its own patch scripts/Makefile.lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 68d0134bdbf9..03e79e319293 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -487,7 +487,7 @@ 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 \ From patchwork Sat Nov 4 19:42:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 161599 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp1816497vqu; Sat, 4 Nov 2023 12:42:51 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF6WiXJeCRrgF73a0fNS97xxndQo2Sye/ZJfhmCl3qaJsowLDyFroQ0FkylFlWojK/t05T/ X-Received: by 2002:a05:6808:1149:b0:3b5:64c5:db3a with SMTP id u9-20020a056808114900b003b564c5db3amr17725322oiu.49.1699126971602; Sat, 04 Nov 2023 12:42:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1699126971; cv=none; d=google.com; s=arc-20160816; b=KhfyCDtFAHEUw6S75lcaA6ToY8hdQtxt1Xm/k5wI8SS44og3XldQ0YzC8kMX7najsL 2hMsiBXkc3fx7R5qcCSAbPYnye916JDfazRdGMPSUQoJNEJp4A98NvP53BRtaY6Q6VE7 5LvMyE723d0McSUqI57WJ4stkDtxkcLAOYAkNHUfk5tgzgzNQCNEKmIIX3WWdOvPImSh 7jHDWFJxMx0MJQf+HXw3JCpLIVKoiDfaJVmFW73Ha5i2RWAqjJknZXx52W5sGNafQVd/ pT8eQeqoUuBxSQuqnxcGiiQYY05OLoZvVYVDP7CIuDTPvIkb0cfHL3XLKIiRE2P2WzXx vadw== 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=9SJMC+YwLpaY0RKexevOXF6QTYL/zFjGR4wGfi7HoDk=; fh=gMYtiOnikXPU57D4E0yjzqpcGVTKtIdXI7et5S29+d4=; b=sSMnBmYK0EN/i9zo5JxkQp7wC1v63rp+WpFgv2VMzn29LZIu65YeJrxMrTOGzFfyVe TlRqNUaShewbZolkiomGpToyEHkSYCeTrb8TAmSak4gMHPDAGJMtb87yGhKzQhQOwZSC xwrBZnG41/8f7WrCmwgJ2+5tzvMTL4EmVhXrzDi3xbNHoUQX0F4DcLdomSTMAFYSY3U/ 6bG4/owH477UIpDWMDZJ+u6lwtjAXYNRy+bfB7d7lbkKkiNyGbefp4DPKHIOEQXOrldT RjU9q7h9EWKZpnTJX+HWp2dqC6/FkwjwITMGjA6+Yo1diN7FhstIIk7iX7WrmEuzhKVU wmpw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=MXkFv9I4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id by19-20020a056a02059300b005b874265d1fsi4490843pgb.513.2023.11.04.12.42.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Nov 2023 12:42:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=MXkFv9I4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (Postfix) with ESMTP id 0C9278092C93; Sat, 4 Nov 2023 12:42:48 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232483AbjKDTmj (ORCPT + 35 others); Sat, 4 Nov 2023 15:42:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42158 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232459AbjKDTmg (ORCPT ); Sat, 4 Nov 2023 15:42:36 -0400 Received: from mail-io1-xd30.google.com (mail-io1-xd30.google.com [IPv6:2607:f8b0:4864:20::d30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BC4E6D47 for ; Sat, 4 Nov 2023 12:42:32 -0700 (PDT) Received: by mail-io1-xd30.google.com with SMTP id ca18e2360f4ac-7a67b9cd230so115988739f.1 for ; Sat, 04 Nov 2023 12:42:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1699126952; x=1699731752; 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=9SJMC+YwLpaY0RKexevOXF6QTYL/zFjGR4wGfi7HoDk=; b=MXkFv9I4roJVRp8LJsrD+OU3Nt7GeVls5oASqZiyEjYzOwjdhICev2d/TMlYnCgtRr aGewM58zfkfUbHxn/MnwQtHrOJ8z5dJ5Xsmkx3hrEyZ/mmgviemiGDvJkssDQo+P30C/ AnxGYpDuwHtZfntVlJnSRvpVEfte1+37CE2VQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699126952; x=1699731752; 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=9SJMC+YwLpaY0RKexevOXF6QTYL/zFjGR4wGfi7HoDk=; b=b9SydrI9WyeQj7BEh0rM027LfEbopzKHTWfIt4MLykfZgIGfaS9MVaMCGRlQhVGaKQ pLCMsGofLVcup/KLDvIkVS/BSlPaiCmUU/66G++E6PnI6BQaCQqRROn7MLGrwVZ1gL6f 3zX4ZT7fe5oNxzNmcUjMp3VMEJEO0CSvu5m9lkgjJUsgevrWijg49SVXGZLY2K68UmRu upZrAv8wQpe2Z+8Zxi9iKrqB0vHXqLVcgTMhwZ5+Bd7+p2FN5NIi3o7wqEdIg3TxCBWo DiADrO4BJSLLqWG5e3CUhZPoPgdib9WtWoow0hFhTfUBzaYbEvquDAIW7yU/YkoI2R4N rcqg== X-Gm-Message-State: AOJu0YwFrL6z3KHxbmEqXOjOmEQUT03zw93kJhb1qlYD63ETc3MVrh11 8tNQbwRHm9opdwA+78h5jZ49Sq7yvIr4Zp9VQr/HmA== X-Received: by 2002:a6b:1414:0:b0:7ac:cb6b:616c with SMTP id 20-20020a6b1414000000b007accb6b616cmr13764740iou.17.1699126952043; Sat, 04 Nov 2023 12:42:32 -0700 (PDT) Received: from sjg1.united_club.lax.united.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o4-20020a6b5a04000000b0079fbb834232sm1293318iob.19.2023.11.04.12.42.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Nov 2023 12:42:31 -0700 (PDT) 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 v2 3/3] arm64: boot: Support Flat Image Tree Date: Sat, 4 Nov 2023 13:42:04 -0600 Message-ID: <20231104194207.3370542-4-sjg@chromium.org> X-Mailer: git-send-email 2.42.0.869.gea05f2083d-goog In-Reply-To: <20231104194207.3370542-1-sjg@chromium.org> References: <20231104194207.3370542-1-sjg@chromium.org> MIME-Version: 1.0 X-Spam-Status: No, score=-1.4 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_PDS_OTHER_BAD_TLD, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email 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 (groat.vger.email [0.0.0.0]); Sat, 04 Nov 2023 12:42:48 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781663763200151452 X-GMAIL-MSGID: 1781663763200151452 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 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 to-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 | 2 + arch/arm64/boot/Makefile | 9 +- scripts/Makefile.lib | 18 ++- scripts/make_fit.py | 288 +++++++++++++++++++++++++++++++++++++ 6 files changed, 324 insertions(+), 3 deletions(-) create mode 100755 scripts/make_fit.py diff --git a/MAINTAINERS b/MAINTAINERS index b98b87d8e424..bcbececf4b43 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..d8290dcab6b6 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)' +$(if $(CONFIG_EFI_ZBOOT),,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..f84a7073dbcd 100644 --- a/arch/arm64/boot/.gitignore +++ b/arch/arm64/boot/.gitignore @@ -2,3 +2,5 @@ Image Image.gz vmlinuz* +image.itk +image.fit diff --git a/arch/arm64/boot/Makefile b/arch/arm64/boot/Makefile index 1761f5972443..2681f54cd2c8 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,10 @@ $(obj)/Image.lzo: $(obj)/Image FORCE $(obj)/Image.zst: $(obj)/Image FORCE $(call if_changed,zstd) +# Provide the kernel for the FIT +$(obj)/image.itk: $(obj)/Image FORCE + $(call if_changed,copy) + EFI_ZBOOT_PAYLOAD := Image EFI_ZBOOT_BFD_TARGET := elf64-littleaarch64 EFI_ZBOOT_MACH_TYPE := ARM64 @@ -48,3 +53,5 @@ EFI_ZBOOT_OBJCOPY_FLAGS = --add-symbol zboot_code_size=0x$(shell \ $(NM) vmlinux|grep _kernel_codesize|cut -d' ' -f1) include $(srctree)/drivers/firmware/efi/libstub/Makefile.zboot + +clean-files := image.itk diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 03e79e319293..1427dba4f0f9 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -494,7 +494,23 @@ quiet_cmd_uimage = UIMAGE $@ -C $(UIMAGE_COMPRESSION) $(UIMAGE_OPTS-y) \ -T $(UIMAGE_TYPE) \ -a $(UIMAGE_LOADADDR) -e $(UIMAGE_ENTRYADDR) \ - -n $(UIMAGE_NAME) -d $< $@ + -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 # --------------------------------------------------------------------------- diff --git a/scripts/make_fit.py b/scripts/make_fit.py new file mode 100755 index 000000000000..ee33fb54c6d4 --- /dev/null +++ b/scripts/make_fit.py @@ -0,0 +1,288 @@ +#!/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, 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 + 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', 'arm64') + 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.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())