summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorStefan Agner <stefan.agner@toradex.com>2017-05-01 17:20:48 -0700
committerStefan Agner <stefan.agner@toradex.com>2018-07-27 14:14:06 +0200
commit66200a6d2d91f1e3db6396d3695493c4439c4459 (patch)
treeff0eca6339d45da6af928d8aec534a2f759fb4e0 /include
parent7785fe2df617fb0e55342f52372634cd0441564f (diff)
colibri_imx7: 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')
-rw-r--r--include/configs/colibri_imx7.h29
1 files changed, 26 insertions, 3 deletions
diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index ea04762b491..3903591f9a6 100644
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -68,7 +68,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" \
@@ -93,6 +92,18 @@
"load mmc 0:1 ${fdt_addr_r} ${soc}-colibri-${fdt_board}.dtb && " \
"run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
+#ifdef CONFIG_TDX_EASY_INSTALLER
+#define UBI_BOOTCMD \
+ "ubiargs=ubi.mtd=ubi root=ubi0:rootfs rw rootfstype=ubifs " \
+ "ubi.fm_autoconvert=1\0" \
+ "ubiboot=run setup; " \
+ "setenv bootargs console=ttymxc0,115200 quiet " \
+ "rootfstype=squashfs root=/dev/ram autoinstall " \
+ "${teziargs}; echo Booting Toradex Easy Installer...; " \
+ "ubi part ubi && " \
+ "ubi read ${ramdisk_addr_r} rootfs && " \
+ "bootm ${ramdisk_addr_r}#config@${soc}\0"
+#else /* CONFIG_TDX_EASY_INSTALLER */
#define UBI_BOOTCMD \
"ubiargs=ubi.mtd=ubi root=ubi0:rootfs rw rootfstype=ubifs " \
"ubi.fm_autoconvert=1\0" \
@@ -102,10 +113,16 @@
"ubi part ubi && run m4boot && " \
"ubi read ${kernel_addr_r} kernel && " \
"ubi read ${fdt_addr_r} dtb && " \
- "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
+ "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0"
+#endif /* CONFIG_TDX_EASY_INSTALLER */
+#ifdef CONFIG_TDX_EASY_INSTALLER
+#define CONFIG_BOOTCOMMAND "setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && " \
+ "run bootcmd_mmc0; run ubiboot; run distro_bootcmd"
+#else
#define CONFIG_BOOTCOMMAND "run ubiboot; " \
- "setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && run distro_bootcmd;"
+ "setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && run distro_bootcmd"
+#endif
#define BOOTENV_RUN_NET_USB_START ""
#define BOOT_TARGET_DEVICES(func) \
@@ -175,12 +192,18 @@
/* FLASH and environment organization */
#define CONFIG_SYS_NO_FLASH
+#ifdef CONFIG_TDX_EASY_INSTALLER
+#define CONFIG_ENV_IS_NOWHERE
+#else
#define CONFIG_ENV_IS_IN_NAND
+#endif
#if defined(CONFIG_ENV_IS_IN_NAND)
#define CONFIG_ENV_SECT_SIZE (128 * 1024)
#define CONFIG_ENV_OFFSET (28 * CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
+#else
+#define CONFIG_ENV_SIZE (8 * SZ_64K)
#endif
#define CONFIG_NAND_MXS