* [DistroKit] [PATCH] v7a: rpi2: Restore finding rpi-firmware when used as base layer
@ 2023-06-30 12:08 Alexander Dahl
2023-06-30 17:11 ` Michael Olbrich
2023-07-11 5:36 ` Robert Schwebel
0 siblings, 2 replies; 4+ messages in thread
From: Alexander Dahl @ 2023-06-30 12:08 UTC (permalink / raw)
To: distrokit
When DistroKit was used as a base layer, the firmware was not in
'$(PTXDIST_WORKSPACE)/rpi-firmware' but in
'$(PTXDIST_WORKSPACE)/base/rpi-firmware' or
'$(PTXDIST_WORKSPACE)/base/base/rpi-firmware' … so we just need to look
for it in all layers. Otherwise no firmware is put to the FAT partition
of the SD card image and the device does not boot at all.
Fixes: 4dbcbb498769 ("v7a: rpi2: move rpi-firmware directory to top-level workspace")
Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
configs/platform-v7a/rules/image-rpi2.make | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configs/platform-v7a/rules/image-rpi2.make b/configs/platform-v7a/rules/image-rpi2.make
index e74edd1..22f1158 100644
--- a/configs/platform-v7a/rules/image-rpi2.make
+++ b/configs/platform-v7a/rules/image-rpi2.make
@@ -19,7 +19,7 @@ IMAGE_RPI2_DIR := $(BUILDDIR)/$(IMAGE_RPI2)
IMAGE_RPI2_IMAGE := $(IMAGEDIR)/rpi.hdimg
IMAGE_RPI2_FILES := $(IMAGEDIR)/root.tgz
IMAGE_RPI2_CONFIG := rpi2.config
-IMAGE_RPI2_DATA_DIR := $(PTXDIST_WORKSPACE)/rpi-firmware
+IMAGE_RPI2_DATA_DIR := $(call ptx/in-path, PTXDIST_PATH, rpi-firmware)
IMAGE_RPI2_DATA := \
$(wildcard $(IMAGE_RPI2_DATA_DIR)/*.bin) \
$(wildcard $(IMAGE_RPI2_DATA_DIR)/*.elf) \
base-commit: 79db26e54a2974dbcdcf2752ea5af15e95c5b644
--
2.30.2
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [DistroKit] [PATCH] v7a: rpi2: Restore finding rpi-firmware when used as base layer
2023-06-30 12:08 [DistroKit] [PATCH] v7a: rpi2: Restore finding rpi-firmware when used as base layer Alexander Dahl
@ 2023-06-30 17:11 ` Michael Olbrich
2023-07-03 6:07 ` Alexander Dahl
2023-07-11 5:36 ` Robert Schwebel
1 sibling, 1 reply; 4+ messages in thread
From: Michael Olbrich @ 2023-06-30 17:11 UTC (permalink / raw)
To: Alexander Dahl; +Cc: distrokit
On Fri, Jun 30, 2023 at 02:08:47PM +0200, Alexander Dahl wrote:
> When DistroKit was used as a base layer, the firmware was not in
> '$(PTXDIST_WORKSPACE)/rpi-firmware' but in
> '$(PTXDIST_WORKSPACE)/base/rpi-firmware' or
> '$(PTXDIST_WORKSPACE)/base/base/rpi-firmware' … so we just need to look
> for it in all layers. Otherwise no firmware is put to the FAT partition
> of the SD card image and the device does not boot at all.
>
> Fixes: 4dbcbb498769 ("v7a: rpi2: move rpi-firmware directory to top-level workspace")
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
Reviewed-by: Michael Olbrich <m.olbrich@pengutronix.de>
It would make sense to move this stuff into the platform since it's only
used there, but that's unrelated to this patch.
Michael
> ---
> configs/platform-v7a/rules/image-rpi2.make | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/configs/platform-v7a/rules/image-rpi2.make b/configs/platform-v7a/rules/image-rpi2.make
> index e74edd1..22f1158 100644
> --- a/configs/platform-v7a/rules/image-rpi2.make
> +++ b/configs/platform-v7a/rules/image-rpi2.make
> @@ -19,7 +19,7 @@ IMAGE_RPI2_DIR := $(BUILDDIR)/$(IMAGE_RPI2)
> IMAGE_RPI2_IMAGE := $(IMAGEDIR)/rpi.hdimg
> IMAGE_RPI2_FILES := $(IMAGEDIR)/root.tgz
> IMAGE_RPI2_CONFIG := rpi2.config
> -IMAGE_RPI2_DATA_DIR := $(PTXDIST_WORKSPACE)/rpi-firmware
> +IMAGE_RPI2_DATA_DIR := $(call ptx/in-path, PTXDIST_PATH, rpi-firmware)
> IMAGE_RPI2_DATA := \
> $(wildcard $(IMAGE_RPI2_DATA_DIR)/*.bin) \
> $(wildcard $(IMAGE_RPI2_DATA_DIR)/*.elf) \
>
> base-commit: 79db26e54a2974dbcdcf2752ea5af15e95c5b644
> --
> 2.30.2
>
>
>
--
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 |
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [DistroKit] [PATCH] v7a: rpi2: Restore finding rpi-firmware when used as base layer
2023-06-30 17:11 ` Michael Olbrich
@ 2023-07-03 6:07 ` Alexander Dahl
0 siblings, 0 replies; 4+ messages in thread
From: Alexander Dahl @ 2023-07-03 6:07 UTC (permalink / raw)
To: Michael Olbrich; +Cc: Alexander Dahl, distrokit, Ahmad Fatoum
Hello Michael,
Am Fri, Jun 30, 2023 at 07:11:33PM +0200 schrieb Michael Olbrich:
> On Fri, Jun 30, 2023 at 02:08:47PM +0200, Alexander Dahl wrote:
> > When DistroKit was used as a base layer, the firmware was not in
> > '$(PTXDIST_WORKSPACE)/rpi-firmware' but in
> > '$(PTXDIST_WORKSPACE)/base/rpi-firmware' or
> > '$(PTXDIST_WORKSPACE)/base/base/rpi-firmware' … so we just need to look
> > for it in all layers. Otherwise no firmware is put to the FAT partition
> > of the SD card image and the device does not boot at all.
> >
> > Fixes: 4dbcbb498769 ("v7a: rpi2: move rpi-firmware directory to top-level workspace")
> > Signed-off-by: Alexander Dahl <ada@thorsis.com>
>
> Reviewed-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> It would make sense to move this stuff into the platform since it's only
> used there, but that's unrelated to this patch.
The commit message of 4dbcbb498769 ("v7a: rpi2: move rpi-firmware
directory to top-level workspace") implies that someone wanted to add
rpi3 and rpi4 support to v8a, and avoid duplicating those firmware
files in multiple platforms. That v8a rpi support just did not
happen. Yet? ;-)
Greets
Alex
>
> Michael
>
> > ---
> > configs/platform-v7a/rules/image-rpi2.make | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/configs/platform-v7a/rules/image-rpi2.make b/configs/platform-v7a/rules/image-rpi2.make
> > index e74edd1..22f1158 100644
> > --- a/configs/platform-v7a/rules/image-rpi2.make
> > +++ b/configs/platform-v7a/rules/image-rpi2.make
> > @@ -19,7 +19,7 @@ IMAGE_RPI2_DIR := $(BUILDDIR)/$(IMAGE_RPI2)
> > IMAGE_RPI2_IMAGE := $(IMAGEDIR)/rpi.hdimg
> > IMAGE_RPI2_FILES := $(IMAGEDIR)/root.tgz
> > IMAGE_RPI2_CONFIG := rpi2.config
> > -IMAGE_RPI2_DATA_DIR := $(PTXDIST_WORKSPACE)/rpi-firmware
> > +IMAGE_RPI2_DATA_DIR := $(call ptx/in-path, PTXDIST_PATH, rpi-firmware)
> > IMAGE_RPI2_DATA := \
> > $(wildcard $(IMAGE_RPI2_DATA_DIR)/*.bin) \
> > $(wildcard $(IMAGE_RPI2_DATA_DIR)/*.elf) \
> >
> > base-commit: 79db26e54a2974dbcdcf2752ea5af15e95c5b644
> > --
> > 2.30.2
> >
> >
> >
>
> --
> 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 |
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [DistroKit] [PATCH] v7a: rpi2: Restore finding rpi-firmware when used as base layer
2023-06-30 12:08 [DistroKit] [PATCH] v7a: rpi2: Restore finding rpi-firmware when used as base layer Alexander Dahl
2023-06-30 17:11 ` Michael Olbrich
@ 2023-07-11 5:36 ` Robert Schwebel
1 sibling, 0 replies; 4+ messages in thread
From: Robert Schwebel @ 2023-07-11 5:36 UTC (permalink / raw)
To: Alexander Dahl; +Cc: distrokit
applied to next
On Fri, Jun 30, 2023 at 02:08:47PM +0200, Alexander Dahl wrote:
> When DistroKit was used as a base layer, the firmware was not in
> '$(PTXDIST_WORKSPACE)/rpi-firmware' but in
> '$(PTXDIST_WORKSPACE)/base/rpi-firmware' or
> '$(PTXDIST_WORKSPACE)/base/base/rpi-firmware' … so we just need to look
> for it in all layers. Otherwise no firmware is put to the FAT partition
> of the SD card image and the device does not boot at all.
>
> Fixes: 4dbcbb498769 ("v7a: rpi2: move rpi-firmware directory to top-level workspace")
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> ---
> configs/platform-v7a/rules/image-rpi2.make | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/configs/platform-v7a/rules/image-rpi2.make b/configs/platform-v7a/rules/image-rpi2.make
> index e74edd1..22f1158 100644
> --- a/configs/platform-v7a/rules/image-rpi2.make
> +++ b/configs/platform-v7a/rules/image-rpi2.make
> @@ -19,7 +19,7 @@ IMAGE_RPI2_DIR := $(BUILDDIR)/$(IMAGE_RPI2)
> IMAGE_RPI2_IMAGE := $(IMAGEDIR)/rpi.hdimg
> IMAGE_RPI2_FILES := $(IMAGEDIR)/root.tgz
> IMAGE_RPI2_CONFIG := rpi2.config
> -IMAGE_RPI2_DATA_DIR := $(PTXDIST_WORKSPACE)/rpi-firmware
> +IMAGE_RPI2_DATA_DIR := $(call ptx/in-path, PTXDIST_PATH, rpi-firmware)
> IMAGE_RPI2_DATA := \
> $(wildcard $(IMAGE_RPI2_DATA_DIR)/*.bin) \
> $(wildcard $(IMAGE_RPI2_DATA_DIR)/*.elf) \
>
> base-commit: 79db26e54a2974dbcdcf2752ea5af15e95c5b644
> --
> 2.30.2
>
>
>
--
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 |
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-07-11 5:36 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-30 12:08 [DistroKit] [PATCH] v7a: rpi2: Restore finding rpi-firmware when used as base layer Alexander Dahl
2023-06-30 17:11 ` Michael Olbrich
2023-07-03 6:07 ` Alexander Dahl
2023-07-11 5:36 ` Robert Schwebel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox