From 32c022da358ae016a84cf1dd9bd558a02f979b1a Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Mon, 14 Nov 2016 18:22:27 -0800 Subject: 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 Acked-by: Marcel Ziswiler --- board/toradex/apalis_imx6/apalis_imx6.c | 4 +-- configs/apalis_imx6_tezi_defconfig | 56 +++++++++++++++++++++++++++++++++ include/configs/apalis_imx6.h | 24 +++++++++----- 3 files changed, 75 insertions(+), 9 deletions(-) create mode 100644 configs/apalis_imx6_tezi_defconfig diff --git a/board/toradex/apalis_imx6/apalis_imx6.c b/board/toradex/apalis_imx6/apalis_imx6.c index a98b8eee9a..5ceecb352d 100644 --- a/board/toradex/apalis_imx6/apalis_imx6.c +++ b/board/toradex/apalis_imx6/apalis_imx6.c @@ -837,13 +837,13 @@ int board_late_init(void) #endif /* CONFIG_TDX_APALIS_IMX6_V1_0 */ #endif /* CONFIG_REVISION_TAG */ -#ifdef CONFIG_CMD_USB_SDP +#if defined(CONFIG_TDX_EASY_INSTALLER) && defined(CONFIG_CMD_USB_SDP) if (is_boot_from_usb()) { printf("Serial Downloader recovery mode, using sdp command\n"); setenv("bootdelay", "0"); setenv("bootcmd", "sdp 0"); } -#endif /* CONFIG_CMD_USB_SDP */ +#endif /* CONFIG_TDX_EASY_INSTALLER & CONFIG_CMD_USB_SDP */ return 0; } diff --git a/configs/apalis_imx6_tezi_defconfig b/configs/apalis_imx6_tezi_defconfig new file mode 100644 index 0000000000..80e8e1e1c1 --- /dev/null +++ b/configs/apalis_imx6_tezi_defconfig @@ -0,0 +1,56 @@ +CONFIG_ARM=y +CONFIG_ARCH_MX6=y +CONFIG_SPL_GPIO_SUPPORT=y +CONFIG_SPL_LIBCOMMON_SUPPORT=y +CONFIG_SPL_LIBGENERIC_SUPPORT=y +# CONFIG_TDX_CFG_BLOCK_USB_GADGET_PID is not set +CONFIG_TDX_EASY_INSTALLER=y +CONFIG_TARGET_APALIS_IMX6=y +CONFIG_SPL_I2C_SUPPORT=y +CONFIG_SPL_MMC_SUPPORT=y +CONFIG_SPL_SERIAL_SUPPORT=y +CONFIG_FIT=y +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q" +CONFIG_BOOTDELAY=1 +# CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_SPL=y +CONFIG_SPL_DMA_SUPPORT=y +CONFIG_SPL_USB_HOST_SUPPORT=y +CONFIG_SPL_USB_GADGET_SUPPORT=y +CONFIG_SPL_USB_SDP_SUPPORT=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="Apalis iMX6 # " +CONFIG_CMD_BOOTZ=y +# CONFIG_CMD_ELF is not set +# CONFIG_CMD_IMI is not set +# CONFIG_CMD_IMLS is not set +# CONFIG_CMD_XIMG is not set +CONFIG_CMD_ASKENV=y +CONFIG_CMD_MEMTEST=y +CONFIG_CMD_MMC=y +CONFIG_CMD_I2C=y +CONFIG_CMD_USB=y +CONFIG_CMD_DFU=y +CONFIG_CMD_USB_SDP=y +CONFIG_CMD_USB_MASS_STORAGE=y +# CONFIG_CMD_FPGA is not set +CONFIG_CMD_GPIO=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_MII=y +CONFIG_CMD_PING=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_EXT4=y +CONFIG_CMD_FAT=y +CONFIG_CMD_FS_GENERIC=y +CONFIG_USB=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_STORAGE=y +CONFIG_USB_GADGET=y +CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Toradex" +CONFIG_G_DNL_VENDOR_NUM=0x1b67 +CONFIG_G_DNL_PRODUCT_NUM=0x4000 +CONFIG_OF_LIBFDT=y +CONFIG_OF_LIBFDT_OVERLAY=y +# CONFIG_EFI_LOADER is not set diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index 71dfeb56f5..7eb7d07b29 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 @@ -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" */ -- cgit v1.2.3