summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2023-08-23 11:12:36 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2023-09-05 05:52:34 -0300
commitb936bacb982e980ea3d99ba2f80238b866eb382a (patch)
treea4e06b644122f4443f11e52adb99ad2f6760a7ca
parente8c54dc6fb4f29fbe9a788e322797cdafbffa727 (diff)
u-boot-toradex: colibri-imx7: drop support booting a downstream kernel
We no longer provide a kernel based on the NXP downstream BSP. Drop patching U-Boot to support booting such a kernel on a Colibri iMX7. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
-rw-r--r--recipes-bsp/u-boot/u-boot-toradex/0001-colibri_imx7-boot-linux-kernel-in-secure-mode.patch31
-rw-r--r--recipes-bsp/u-boot/u-boot-toradex_2022.07.bb3
2 files changed, 0 insertions, 34 deletions
diff --git a/recipes-bsp/u-boot/u-boot-toradex/0001-colibri_imx7-boot-linux-kernel-in-secure-mode.patch b/recipes-bsp/u-boot/u-boot-toradex/0001-colibri_imx7-boot-linux-kernel-in-secure-mode.patch
deleted file mode 100644
index 4a19cd0..0000000
--- a/recipes-bsp/u-boot/u-boot-toradex/0001-colibri_imx7-boot-linux-kernel-in-secure-mode.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 645496d7a35ce78f4057f5668ed210204c7acef0 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 ac188ee3ac..82b3ff9323 100644
---- a/include/configs/colibri_imx7.h
-+++ b/include/configs/colibri_imx7.h
-@@ -142,6 +142,7 @@
- MODULE_EXTRA_ENV_SETTINGS \
- UBOOT_UPDATE \
- "boot_file=zImage\0" \
-+ "bootm_boot_mode=sec\0" \
- "bootubipart=ubi\0" \
- "console=ttymxc0\0" \
- "defargs=\0" \
---
-2.20.1
-
diff --git a/recipes-bsp/u-boot/u-boot-toradex_2022.07.bb b/recipes-bsp/u-boot/u-boot-toradex_2022.07.bb
index e9fdfaf..44f70da 100644
--- a/recipes-bsp/u-boot/u-boot-toradex_2022.07.bb
+++ b/recipes-bsp/u-boot/u-boot-toradex_2022.07.bb
@@ -36,9 +36,6 @@ TDX_PATCHES:use-head-next = " \
"
SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master"
SRC_URI:append = " ${TDX_PATCHES}"
-SRC_URI:append:use-nxp-bsp:colibri-imx7 = " \
- file://0001-colibri_imx7-boot-linux-kernel-in-secure-mode.patch \
-"
inherit toradex-u-boot-localversion