From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: distrokit@pengutronix.de
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [DistroKit] [PATCH v3 1/8] platforms: drop no longer needed blspec-rpi4
Date: Wed, 31 May 2023 13:47:37 +0200 [thread overview]
Message-ID: <20230531114744.3281270-2-a.fatoum@pengutronix.de> (raw)
In-Reply-To: <20230531114744.3281270-1-a.fatoum@pengutronix.de>
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 <a.fatoum@pengutronix.de>
---
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 <a.fatoum@pengutronix.de>
-#
-# 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 <a.fatoum@pengutronix.de>")
- @$(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
next prev parent reply other threads:[~2023-05-31 11:47 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-31 11:47 [DistroKit] [PATCH v3 0/8] v8a: barebox: update to use upstream PTXdist rule Ahmad Fatoum
2023-05-31 11:47 ` Ahmad Fatoum [this message]
2023-05-31 11:47 ` [DistroKit] [PATCH v3 2/8] v8a: barebox: rock3a: drop no longer needed SD-Card speed quirk Ahmad Fatoum
2023-05-31 11:47 ` [DistroKit] [PATCH v3 3/8] v8a: barebox: version bump v2023.01.0 → v2023.05.0 Ahmad Fatoum
2023-05-31 11:47 ` [DistroKit] [PATCH v3 4/8] Revert "v8a: barebox: rockchip: disable CONFIG_MMCBLKDEV_ROOTARG" Ahmad Fatoum
2023-05-31 11:47 ` [DistroKit] [PATCH v3 5/8] v8a: rockchip: use common environment Ahmad Fatoum
2023-06-23 13:04 ` Roland Hieber
2023-06-23 13:14 ` Ahmad Fatoum
2023-05-31 11:47 ` [DistroKit] [PATCH v3 6/8] v8a: barebox: configure upstream barebox rule for both imx8m and rockchip Ahmad Fatoum
2023-05-31 11:47 ` [DistroKit] [PATCH v3 7/8] v8a: barebox: switch to upstream rule Ahmad Fatoum
2023-05-31 11:47 ` [DistroKit] [PATCH v3 8/8] v8a: barebox: remove left-over SoC-specific rules Ahmad Fatoum
2023-05-31 12:02 ` [DistroKit] [PATCH v3 0/8] v8a: barebox: update to use upstream PTXdist rule Robert Schwebel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230531114744.3281270-2-a.fatoum@pengutronix.de \
--to=a.fatoum@pengutronix.de \
--cc=distrokit@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox