summaryrefslogtreecommitdiff
path: root/recipes-bsp/u-boot
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2022-04-24 14:02:04 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2022-04-26 10:42:03 +0200
commit8b31df99e8c9aabc388896ed71b15179e39a164a (patch)
tree88227dd4e1766fbff225d9d6b496f696d12c4562 /recipes-bsp/u-boot
parentab228b0078853730099de38cf18ebba6e716041f (diff)
u-boot: forward port patch
Forward port the patch, currently for use-head-next only. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'recipes-bsp/u-boot')
-rw-r--r--recipes-bsp/u-boot/u-boot/use-head-next/0001-colibri_imx7-boot-linux-kernel-in-secure-mode.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/recipes-bsp/u-boot/u-boot/use-head-next/0001-colibri_imx7-boot-linux-kernel-in-secure-mode.patch b/recipes-bsp/u-boot/u-boot/use-head-next/0001-colibri_imx7-boot-linux-kernel-in-secure-mode.patch
new file mode 100644
index 0000000..ad3b881
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot/use-head-next/0001-colibri_imx7-boot-linux-kernel-in-secure-mode.patch
@@ -0,0 +1,31 @@
+From 286128fcce747d998e3b476a7129248fdaf3c02c Mon Sep 17 00:00:00 2001
+From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
+Date: Wed, 30 Sep 2020 16:37:54 +0200
+Subject: [PATCH] colibri_imx7: boot linux kernel in secure mode
+
+While NXP i.MX 7 downstream requires the Linux kernel to boot in secure
+mode mainline/upstream requires non-secure mode instead, as it properly
+uses PSCI to control further cores.
+
+Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
+Reworked for mainline U-Boot.
+Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
+---
+ include/configs/colibri_imx7.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
+index 3dba7bcef2..c034695805 100644
+--- a/include/configs/colibri_imx7.h
++++ b/include/configs/colibri_imx7.h
+@@ -131,6 +131,7 @@
+ UBOOT_UPDATE \
+ "boot_file=zImage\0" \
+ "boot_script_dhcp=boot.scr\0" \
++ "bootm_boot_mode=sec\0" \
+ "bootubipart=ubi\0" \
+ "console=ttymxc0\0" \
+ "defargs=\0" \
+--
+2.20.1
+