From: Michael Olbrich <m.olbrich@pengutronix.de>
To: Ahmad Fatoum <a.fatoum@pengutronix.de>
Cc: distrokit@pengutronix.de
Subject: Re: [DistroKit] [PATCH 1/7] platform-v8a: cleanup barebox firmware handling
Date: Thu, 8 Jun 2023 11:19:31 +0200 [thread overview]
Message-ID: <ZIGdI+7yo2vKbEjp@pengutronix.de> (raw)
In-Reply-To: <df1d9eed-df01-29c1-1d08-180b2330d38d@pengutronix.de>
On Fri, Jun 02, 2023 at 06:40:55PM +0200, Ahmad Fatoum wrote:
> On 02.06.23 16:59, Michael Olbrich wrote:
> > BAREBOX_INJECT_FILES is explicitly designed in such a way that all
> > packages can add to it in their regular rules, so move the declarations
> > accordingly. And only add to BAREBOX_INJECT_FILES if the package is
> > acutally enabled.
> >
> > imx/imx-usb-loader is already part of BAREBOX_PROGS_HOST, so no need to
> > add it.
> >
> > Move rk-usb-loader to rules/barebox.rockchip.make (it's explicitly
> > loaded after rules/barebox.make) for now. This can be removed when this
> > is added upstream.
> >
> > Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> > ---
> > configs/platform-v8a/rules/barebox.rockchip.make | 12 ++++++++++++
> > configs/platform-v8a/rules/firmware-imx.make | 13 +++++++++++++
> > .../platform-v8a/rules/firmware-rockchip.make | 10 ++++++++++
> > .../platform-v8a/rules/post/barebox-fixup.make | 16 ----------------
> > 4 files changed, 35 insertions(+), 16 deletions(-)
> > create mode 100644 configs/platform-v8a/rules/barebox.rockchip.make
> > delete mode 100644 configs/platform-v8a/rules/post/barebox-fixup.make
> >
> > diff --git a/configs/platform-v8a/rules/barebox.rockchip.make b/configs/platform-v8a/rules/barebox.rockchip.make
> > new file mode 100644
> > index 000000000000..17092a9b728c
> > --- /dev/null
> > +++ b/configs/platform-v8a/rules/barebox.rockchip.make
>
> What magic includes this file?
I originally introduced this because I needed it to include generated
makefiles for cargo. So I added a generic mechanism to source all
<pkg>.<anything>.make files directly after <pkg>.make. This works for the
cargo use-case, but also to extend package rules in simple ways to avoid
copying the rule.
Michael
> Patch looks fine though:
>
> Reviewed-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
>
> > @@ -0,0 +1,12 @@
> > +# -*-makefile-*-
> > +#
> > +# Copyright (C) 2023 by Michael Olbrich <m.olbrich@pengutronix.de>
> > +#
> > +# For further information about the PTXdist project and license conditions
> > +# see the README file.
> > +#
> > +
> > +# TODO: remove this when it is added in PTXdist upstream
> > +BAREBOX_PROGS_HOST += rk-usb-loader
> > +
> > +# vim: syntax=make
> > diff --git a/configs/platform-v8a/rules/firmware-imx.make b/configs/platform-v8a/rules/firmware-imx.make
> > index fbdd93a15971..7bf1701b3ce1 100644
> > --- a/configs/platform-v8a/rules/firmware-imx.make
> > +++ b/configs/platform-v8a/rules/firmware-imx.make
> > @@ -25,6 +25,19 @@ FIRMWARE_IMX_LICENSE_FILES := \
> > file://$(FIRMWARE_IMX_PKGDIR)/COPYING;md5=228c72f2a91452b8a03c4cab30f30ef9
> > FIRMWARE_IMX_SOURCE := $(SRCDIR)/$(FIRMWARE_IMX).$(FIRMWARE_IMX_SUFFIX)
> >
> > +#
> > +# Firmware blobs for barebox
> > +#
> > +ifdef PTXCONF_FIRMWARE_IMX
> > +BAREBOX_INJECT_FILES += imx8mm-bl31.bin:firmware/imx8mm-bl31.bin
> > +BAREBOX_INJECT_FILES += imx8mp-bl31.bin:firmware/imx8mp-bl31.bin
> > +BAREBOX_INJECT_FILES += imx8mq-bl31.bin:firmware/imx8mq-bl31.bin
> > +BAREBOX_INJECT_FILES += ddr/synopsys/lpddr4_pmu_train_1d_dmem.bin:firmware/lpddr4_pmu_train_1d_dmem.bin
> > +BAREBOX_INJECT_FILES += ddr/synopsys/lpddr4_pmu_train_1d_imem.bin:firmware/lpddr4_pmu_train_1d_imem.bin
> > +BAREBOX_INJECT_FILES += ddr/synopsys/lpddr4_pmu_train_2d_dmem.bin:firmware/lpddr4_pmu_train_2d_dmem.bin
> > +BAREBOX_INJECT_FILES += ddr/synopsys/lpddr4_pmu_train_2d_imem.bin:firmware/lpddr4_pmu_train_2d_imem.bin
> > +endif
> > +
> > # ----------------------------------------------------------------------------
> > # Extract
> > # ----------------------------------------------------------------------------
> > diff --git a/configs/platform-v8a/rules/firmware-rockchip.make b/configs/platform-v8a/rules/firmware-rockchip.make
> > index dd50c865a037..694914800ed1 100644
> > --- a/configs/platform-v8a/rules/firmware-rockchip.make
> > +++ b/configs/platform-v8a/rules/firmware-rockchip.make
> > @@ -20,6 +20,16 @@ FIRMWARE_ROCKCHIP_SOURCE := $(SRCDIR)/$(FIRMWARE_ROCKCHIP).$(FIRMWARE_ROCKCHIP_S
> > FIRMWARE_ROCKCHIP_DIR := $(BUILDDIR)/$(FIRMWARE_ROCKCHIP)
> > FIRMWARE_ROCKCHIP_LICENSE := proprietary
> >
> > +#
> > +# Firmware blobs for barebox
> > +#
> > +ifdef PTXCONF_FIRMWARE_ROCKCHIP
> > +BAREBOX_INJECT_FILES += rk3568_bl31_v1.24.elf:firmware/rk3568-bl31.bin
> > +BAREBOX_INJECT_FILES += rk3568_bl32_v1.05.bin:firmware/rk3568-op-tee.bin
> > +BAREBOX_INJECT_FILES += rk3568_ddr_1560MHz_v1.08.bin:arch/arm/boards/rockchip-rk3568-evb/sdram-init.bin
> > +BAREBOX_INJECT_FILES += rk3568_ddr_1560MHz_v1.08.bin:arch/arm/boards/radxa-rock3/sdram-init.bin
> > +endif
> > +
> > # ----------------------------------------------------------------------------
> > # Prepare
> > # ----------------------------------------------------------------------------
> > diff --git a/configs/platform-v8a/rules/post/barebox-fixup.make b/configs/platform-v8a/rules/post/barebox-fixup.make
> > deleted file mode 100644
> > index 7c4ce40420ad..000000000000
> > --- a/configs/platform-v8a/rules/post/barebox-fixup.make
> > +++ /dev/null
> > @@ -1,16 +0,0 @@
> > -# Firmware blobs for Rockchip platforms
> > -BAREBOX_INJECT_FILES += rk3568_bl31_v1.24.elf:firmware/rk3568-bl31.bin
> > -BAREBOX_INJECT_FILES += rk3568_bl32_v1.05.bin:firmware/rk3568-op-tee.bin
> > -BAREBOX_INJECT_FILES += rk3568_ddr_1560MHz_v1.08.bin:arch/arm/boards/rockchip-rk3568-evb/sdram-init.bin
> > -BAREBOX_INJECT_FILES += rk3568_ddr_1560MHz_v1.08.bin:arch/arm/boards/radxa-rock3/sdram-init.bin
> > -BAREBOX_PROGS_HOST += rk-usb-loader
> > -
> > -# Firmware blobs for NXP i.MX8M platforms
> > -BAREBOX_INJECT_FILES += imx8mm-bl31.bin:firmware/imx8mm-bl31.bin
> > -BAREBOX_INJECT_FILES += imx8mp-bl31.bin:firmware/imx8mp-bl31.bin
> > -BAREBOX_INJECT_FILES += imx8mq-bl31.bin:firmware/imx8mq-bl31.bin
> > -BAREBOX_INJECT_FILES += ddr/synopsys/lpddr4_pmu_train_1d_dmem.bin:firmware/lpddr4_pmu_train_1d_dmem.bin
> > -BAREBOX_INJECT_FILES += ddr/synopsys/lpddr4_pmu_train_1d_imem.bin:firmware/lpddr4_pmu_train_1d_imem.bin
> > -BAREBOX_INJECT_FILES += ddr/synopsys/lpddr4_pmu_train_2d_dmem.bin:firmware/lpddr4_pmu_train_2d_dmem.bin
> > -BAREBOX_INJECT_FILES += ddr/synopsys/lpddr4_pmu_train_2d_imem.bin:firmware/lpddr4_pmu_train_2d_imem.bin
> > -BAREBOX_PROGS_HOST += imx/imx-usb-loader
>
> --
> 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 |
next prev parent reply other threads:[~2023-06-08 9:19 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-02 14:59 [DistroKit] [PATCH 0/7] platform-v8a: cleanup firmware rules Michael Olbrich
2023-06-02 14:59 ` [DistroKit] [PATCH 1/7] platform-v8a: cleanup barebox firmware handling Michael Olbrich
2023-06-02 16:40 ` Ahmad Fatoum
2023-06-08 9:19 ` Michael Olbrich [this message]
2023-06-02 14:59 ` [DistroKit] [PATCH 2/7] firmware-imx: move to the correct section Michael Olbrich
2023-06-02 16:41 ` Ahmad Fatoum
2023-06-02 14:59 ` [DistroKit] [PATCH 3/7] platform-v8a: move platform menu files to platforms/ Michael Olbrich
2023-06-02 16:44 ` Ahmad Fatoum
2023-06-08 9:22 ` Michael Olbrich
2023-06-08 9:27 ` Ahmad Fatoum
2023-06-02 14:59 ` [DistroKit] [PATCH 4/7] platform-v8a: simplify dts search path Michael Olbrich
2023-06-02 16:44 ` Ahmad Fatoum
2023-06-02 14:59 ` [DistroKit] [PATCH 5/7] firmware-imx: use foreach and ptx/nl Michael Olbrich
2023-06-02 16:45 ` Ahmad Fatoum
2023-06-02 14:59 ` [DistroKit] [PATCH 6/7] firmware-imx: make sure menuconfig works correctly Michael Olbrich
2023-06-02 16:38 ` Ahmad Fatoum
2023-06-08 9:25 ` [DistroKit] [PATCH v2] " Michael Olbrich
2023-06-08 9:27 ` Ahmad Fatoum
2023-06-02 14:59 ` [DistroKit] [PATCH 7/7] firmware-rockchip: " Michael Olbrich
2023-06-20 13:26 ` [DistroKit] [PATCH 0/7] platform-v8a: cleanup firmware rules 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=ZIGdI+7yo2vKbEjp@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=a.fatoum@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