diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2017-11-25 23:32:21 +0100 |
|---|---|---|
| committer | Stefan Agner <stefan.agner@toradex.com> | 2018-07-27 14:49:25 +0200 |
| commit | 7fbd7d67294c166f72300006bed37e16087a46f2 (patch) | |
| tree | 7f098dca54432087f0f7619030f7bb1728a01a4e /include | |
| parent | 194f6409e9bf7801ec92c77028186c75c316d6da (diff) | |
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 <marcel.ziswiler@toradex.com>
Acked-by: Stefan Agner <stefan.agner@toradex.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/apalis-tk1.h | 14 | ||||
| -rw-r--r-- | include/configs/tegra-common-post.h | 7 |
2 files changed, 17 insertions, 4 deletions
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 <config_distro_bootcmd.h> |