From b4116200c7138c259eac8480f0adab801c6cda47 Mon Sep 17 00:00:00 2001 From: Marcel Ziswiler Date: Sat, 15 Dec 2018 17:31:15 +0100 Subject: 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 Acked-by: Max Krummenacher --- include/configs/colibri_imx7_emmc.h | 9 +++++++++ 1 file changed, 9 insertions(+) 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" \ -- cgit v1.2.3