From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 31 May 2023 13:47:59 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1q4KJ6-004CNS-Hu for lore@lore.pengutronix.de; Wed, 31 May 2023 13:47:59 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1q4KJ2-0005jm-OH; Wed, 31 May 2023 13:47:56 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1q4KIu-0005e4-J0; Wed, 31 May 2023 13:47:48 +0200 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1q4KIt-00463b-Tq; Wed, 31 May 2023 13:47:47 +0200 Received: from afa by dude05.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1q4KIs-00Dlcv-9a; Wed, 31 May 2023 13:47:46 +0200 From: Ahmad Fatoum To: distrokit@pengutronix.de Date: Wed, 31 May 2023 13:47:37 +0200 Message-Id: <20230531114744.3281270-2-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230531114744.3281270-1-a.fatoum@pengutronix.de> References: <20230531114744.3281270-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [DistroKit] [PATCH v3 1/8] platforms: drop no longer needed blspec-rpi4 X-BeenThere: distrokit@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: DistroKit Mailinglist List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ahmad Fatoum Sender: "DistroKit" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: distrokit-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Now that we have commits: - 552ea42fe7aa ("v8a: blspec: switch to default blspec entry") - b7a4fe185852 ("v7a: blspec: convert to ptxdist default entries") we don't need special dedicated blspec rules anymore for v7a/v8a, so drop the last one we had left. Signed-off-by: Ahmad Fatoum --- configs/platform-v7a/platformconfig | 1 - configs/platform-v8a/platformconfig | 1 - platforms/blspec-rpi4.in | 7 ----- projectroot/loader/entries/rpi400.conf | 6 ---- projectroot/loader/entries/rpi4b.conf | 6 ---- rules/blspec-rpi4.make | 38 -------------------------- 6 files changed, 59 deletions(-) delete mode 100644 platforms/blspec-rpi4.in delete mode 100644 projectroot/loader/entries/rpi400.conf delete mode 100644 projectroot/loader/entries/rpi4b.conf delete mode 100644 rules/blspec-rpi4.make diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig index 94efb206e41c..5e37156b3180 100644 --- a/configs/platform-v7a/platformconfig +++ b/configs/platform-v7a/platformconfig @@ -229,7 +229,6 @@ PTXCONF_BLSPEC_ENTRY=y PTXCONF_BLSPEC_ENTRY_DEVICETREE=y PTXCONF_BLSPEC_ENTRY_CMDLINE="rootwait rw" PTXCONF_BLSPEC_ENTRY_APPENDROOT=y -# PTXCONF_BLSPEC_RPI4 is not set # end of bootloader spec entries # diff --git a/configs/platform-v8a/platformconfig b/configs/platform-v8a/platformconfig index e29e96046faf..98e5840760a8 100644 --- a/configs/platform-v8a/platformconfig +++ b/configs/platform-v8a/platformconfig @@ -210,7 +210,6 @@ PTXCONF_BLSPEC_ENTRY=y PTXCONF_BLSPEC_ENTRY_DEVICETREE=y PTXCONF_BLSPEC_ENTRY_CMDLINE="rootwait" PTXCONF_BLSPEC_ENTRY_APPENDROOT=y -PTXCONF_BLSPEC_RPI4=y # end of bootloader spec entries # diff --git a/platforms/blspec-rpi4.in b/platforms/blspec-rpi4.in deleted file mode 100644 index aa3e7aff5ae3..000000000000 --- a/platforms/blspec-rpi4.in +++ /dev/null @@ -1,7 +0,0 @@ -## SECTION=blspec - -config BLSPEC_RPI4 - tristate - # make sure it's only visible on platforms, where it makes sense - depends on ARCH_ARM && ARCH_ARMV7_NEON || ARCH_ARM64 - prompt "/loader/entries/rpi4*.conf bootloader spec entries" diff --git a/projectroot/loader/entries/rpi400.conf b/projectroot/loader/entries/rpi400.conf deleted file mode 100644 index 4d212c0b9e71..000000000000 --- a/projectroot/loader/entries/rpi400.conf +++ /dev/null @@ -1,6 +0,0 @@ -title Raspberry Pi 400 - Pengutronix-DistroKit -version 4.6 -options rootwait rw -linux /boot/zImage -devicetree /boot/bcm2711-rpi-400.dtb -linux-appendroot true diff --git a/projectroot/loader/entries/rpi4b.conf b/projectroot/loader/entries/rpi4b.conf deleted file mode 100644 index c0fd6f1fa5d8..000000000000 --- a/projectroot/loader/entries/rpi4b.conf +++ /dev/null @@ -1,6 +0,0 @@ -title Raspberry Pi 4b - Pengutronix-DistroKit -version 4.6 -options rootwait rw -linux /boot/zImage -devicetree /boot/bcm2711-rpi-4-b.dtb -linux-appendroot true diff --git a/rules/blspec-rpi4.make b/rules/blspec-rpi4.make deleted file mode 100644 index 50a5f88ac9cf..000000000000 --- a/rules/blspec-rpi4.make +++ /dev/null @@ -1,38 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2022 by Ahmad Fatoum -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_BLSPEC_RPI4) += blspec-rpi4 - -BLSPEC_RPI4_VERSION := 4.6 - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/blspec-rpi4.targetinstall: - @$(call targetinfo) - - @$(call install_init, blspec-rpi4) - @$(call install_fixup,blspec-rpi4,PRIORITY,optional) - @$(call install_fixup,blspec-rpi4,SECTION,base) - @$(call install_fixup,blspec-rpi4,AUTHOR,"Ahmad Fatoum ") - @$(call install_fixup,blspec-rpi4,DESCRIPTION,missing) - - @$(call install_alternative, blspec-rpi4, 0, 0, 0644, \ - /loader/entries/rpi4b.conf) - @$(call install_alternative, blspec-rpi4, 0, 0, 0644, \ - /loader/entries/rpi400.conf) - - @$(call install_finish,blspec-rpi4) - - @$(call touch) - -# vim: syntax=make -- 2.39.2