From patchwork Fri Oct 4 23:07:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1992995 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=F1m0riGP; dkim=pass (2048-bit key) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=ofPDfaqB; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XL43G6XYhz1xsn for ; Sat, 5 Oct 2024 09:08:26 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3DC7D88DA9; Sat, 5 Oct 2024 01:08:17 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1728083297; bh=MhBih4bXllueugx3TpysBeGPSBKKJQu5tTWDW0EJMF4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=F1m0riGPj0kuxQVS58MuokUQYdTenqIaz2Aa1BuiFZNCh8HmJkz5I8rXWaFzimLAx BKiokOAIuTCup0DQsvxnJuQj72/DiRt1N4dUUTxElDxBCvLGdF5rKFnkZOPRVwiwfi 48rhtLSJixN3xiJvI15NYzdIFrp7o02DaWYne3mVPcET6p247qDRWN7KmEix6JVxCz A/W684MEjbZX66QiozT1x7gTjn/79FdBmibQa9l0/QNw6VYkNhKWJm2kvhD6RSTOwV Wu/w+JQy0NCzJbFAD1Cau4BFnMwLCaUD0GIU2XVwxe95ZvoQyKlby5JDDkOYCfbQkS VDN7mDO/HxOyg== Received: from tr.lan (ip-86-49-120-218.bb.vodafone.cz [86.49.120.218]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id E885888AFF; Sat, 5 Oct 2024 01:08:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1728083295; bh=MhBih4bXllueugx3TpysBeGPSBKKJQu5tTWDW0EJMF4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ofPDfaqB6cK/mnyJtoWrvhm110jHUxilT+buRzd6Sy2aNJV17eYWeBzUkXwuXR+sC LISkQNsh/LGEEUKEZNtg5FOsAKU/EmWjGBsijUjW8tQPeRUx/2ge7IYKlyUCCzV6v3 5hmySIt/KdB/YifIcbpy9SyyDGll0uMqz9W0N1o+b5MT3orfCFP37xRj5hQVyz07Uv ER/ryf4PZOsN7rZ7qdAysEZb6xsdko7q3EGN6TT5LCI8/CCDth1uUoU85JLMKLm60U S03XVx3Vpg2T9jyjCJ0d3ym/e7EZPBL2EiWmRZ27LyuQ1hAuK0M1kc1W0DmigjIxdJ xfWElpEguP5DA== From: Marek Vasut To: u-boot@lists.denx.de Cc: Marek Vasut , AKASHI Takahiro , Heinrich Schuchardt , Ilias Apalodimas , Marcel Ziswiler , Mattijs Korpershoek , Patrice Chotard , Patrick Delaunay , Peter Robinson , Quentin Schulz , Rasmus Villemoes , Sean Anderson , Simon Glass , Sumit Garg , Tom Rini , u-boot@dh-electronics.com, uboot-stm32@st-md-mailman.stormreply.com Subject: [PATCH 2/2] Makefile: Drop SPL_FIT_GENERATOR support Date: Sat, 5 Oct 2024 01:07:14 +0200 Message-ID: <20241004230756.371153-2-marex@denx.de> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241004230756.371153-1-marex@denx.de> References: <20241004230756.371153-1-marex@denx.de> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean The SPL_FIT_GENERATOR is long superseded by binman, drop SPL_FIT_GENERATOR support as there are no more users. Signed-off-by: Marek Vasut --- Cc: AKASHI Takahiro Cc: Heinrich Schuchardt Cc: Ilias Apalodimas Cc: Marcel Ziswiler Cc: Mattijs Korpershoek Cc: Patrice Chotard Cc: Patrick Delaunay Cc: Peter Robinson Cc: Quentin Schulz Cc: Rasmus Villemoes Cc: Sean Anderson Cc: Simon Glass Cc: Sumit Garg Cc: Tom Rini Cc: u-boot@dh-electronics.com Cc: u-boot@lists.denx.de Cc: uboot-stm32@st-md-mailman.stormreply.com --- NOTE: Depends on https://lore.kernel.org/u-boot/20241004225916.361000-1-marex@denx.de/ --- Makefile | 18 ------------------ boot/Kconfig | 15 --------------- doc/usage/fit/howto.rst | 4 ---- 3 files changed, 37 deletions(-) diff --git a/Makefile b/Makefile index a70926ec2fa..45592eb2bac 100644 --- a/Makefile +++ b/Makefile @@ -1139,13 +1139,6 @@ ifeq ($(CONFIG_OF_EMBED)$(CONFIG_EFI_APP),y) @echo >&2 "CONFIG_OF_SEPARATE for boards in mainline." @echo >&2 "See doc/develop/devicetree/control.rst for more info." @echo >&2 "====================================================" -endif -ifneq ($(CONFIG_SPL_FIT_GENERATOR),) - @echo >&2 "===================== WARNING ======================" - @echo >&2 "This board uses CONFIG_SPL_FIT_GENERATOR. Please migrate" - @echo >&2 "to binman instead, to avoid the proliferation of" - @echo >&2 "arch-specific scripts with no tests." - @echo >&2 "====================================================" endif $(call deprecated,CONFIG_WDT,DM watchdog,v2019.10,\ $(CONFIG_WATCHDOG)$(CONFIG_HW_WATCHDOG)) @@ -1413,17 +1406,6 @@ OBJCOPYFLAGS_u-boot.ldr.srec := -I binary -O srec u-boot.ldr.hex u-boot.ldr.srec: u-boot.ldr FORCE $(call if_changed,objcopy) -# Boards with more complex image requirements can provide an .its source file -# or a generator script -# NOTE: Please do not use this. We are migrating away from Makefile rules to use -# binman instead. -ifneq ($(CONFIG_USE_SPL_FIT_GENERATOR),) -U_BOOT_ITS := u-boot.its -$(U_BOOT_ITS): $(U_BOOT_ITS_DEPS) FORCE - $(srctree)/$(CONFIG_SPL_FIT_GENERATOR) \ - $(patsubst %,$(dt_dir)/%.dtb,$(subst ",,$(CONFIG_OF_LIST))) > $@ -endif - ifdef CONFIG_SPL_LOAD_FIT MKIMAGEFLAGS_u-boot.img = -f auto -A $(ARCH) -T firmware -C none -O u-boot \ -a $(CONFIG_TEXT_BASE) -e $(CONFIG_SYS_UBOOT_START) \ diff --git a/boot/Kconfig b/boot/Kconfig index 51e6cd6cb1d..4314227d5f8 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -282,21 +282,6 @@ config SPL_FIT_IMAGE_POST_PROCESS injected into the FIT creation (i.e. the blobs would have been pre- processed before being added to the FIT image). -config USE_SPL_FIT_GENERATOR - bool "Use a script to generate the .its script" - depends on SPL_FIT - default y if SPL_FIT && ARCH_ZYNQMP - -config SPL_FIT_GENERATOR - string ".its file generator script for U-Boot FIT image" - depends on USE_SPL_FIT_GENERATOR - default "arch/arm/mach-zynqmp/mkimage_fit_atf.sh" if SPL_LOAD_FIT && ARCH_ZYNQMP - help - Specifies a (platform specific) script file to generate the FIT - source file used to build the U-Boot FIT image file. This gets - passed a list of supported device tree file stub names to - include in the generated image. - if VPL config VPL_FIT diff --git a/doc/usage/fit/howto.rst b/doc/usage/fit/howto.rst index 280eff724f6..675c9aa5bb0 100644 --- a/doc/usage/fit/howto.rst +++ b/doc/usage/fit/howto.rst @@ -57,10 +57,6 @@ own subnode under the /images node, which should then be referenced from one or multiple /configurations subnodes. The required images must be enumerated in the "loadables" property as a list of strings. -CONFIG_SPL_FIT_GENERATOR can point to a script which generates this image source -file during the build process. It gets passed a list of device tree files (taken -from the CONFIG_OF_LIST symbol). - The SPL also records to a DT all additional images (called loadables) which are loaded. The information about loadables locations is passed via the DT node with fit-images name.