diff options
| author | Thomas Keller <thomas.keller@toradex.com> | 2024-02-22 16:54:15 +0100 |
|---|---|---|
| committer | Thomas Keller <thomas.keller@toradex.com> | 2024-02-22 16:54:15 +0100 |
| commit | bb63bd8579d6c006261ef9c1f2b3e71858c1fdab (patch) | |
| tree | f3109952a2ac9272d1482699559e193a6d166356 | |
| parent | 5e4528c5f50bc2f30212335938c7b3c079ee7b47 (diff) | |
u-boot-toradex: fix a patch fuzz
This fixes a following do_patch warning:
| WARNING: u-boot-toradex-1_2020.07+gitAUTOINC+4baed78646-r0 do_patch: Fuzz detected:
| Applying patch 0001-colibri_imx7-boot-linux-kernel-in-non-secure-mode.patch
| patching file include/configs/colibri_imx7.h
| Hunk #1 succeeded at 161 with fuzz 2 (offset 21 lines).
Signed-off-by: Thomas Keller <thomas.keller@toradex.com>
| -rw-r--r-- | recipes-bsp/u-boot/files/0001-colibri_imx7-boot-linux-kernel-in-non-secure-mode.patch | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/recipes-bsp/u-boot/files/0001-colibri_imx7-boot-linux-kernel-in-non-secure-mode.patch b/recipes-bsp/u-boot/files/0001-colibri_imx7-boot-linux-kernel-in-non-secure-mode.patch index 20e7e98..8573807 100644 --- a/recipes-bsp/u-boot/files/0001-colibri_imx7-boot-linux-kernel-in-non-secure-mode.patch +++ b/recipes-bsp/u-boot/files/0001-colibri_imx7-boot-linux-kernel-in-non-secure-mode.patch @@ -1,5 +1,4 @@ -From 9bdb801953e4a81c59fc358cc5bf91811b0d514f Mon Sep 17 00:00:00 2001 -Message-Id: <9bdb801953e4a81c59fc358cc5bf91811b0d514f.1601476897.git.marcel.ziswiler@toradex.com> +From 3192378a0bd7cfbadf752a770545e7c879f3e603 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 non-secure mode @@ -9,23 +8,21 @@ 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> + --- include/configs/colibri_imx7.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h -index 1b50dac83c..be33f1bdf9 100644 +index b48172ab19..b796fba3e2 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h -@@ -140,7 +140,7 @@ - UBOOT_UPDATE \ - "boot_script_dhcp=boot.scr\0" \ +@@ -161,7 +161,7 @@ + "boot_scripts=" BOOT_SCRIPT "\0" \ + "boot_script_dhcp=" BOOT_SCRIPT "\0" \ "boot_file=zImage\0" \ - "bootm_boot_mode=sec\0" \ + "bootm_boot_mode=nonsec\0" \ "bootubipart=ubi\0" \ "console=ttymxc0\0" \ "defargs=\0" \ --- -2.29.0 - |