[DistroKit] [PATCH] blspec-rpi4: move rule file to platform-v7a/rules/

[DistroKit] [PATCH] blspec-rpi4: move rule file to platform-v7a/rules/

[Michael Olbrich]

The menu file and all other blspec packages are defined in the platform as
well. Without this "ptxdist lint" reports for all other platforms:

[...]
Checking kconfig symbols in rule files ...
Undefined symbol PTXCONF_BLSPEC_RPI4 used in 'DistroKit/rules/blspec-rpi4.make'.
[...]

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
 {rules => configs/platform-v7a/rules}/blspec-rpi4.make | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {rules => configs/platform-v7a/rules}/blspec-rpi4.make (100%)

diff --git a/rules/blspec-rpi4.make b/configs/platform-v7a/rules/blspec-rpi4.make
similarity index 100%
rename from rules/blspec-rpi4.make
rename to configs/platform-v7a/rules/blspec-rpi4.make
-- 
2.30.2

Re: [DistroKit] [PATCH] blspec-rpi4: move rule file to platform-v7a/rules/

[Ahmad Fatoum]

Hello Michael,

On 12.12.22 09:23, Michael Olbrich wrote:
> The menu file and all other blspec packages are defined in the platform as
> well. Without this "ptxdist lint" reports for all other platforms:

I placed it top-level, because I intended for the rule to be reused
when 64-bit support for the Raspberry Pi 4b is added to DistroKit.

Is there a way to accommodate this without ptxdist lint complaining?

Cheers,
Ahmad

> 
> [...]
> Checking kconfig symbols in rule files ...
> Undefined symbol PTXCONF_BLSPEC_RPI4 used in 'DistroKit/rules/blspec-rpi4.make'.
> [...]
> 
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> ---
>  {rules => configs/platform-v7a/rules}/blspec-rpi4.make | 0
>  1 file changed, 0 insertions(+), 0 deletions(-)
>  rename {rules => configs/platform-v7a/rules}/blspec-rpi4.make (100%)
> 
> diff --git a/rules/blspec-rpi4.make b/configs/platform-v7a/rules/blspec-rpi4.make
> similarity index 100%
> rename from rules/blspec-rpi4.make
> rename to configs/platform-v7a/rules/blspec-rpi4.mak

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

Re: [DistroKit] [PATCH] blspec-rpi4: move rule file to platform-v7a/rules/

[Michael Olbrich]

On Mon, Dec 12, 2022 at 06:06:59PM +0100, Ahmad Fatoum wrote:
> On 12.12.22 09:23, Michael Olbrich wrote:
> > The menu file and all other blspec packages are defined in the platform as
> > well. Without this "ptxdist lint" reports for all other platforms:
> 
> I placed it top-level, because I intended for the rule to be reused
> when 64-bit support for the Raspberry Pi 4b is added to DistroKit.
> 
> Is there a way to accommodate this without ptxdist lint complaining?

In that case, you should place the menu file into the toplevel platforms/
directory. You need it anyways to reuse it in other platforms.
Add a 'depends on ARCH_ARM || ARCH_ARM64' to hide it for other platforms.

Michael

> > [...]
> > Checking kconfig symbols in rule files ...
> > Undefined symbol PTXCONF_BLSPEC_RPI4 used in 'DistroKit/rules/blspec-rpi4.make'.
> > [...]
> > 
> > Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> > ---
> >  {rules => configs/platform-v7a/rules}/blspec-rpi4.make | 0
> >  1 file changed, 0 insertions(+), 0 deletions(-)
> >  rename {rules => configs/platform-v7a/rules}/blspec-rpi4.make (100%)
> > 
> > diff --git a/rules/blspec-rpi4.make b/configs/platform-v7a/rules/blspec-rpi4.make
> > similarity index 100%
> > rename from rules/blspec-rpi4.make
> > rename to configs/platform-v7a/rules/blspec-rpi4.mak
> 
> -- 
> Pengutronix e.K.                           |                             |
> Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
> 31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
> Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
> 
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

[DistroKit] [PATCH] blspec-rpi4: move menu file to platforms/

[Michael Olbrich]

The rule file is toplevel in rules/ so without this "ptxdist lint" reports
for all other platforms:

[...]
Checking kconfig symbols in rule files ...
Undefined symbol PTXCONF_BLSPEC_RPI4 used in 'DistroKit/rules/blspec-rpi4.make'.
[...]

Add some dependencies so it can only be selected on platforms where it
makes sense and disable it on v8a for now.

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---

With this it can be enabled on v8a in the future but no other platform will
show it in the menu.

Michael

 configs/platform-v7a/platforms/blspec-rpi4.in | 5 -----
 configs/platform-v8a/platformconfig           | 1 +
 platforms/blspec-rpi4.in                      | 7 +++++++
 3 files changed, 8 insertions(+), 5 deletions(-)
 delete mode 100644 configs/platform-v7a/platforms/blspec-rpi4.in
 create mode 100644 platforms/blspec-rpi4.in

diff --git a/configs/platform-v7a/platforms/blspec-rpi4.in b/configs/platform-v7a/platforms/blspec-rpi4.in
deleted file mode 100644
index 0c0ce14f47bf..000000000000
--- a/configs/platform-v7a/platforms/blspec-rpi4.in
+++ /dev/null
@@ -1,5 +0,0 @@
-## SECTION=blspec
-
-config BLSPEC_RPI4
-	tristate
-	prompt "/loader/entries/rpi4*.conf bootloader spec entries"
diff --git a/configs/platform-v8a/platformconfig b/configs/platform-v8a/platformconfig
index 36708d6aa47b..785a1a22e069 100644
--- a/configs/platform-v8a/platformconfig
+++ b/configs/platform-v8a/platformconfig
@@ -194,6 +194,7 @@ 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
 # end of bootloader spec entries       
 
 #
diff --git a/platforms/blspec-rpi4.in b/platforms/blspec-rpi4.in
new file mode 100644
index 000000000000..aa3e7aff5ae3
--- /dev/null
+++ b/platforms/blspec-rpi4.in
@@ -0,0 +1,7 @@
+## 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"
-- 
2.30.2

Re: [DistroKit] [PATCH] blspec-rpi4: move menu file to platforms/

[Robert Schwebel]

On Fri, Jan 06, 2023 at 12:39:46PM +0100, Michael Olbrich wrote:
> The rule file is toplevel in rules/ so without this "ptxdist lint" reports
> for all other platforms:
> 
> [...]
> Checking kconfig symbols in rule files ...
> Undefined symbol PTXCONF_BLSPEC_RPI4 used in 'DistroKit/rules/blspec-rpi4.make'.
> [...]
> 
> Add some dependencies so it can only be selected on platforms where it
> makes sense and disable it on v8a for now.
> 
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> ---
> 
> With this it can be enabled on v8a in the future but no other platform will
> show it in the menu.

Applied to next.

rsc
-- 
Pengutronix e.K.                           | Dipl.-Ing. Robert Schwebel  |
Steuerwalder Str. 21                       | https://www.pengutronix.de/ |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-9    |