From b45a64500bae87de595e466fc6412e4ba7974331 Mon Sep 17 00:00:00 2001 From: Marcel Ziswiler Date: Sat, 15 Dec 2018 17:27:41 +0100 Subject: colibri_imx7: fix kernel freeze if M4 started from U-Boot Commit 66200a6d2d ("colibri_imx7: 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.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index ea98570b90..6c91951878 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -65,9 +65,18 @@ #define CONFIG_NETMASK 255.255.255.0 #define CONFIG_SERVERIP 192.168.10.1 +#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