From: Alexander Dahl <ada@thorsis.com>
To: Michael Olbrich <m.olbrich@pengutronix.de>
Cc: Alexander Dahl <ada@thorsis.com>,
distrokit@pengutronix.de, Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: Re: [DistroKit] [PATCH] v7a: rpi2: Restore finding rpi-firmware when used as base layer
Date: Mon, 3 Jul 2023 08:07:15 +0200 [thread overview]
Message-ID: <20230703-triceps-cloud-e9dfa6166be3@ifak-system.com> (raw)
In-Reply-To: <ZJ8MxUl72BubR5jl@pengutronix.de>
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 |
next prev parent reply other threads:[~2023-07-03 6:07 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-30 12:08 Alexander Dahl
2023-06-30 17:11 ` Michael Olbrich
2023-07-03 6:07 ` Alexander Dahl [this message]
2023-07-11 5:36 ` 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=20230703-triceps-cloud-e9dfa6166be3@ifak-system.com \
--to=ada@thorsis.com \
--cc=a.fatoum@pengutronix.de \
--cc=distrokit@pengutronix.de \
--cc=m.olbrich@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