From patchwork Sat Nov 11 00:28:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 13452870 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EF3A0C4167D for ; Sat, 11 Nov 2023 00:30:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ESxPxX6uuW5AQb7TMyIc/n+wmVdw9XyBUcwsZYyZbdc=; b=tItpGcs1PaIpEq fDJ3fCZKrMUb1iUwmQl89jOh0Z7x9LS5IeYtS6SRk/ktf+TCJkV+tmt2QG/iOPcPrlM7pzCIp9P4T vbgv7Ex2ublHi++oW5iN/kJupatWo/JA0G6koGjT/kaZggf41N8kSKbp35NbIEOfgM3EqP+53SdKc +cb5iGx4bzcpGm09z7Gyzk8wIT9WSfp837bY4wcMEVl3xhno/U5REs7W3S1UiXgDMyTaTnstzNQVm zGHXrMXILz4Z0c4L/fsQK+g1aHvwPKJ2j5KLkYEsLNK00+KdmHRqfGCGT9jKfLxSD/001D/6DjObU yK0KDxhDiG7jyQAWbPbg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r1bsY-009j8s-1g; Sat, 11 Nov 2023 00:29:38 +0000 Received: from mail-qv1-xf2f.google.com ([2607:f8b0:4864:20::f2f]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r1bsV-009j7v-05 for linux-arm-kernel@lists.infradead.org; Sat, 11 Nov 2023 00:29:36 +0000 Received: by mail-qv1-xf2f.google.com with SMTP id 6a1803df08f44-66cfd35f595so14968916d6.2 for ; Fri, 10 Nov 2023 16:29:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1699662573; x=1700267373; darn=lists.infradead.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=et5CNEbbpEZc7/GZDGct9Q6Ku2JLjZggspOXrOUtq84=; b=D/5KM0mN77iMm35K5/hf37SFwgsdZnKjysOe9lJfqsBEoI4DMej/6aFRot3B3Zaj3f Qxn94zXlgyU11Nc3apo/8hHK3x9rfu3yMpB30fmzYpe14wmbuE93g2/HuaTGlH437XrS X3CcCVKszFUwz6fNrRiMXRXCEEHRi1l973JOo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699662573; x=1700267373; 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=et5CNEbbpEZc7/GZDGct9Q6Ku2JLjZggspOXrOUtq84=; b=D3ITvMQP16q0jOX2ifXSQULZeOI2BG69bv3okFE4P9hbrhFvUrXh+SKXTFWiM7KBBK SpaVBinNqNmUtvNsoC3dNqbPcp7lxvdEsk5s91npTu/yMdT7vxmSZUi3GbtljiDO6qc6 jNTDhmxJo5tmMcJgcIq5O2gagMfRpxaYQaFRG5e3OjJdf2CghXZkKmbERKkqNg52RXNx XqQYrC2Ugq5AphmNWPdRbKHaKGPAhAVj1Y6hR2Aa3SlK3Ik5hRca5BkV1cyQMBAHmDJr 1sKOiAxB9C12zsT53We7S2TLcGkjIc07QwleZyxRD1KJWPHEmWZox2Ljnlt2/p0DaYiU Ubgg== X-Gm-Message-State: AOJu0YzV2O9z0hJtracwmdLOqiRKqHSiEQ1M7rvcUJsdspSmOhY/dS+o hQTCeoDQqRDgWazFbNGcZazzWB9R+sGwLNOjAwnDIw== X-Google-Smtp-Source: AGHT+IEN8beePUf5tFQkONDRQomBUyxK3TsSyakryn92MhWDO9HPDNzsR0zDFHQT0xvjn7EW56ku0Q== X-Received: by 2002:ad4:45b4:0:b0:658:1eec:408a with SMTP id y20-20020ad445b4000000b006581eec408amr734218qvu.40.1699662573056; Fri, 10 Nov 2023 16:29:33 -0800 (PST) Received: from kea.bld.corp.google.com ([2620:15c:183:200:5104:5a27:f95d:21d1]) by smtp.gmail.com with ESMTPSA id l16-20020a056214029000b00677adcfd261sm55898qvv.89.2023.11.10.16.29.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Nov 2023 16:29:32 -0800 (PST) From: Simon Glass To: linux-arm-kernel@lists.infradead.org Cc: lkml , Tom Rini , Masahiro Yamada , U-Boot Mailing List , Simon Glass , Catalin Marinas , Will Deacon Subject: [PATCH v5 1/3] kbuild: arm64: Add BOOT_TARGETS variable Date: Fri, 10 Nov 2023 17:28:00 -0700 Message-ID: <20231111002851.1293891-2-sjg@chromium.org> X-Mailer: git-send-email 2.42.0.869.gea05f2083d-goog In-Reply-To: <20231111002851.1293891-1-sjg@chromium.org> References: <20231111002851.1293891-1-sjg@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231110_162935_062546_21A5C3DE X-CRM114-Status: GOOD ( 10.58 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 2d49aea0ff67..cd9bca2358d2 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 11 00:28:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 13452871 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 67DD8C4332F for ; Sat, 11 Nov 2023 00:30:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Z5RzjDbhzAKOWbxB4825F2QKdXj2kHAT3UKzuJ8Eva0=; b=v59RCagOBW+ppB FezSVgHHUv+nKuueY53hTk1qlu+5mo5TCdtWTzO3bAcJVjo5fonU4jPQqzr6zF030f1qmDi9P+Rxo 4M/OiKM7OoBPc+J3RtjxIWgQWAaBvFV8Vi92NaAacdINC/+4E77rRagQ43nZRkPluVWiC2GYZWDZ1 KSlTdH3RRfrn0pkB2sZNCizucKjSFKdrfiFY511EkbBbV9WxyuHudBj2FufwjnTkkvvJ6AHzaIj/M cxk0GS+db8cRwHLh+0hCnx6hte1Bt9OWpjhJsC+/AwZ+1sOzIfSFzIO8yVkeCkLf/5ooa5PU7y7d8 rVKM+KsIUYaq7lz342Aw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r1bsb-009jAQ-2e; Sat, 11 Nov 2023 00:29:41 +0000 Received: from mail-qv1-xf2b.google.com ([2607:f8b0:4864:20::f2b]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r1bsW-009j8I-2l for linux-arm-kernel@lists.infradead.org; Sat, 11 Nov 2023 00:29:39 +0000 Received: by mail-qv1-xf2b.google.com with SMTP id 6a1803df08f44-66d0760cd20so22174916d6.0 for ; Fri, 10 Nov 2023 16:29:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1699662575; x=1700267375; darn=lists.infradead.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=dMe27PCpSGrpKy6akin6UXrBQxmCtSQz/w0mkm8+aO0=; b=CRsxCGHCAxx/fN+IZzuKsvobUpPV1elaIbKBE/fYJf0jNAPSPszDRsyXKn/MB7XVXO /2LCPAZc1fc6UufCpgyUs+0c/ndHGNhqv0O8lOGnW6aRcGHFt8RVk91FIZsjLzTSskmG wkYt8D5tzXb9hHGmtS6/bVxKzhZ/C+W4StkuU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699662575; x=1700267375; 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=dMe27PCpSGrpKy6akin6UXrBQxmCtSQz/w0mkm8+aO0=; b=MpWP/n7mMVWjg9fAY0698eLA+H23f4KWE+OiQCsHOjzurEA6b5QaPV8jHhGcZnhHbN XUxWGCadwuNcG3EBOo8yyidnZ3ZbA5F8KSGOzGqlwt8av8Jr+ySOGoajqc8hAnxYkHTq ZsVwL3KYmD0KN3SAhhRWdmMVXyau+1mwG6GXBqThUrw8XjdMTRD6ADybPCWCrVltZh7M 7lD4zNRa3W34jSeXNt7UnEBETUj/ar+0TE8rliYbb/QPI14Z+FBBToRwVZ56EZqYAavQ rG61dSlDZbSIuMxnkFgWJ/yioHIvXHhd1YqqCpeICjsRIFX7rjGtSs4BhKWX21GUcLWF QgZA== X-Gm-Message-State: AOJu0YwYzIM/5KAJW5GC6Pw4WLfhWRp58F3VXaPkGeDzrX8lmzfZnAO3 sPrqO/Vq59sAw7ANU1YiEpeuozCPgGL4jE9UmsXwpA== X-Google-Smtp-Source: AGHT+IE0a/VdrtgvwTmIbRQLeoUJHTOtRwQJiuZK5PAG5tzmD5AD8V4FRMa71Q4svxolT1LcdUmEbg== X-Received: by 2002:ad4:4e6d:0:b0:670:ba7c:938d with SMTP id ec13-20020ad44e6d000000b00670ba7c938dmr1203791qvb.25.1699662575054; Fri, 10 Nov 2023 16:29:35 -0800 (PST) Received: from kea.bld.corp.google.com ([2620:15c:183:200:5104:5a27:f95d:21d1]) by smtp.gmail.com with ESMTPSA id l16-20020a056214029000b00677adcfd261sm55898qvv.89.2023.11.10.16.29.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Nov 2023 16:29:34 -0800 (PST) From: Simon Glass To: linux-arm-kernel@lists.infradead.org Cc: lkml , Tom Rini , Masahiro Yamada , U-Boot Mailing List , Simon Glass , Nathan Chancellor , Nick Desaulniers , Nicolas Schier , linux-kbuild@vger.kernel.org Subject: [PATCH v5 2/3] arm: boot: Move the single quotes for image name Date: Fri, 10 Nov 2023 17:28:01 -0700 Message-ID: <20231111002851.1293891-3-sjg@chromium.org> X-Mailer: git-send-email 2.42.0.869.gea05f2083d-goog In-Reply-To: <20231111002851.1293891-1-sjg@chromium.org> References: <20231111002851.1293891-1-sjg@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231110_162936_889782_311E65C4 X-CRM114-Status: GOOD ( 12.35 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 --- (no changes since v4) 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 Sat Nov 11 00:28: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: 13452872 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C510EC4167D for ; Sat, 11 Nov 2023 00:30:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=xjFg6Cb66C/pYaTcQe3FSDMrA7ZpB2kQWxch4IcHRb0=; b=R5KDFBmlenvi/A jfTONmwp9QQErj2kPAhSeKomEE86AGN3Mf+shM4sIH8JRE7ux34cWU0izmhOl2UpkOfyiGXM/+9Xb s1vLsRZL5BuJbyY0kif4FHBeFlEEkmfQwZVdR/MNCDlp8AL1iA27shkb0Adeg/ZgGpLbe0bJx6lzv PxY/WPklKX97LJQsEP8xvgpeqqAtk9QLHMAs7z+UkUswVfjQnHbHZXeyw4oiJ+93psYU91bR3Y6Fe 9A3tbWUJtTmo9fLP+ihGkWgP9Y8pIaW3jc30SCcP+OOMZAsPB8J4x3bFFoawFb7Akcwb6jHR1MhG9 MEDMPbEAOrgyhzTjCJsA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r1bse-009jBM-1Z; Sat, 11 Nov 2023 00:29:44 +0000 Received: from mail-qv1-xf2d.google.com ([2607:f8b0:4864:20::f2d]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r1bsZ-009j94-1f for linux-arm-kernel@lists.infradead.org; Sat, 11 Nov 2023 00:29:43 +0000 Received: by mail-qv1-xf2d.google.com with SMTP id 6a1803df08f44-66cfc96f475so15073076d6.3 for ; Fri, 10 Nov 2023 16:29:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1699662578; x=1700267378; darn=lists.infradead.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=P74lj3H9s1SB/HLRWB5sTm4MijoXiYyy8vj6I4JQBFg=; b=ivuNTMpRCLt4qmfNgxUIFx3S/Ovvr5sXXCpDh1sYNfiam8SJFnlFwj3IC0CnPrBkXf lDzjQHkmiZXZb4KHZtzjPFjlKRCALqNNlIdQd4wdd5zH1nyc76oZFyyVMIM8/c7ypH5q vpubXWqSOrwl1oDsczN2sc1pr/v19uJb6oti4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699662578; x=1700267378; 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=P74lj3H9s1SB/HLRWB5sTm4MijoXiYyy8vj6I4JQBFg=; b=NTL1FFsa+G+KrXVaDC50bAy+vzoM1K72dIk0zZLyPKxIiZ+YhkPxZmDk3G5RM8d/Pr WtxIf5jIgm1GrmR0AS+TB3s/ETAUqU1UCghKIQT7jcJ7TiUyUgGRccjkI1KYfJVESKmL LOzJKPNtjFwNhnyNL7dNj9nWq1S5l0PpCf2Ck6FtzfTGqYZHP5QUHGuEnFh/YObbmeOL kyc7MI6lwkRhr/JJNEcEMZ3qtIJeJ5+DafpUjLmP3RJtRcBWXdECNGtTTtN2wWmbqNzh VqvH1p6Idj5j48dDpDnGl6KjlfgVJOpF1jfwBEooU3BiNXNHJuV4qBsMU1Zni6rxIsVA ZTQw== X-Gm-Message-State: AOJu0YxkxjaYDUz2mlyUE6NP2nBefW9onTVDSZpR9Rh+++jn0HM49Su/ tu3f3yJIqUG2qZWkR3lS0mmAWF0qOlnb1RGGtCovYw== X-Google-Smtp-Source: AGHT+IHyRK3ggcUSPg5HkyGcmbPUPeHMcA636svxIOg778jkYGFMY14WvOj36C7M6bnvciFn0/SmkQ== X-Received: by 2002:a0c:bf0e:0:b0:66d:59da:d225 with SMTP id m14-20020a0cbf0e000000b0066d59dad225mr611665qvi.15.1699662577569; Fri, 10 Nov 2023 16:29:37 -0800 (PST) Received: from kea.bld.corp.google.com ([2620:15c:183:200:5104:5a27:f95d:21d1]) by smtp.gmail.com with ESMTPSA id l16-20020a056214029000b00677adcfd261sm55898qvv.89.2023.11.10.16.29.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Nov 2023 16:29:36 -0800 (PST) From: Simon Glass To: linux-arm-kernel@lists.infradead.org Cc: lkml , Tom Rini , Masahiro Yamada , U-Boot Mailing List , Simon Glass , Catalin Marinas , Nathan Chancellor , Nick Desaulniers , Nick Terrell , Nicolas Schier , Will Deacon , linux-kbuild@vger.kernel.org Subject: [PATCH v5 3/3] arm64: boot: Support Flat Image Tree Date: Fri, 10 Nov 2023 17:28:02 -0700 Message-ID: <20231111002851.1293891-4-sjg@chromium.org> X-Mailer: git-send-email 2.42.0.869.gea05f2083d-goog In-Reply-To: <20231111002851.1293891-1-sjg@chromium.org> References: <20231111002851.1293891-1-sjg@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231110_162939_561136_80C8133F X-CRM114-Status: GOOD ( 32.62 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 v5: - Correct compression rule which was broken in v4 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 | 13 ++ scripts/make_fit.py | 289 +++++++++++++++++++++++++++++++++++++ 6 files changed, 317 insertions(+), 2 deletions(-) create mode 100755 scripts/make_fit.py diff --git a/MAINTAINERS b/MAINTAINERS index c934244acc31..b7588504b74c 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 cd9bca2358d2..c377cf4c6dcf 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) @@ -218,6 +218,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..8d591fda078f 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,gzip) + 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..ecd8cd358f3e 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -496,6 +496,19 @@ 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 + # 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())