From 03d40edfd0215a6a421e7567fd75606331b338d2 Mon Sep 17 00:00:00 2001
From: Gabriel Valcazar <gabriel.valcazar@digi.com>
Date: Fri, 19 Jul 2019 11:10:40 +0200
Subject: [PATCH] imx-boot: add patch to fix imx-boot images with M4 demos

These images were broken in many ways, including ethernet not working and Linux
not booting. For now, revert back to the build command that was used in
DEY-2.6-r1.

https://jira.digi.com/browse/DEL-6677

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
---
 ..._BD_FLAGS_ALT_CONFIG-flag-in-flash_r.patch | 31 +++++++++++++++++++
 .../imx-mkimage/imx-boot_0.2.bbappend         |  3 ++
 2 files changed, 34 insertions(+)
 create mode 100644 meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot/0001-iMX8QX-remove-SC_BD_FLAGS_ALT_CONFIG-flag-in-flash_r.patch

diff --git a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot/0001-iMX8QX-remove-SC_BD_FLAGS_ALT_CONFIG-flag-in-flash_r.patch b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot/0001-iMX8QX-remove-SC_BD_FLAGS_ALT_CONFIG-flag-in-flash_r.patch
new file mode 100644
index 000000000..d5467c928
--- /dev/null
+++ b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot/0001-iMX8QX-remove-SC_BD_FLAGS_ALT_CONFIG-flag-in-flash_r.patch
@@ -0,0 +1,31 @@
+From: Gabriel Valcazar <gabriel.valcazar@digi.com>
+Date: Fri, 19 Jul 2019 10:42:35 +0200
+Subject: [PATCH] iMX8QX: remove SC_BD_FLAGS_ALT_CONFIG flag in
+ flash_regression_linux_m4 target
+
+This flag breaks the ccimx8x U-Boot due to the code that is executed in the
+SCFW when it's set. Make the build command the same as the "flash_all" target
+in the rel_imx_4.14.78_1.0.0_ga tag, since the M4 demos still seem to work as
+expected when the flag is removed. The "-p3" parameter also needs to be removed
+for the images to boot properly.
+
+https://jira.digi.com/browse/DEL-6677
+
+Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
+---
+ iMX8QX/soc.mak | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/iMX8QX/soc.mak b/iMX8QX/soc.mak
+index 3c8e7b1..f06ece8 100755
+--- a/iMX8QX/soc.mak
++++ b/iMX8QX/soc.mak
+@@ -114,7 +114,7 @@ flash_linux_m4_xip: $(MKIMG) mx8qx-ahab-container.img scfw_tcm.bin u-boot-atf-co
+ 	./$(QSPI_PACKER) $(QSPI_HEADER)
+ 
+ flash_regression_linux_m4: $(MKIMG) mx8qx-ahab-container.img scfw_tcm.bin u-boot-atf.bin m4_image.bin
+-	./$(MKIMG) -soc QX -rev B0 -append mx8qx-ahab-container.img -c -flags 0x00200000 -scfw scfw_tcm.bin -ap u-boot-atf.bin a35 0x80000000 -p3 -m4 m4_image.bin 0 0x34FE0000 -out flash.bin
++	./$(MKIMG) -soc QX -rev B0 -append mx8qx-ahab-container.img -c -scfw scfw_tcm.bin -ap u-boot-atf.bin a35 0x80000000 -m4 m4_image.bin 0 0x34FE0000 -out flash.bin
+ 
+ flash_regression_linux_m4_ddr: $(MKIMG) mx8qx-ahab-container.img scfw_tcm.bin u-boot-atf.bin m4_image.bin
+ 	./$(MKIMG) -soc QX -rev B0 -append mx8qx-ahab-container.img -c -flags 0x00200000 -scfw scfw_tcm.bin -ap u-boot-atf.bin a35 0x80000000 -p3 -m4 m4_image.bin 0 0x88000000 -out flash.bin
diff --git a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_0.2.bbappend b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_0.2.bbappend
index d7c5a16cb..54d02bc29 100644
--- a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_0.2.bbappend
+++ b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_0.2.bbappend
@@ -5,6 +5,9 @@ inherit boot-artifacts
 SRCBRANCH = "imx_4.14.98_2.0.0_ga"
 SRCREV = "dd0234001713623c79be92b60fa88bc07b07f24f"
 
+FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
+SRC_URI_append_ccimx8x = " file://0001-iMX8QX-remove-SC_BD_FLAGS_ALT_CONFIG-flag-in-flash_r.patch"
+
 IMX_EXTRA_FIRMWARE_ccimx8x = "digi-sc-firmware"
 
 DEPENDS_append_ccimx8x = " coreutils-native"