Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "imx-boot: add patch to fix imx-boot images with M4 demos" 

This reverts commit 03d40edfd0.

The build of U-Boot without the flags field, incorporated changes
that made the Cortex M4 acquired certain resources (like GPIOs)
that were later not available for the Cortex A35 cores.
Revert this patch so that such changes only take place on images
that contain the M4 applications.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>

https://jira.digi.com/browse/DEL-7073
(cherry picked from commit 28ce9340f55a35199dacf1bcbf83dc016b6a2fc7)
This commit is contained in:
Hector Palacios 2020-04-27 17:14:32 +02:00 committed by Gabriel Valcazar
parent 36d91492f6
commit ca3d27981f
2 changed files with 0 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot/0001-iMX8QX-remove-SC_BD_FLAGS_ALT_CONFIG-flag-in-flash_r.patch
View File

@ -1,31 +0,0 @@
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 e08cf3c..88f990a 100755
--- a/iMX8QX/soc.mak
+++ b/iMX8QX/soc.mak
@@ -120,7 +120,7 @@ flash_linux_m4_xip: $(MKIMG) $(AHAB_IMG) scfw_tcm.bin u-boot-atf-container.img m
./$(QSPI_PACKER) $(QSPI_HEADER)
flash_regression_linux_m4: $(MKIMG) $(AHAB_IMG) scfw_tcm.bin u-boot-atf.bin m4_image.bin
- ./$(MKIMG) -soc QX -rev B0 -append $(AHAB_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 $(AHAB_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) $(AHAB_IMG) scfw_tcm.bin u-boot-atf.bin m4_image.bin
./$(MKIMG) -soc QX -rev B0 -append $(AHAB_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

3
meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend
View File

@ -1,9 +1,6 @@
# Copyright 2019,2020 Digi International, Inc.
inherit boot-artifacts
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 imx-seco"
DEPENDS_append_ccimx8x = " coreutils-native"