diff options
| author | Gerard Salvatella <gerard.salvatella@toradex.com> | 2019-05-09 16:57:57 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2020-03-05 19:22:19 +0100 |
| commit | 912a867e46040ddb128c1f0442945ad67b5e1b1c (patch) | |
| tree | 51cacc14e5a8d041bd9996933cae74ab57c6f95e | |
| parent | ff45d3d52bab741f35b6a1522c34a3c3ae5bf164 (diff) | |
apalis-imx8: enable distro boot in tezi
Tezi uses Distro Boot by default. Enable it and modify the appropriate
environment.
Signed-off-by: Gerard Salvatella <gerard.salvatella@toradex.com>
| -rw-r--r-- | include/configs/apalis-imx8.h | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h index 7d22ee5120..67721bd23c 100644 --- a/include/configs/apalis-imx8.h +++ b/include/configs/apalis-imx8.h @@ -83,22 +83,23 @@ "m4boot_0=run loadm4image_0; dcache flush; bootaux ${loadaddr} 0\0" \ "m4boot_1=run loadm4image_1; dcache flush; bootaux ${loadaddr} 1\0" \ -#define CONFIG_MFG_ENV_SETTINGS \ - "mfgtool_args=setenv bootargs console=${console},${baudrate} " \ - "rdinit=/linuxrc " \ - "g_mass_storage.stall=0 g_mass_storage.removable=1 " \ - "g_mass_storage.idVendor=0x066F g_mass_storage.idProduct=0x37FF "\ - "g_mass_storage.iSerialNumber=\"\" "\ - "video=imxdpufb5:off video=imxdpufb6:off video=imxdpufb7:off " \ - "clk_ignore_unused "\ - "\0" \ - "initrd_addr=0x83800000\0" \ - "initrd_high=0xffffffff\0" \ - "bootcmd_mfg=run mfgtool_args;booti ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \ +/* Enable Distro Boot */ +#ifndef CONFIG_SPL_BUILD +#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> +#undef CONFIG_ISO_PARTITION +#else +#define BOOTENV +#endif /* Initial environment variables */ #define CONFIG_EXTRA_ENV_SETTINGS \ - CONFIG_MFG_ENV_SETTINGS \ + BOOTENV \ M4_BOOT_ENV \ MEM_LAYOUT_ENV_SETTINGS \ "script=boot.scr\0" \ @@ -160,6 +161,9 @@ "fi;\0" #undef CONFIG_BOOTCOMMAND +#ifdef CONFIG_TDX_EASY_INSTALLER +#define CONFIG_BOOTCOMMAND "run distro_bootcmd" +#else #define CONFIG_BOOTCOMMAND \ "mmc dev ${mmcdev}; if mmc rescan; then " \ "if run loadbootscript; then " \ @@ -171,6 +175,7 @@ "fi; " \ "fi; " \ "else booti ${loadaddr} - ${fdt_addr}; fi" +#endif /* Link Definitions */ #define CONFIG_LOADADDR 0x80280000 |