diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2017-09-04 14:23:38 -0700 |
|---|---|---|
| committer | Stefan Agner <stefan.agner@toradex.com> | 2018-07-27 14:14:06 +0200 |
| commit | 2196085dc58eeff58f49b30e33dbf7ce95456871 (patch) | |
| tree | 6d0e314f8a520ff719ba8877ee27eb4dfba5159f /include/configs/colibri_imx7_emmc.h | |
| parent | 66200a6d2d91f1e3db6396d3695493c4439c4459 (diff) | |
colibri_imx7_emmc: add configuration for tezi
Modify configuration for Tezi:
- Enable SDP in U-Boot
- Enable FDT relocation (in-place is causing issues with FIT images)
- Remove video output
- Boot from external SD cards using distroboot first by default
- Disable USB PID from config block (otherwise recovery mode download
in U-Boot stage fails)
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Diffstat (limited to 'include/configs/colibri_imx7_emmc.h')
| -rw-r--r-- | include/configs/colibri_imx7_emmc.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/include/configs/colibri_imx7_emmc.h b/include/configs/colibri_imx7_emmc.h index 8ea8955cb2..23d8eb94b1 100644 --- a/include/configs/colibri_imx7_emmc.h +++ b/include/configs/colibri_imx7_emmc.h @@ -81,7 +81,6 @@ #define MEM_LAYOUT_ENV_SETTINGS \ "bootm_size=0x10000000\0" \ "fdt_addr_r=0x82000000\0" \ - "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "kernel_addr_r=0x81000000\0" \ "pxefile_addr_r=0x87100000\0" \ @@ -106,12 +105,17 @@ "load mmc 1:1 ${fdt_addr_r} ${soc}-colibri-emmc-${fdt_board}.dtb && " \ "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ -#define CONFIG_BOOTCOMMAND "run emmcboot ; echo ; echo emmcboot failed ; " \ - "setenv fdtfile ${soc}-colibri-emmc-${fdt_board}.dtb && run distro_bootcmd;" +#ifdef CONFIG_TDX_EASY_INSTALLER +#define CONFIG_BOOTCOMMAND "run distro_bootcmd" +#else +#define CONFIG_BOOTCOMMAND "run emmcboot; echo; echo emmcboot failed; " \ + "setenv fdtfile ${soc}-colibri-emmc-${fdt_board}.dtb && run distro_bootcmd" +#endif #define BOOTENV_RUN_NET_USB_START "" #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 1) \ + func(MMC, mmc, 0) \ func(USB, usb, 0) \ func(DHCP, dhcp, na) #include <config_distro_bootcmd.h> @@ -181,7 +185,11 @@ #define CONFIG_ENV_SIZE (8 * 1024) +#ifdef CONFIG_TDX_EASY_INSTALLER +#define CONFIG_ENV_IS_NOWHERE +#else #define CONFIG_ENV_IS_IN_MMC +#endif #if defined(CONFIG_ENV_IS_IN_MMC) /* Environment in eMMC, before config block at the end of 1st "boot sector" */ |