* [Buildroot] [PATCH 1/2] board/freescale: use correct ahab-container.img file name
@ 2020-02-20 2:18 Thomas Petazzoni
2020-02-20 2:18 ` [Buildroot] [PATCH 2/2] package/freescale-imx/firmware-imx: install mx8qm-ahab-container.img Thomas Petazzoni
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: Thomas Petazzoni @ 2020-02-20 2:18 UTC (permalink / raw)
To: buildroot
Commit 3f8ace002831a01ed6aec59b704bd92c8a3b957f
("board/freescale/common/imx: add support for i.MX8") had its
conflicts incorrectly tweaked when applied to Buildroot. The
ahab-container.img is installed with this name (ahab-container.img) by
the imx-firmware package, and not mx8qm-ahab-container.img or
mx8qx-ahab-container.img.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
board/freescale/common/imx/imx8-bootloader-prepare.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/board/freescale/common/imx/imx8-bootloader-prepare.sh b/board/freescale/common/imx/imx8-bootloader-prepare.sh
index 302fd00658..45c648e360 100755
--- a/board/freescale/common/imx/imx8-bootloader-prepare.sh
+++ b/board/freescale/common/imx/imx8-bootloader-prepare.sh
@@ -28,9 +28,9 @@ main ()
cp ${BINARIES_DIR}/bl31.bin ${BINARIES_DIR}/u-boot-atf.bin
dd if=${BINARIES_DIR}/u-boot-hash.bin of=${BINARIES_DIR}/u-boot-atf.bin bs=1K seek=128
if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8=y$" ${BR2_CONFIG}; then
- ${HOST_DIR}/bin/mkimage_imx8 -soc QM -rev B0 -append ${BINARIES_DIR}/mx8qm-ahab-container.img -c -scfw ${BINARIES_DIR}/mx8qm-mek-scfw-tcm.bin -ap ${BINARIES_DIR}/u-boot-atf.bin a53 0x80000000 -out ${BINARIES_DIR}/imx8-boot-sd.bin
+ ${HOST_DIR}/bin/mkimage_imx8 -soc QM -rev B0 -append ${BINARIES_DIR}/ahab-container.img -c -scfw ${BINARIES_DIR}/mx8qm-mek-scfw-tcm.bin -ap ${BINARIES_DIR}/u-boot-atf.bin a53 0x80000000 -out ${BINARIES_DIR}/imx8-boot-sd.bin
else
- ${HOST_DIR}/bin/mkimage_imx8 -soc QX -rev B0 -append ${BINARIES_DIR}/mx8qx-ahab-container.img -c -scfw ${BINARIES_DIR}/mx8qx-mek-scfw-tcm.bin -ap ${BINARIES_DIR}/u-boot-atf.bin a35 0x80000000 -out ${BINARIES_DIR}/imx8-boot-sd.bin
+ ${HOST_DIR}/bin/mkimage_imx8 -soc QX -rev B0 -append ${BINARIES_DIR}/ahab-container.img -c -scfw ${BINARIES_DIR}/mx8qx-mek-scfw-tcm.bin -ap ${BINARIES_DIR}/u-boot-atf.bin a35 0x80000000 -out ${BINARIES_DIR}/imx8-boot-sd.bin
fi
fi
--
2.24.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [Buildroot] [PATCH 2/2] package/freescale-imx/firmware-imx: install mx8qm-ahab-container.img
2020-02-20 2:18 [Buildroot] [PATCH 1/2] board/freescale: use correct ahab-container.img file name Thomas Petazzoni
@ 2020-02-20 2:18 ` Thomas Petazzoni
2020-02-20 7:02 ` Refik Tuzakli
` (2 more replies)
2020-02-20 20:27 ` [Buildroot] [PATCH 1/2] board/freescale: use correct ahab-container.img file name Julien Olivain
` (2 subsequent siblings)
3 siblings, 3 replies; 8+ messages in thread
From: Thomas Petazzoni @ 2020-02-20 2:18 UTC (permalink / raw)
To: buildroot
This commit ensures the mx8qm-ahab-container.img file gets installed
for the i.MX8 platform (BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8). This
is needed for board/freescale/common/imx/imx8-bootloader-prepare.sh to
find this file when creating the bootloader image.
Note that it means that the default FIRMWARE_IMX_INSTALL_TARGET_CMDS
that applies to all platforms except i.MX8M, i.MX8MM and i.MX8X also
no longer applies to i.MX8. But this is anyway probably relevant, as
most likely i.MX8 also needs a special variant of
FIRMWARE_IMX_INSTALL_TARGET_CMDS.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
NOTE: some review on this patch from i.MX people would be greatly
appreciated. Thanks!
---
package/freescale-imx/firmware-imx/firmware-imx.mk | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk
index b251fcda2a..b79973a104 100644
--- a/package/freescale-imx/firmware-imx/firmware-imx.mk
+++ b/package/freescale-imx/firmware-imx/firmware-imx.mk
@@ -59,6 +59,14 @@ define FIRMWARE_IMX_INSTALL_TARGET_CMDS
$(INSTALL) -D -m 0644 $(@D)/firmware/vpu/vpu_fw_imx8_enc.bin \
$(TARGET_DIR)/lib/firmware/vpu/vpu_fw_imx8_enc.bin
endef
+else ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8),y)
+FIRMWARE_IMX_INSTALL_IMAGES = YES
+define FIRMWARE_IMX_INSTALL_IMAGES_CMDS
+ # SECO firmware is needed when generating imx8-boot-sd.bin which
+ # is done in post-image script.
+ cp $(@D)/firmware/seco/mx8qm-ahab-container.img \
+ $(BINARIES_DIR)/ahab-container.img
+endef
else
define FIRMWARE_IMX_INSTALL_TARGET_CMDS
mkdir -p $(TARGET_DIR)/lib/firmware/imx
--
2.24.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [Buildroot] [PATCH 2/2] package/freescale-imx/firmware-imx: install mx8qm-ahab-container.img
2020-02-20 2:18 ` [Buildroot] [PATCH 2/2] package/freescale-imx/firmware-imx: install mx8qm-ahab-container.img Thomas Petazzoni
@ 2020-02-20 7:02 ` Refik Tuzakli
2020-02-20 20:28 ` Julien Olivain
2020-07-27 13:25 ` Thomas Petazzoni
2 siblings, 0 replies; 8+ messages in thread
From: Refik Tuzakli @ 2020-02-20 7:02 UTC (permalink / raw)
To: buildroot
Hello Thomas,
Imx8 alsa have dpu as imx8x. When kernel boot, it asks for vpu firmware.
You should define "FIRMWARE_IMX_INSTALL_TARGET_CMDS"
function for imx8, totally same as imx8x.
Regards,
20 ?ub 2020 Per 05:19 tarihinde Thomas Petazzoni <
thomas.petazzoni@bootlin.com> ?unu yazd?:
> This commit ensures the mx8qm-ahab-container.img file gets installed
> for the i.MX8 platform (BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8). This
> is needed for board/freescale/common/imx/imx8-bootloader-prepare.sh to
> find this file when creating the bootloader image.
>
> Note that it means that the default FIRMWARE_IMX_INSTALL_TARGET_CMDS
> that applies to all platforms except i.MX8M, i.MX8MM and i.MX8X also
> no longer applies to i.MX8. But this is anyway probably relevant, as
> most likely i.MX8 also needs a special variant of
> FIRMWARE_IMX_INSTALL_TARGET_CMDS.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> ---
> NOTE: some review on this patch from i.MX people would be greatly
> appreciated. Thanks!
> ---
> package/freescale-imx/firmware-imx/firmware-imx.mk | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk
> b/package/freescale-imx/firmware-imx/firmware-imx.mk
> index b251fcda2a..b79973a104 100644
> --- a/package/freescale-imx/firmware-imx/firmware-imx.mk
> +++ b/package/freescale-imx/firmware-imx/firmware-imx.mk
> @@ -59,6 +59,14 @@ define FIRMWARE_IMX_INSTALL_TARGET_CMDS
> $(INSTALL) -D -m 0644 $(@D)/firmware/vpu/vpu_fw_imx8_enc.bin \
> $(TARGET_DIR)/lib/firmware/vpu/vpu_fw_imx8_enc.bin
> endef
> +else ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8),y)
> +FIRMWARE_IMX_INSTALL_IMAGES = YES
> +define FIRMWARE_IMX_INSTALL_IMAGES_CMDS
> + # SECO firmware is needed when generating imx8-boot-sd.bin which
> + # is done in post-image script.
> + cp $(@D)/firmware/seco/mx8qm-ahab-container.img \
> + $(BINARIES_DIR)/ahab-container.img
> +endef
> else
> define FIRMWARE_IMX_INSTALL_TARGET_CMDS
> mkdir -p $(TARGET_DIR)/lib/firmware/imx
> --
> 2.24.1
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20200220/1453a8e8/attachment.html>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 2/2] package/freescale-imx/firmware-imx: install mx8qm-ahab-container.img
2020-02-20 2:18 ` [Buildroot] [PATCH 2/2] package/freescale-imx/firmware-imx: install mx8qm-ahab-container.img Thomas Petazzoni
2020-02-20 7:02 ` Refik Tuzakli
@ 2020-02-20 20:28 ` Julien Olivain
2020-07-27 13:25 ` Thomas Petazzoni
2 siblings, 0 replies; 8+ messages in thread
From: Julien Olivain @ 2020-02-20 20:28 UTC (permalink / raw)
To: buildroot
Hi Thomas,
Patch looks good. Thanks.
On 2020-02-20 03:18, Thomas Petazzoni wrote:
> This commit ensures the mx8qm-ahab-container.img file gets installed
> for the i.MX8 platform (BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8). This
> is needed for board/freescale/common/imx/imx8-bootloader-prepare.sh to
> find this file when creating the bootloader image.
>
> Note that it means that the default FIRMWARE_IMX_INSTALL_TARGET_CMDS
> that applies to all platforms except i.MX8M, i.MX8MM and i.MX8X also
> no longer applies to i.MX8. But this is anyway probably relevant, as
> most likely i.MX8 also needs a special variant of
> FIRMWARE_IMX_INSTALL_TARGET_CMDS.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> ---
> NOTE: some review on this patch from i.MX people would be greatly
> appreciated. Thanks!
> ---
> package/freescale-imx/firmware-imx/firmware-imx.mk | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk
> b/package/freescale-imx/firmware-imx/firmware-imx.mk
> index b251fcda2a..b79973a104 100644
> --- a/package/freescale-imx/firmware-imx/firmware-imx.mk
> +++ b/package/freescale-imx/firmware-imx/firmware-imx.mk
> @@ -59,6 +59,14 @@ define FIRMWARE_IMX_INSTALL_TARGET_CMDS
> $(INSTALL) -D -m 0644 $(@D)/firmware/vpu/vpu_fw_imx8_enc.bin \
> $(TARGET_DIR)/lib/firmware/vpu/vpu_fw_imx8_enc.bin
> endef
> +else ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8),y)
> +FIRMWARE_IMX_INSTALL_IMAGES = YES
> +define FIRMWARE_IMX_INSTALL_IMAGES_CMDS
> + # SECO firmware is needed when generating imx8-boot-sd.bin which
> + # is done in post-image script.
> + cp $(@D)/firmware/seco/mx8qm-ahab-container.img \
> + $(BINARIES_DIR)/ahab-container.img
> +endef
> else
> define FIRMWARE_IMX_INSTALL_TARGET_CMDS
> mkdir -p $(TARGET_DIR)/lib/firmware/imx
Reviewed-by: Julien Olivain <juju@cotds.org>
Tested-by: Julien Olivain <juju@cotds.org>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 2/2] package/freescale-imx/firmware-imx: install mx8qm-ahab-container.img
2020-02-20 2:18 ` [Buildroot] [PATCH 2/2] package/freescale-imx/firmware-imx: install mx8qm-ahab-container.img Thomas Petazzoni
2020-02-20 7:02 ` Refik Tuzakli
2020-02-20 20:28 ` Julien Olivain
@ 2020-07-27 13:25 ` Thomas Petazzoni
2 siblings, 0 replies; 8+ messages in thread
From: Thomas Petazzoni @ 2020-07-27 13:25 UTC (permalink / raw)
To: buildroot
On Thu, 20 Feb 2020 03:18:57 +0100
Thomas Petazzoni <thomas.petazzoni@bootlin.com> wrote:
> This commit ensures the mx8qm-ahab-container.img file gets installed
> for the i.MX8 platform (BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8). This
> is needed for board/freescale/common/imx/imx8-bootloader-prepare.sh to
> find this file when creating the bootloader image.
>
> Note that it means that the default FIRMWARE_IMX_INSTALL_TARGET_CMDS
> that applies to all platforms except i.MX8M, i.MX8MM and i.MX8X also
> no longer applies to i.MX8. But this is anyway probably relevant, as
> most likely i.MX8 also needs a special variant of
> FIRMWARE_IMX_INSTALL_TARGET_CMDS.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> ---
> NOTE: some review on this patch from i.MX people would be greatly
> appreciated. Thanks!
> ---
> package/freescale-imx/firmware-imx/firmware-imx.mk | 8 ++++++++
> 1 file changed, 8 insertions(+)
This patch has been rendered useless by
https://git.buildroot.org/buildroot/commit/?id=97d54bdcb2185914e232749fa4171601a9ec7f0d
where the imx-seco package now properly installs ahab-container.img for
the BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8=y configuration.
So I've marked this patch as not applicable.
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 1/2] board/freescale: use correct ahab-container.img file name
2020-02-20 2:18 [Buildroot] [PATCH 1/2] board/freescale: use correct ahab-container.img file name Thomas Petazzoni
2020-02-20 2:18 ` [Buildroot] [PATCH 2/2] package/freescale-imx/firmware-imx: install mx8qm-ahab-container.img Thomas Petazzoni
@ 2020-02-20 20:27 ` Julien Olivain
2020-02-20 20:33 ` Fabio Estevam
2020-02-26 21:28 ` Thomas Petazzoni
3 siblings, 0 replies; 8+ messages in thread
From: Julien Olivain @ 2020-02-20 20:27 UTC (permalink / raw)
To: buildroot
Hi Thomas,
Patch looks good. I successfully built and booted on i.MX8 MEK QM and
QXP boards. Thanks!
On 2020-02-20 03:18, Thomas Petazzoni wrote:
> Commit 3f8ace002831a01ed6aec59b704bd92c8a3b957f
> ("board/freescale/common/imx: add support for i.MX8") had its
> conflicts incorrectly tweaked when applied to Buildroot. The
> ahab-container.img is installed with this name (ahab-container.img) by
> the imx-firmware package, and not mx8qm-ahab-container.img or
> mx8qx-ahab-container.img.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> ---
> board/freescale/common/imx/imx8-bootloader-prepare.sh | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/board/freescale/common/imx/imx8-bootloader-prepare.sh
> b/board/freescale/common/imx/imx8-bootloader-prepare.sh
> index 302fd00658..45c648e360 100755
> --- a/board/freescale/common/imx/imx8-bootloader-prepare.sh
> +++ b/board/freescale/common/imx/imx8-bootloader-prepare.sh
> @@ -28,9 +28,9 @@ main ()
> cp ${BINARIES_DIR}/bl31.bin ${BINARIES_DIR}/u-boot-atf.bin
> dd if=${BINARIES_DIR}/u-boot-hash.bin
> of=${BINARIES_DIR}/u-boot-atf.bin bs=1K seek=128
> if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8=y$"
> ${BR2_CONFIG}; then
> - ${HOST_DIR}/bin/mkimage_imx8 -soc QM -rev B0 -append
> ${BINARIES_DIR}/mx8qm-ahab-container.img -c -scfw
> ${BINARIES_DIR}/mx8qm-mek-scfw-tcm.bin -ap
> ${BINARIES_DIR}/u-boot-atf.bin a53 0x80000000 -out
> ${BINARIES_DIR}/imx8-boot-sd.bin
> + ${HOST_DIR}/bin/mkimage_imx8 -soc QM -rev B0 -append
> ${BINARIES_DIR}/ahab-container.img -c -scfw
> ${BINARIES_DIR}/mx8qm-mek-scfw-tcm.bin -ap
> ${BINARIES_DIR}/u-boot-atf.bin a53 0x80000000 -out
> ${BINARIES_DIR}/imx8-boot-sd.bin
> else
> - ${HOST_DIR}/bin/mkimage_imx8 -soc QX -rev B0 -append
> ${BINARIES_DIR}/mx8qx-ahab-container.img -c -scfw
> ${BINARIES_DIR}/mx8qx-mek-scfw-tcm.bin -ap
> ${BINARIES_DIR}/u-boot-atf.bin a35 0x80000000 -out
> ${BINARIES_DIR}/imx8-boot-sd.bin
> + ${HOST_DIR}/bin/mkimage_imx8 -soc QX -rev B0 -append
> ${BINARIES_DIR}/ahab-container.img -c -scfw
> ${BINARIES_DIR}/mx8qx-mek-scfw-tcm.bin -ap
> ${BINARIES_DIR}/u-boot-atf.bin a35 0x80000000 -out
> ${BINARIES_DIR}/imx8-boot-sd.bin
> fi
> fi
Reviewed-by: Julien Olivain <juju@cotds.org>
Tested-by: Julien Olivain <juju@cotds.org>
^ permalink raw reply [flat|nested] 8+ messages in thread* [Buildroot] [PATCH 1/2] board/freescale: use correct ahab-container.img file name
2020-02-20 2:18 [Buildroot] [PATCH 1/2] board/freescale: use correct ahab-container.img file name Thomas Petazzoni
2020-02-20 2:18 ` [Buildroot] [PATCH 2/2] package/freescale-imx/firmware-imx: install mx8qm-ahab-container.img Thomas Petazzoni
2020-02-20 20:27 ` [Buildroot] [PATCH 1/2] board/freescale: use correct ahab-container.img file name Julien Olivain
@ 2020-02-20 20:33 ` Fabio Estevam
2020-02-26 21:28 ` Thomas Petazzoni
3 siblings, 0 replies; 8+ messages in thread
From: Fabio Estevam @ 2020-02-20 20:33 UTC (permalink / raw)
To: buildroot
Hi Thomas,
On Wed, Feb 19, 2020 at 11:19 PM Thomas Petazzoni
<thomas.petazzoni@bootlin.com> wrote:
>
> Commit 3f8ace002831a01ed6aec59b704bd92c8a3b957f
> ("board/freescale/common/imx: add support for i.MX8") had its
> conflicts incorrectly tweaked when applied to Buildroot. The
> ahab-container.img is installed with this name (ahab-container.img) by
> the imx-firmware package, and not mx8qm-ahab-container.img or
> mx8qx-ahab-container.img.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Reported-by: Fabio Estevam <festevam@gmail.com>
Tested-by: Fabio Estevam <festevam@gmail.com>
^ permalink raw reply [flat|nested] 8+ messages in thread* [Buildroot] [PATCH 1/2] board/freescale: use correct ahab-container.img file name
2020-02-20 2:18 [Buildroot] [PATCH 1/2] board/freescale: use correct ahab-container.img file name Thomas Petazzoni
` (2 preceding siblings ...)
2020-02-20 20:33 ` Fabio Estevam
@ 2020-02-26 21:28 ` Thomas Petazzoni
3 siblings, 0 replies; 8+ messages in thread
From: Thomas Petazzoni @ 2020-02-26 21:28 UTC (permalink / raw)
To: buildroot
On Thu, 20 Feb 2020 03:18:56 +0100
Thomas Petazzoni <thomas.petazzoni@bootlin.com> wrote:
> Commit 3f8ace002831a01ed6aec59b704bd92c8a3b957f
> ("board/freescale/common/imx: add support for i.MX8") had its
> conflicts incorrectly tweaked when applied to Buildroot. The
> ahab-container.img is installed with this name (ahab-container.img) by
> the imx-firmware package, and not mx8qm-ahab-container.img or
> mx8qx-ahab-container.img.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> ---
> board/freescale/common/imx/imx8-bootloader-prepare.sh | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2020-07-27 13:25 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-02-20 2:18 [Buildroot] [PATCH 1/2] board/freescale: use correct ahab-container.img file name Thomas Petazzoni
2020-02-20 2:18 ` [Buildroot] [PATCH 2/2] package/freescale-imx/firmware-imx: install mx8qm-ahab-container.img Thomas Petazzoni
2020-02-20 7:02 ` Refik Tuzakli
2020-02-20 20:28 ` Julien Olivain
2020-07-27 13:25 ` Thomas Petazzoni
2020-02-20 20:27 ` [Buildroot] [PATCH 1/2] board/freescale: use correct ahab-container.img file name Julien Olivain
2020-02-20 20:33 ` Fabio Estevam
2020-02-26 21:28 ` Thomas Petazzoni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox