From 8f7abc1ea1a1dff9192894acb3b874013802f4eb Mon Sep 17 00:00:00 2001 From: Emanuele Ghidoli Date: Thu, 21 Mar 2024 11:00:52 +0100 Subject: u-boot-toradex: remove stale patch The removed patch is relevant to the downstream colibri-imx7 kernel which is no longer supported. Related-to: ELB-5611 Signed-off-by: Emanuele Ghidoli --- ...bri_imx7-boot-linux-kernel-in-secure-mode.patch | 31 ---------------------- ...bri_imx7-boot-linux-kernel-in-secure-mode.patch | 31 ---------------------- recipes-bsp/u-boot/u-boot-toradex_2022.07.bb | 3 --- 3 files changed, 65 deletions(-) delete mode 100644 recipes-bsp/u-boot/u-boot-toradex/0001-colibri_imx7-boot-linux-kernel-in-secure-mode.patch delete mode 100644 recipes-bsp/u-boot/u-boot-toradex/use-head-next/0001-colibri_imx7-boot-linux-kernel-in-secure-mode.patch 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 -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 -Reworked for mainline U-Boot. -Signed-off-by: Max Krummenacher ---- - 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/use-head-next/0001-colibri_imx7-boot-linux-kernel-in-secure-mode.patch b/recipes-bsp/u-boot/u-boot-toradex/use-head-next/0001-colibri_imx7-boot-linux-kernel-in-secure-mode.patch deleted file mode 100644 index dbcfa32..0000000 --- a/recipes-bsp/u-boot/u-boot-toradex/use-head-next/0001-colibri_imx7-boot-linux-kernel-in-secure-mode.patch +++ /dev/null @@ -1,31 +0,0 @@ -From a936c63690098b19c12acb7a9f106e023129ed99 Mon Sep 17 00:00:00 2001 -From: Marcel Ziswiler -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 -Reworked for mainline U-Boot. -Signed-off-by: Max Krummenacher ---- - 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 9543e0233e..e33d066328 100644 ---- a/include/configs/colibri_imx7.h -+++ b/include/configs/colibri_imx7.h -@@ -130,6 +130,7 @@ - UBOOT_UPDATE \ - "boot_file=zImage\0" \ - "boot_script_dhcp=boot.scr\0" \ -+ "bootm_boot_mode=sec\0" \ - "console=ttymxc0\0" \ - "defargs=\0" \ - "fdt_board=eval-v3\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 53f3063..9e9addc 100644 --- a/recipes-bsp/u-boot/u-boot-toradex_2022.07.bb +++ b/recipes-bsp/u-boot/u-boot-toradex_2022.07.bb @@ -37,9 +37,6 @@ TDX_PATCHES = " \ file://0014-toradex-tdx-cfg-block-Add-new-apalis-and-colibri-pid.patch \ " 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 -- cgit v1.2.3