diff options
| author | Ming Liu <ming.liu@toradex.com> | 2020-11-07 14:03:54 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2021-02-22 18:34:26 +0100 |
| commit | c4de12e37a48cabcf5cacbf4995f7a6d072a25c3 (patch) | |
| tree | 5e7f10e40ecf43225ccdbee08ad2150cd3794ae4 | |
| parent | f8bc694d0d6c96746f8778fa1301e42b295991af (diff) | |
u-boot-toradex: fix a patch fuzz
This fixes a following do_patch warning:
| WARNING: u-boot-toradex do_patch: Fuzz detected:
| Applying 0001-colibri_imx7-boot-linux-kernel-in-non-secure-mode.patch
| patching file include/configs/colibri_imx7.h
| Hunk #1 succeeded at 140 with fuzz 2 (offset -9 lines).
Related-to: TOR-1518
Signed-off-by: Ming Liu <ming.liu@toradex.com>
(cherry picked from commit f5f752d9d7b8a684b1afaccb41eb6a6f6c8c2c08)
| -rw-r--r-- | recipes-bsp/u-boot/files/0001-colibri_imx7-boot-linux-kernel-in-non-secure-mode.patch | 8 |
1 files changed, 4 insertions, 4 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 362e9ef..20e7e98 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 @@ -14,12 +14,12 @@ Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h -index b520da00ed..9d79af14a2 100644 +index 1b50dac83c..be33f1bdf9 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h -@@ -149,7 +149,7 @@ - MODULE_EXTRA_ENV_SETTINGS \ +@@ -140,7 +140,7 @@ UBOOT_UPDATE \ + "boot_script_dhcp=boot.scr\0" \ "boot_file=zImage\0" \ - "bootm_boot_mode=sec\0" \ + "bootm_boot_mode=nonsec\0" \ @@ -27,5 +27,5 @@ index b520da00ed..9d79af14a2 100644 "console=ttymxc0\0" \ "defargs=\0" \ -- -2.25.4 +2.29.0 |