diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2020-09-30 16:45:22 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2020-09-30 16:45:22 +0200 |
| commit | 65ad0c9327000b100eaf51958023f8dac7642753 (patch) | |
| tree | d89c71ac676d1980573e49b618523212501af25f /recipes-bsp | |
| parent | b8712aa8fc6557d30d6d79d91fbe9e5773276e99 (diff) | |
u-boot-toradex: colibri-imx7: boot linux kernel in non-secure/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>
Diffstat (limited to 'recipes-bsp')
| -rw-r--r-- | recipes-bsp/u-boot/files/0001-colibri_imx7-boot-linux-kernel-in-non-secure-mode.patch | 31 | ||||
| -rw-r--r-- | recipes-bsp/u-boot/u-boot-toradex_2020.07.bb | 6 |
2 files changed, 37 insertions, 0 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 new file mode 100644 index 0000000..362e9ef --- /dev/null +++ b/recipes-bsp/u-boot/files/0001-colibri_imx7-boot-linux-kernel-in-non-secure-mode.patch @@ -0,0 +1,31 @@ +From 9bdb801953e4a81c59fc358cc5bf91811b0d514f Mon Sep 17 00:00:00 2001 +Message-Id: <9bdb801953e4a81c59fc358cc5bf91811b0d514f.1601476897.git.marcel.ziswiler@toradex.com> +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 + +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> +--- + 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 b520da00ed..9d79af14a2 100644 +--- a/include/configs/colibri_imx7.h ++++ b/include/configs/colibri_imx7.h +@@ -149,7 +149,7 @@ + MODULE_EXTRA_ENV_SETTINGS \ + UBOOT_UPDATE \ + "boot_file=zImage\0" \ +- "bootm_boot_mode=sec\0" \ ++ "bootm_boot_mode=nonsec\0" \ + "bootubipart=ubi\0" \ + "console=ttymxc0\0" \ + "defargs=\0" \ +-- +2.25.4 + diff --git a/recipes-bsp/u-boot/u-boot-toradex_2020.07.bb b/recipes-bsp/u-boot/u-boot-toradex_2020.07.bb index fd6359e..4add74e 100644 --- a/recipes-bsp/u-boot/u-boot-toradex_2020.07.bb +++ b/recipes-bsp/u-boot/u-boot-toradex_2020.07.bb @@ -7,6 +7,12 @@ PROVIDES += "u-boot" DEPENDS += "bc-native dtc-native" +# 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. +SRC_URI_append_use-mainline-bsp_colibri-imx7 = " file://0001-colibri_imx7-boot-linux-kernel-in-non-secure-mode.patch" +SRC_URI_append_use-mainline-bsp_colibri-imx7-emmc = " file://0001-colibri_imx7-boot-linux-kernel-in-non-secure-mode.patch" + BOOT_TOOLS = "imx-boot-tools" PADDING_DIR = "${B}" |