diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2018-12-15 17:31:15 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2018-12-20 14:07:47 +0100 |
| commit | b4116200c7138c259eac8480f0adab801c6cda47 (patch) | |
| tree | 6479ab0fec3a46e51cea513b15121ff11bdf66c3 | |
| parent | b45a64500bae87de595e466fc6412e4ba7974331 (diff) | |
colibri_imx7_emmc: fix kernel freeze if M4 started from U-Boot
Commit 2196085dc58e ("colibri_imx7_emmc: add configuration for tezi")
also enabled FDT relocation, however, this is causing the Linux kernel
to freeze if the M4 firmware was previously started from within U-Boot.
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
| -rw-r--r-- | include/configs/colibri_imx7_emmc.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/configs/colibri_imx7_emmc.h b/include/configs/colibri_imx7_emmc.h index 9c49f885d8..ffd39c3586 100644 --- a/include/configs/colibri_imx7_emmc.h +++ b/include/configs/colibri_imx7_emmc.h @@ -78,9 +78,18 @@ "load mmc 0:1 ${kernel_addr_r} ${boot_file} && " \ "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" +#ifdef CONFIG_TDX_EASY_INSTALLER +#define FDT_HIGH_SETTING \ + "" +#else +#define FDT_HIGH_SETTING \ + "fdt_high=0xffffffff\0" +#endif + #define MEM_LAYOUT_ENV_SETTINGS \ "bootm_size=0x10000000\0" \ "fdt_addr_r=0x82000000\0" \ + FDT_HIGH_SETTING \ "initrd_high=0xffffffff\0" \ "kernel_addr_r=0x81000000\0" \ "pxefile_addr_r=0x87100000\0" \ |