From 7fbd7d67294c166f72300006bed37e16087a46f2 Mon Sep 17 00:00:00 2001 From: Marcel Ziswiler Date: Sat, 25 Nov 2017 23:32:21 +0100 Subject: apalis-tk1: add configuration for tezi Modify configuration for Tezi: - 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: Marcel Ziswiler Acked-by: Stefan Agner --- configs/apalis-tk1_tezi_defconfig | 59 +++++++++++++++++++++++++++++++++++++ include/configs/apalis-tk1.h | 14 ++++++++- include/configs/tegra-common-post.h | 7 +++-- 3 files changed, 76 insertions(+), 4 deletions(-) create mode 100644 configs/apalis-tk1_tezi_defconfig diff --git a/configs/apalis-tk1_tezi_defconfig b/configs/apalis-tk1_tezi_defconfig new file mode 100644 index 0000000000..f7209b82f0 --- /dev/null +++ b/configs/apalis-tk1_tezi_defconfig @@ -0,0 +1,59 @@ +CONFIG_ARM=y +CONFIG_TEGRA=y +CONFIG_TEGRA124=y +CONFIG_TDX_EASY_INSTALLER=y +CONFIG_TARGET_APALIS_TK1=y +CONFIG_DEFAULT_DEVICE_TREE="tegra124-apalis" +CONFIG_FIT=y +CONFIG_OF_SYSTEM_SETUP=y +CONFIG_BOOTDELAY=1 +CONFIG_CONSOLE_MUX=y +CONFIG_SYS_STDIO_DEREGISTER=y +CONFIG_VERSION_VARIABLE=y +# CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="Apalis TK1 # " +CONFIG_CMD_BOOTZ=y +# CONFIG_CMD_IMI is not set +# CONFIG_CMD_IMLS is not set +# CONFIG_CMD_FLASH is not set +CONFIG_CMD_MMC=y +CONFIG_CMD_I2C=y +CONFIG_CMD_USB=y +CONFIG_CMD_DFU=y +CONFIG_CMD_USB_MASS_STORAGE=y +# CONFIG_CMD_FPGA is not set +CONFIG_CMD_GPIO=y +CONFIG_CMD_DHCP=y +# CONFIG_CMD_NFS is not set +CONFIG_CMD_MII=y +CONFIG_CMD_PING=y +CONFIG_CMD_EXT2=y +CONFIG_CMD_EXT4=y +CONFIG_CMD_EXT4_WRITE=y +CONFIG_CMD_FAT=y +CONFIG_CMD_FS_GENERIC=y +CONFIG_SPL_DM=y +# CONFIG_BLK is not set +CONFIG_DFU_MMC=y +CONFIG_DFU_RAM=y +# CONFIG_DM_MMC_OPS is not set +CONFIG_TEGRA_MMC=y +CONFIG_TEGRA124_MMC_DISABLE_EXT_LOOPBACK=y +CONFIG_E1000=y +CONFIG_PCI=y +CONFIG_DM_PCI=y +CONFIG_DM_PCI_COMPAT=y +CONFIG_PCI_TEGRA=y +CONFIG_SYS_NS16550=y +CONFIG_USB=y +CONFIG_DM_USB=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_OVERLAY=y +# CONFIG_EFI_LOADER is not set diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h index 7aff697504..988663ec70 100644 --- a/include/configs/apalis-tk1.h +++ b/include/configs/apalis-tk1.h @@ -37,12 +37,19 @@ #define CONFIG_GENERIC_MMC #define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */ -/* Environment in eMMC, before config block at the end of 1st "boot sector" */ +#ifdef CONFIG_TDX_EASY_INSTALLER +#define CONFIG_ENV_IS_NOWHERE +#else #define CONFIG_ENV_IS_IN_MMC +#endif + +#ifdef CONFIG_ENV_IS_IN_MMC +/* Environment in eMMC, before config block at the end of 1st "boot sector" */ #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE + \ CONFIG_TDX_CFG_BLOCK_OFFSET) #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 1 +#endif /*CONFIG_ENV_IS_IN_MMC */ /* USB host support */ #define CONFIG_USB_EHCI @@ -69,9 +76,14 @@ #undef CONFIG_SERVERIP #define CONFIG_SERVERIP 192.168.10.1 +#ifdef CONFIG_TDX_EASY_INSTALLER +#define CONFIG_BOOTCOMMAND \ + "run distro_bootcmd" +#else #define CONFIG_BOOTCOMMAND \ "run emmcboot; setenv fdtfile ${soc}-${fdt_module}-${fdt_board}.dtb && " \ "run distro_bootcmd" +#endif #define DFU_ALT_EMMC_INFO "apalis-tk1.img raw 0x0 0x500 mmcpart 1; " \ "boot part 0 1 mmcpart 0; " \ diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h index a9990b7383..32310bd277 100644 --- a/include/configs/tegra-common-post.h +++ b/include/configs/tegra-common-post.h @@ -23,9 +23,10 @@ #ifndef CONFIG_SPL_BUILD #define BOOT_TARGET_DEVICES(func) \ - func(MMC, mmc, 1) \ - func(MMC, mmc, 0) \ - func(USB, usb, 0) \ + func(MMC, mmc, 1) \ + func(MMC, mmc, 2) \ + func(MMC, mmc, 0) \ + func(USB, usb, 0) \ func(PXE, pxe, na) \ func(DHCP, dhcp, na) #include -- cgit v1.2.3