From patchwork Thu Oct 26 07:26:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 158428 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp487093vqb; Thu, 26 Oct 2023 00:28:25 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFKBG3IhP1RfozoDVX9UQrlHn1RS0mZDX8qHL8aDO2zw0hrK2j73ldg7eFwMNs/desIwebQ X-Received: by 2002:a81:a74a:0:b0:5af:196c:dfcc with SMTP id e71-20020a81a74a000000b005af196cdfccmr456600ywh.8.1698305305221; Thu, 26 Oct 2023 00:28:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698305305; cv=none; d=google.com; s=arc-20160816; b=NMKqfuNpmbI9gcnyN/fHDfxw7wdsOOOlEbcfFSWekV9C1TRUzcGvfQoBSBhllp6Chz 2SpDaqEqFdHXFkCNVxavYxilkCE1FDffvo/098lzmnA2xsly040HfdKS8spMWGIDDePX WelW4Uhe6YwnUD5WVm/vA4w6AbDuhz4WRIQD0TjE8cG2PoxES9h1uyXbAedADQaQAXI1 VmDizs7sAG8e5QyXjzgU3dg+AmzsKPt/StvulG57pgNGGBmPF0uzAu/YkTHYxc7w2lhA mxwwuLluU0fdiuLcVnUeSTcaa143q65zw5Tig6tJ4mYEMmyIsbSJ9EZpu3MGcqUyF+4y zGvw== 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=UTwZx3oM2k52vN4dFBT99PYUWHkrvjvdxEhL3D6GWJ0=; fh=1SbH2UHa9fu4FCckgKiAHrnpQ394xmuVCZrbMKfVfvc=; b=WQEu5xXJ3Zule5M6+ap9EcAPOwogrdz2VwXXPKFdcH4Zd84CgGgWMgpsP8ASDbuk7b Ty8BZIgSLR982yUYA/sITtnUS31bzXqPPhFQHea4iP14/M+t5FeNv+K41RC3zXWRCmCE jr+PH5YebrrElJCUBFgbGKEKJyKxUUokIdM4ZjR0oKQ4YIS1tjDMFFxvEifmGzv0EKZG FDuYkj3HNNfNt1L4/NivghcI7kgmKdLM2V0YG9O29SS3X9ALY5YlNV30ooKx3Ttf4OnV PLkjy23Gu3CfLDEE4Z2xCizTjtLdt2ar5ajgKHyV1bS8aVXrq/ZuEEP/gNqB03JvZ/CZ CgIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=oQhwfqDt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id b20-20020a0dd914000000b0058dbca2d04asi14269183ywe.313.2023.10.26.00.28.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Oct 2023 00:28:25 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=oQhwfqDt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (Postfix) with ESMTP id 37AF181ADCEF; Thu, 26 Oct 2023 00:28:22 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344406AbjJZH1t (ORCPT + 26 others); Thu, 26 Oct 2023 03:27:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39972 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229739AbjJZH1s (ORCPT ); Thu, 26 Oct 2023 03:27:48 -0400 Received: from mail-pl1-x632.google.com (mail-pl1-x632.google.com [IPv6:2607:f8b0:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 549E01AB for ; Thu, 26 Oct 2023 00:27:46 -0700 (PDT) Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-1caa7597af9so4191925ad.1 for ; Thu, 26 Oct 2023 00:27:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1698305266; x=1698910066; 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=UTwZx3oM2k52vN4dFBT99PYUWHkrvjvdxEhL3D6GWJ0=; b=oQhwfqDtff9r9446746OsT707+BlU1WPXH1N0wR8+HWWCf7Go1KHwJAEnk6TRek56O rAkcZXqySJZGhJhCEFG/n+1THLBxYaUwgYUWP5zVQfoANhtxLHzP6KisdmLjwVDHpWZ5 z8nn1idSeQy6h3rSBx8WpS63kKQWLvuOYscAU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698305266; x=1698910066; 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=UTwZx3oM2k52vN4dFBT99PYUWHkrvjvdxEhL3D6GWJ0=; b=aRwScYtnD064U15KPodgxX1NrO7I3f3+RkLLbAwyeacDewKoVqtbm66Kl3+X3gXy2p 1jcD64NitPHZoxaLT4x6pNoXV/st814dNmxvUs3anlJLfhWFt8V2s4zNg2GfjEONU7yE FduoaRZlslPkSDJAh+N7xXtBsr3ANeQ8D2zXG6GRqDpgORJ6ZcpHBWIEIetN0M3HMKWl G8KziJNawXnLmiplWefuFzdtHLEZoaKYlBVCSfz+0O9wk4Q1Z+6k/RE84e0Cb2l0M3JN zGo0sTXPlHpquxRxWrcbHkV57z1SQKxASkxEQNUpiGzH/0gWl6OqGh6lrl9yrpaMHVSI 97Rg== X-Gm-Message-State: AOJu0YxFjapC5ZeRojSPURiLgc8/KzxqNpzvYTKjm2420j/9gALPwP0d fDuViuYctyDYYnGNTvHyJAO38A== X-Received: by 2002:a17:902:ce92:b0:1c9:e774:58e1 with SMTP id f18-20020a170902ce9200b001c9e77458e1mr17515487plg.8.1698305265723; Thu, 26 Oct 2023 00:27:45 -0700 (PDT) Received: from sjg1.roam.corp.google.com ([202.144.206.130]) by smtp.gmail.com with ESMTPSA id n17-20020a170902e55100b001b7cbc5871csm10294023plf.53.2023.10.26.00.27.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Oct 2023 00:27:45 -0700 (PDT) From: Simon Glass To: linux-arm-kernel@lists.infradead.org Cc: U-Boot Mailing List , Simon Glass , Masahiro Yamada , Nathan Chancellor , Nick Desaulniers , Nicolas Schier , linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] kbuild: Correct missing architecture-specific hyphens Date: Thu, 26 Oct 2023 20:26:23 +1300 Message-ID: <20231026072628.4115527-2-sjg@chromium.org> X-Mailer: git-send-email 2.42.0.758.gaed0368e0e-goog In-Reply-To: <20231026072628.4115527-1-sjg@chromium.org> References: <20231026072628.4115527-1-sjg@chromium.org> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 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,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.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 (pete.vger.email [0.0.0.0]); Thu, 26 Oct 2023 00:28:22 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780802183853620195 X-GMAIL-MSGID: 1780802183853620195 These should add a hyphen to indicate that it makes a adjective. Fix them. Signed-off-by: Simon Glass --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 690cde550acd..b63796e6f94a 100644 --- a/Makefile +++ b/Makefile @@ -675,7 +675,7 @@ ifdef config-build # *config targets only - make sure prerequisites are updated, and descend # in scripts/kconfig to make the *config target -# Read arch specific Makefile to set KBUILD_DEFCONFIG as needed. +# Read arch-specific Makefile to set KBUILD_DEFCONFIG as needed. # KBUILD_DEFCONFIG may point out an alternative default configuration # used for 'make defconfig' include $(srctree)/arch/$(SRCARCH)/Makefile @@ -689,7 +689,7 @@ config: outputmakefile scripts_basic FORCE else #!config-build # =========================================================================== -# Build targets only - this includes vmlinux, arch specific targets, clean +# Build targets only - this includes vmlinux, arch-specific targets, clean # targets and others. In general all targets except *config targets. # If building an external module we do not care about the all: rule @@ -1637,9 +1637,9 @@ help: @echo 'Documentation targets:' @$(MAKE) -f $(srctree)/Documentation/Makefile dochelp @echo '' - @echo 'Architecture specific targets ($(SRCARCH)):' + @echo 'Architecture-specific targets ($(SRCARCH)):' @$(or $(archhelp),\ - echo ' No architecture specific help defined for $(SRCARCH)') + echo ' No architecture-specific help defined for $(SRCARCH)') @echo '' @$(if $(boards), \ $(foreach b, $(boards), \ @@ -1681,7 +1681,7 @@ help-boards: $(help-board-dirs) boards-per-dir = $(sort $(notdir $(wildcard $(srctree)/arch/$(SRCARCH)/configs/$*/*_defconfig))) $(help-board-dirs): help-%: - @echo 'Architecture specific targets ($(SRCARCH) $*):' + @echo 'Architecture-specific targets ($(SRCARCH) $*):' @$(if $(boards-per-dir), \ $(foreach b, $(boards-per-dir), \ printf " %-24s - Build for %s\\n" $*/$(b) $(subst _defconfig,,$(b));) \ From patchwork Thu Oct 26 07:26:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 158427 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp487044vqb; Thu, 26 Oct 2023 00:28:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFXHCeDcL/LqL/ToDU0Pi4LpHgRdxXhulvns2XbylW5t5akhhl6NrDW17Wk0yMQpjM+0ETc X-Received: by 2002:a81:ae5f:0:b0:5ae:f1a3:dde1 with SMTP id g31-20020a81ae5f000000b005aef1a3dde1mr1000140ywk.34.1698305298215; Thu, 26 Oct 2023 00:28:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698305298; cv=none; d=google.com; s=arc-20160816; b=ImM+3xphavI7xqxOJyT9J7l2EibNxBXWBynL1SJ/qLhowUWS+qxjNt7sx8DuHSlhOt E9SIF2sZ26Lhow9PXTqkZamxVzRKBUp3PHBkzUIxkUZkH1cxMZtDge5pnds7el6LXJ79 A/fSdriJII83biTJdVimi/r8Ig/Xe5KWv/i53/gEmeuUP3NkKZwWcznpwGvgCWdOVUNk +3bKM5w3UTqlFfiZKDUttHtjF/ANZmWZKhxVu47+qP/R3fog8PcV4QJGo2G5fmgD4tSr +Aq+MH+PNsTf3/W6KT6k14jnhwWxVCzfoFNVUujo+V72JiS/5kdrLEvmNIshy4VxkNw+ zueg== 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=j5HROyknCuzezfPnKKu8GDq6Ak0A1oqAWU9OMPRzgBc=; fh=1K11mxcBqu82jKBYVbB5Frp32cKCZ51GwjRtRwGLGw4=; b=D9MwcnDT2I1q05VGDGyAvuceAvWdbmHmmqZR8dUeyyw4sR7LPGSi1/vGvucIEqoidq VtwF2osRS/oPwS/HRwphH7Pqr4J8TOpw84Jk2FQOzLJszmb9bPlc4kr+3/LwEjLErEZ7 wLzmQhjWD3yPXZ1EyaCxKu+GPoLSTCRV3A2mVi3V8eyZXDXZ/X7QzG+mb5NhGHaWB1Wx hvtSkbdVi5K1jieiuAi+NkGykl7myHLJ660FMACmfvL9eQK+BYgAYd0J8sEAQbuQ4v5e UGFg8zohsj4gHeL6sAaXBpXehz8l4eTAL+svEXgSi2GDqLeperdRv0BWXpbHYoziAnYV r5Eg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=eOSg+QfQ; 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 a135-20020a0dd88d000000b005a7a7313354si14661378ywe.113.2023.10.26.00.28.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Oct 2023 00:28:18 -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=eOSg+QfQ; 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 0BD9A81D773C; Thu, 26 Oct 2023 00:28:07 -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 S1344429AbjJZH16 (ORCPT + 26 others); Thu, 26 Oct 2023 03:27:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40058 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233257AbjJZH1y (ORCPT ); Thu, 26 Oct 2023 03:27:54 -0400 Received: from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com [IPv6:2607:f8b0:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 638F219F for ; Thu, 26 Oct 2023 00:27:52 -0700 (PDT) Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-1c87a85332bso4731245ad.2 for ; Thu, 26 Oct 2023 00:27:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1698305272; x=1698910072; 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=j5HROyknCuzezfPnKKu8GDq6Ak0A1oqAWU9OMPRzgBc=; b=eOSg+QfQnvK4iJwflaHilWiUIJOir2Za0dxYXpG65BaQ1bl371yS2Rqg4PFrxcdiO/ hTwzKBcTreEPC+o+vppNNzKcoj3FwuWS9SnxyeqdkCiMdpxTBgY1gfVPioWL9Fu12Z0p Eag0LMHlsA3nPb5C0JeiHlUCoH1PQg0UJR/70= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698305272; x=1698910072; 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=j5HROyknCuzezfPnKKu8GDq6Ak0A1oqAWU9OMPRzgBc=; b=t50qCiiLxOomqK/y7aBokEr9Io5O6FeOQOVzmroQirI9Ztr/C0/4Ld/JwQu8TmdRwW WRYpZzbZ6r74kCYLBSj25sJ0G3Kk9yHfaQoUwEcbtc47lNgCO3+Jvg16/Hub73edZ7wV MhxKAxljCdHuW5xjT6V70LrYX6XJYY0RrQI12tuYXbw1jH+ZwFA1itfIZjE9Rr+pUwE+ QFsLKV+AF6CvPmlBKhPoNEXNVr90BeNM3QnPyrzD2hJghO4tsnA9p7DrJTCmBrroVShk W57byoSb4ala6hc7BEA5o+fV3q/09mTr5ZgaHa5RmiqdyTBfBsC3SjI/wesfLiWP1c5m XkTg== X-Gm-Message-State: AOJu0YyP3JokUBcVmkk19pRm5eVC2NT60ggrhJPV4BGWbOQGyGo644UG Ulpt9/rSeeax70mAwloAx0DR2X8scX3BhHqgOyh1mg== X-Received: by 2002:a17:903:200d:b0:1ca:754a:692e with SMTP id s13-20020a170903200d00b001ca754a692emr15633418pla.30.1698305271862; Thu, 26 Oct 2023 00:27:51 -0700 (PDT) Received: from sjg1.roam.corp.google.com ([202.144.206.130]) by smtp.gmail.com with ESMTPSA id n17-20020a170902e55100b001b7cbc5871csm10294023plf.53.2023.10.26.00.27.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Oct 2023 00:27:51 -0700 (PDT) From: Simon Glass To: linux-arm-kernel@lists.infradead.org Cc: U-Boot Mailing List , Simon Glass , Catalin Marinas , Will Deacon , linux-kernel@vger.kernel.org Subject: [PATCH 2/3] kbuild: arm64: Add BOOT_TARGETS variable Date: Thu, 26 Oct 2023 20:26:24 +1300 Message-ID: <20231026072628.4115527-3-sjg@chromium.org> X-Mailer: git-send-email 2.42.0.758.gaed0368e0e-goog In-Reply-To: <20231026072628.4115527-1-sjg@chromium.org> References: <20231026072628.4115527-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_NONE, SPF_HELO_NONE,SPF_PASS,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]); Thu, 26 Oct 2023 00:28:07 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780802176488703826 X-GMAIL-MSGID: 1780802176488703826 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 --- 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 Thu Oct 26 07:26:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 158429 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp487157vqb; Thu, 26 Oct 2023 00:28:34 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGmE7Gr5+6YMp9QtowJzrQm2hgggfkz5UMOKwZ/51oWaQgDkZIamVjsK7QOW7dstVx3QFce X-Received: by 2002:a81:440c:0:b0:5ae:c0e2:da1b with SMTP id r12-20020a81440c000000b005aec0e2da1bmr1854709ywa.45.1698305314627; Thu, 26 Oct 2023 00:28:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698305314; cv=none; d=google.com; s=arc-20160816; b=UIjwc9BRXpXgqQIUn4TzTZ/ReSi5pOtNbVLo5zI/cMFESVSX1/428D+NdHHQuuVmXV vrjrg9AS8XO9rAACQ6n2f2o7KW/km9HjHvgf64j1XqwkL4yU2lni88+OwQQGMFTrRovW B4dHtdFuBFyejpFW4Yvsx9hY6POwSugciOtHCJD2ls8yvWEwWkgzWe3PVmdKVPxj1Ux/ byroouWGgRwKcQBh2Lr6LpQInpRDl5geUcn+XXJx+eU2wU3zAkTnBuhVR++6R3N1tKiD nk07V/aWjr53OdOfemvdboKXcNkkTnxbTyjoPlDrjprFlmqcvwhukXKUPMGOqs74gAjk XT+A== 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=vVg38DAEY+GKxvLT4QMM3vicbeMq8NcfMl/wOJcG9Pk=; fh=hDGuM9SMVqOObg2b4e9VtC/AP5QXfb69Vl8WjvNFn+I=; b=gkiEuXkRARSxkxq18Mg/1BPl8/fkgOpq8/S27MENXkt/miTPJmv/SPs/5lx+gM4uIe /EXE1WEISjxUKXA8ixHdpGTVLyKomo/RTCtiZvGMK7XTQwAATJv4DIp3FAnCUbVp7VIs 5R4PDlrmnPtOyT4iEhZ0ckyDkaaKzG7Lt5t0u8iKPCRQyGX/P6RQVzgb6zgCM/hdZ+03 SlyygZ7zshSxDZZ7TNurZFQyhNX9hKLQZcRSv6dj3sbEROJh6mT831qQVfX595V2Ov1A IYEoHYDrls65U0VnfoK3wiSS1TQ2AiZj6N9z9HPTLU1mY1YHkM13QJHsftUJNv3n/cz6 CdmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=PvPDzny5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 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 pete.vger.email (pete.vger.email. [2620:137:e000::3:6]) by mx.google.com with ESMTPS id n17-20020a0dcb11000000b005a7c8e2c302si13349819ywd.323.2023.10.26.00.28.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Oct 2023 00:28:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=PvPDzny5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 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 pete.vger.email (Postfix) with ESMTP id C7EB081ADCD6; Thu, 26 Oct 2023 00:28:30 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234913AbjJZH2K (ORCPT + 26 others); Thu, 26 Oct 2023 03:28:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57736 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344437AbjJZH2B (ORCPT ); Thu, 26 Oct 2023 03:28:01 -0400 Received: from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com [IPv6:2607:f8b0:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AAA421A6 for ; Thu, 26 Oct 2023 00:27:57 -0700 (PDT) Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-1ca82f015e4so4669775ad.1 for ; Thu, 26 Oct 2023 00:27:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1698305277; x=1698910077; 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=vVg38DAEY+GKxvLT4QMM3vicbeMq8NcfMl/wOJcG9Pk=; b=PvPDzny5X52mQJnq5lJZO7B4UcLtKxGgCl6xVB7Irm35KtCsabhgcwy+oz8u/MgZX2 T5e4dykdb0ux1mNeu1O1bzSo6xcZbX1WXlDBxqTwmkwcr/GJRUgwGyQCtHaKmxPGCcZK COwqRlwIUjjlC/QJhE1TiLSMbCCzrLCMTQvY4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698305277; x=1698910077; 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=vVg38DAEY+GKxvLT4QMM3vicbeMq8NcfMl/wOJcG9Pk=; b=J3ndTDvYSIYmaibxF3OGRxV2dTl4QSjKeY9zOGzC0gKkt7I9DklK8gr2lprcPlyPGo eAnZkatUw5mYJez8taF/QKUFDhyRuzRe1pW27UKZsTdmzY4OzK2Mm+m1CbnNZqE8FCPB HX3kozsMgpa41vy6wcIv4PUTFyQgooy+a+TFR4iUAxW3r6O5EGOfebzgqvaoJsQxZIfU hCog503gjv6btWhWOKpWoVTyCQ6Iq3Iv+kAaQC1ks/qfjxqbHJhQR+zTEbGF3T4Df3hw d9jkrdC2qtR/oJlgmt41+t6vHYalbQjnnsHyMiIQwjleSQp77PaFiTCJGWpEKFDeRAO7 2AqQ== X-Gm-Message-State: AOJu0YzQeVR57UwE+T4RVpBoptUsSEgJWdn36YsNk8us3Zvf2s2wnz7E FVOnXUSUw4nZrY8CZ2UsI9VVRg== X-Received: by 2002:a17:902:d48f:b0:1c9:dff6:58e8 with SMTP id c15-20020a170902d48f00b001c9dff658e8mr15543630plg.54.1698305277011; Thu, 26 Oct 2023 00:27:57 -0700 (PDT) Received: from sjg1.roam.corp.google.com ([202.144.206.130]) by smtp.gmail.com with ESMTPSA id n17-20020a170902e55100b001b7cbc5871csm10294023plf.53.2023.10.26.00.27.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Oct 2023 00:27:56 -0700 (PDT) From: Simon Glass To: linux-arm-kernel@lists.infradead.org Cc: U-Boot Mailing List , Simon Glass , Catalin Marinas , Masahiro Yamada , Nathan Chancellor , Nick Desaulniers , Nick Terrell , Nicolas Schier , Will Deacon , linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] arm64: boot: Support Flat Image Tree Date: Thu, 26 Oct 2023 20:26:25 +1300 Message-ID: <20231026072628.4115527-4-sjg@chromium.org> X-Mailer: git-send-email 2.42.0.758.gaed0368e0e-goog In-Reply-To: <20231026072628.4115527-1-sjg@chromium.org> References: <20231026072628.4115527-1-sjg@chromium.org> MIME-Version: 1.0 X-Spam-Status: No, score=1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,URIBL_SBL_A autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.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 (pete.vger.email [0.0.0.0]); Thu, 26 Oct 2023 00:28:30 -0700 (PDT) X-Spam-Level: * X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780802193586640061 X-GMAIL-MSGID: 1780802193586640061 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 85MB 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 --- MAINTAINERS | 7 + arch/arm64/Makefile | 3 +- arch/arm64/boot/Makefile | 8 +- scripts/Makefile.lib | 16 ++- scripts/make_fit.py | 285 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 315 insertions(+), 4 deletions(-) create mode 100755 scripts/make_fit.py diff --git a/MAINTAINERS b/MAINTAINERS index 2d13bbd69adb..d6955ebc3c24 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1575,6 +1575,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/Makefile b/arch/arm64/boot/Makefile index 1761f5972443..a6e5b20b22bd 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,11 @@ $(obj)/Image.lzo: $(obj)/Image FORCE $(obj)/Image.zst: $(obj)/Image FORCE $(call if_changed,zstd) +ifndef CONFIG_EFI_ZBOOT +$(obj)/image.fit: $(obj)/Image $(obj)/dts FORCE + $(call if_changed,fit,gzip) +endif + 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 68d0134bdbf9..4e4364ad641a 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -487,14 +487,26 @@ 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 $< $@ + +# 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) $^ # XZ # --------------------------------------------------------------------------- diff --git a/scripts/make_fit.py b/scripts/make_fit.py new file mode 100755 index 000000000000..07500d8638e9 --- /dev/null +++ b/scripts/make_fit.py @@ -0,0 +1,285 @@ +#!/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 /tmp/kern/arch/arm64/boot/Image + /tmp/kern/arch/arm64/boot/dts/ -E -c gzip + +Creates a FIT containing the supplied list of files. The kernel must +be specified first. The DTB files are specified by way of a directory +tree containing them. + +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('srcdir', type=str, nargs='*', + help='Specifies the directory tree that contains .dtb files') + + return parser.parse_args() + +def setup_fit(fsw): + """Make a start on writing the FIT + + Outputs the root properties and the 'images' node + + Args: + fsw (libfdt.FdtSw): Object to use for writing + """ + fsw.INC_SIZE = 65536 + fsw.finish_reservemap() + fsw.begin_node('') + fsw.property_string('description', 'DTB set') + fsw.property_u32('#address-cells', 1) + + fsw.property_u32('timestamp', int(time.time())) + fsw.begin_node('images') + + +def write_kernel(fsw, data, arch, fit_os, name, compress): + """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) + arch (str): FIT architecture, e.g. 'arm64' + fit_os (str): Operating Systems, e.g. 'linux' + name (str): Name of OS, e.g. 'Linux-6.6.0-rc7' + compress (str): Compression algorithm to use, e.g. 'gzip' + """ + with fsw.add_node('kernel'): + fsw.property_string('description', name) + fsw.property_string('type', 'kernel_noload') + fsw.property_string('arch', arch) + fsw.property_string('os', fit_os) + fsw.property_string('compression', 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 object containing program arguments + + Returns: + tuple: + bytes: FIT data + int: Number of configurations generated + size: Total uncompressed size of data + """ + fsw = libfdt.FdtSw() + setup_fit(fsw) + seq = 0 + size = 0 + entries = [] + 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]) + + # Handle the kernel + elif path != 'FORCE': + with open(path, 'rb') as inf: + comp_data = compress_data(inf, args.compress) + size += os.path.getsize(path) + write_kernel(fsw, comp_data, args.arch, args.os, + args.name, args.compress) + + finish_fit(fsw, entries) + + return fsw.as_fdt().as_bytearray(), seq, 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())