summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorStefan Agner <stefan.agner@toradex.com>2016-11-14 18:22:27 -0800
committerStefan Agner <stefan.agner@toradex.com>2018-07-27 14:14:06 +0200
commit32c022da358ae016a84cf1dd9bd558a02f979b1a (patch)
treef38461912873a192f050a920bbae4dff8eeadf98 /include
parent8b2f82e2aca52bac5b67fbeddccef2dd44f21444 (diff)
apalis_imx6: add configuration for tezi
Modify configuration for Tezi: - Enable SDP in SPL and U-Boot - Enable FDT relocation (in-place is causing issues with FIT images) - Remove video output - Use distroboot by default - Boot from external SD cards 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/apalis_imx6.h24
1 files changed, 17 insertions, 7 deletions
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index 71dfeb56f5f..7eb7d07b294 100644
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -79,7 +79,7 @@
#define CONFIG_FAT_WRITE
#define CONFIG_DOS_PARTITION
-#ifdef CONFIG_MX6Q
+#if !defined(CONFIG_TDX_EASY_INSTALLER) && defined(CONFIG_MX6Q)
#define CONFIG_CMD_SATA
#endif
@@ -135,9 +135,10 @@
#define CONFIG_MXC_GPIO
/* Framebuffer and LCD */
+#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
+#ifdef CONFIG_VIDEO
#define CONFIG_VIDEO_IPUV3
#define CONFIG_SYS_CONSOLE_IS_IN_ENV
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_SPLASH_SCREEN
#define CONFIG_SPLASH_SCREEN_ALIGN
@@ -150,6 +151,7 @@
#define CONFIG_IMX_HDMI
#define CONFIG_IMX_VIDEO_SKIP
#define CONFIG_CMD_BMP
+#endif /* CONFIG_VIDEO */
/* allow to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE
@@ -171,11 +173,20 @@
#define CONFIG_LOADADDR 0x12000000
#define CONFIG_SYS_TEXT_BASE 0x17800000
+#ifdef CONFIG_TDX_EASY_INSTALLER
+#define CONFIG_BOOTCOMMAND "run distro_bootcmd"
+#else
+#define CONFIG_BOOTCOMMAND "run emmcboot; echo; echo emmcboot failed; " \
+ "run distro_bootcmd; usb start; " \
+ "setenv stdout serial,vga; setenv stdin serial,usbkbd"
+#endif
+
#ifndef CONFIG_SPL_BUILD
#define BOOTENV_RUN_NET_USB_START ""
#define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 1) \
func(MMC, mmc, 2) \
+ func(MMC, mmc, 0) \
func(USB, usb, 0) \
func(DHCP, dhcp, na)
#include <config_distro_bootcmd.h>
@@ -208,7 +219,6 @@
#define MEM_LAYOUT_ENV_SETTINGS \
"bootm_size=0x20000000\0" \
"fdt_addr_r=0x12000000\0" \
- "fdt_high=0xffffffff\0" \
"initrd_high=0xffffffff\0" \
"kernel_addr_r=0x11000000\0" \
"pxefile_addr_r=0x17100000\0" \
@@ -256,10 +266,6 @@
#endif
#define CONFIG_EXTRA_ENV_SETTINGS \
BOOTENV \
- "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \
- "run distro_bootcmd ; " \
- "usb start ;" \
- "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \
"boot_file=zImage\0" \
"console=ttymxc0\0" \
"defargs=vmalloc=400M user_debug=30\0" \
@@ -326,7 +332,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" */