aboutsummaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2020-02-20 03:18:56 +0100
committerGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2020-02-26 22:27:59 +0100
commit538940be388842d5ed3bdddaa6a5e56b34257db1 (patch)
tree573420909b51bf1e5fbeb152ce815be39fde0c31 /board
parent7bed3ee409661107b6ce2a05c48adcc7f79258fa (diff)
downloadbuildroot-538940be388842d5ed3bdddaa6a5e56b34257db1.tar.gz
buildroot-538940be388842d5ed3bdddaa6a5e56b34257db1.tar.bz2
board/freescale: use correct ahab-container.img file name
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> Reviewed-by: Julien Olivain <juju@cotds.org> Tested-by: Julien Olivain <juju@cotds.org> Reported-by: Fabio Estevam <festevam@gmail.com> Tested-by: Fabio Estevam <festevam@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Diffstat (limited to 'board')
-rwxr-xr-xboard/freescale/common/imx/imx8-bootloader-prepare.sh4
1 files 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