From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 10 Feb 2023 20:36:26 +0100 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 1pQZC7-003QMg-Ou for lore@lore.pengutronix.de; Fri, 10 Feb 2023 20:36:26 +0100 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 1pQZC2-0006Kq-Ui; Fri, 10 Feb 2023 20:36:22 +0100 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 1pQZBx-00063v-Og for distrokit@pengutronix.de; Fri, 10 Feb 2023 20:36:17 +0100 Received: from [2a0a:edc0:0:1101:1d::28] (helo=dude02.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1pQZBv-0043fJ-Uz for distrokit@pengutronix.de; Fri, 10 Feb 2023 20:36:17 +0100 Received: from mfe by dude02.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pQZBu-008zkt-Je for distrokit@pengutronix.de; Fri, 10 Feb 2023 20:36:14 +0100 From: Marco Felsch To: distrokit@pengutronix.de Date: Fri, 10 Feb 2023 20:36:09 +0100 Message-Id: <20230210193612.2143905-12-m.felsch@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230210193612.2143905-1-m.felsch@pengutronix.de> References: <20230210193612.2143905-1-m.felsch@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [DistroKit] [PATCH 11/14] v8a: blspec: switch to default blspec entry 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: , 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 PTXdist will create a blspec config for each specified devicetree. Since this mechanism supports the 'linux-appendroot true' feature now we can use it to generate all blspecs entries, so seperate blspec packages for each platform are not longer needed. Enable this mechanism for all supported v8a platforms and remove the dedicated packages execpt for the RPi. Signed-off-by: Marco Felsch --- configs/platform-v8a/platformconfig | 11 +++--- .../platforms/blspec-imx8mm-evk.in | 5 --- .../platforms/blspec-imx8mp-evk.in | 5 --- .../platforms/blspec-imx8mq-evk.in | 5 --- .../platform-v8a/platforms/blspec-rock3a.in | 5 --- .../loader/entries/imx8mm-evk.conf | 6 --- .../loader/entries/imx8mp-evk.conf | 6 --- .../loader/entries/imx8mq-evk.conf | 6 --- .../projectroot/loader/entries/rock3a.conf | 6 --- .../platform-v8a/rules/blspec-imx8mm-evk.make | 38 ------------------- .../platform-v8a/rules/blspec-imx8mp-evk.make | 38 ------------------- .../platform-v8a/rules/blspec-imx8mq-evk.make | 38 ------------------- configs/platform-v8a/rules/blspec-rock3a.make | 38 ------------------- 13 files changed, 5 insertions(+), 202 deletions(-) delete mode 100644 configs/platform-v8a/platforms/blspec-imx8mm-evk.in delete mode 100644 configs/platform-v8a/platforms/blspec-imx8mp-evk.in delete mode 100644 configs/platform-v8a/platforms/blspec-imx8mq-evk.in delete mode 100644 configs/platform-v8a/platforms/blspec-rock3a.in delete mode 100644 configs/platform-v8a/projectroot/loader/entries/imx8mm-evk.conf delete mode 100644 configs/platform-v8a/projectroot/loader/entries/imx8mp-evk.conf delete mode 100644 configs/platform-v8a/projectroot/loader/entries/imx8mq-evk.conf delete mode 100644 configs/platform-v8a/projectroot/loader/entries/rock3a.conf delete mode 100644 configs/platform-v8a/rules/blspec-imx8mm-evk.make delete mode 100644 configs/platform-v8a/rules/blspec-imx8mp-evk.make delete mode 100644 configs/platform-v8a/rules/blspec-imx8mq-evk.make delete mode 100644 configs/platform-v8a/rules/blspec-rock3a.make diff --git a/configs/platform-v8a/platformconfig b/configs/platform-v8a/platformconfig index b308cf3..71eab02 100644 --- a/configs/platform-v8a/platformconfig +++ b/configs/platform-v8a/platformconfig @@ -205,12 +205,11 @@ PTXCONF_TF_A_BL32_NONE=y # # bootloader spec entries # -# PTXCONF_BLSPEC_ENTRY is not set -PTXCONF_BLSPEC_IMX8MM_EVK=y -PTXCONF_BLSPEC_IMX8MP_EVK=y -PTXCONF_BLSPEC_IMX8MQ_EVK=y -PTXCONF_BLSPEC_ROCK3A=y -# PTXCONF_BLSPEC_RPI4 is not set +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/configs/platform-v8a/platforms/blspec-imx8mm-evk.in b/configs/platform-v8a/platforms/blspec-imx8mm-evk.in deleted file mode 100644 index 407eb01..0000000 --- a/configs/platform-v8a/platforms/blspec-imx8mm-evk.in +++ /dev/null @@ -1,5 +0,0 @@ -## SECTION=blspec - -config BLSPEC_IMX8MM_EVK - tristate - prompt "/loader/entries/imx8mm-evk.conf bootloader spec entry" diff --git a/configs/platform-v8a/platforms/blspec-imx8mp-evk.in b/configs/platform-v8a/platforms/blspec-imx8mp-evk.in deleted file mode 100644 index c911c83..0000000 --- a/configs/platform-v8a/platforms/blspec-imx8mp-evk.in +++ /dev/null @@ -1,5 +0,0 @@ -## SECTION=blspec - -config BLSPEC_IMX8MP_EVK - tristate - prompt "/loader/entries/imx8mp-evk.conf bootloader spec entry" diff --git a/configs/platform-v8a/platforms/blspec-imx8mq-evk.in b/configs/platform-v8a/platforms/blspec-imx8mq-evk.in deleted file mode 100644 index 9ef3082..0000000 --- a/configs/platform-v8a/platforms/blspec-imx8mq-evk.in +++ /dev/null @@ -1,5 +0,0 @@ -## SECTION=blspec - -config BLSPEC_IMX8MQ_EVK - tristate - prompt "/loader/entries/imx8mq-evk.conf bootloader spec entry" diff --git a/configs/platform-v8a/platforms/blspec-rock3a.in b/configs/platform-v8a/platforms/blspec-rock3a.in deleted file mode 100644 index e54a102..0000000 --- a/configs/platform-v8a/platforms/blspec-rock3a.in +++ /dev/null @@ -1,5 +0,0 @@ -## SECTION=blspec - -config BLSPEC_ROCK3A - tristate - prompt "/loader/entries/rock3a.conf bootloader spec entry" diff --git a/configs/platform-v8a/projectroot/loader/entries/imx8mm-evk.conf b/configs/platform-v8a/projectroot/loader/entries/imx8mm-evk.conf deleted file mode 100644 index 006691a..0000000 --- a/configs/platform-v8a/projectroot/loader/entries/imx8mm-evk.conf +++ /dev/null @@ -1,6 +0,0 @@ -title PTXdist - Pengutronix-DistroKit - i.MX8MM-EVK -version @VERSION@ -options rootwait -linux /boot/Image -devicetree /boot/imx8mm-evk.dtb -linux-appendroot true diff --git a/configs/platform-v8a/projectroot/loader/entries/imx8mp-evk.conf b/configs/platform-v8a/projectroot/loader/entries/imx8mp-evk.conf deleted file mode 100644 index 6165ed3..0000000 --- a/configs/platform-v8a/projectroot/loader/entries/imx8mp-evk.conf +++ /dev/null @@ -1,6 +0,0 @@ -title PTXdist - Pengutronix-DistroKit - i.MX8MP-EVK -version @VERSION@ -options rootwait -linux /boot/Image -devicetree /boot/imx8mp-evk.dtb -linux-appendroot true diff --git a/configs/platform-v8a/projectroot/loader/entries/imx8mq-evk.conf b/configs/platform-v8a/projectroot/loader/entries/imx8mq-evk.conf deleted file mode 100644 index 17772d8..0000000 --- a/configs/platform-v8a/projectroot/loader/entries/imx8mq-evk.conf +++ /dev/null @@ -1,6 +0,0 @@ -title PTXdist - Pengutronix-DistroKit - i.MX8MQ-EVK -version @VERSION@ -options rootwait -linux /boot/Image -devicetree /boot/imx8mq-evk.dtb -linux-appendroot true diff --git a/configs/platform-v8a/projectroot/loader/entries/rock3a.conf b/configs/platform-v8a/projectroot/loader/entries/rock3a.conf deleted file mode 100644 index 128e25a..0000000 --- a/configs/platform-v8a/projectroot/loader/entries/rock3a.conf +++ /dev/null @@ -1,6 +0,0 @@ -title PTXdist - Pengutronix-DistroKit - ROCK-3A -version @VERSION@ -options rootwait -linux /boot/Image -devicetree /boot/rk3568-rock-3a.dtb -linux-appendroot true diff --git a/configs/platform-v8a/rules/blspec-imx8mm-evk.make b/configs/platform-v8a/rules/blspec-imx8mm-evk.make deleted file mode 100644 index 0850127..0000000 --- a/configs/platform-v8a/rules/blspec-imx8mm-evk.make +++ /dev/null @@ -1,38 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2020 by Sascha Hauer -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_BLSPEC_IMX8MM_EVK) += blspec-imx8mm-evk - -BLSPEC_IMX8MM_EVK_VERSION := 5.6.2 - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/blspec-imx8mm-evk.targetinstall: - @$(call targetinfo) - - @$(call install_init, blspec-imx8mm-evk) - @$(call install_fixup,blspec-imx8mm-evk,PRIORITY,optional) - @$(call install_fixup,blspec-imx8mm-evk,SECTION,base) - @$(call install_fixup,blspec-imx8mm-evk,AUTHOR,"Sascha Hauer ") - @$(call install_fixup,blspec-imx8mm-evk,DESCRIPTION,missing) - - @$(call install_alternative, blspec-imx8mm-evk, 0, 0, 0644, \ - /loader/entries/imx8mm-evk.conf) - @$(call install_replace, blspec-imx8mm-evk, /loader/entries/imx8mm-evk.conf, \ - @VERSION@,'$(PTXDIST_BSP_AUTOVERSION)')$(ptx/nl) - - @$(call install_finish,blspec-imx8mm-evk) - - @$(call touch) - -# vim: syntax=make diff --git a/configs/platform-v8a/rules/blspec-imx8mp-evk.make b/configs/platform-v8a/rules/blspec-imx8mp-evk.make deleted file mode 100644 index cf5360f..0000000 --- a/configs/platform-v8a/rules/blspec-imx8mp-evk.make +++ /dev/null @@ -1,38 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2020 by Sascha Hauer -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_BLSPEC_IMX8MP_EVK) += blspec-imx8mp-evk - -BLSPEC_IMX8MP_EVK_VERSION := 5.6.2 - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/blspec-imx8mp-evk.targetinstall: - @$(call targetinfo) - - @$(call install_init, blspec-imx8mp-evk) - @$(call install_fixup,blspec-imx8mp-evk,PRIORITY,optional) - @$(call install_fixup,blspec-imx8mp-evk,SECTION,base) - @$(call install_fixup,blspec-imx8mp-evk,AUTHOR,"Sascha Hauer ") - @$(call install_fixup,blspec-imx8mp-evk,DESCRIPTION,missing) - - @$(call install_alternative, blspec-imx8mp-evk, 0, 0, 0644, \ - /loader/entries/imx8mp-evk.conf) - @$(call install_replace, blspec-imx8mp-evk, /loader/entries/imx8mp-evk.conf, \ - @VERSION@,'$(PTXDIST_BSP_AUTOVERSION)')$(ptx/nl) - - @$(call install_finish,blspec-imx8mp-evk) - - @$(call touch) - -# vim: syntax=make diff --git a/configs/platform-v8a/rules/blspec-imx8mq-evk.make b/configs/platform-v8a/rules/blspec-imx8mq-evk.make deleted file mode 100644 index 463eeb2..0000000 --- a/configs/platform-v8a/rules/blspec-imx8mq-evk.make +++ /dev/null @@ -1,38 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2020 by Sascha Hauer -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_BLSPEC_IMX8MQ_EVK) += blspec-imx8mq-evk - -BLSPEC_IMX8MQ_EVK_VERSION := 5.6.2 - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/blspec-imx8mq-evk.targetinstall: - @$(call targetinfo) - - @$(call install_init, blspec-imx8mq-evk) - @$(call install_fixup,blspec-imx8mq-evk,PRIORITY,optional) - @$(call install_fixup,blspec-imx8mq-evk,SECTION,base) - @$(call install_fixup,blspec-imx8mq-evk,AUTHOR,"Sascha Hauer ") - @$(call install_fixup,blspec-imx8mq-evk,DESCRIPTION,missing) - - @$(call install_alternative, blspec-imx8mq-evk, 0, 0, 0644, \ - /loader/entries/imx8mq-evk.conf) - @$(call install_replace, blspec-imx8mq-evk, /loader/entries/imx8mq-evk.conf, \ - @VERSION@,'$(PTXDIST_BSP_AUTOVERSION)')$(ptx/nl) - - @$(call install_finish,blspec-imx8mq-evk) - - @$(call touch) - -# vim: syntax=make diff --git a/configs/platform-v8a/rules/blspec-rock3a.make b/configs/platform-v8a/rules/blspec-rock3a.make deleted file mode 100644 index eeaf82b..0000000 --- a/configs/platform-v8a/rules/blspec-rock3a.make +++ /dev/null @@ -1,38 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2020 by Sascha Hauer -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_BLSPEC_ROCK3A) += blspec-rock3a - -BLSPEC_ROCK3A_VERSION := 5.6.2 - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/blspec-rock3a.targetinstall: - @$(call targetinfo) - - @$(call install_init, blspec-rock3a) - @$(call install_fixup,blspec-rock3a,PRIORITY,optional) - @$(call install_fixup,blspec-rock3a,SECTION,base) - @$(call install_fixup,blspec-rock3a,AUTHOR,"Sascha Hauer ") - @$(call install_fixup,blspec-rock3a,DESCRIPTION,missing) - - @$(call install_alternative, blspec-rock3a, 0, 0, 0644, \ - /loader/entries/rock3a.conf) - @$(call install_replace, blspec-rock3a, /loader/entries/rock3a.conf, \ - @VERSION@,'$(PTXDIST_BSP_AUTOVERSION)')$(ptx/nl) - - @$(call install_finish,blspec-rock3a) - - @$(call touch) - -# vim: syntax=make -- 2.30.2