summaryrefslogtreecommitdiff
path: root/recipes-bsp/u-boot
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2022-07-12 10:56:56 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2022-07-12 10:56:56 +0200
commit5028d674679d3ab8c8939ab085b432f0def4f054 (patch)
tree3954e46f5546700a9785f96a0d6f18f515b97139 /recipes-bsp/u-boot
parent4744d2e28fab596554a57aaa888485c20b204d29 (diff)
u-boot: colibri-imx7: forward port patch
With master @ Jul 11, 36b661dc colibri-imx7.h got changed, so that the patch no longer applies. 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.patch8
1 files changed, 4 insertions, 4 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
index ad3b881..dbcfa32 100644
--- 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
@@ -1,4 +1,4 @@
-From 286128fcce747d998e3b476a7129248fdaf3c02c Mon Sep 17 00:00:00 2001
+From a936c63690098b19c12acb7a9f106e023129ed99 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
@@ -15,17 +15,17 @@ Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
1 file changed, 1 insertion(+)
diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
-index 3dba7bcef2..c034695805 100644
+index 9543e0233e..e33d066328 100644
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
-@@ -131,6 +131,7 @@
+@@ -130,6 +130,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" \
+ "fdt_board=eval-v3\0" \
--
2.20.1