DistroKit Mailinglist
 help / color / mirror / Atom feed
From: Marco Felsch <m.felsch@pengutronix.de>
To: distrokit@pengutronix.de
Subject: [DistroKit] [PATCH 11/14] v8a: blspec: switch to default blspec entry
Date: Fri, 10 Feb 2023 20:36:09 +0100	[thread overview]
Message-ID: <20230210193612.2143905-12-m.felsch@pengutronix.de> (raw)
In-Reply-To: <20230210193612.2143905-1-m.felsch@pengutronix.de>

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 <m.felsch@pengutronix.de>
---
 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 <s.hauer@pengutronix.de>
-#
-# 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 <s.hauer@pengutronix.de>")
-	@$(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 <s.hauer@pengutronix.de>
-#
-# 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 <s.hauer@pengutronix.de>")
-	@$(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 <s.hauer@pengutronix.de>
-#
-# 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 <s.hauer@pengutronix.de>")
-	@$(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 <s.hauer@pengutronix.de>
-#
-# 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 <s.hauer@pengutronix.de>")
-	@$(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




  parent reply	other threads:[~2023-02-10 19:36 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-10 19:35 [DistroKit] [PATCH 00/14] Mainline TF-A support and blspec-entry cleanups Marco Felsch
2023-02-10 19:35 ` [DistroKit] [PATCH 01/14] v7a: tf-a: version bump v2.7 -> 2.8/customers/pengutronix/distrokit/20230210-1 Marco Felsch
2023-02-10 19:36 ` [DistroKit] [PATCH 02/14] v8a: tf-a: enable package Marco Felsch
2023-02-10 19:36 ` [DistroKit] [PATCH 03/14] v8a: replace imx-atf with tf-a Marco Felsch
2023-02-10 19:36 ` [DistroKit] [PATCH 04/14] v8a: firmware-imx: fix dest path Marco Felsch
2023-02-10 19:36 ` [DistroKit] [PATCH 05/14] v8a: firmware-imx: fix destition path Marco Felsch
2023-02-10 19:36 ` [DistroKit] [PATCH 06/14] v8a: barebox-imx8m: fix firmware-imx dependencies Marco Felsch
2023-02-10 19:36 ` [DistroKit] [PATCH 07/14] v8a: barebox-imx8m: make use of the INJECT_FILES mechanism Marco Felsch
2023-02-10 19:36 ` [DistroKit] [PATCH 08/14] v8a: barebox: version sync to 2023.01.0 Marco Felsch
2023-02-10 19:36 ` [DistroKit] [PATCH 09/14] blspec-entry: import from upstream ptxdist-2022.12.0 Marco Felsch
2023-02-10 19:36 ` [DistroKit] [PATCH 10/14] blspec-entry: add linux-appendroot support Marco Felsch
2023-02-13  9:00   ` Michael Olbrich
2023-02-13 10:20     ` Marco Felsch
2023-02-10 19:36 ` Marco Felsch [this message]
2023-02-10 19:36 ` [DistroKit] [PATCH 12/14] v7a: blspec: drop incomplete Gute Fee support Marco Felsch
2023-02-10 19:36 ` [DistroKit] [PATCH 13/14] v7a: vexpress: remove console from blspec config Marco Felsch
2023-02-10 19:36 ` [DistroKit] [PATCH 14/14] v7a: blspec: convert to ptxdist default entries Marco Felsch
2023-02-11 20:59 ` [DistroKit] [PATCH 00/14] Mainline TF-A support and blspec-entry cleanups 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=20230210193612.2143905-12-m.felsch@pengutronix.de \
    --to=m.felsch@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