diff options
| author | Oleksandr Suvorov <oleksandr.suvorov@toradex.com> | 2021-06-14 20:19:57 +0300 |
|---|---|---|
| committer | Oleksandr Suvorov <oleksandr.suvorov@toradex.com> | 2021-06-15 18:44:05 +0300 |
| commit | de9b2aab916d5fd69783c9b9128859ad58452878 (patch) | |
| tree | 43ffa2137c13d163f108e630d954b88848c0f911 | |
| parent | deea775d00fa69970eabfaafc8f9ce95a636bc1f (diff) | |
toradex: enable using specific distro boot script for TEZI
The distro boot script for TEZI has another name to prevent u-boot of
regular BSP trying to boot TEZI image. Expand the usage of
TDX_EASY_INSTALLER Kconfig option to seek and use the TEZI-specific
name of the script.
Related-to: TEI-791
Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
| -rw-r--r-- | include/configs/apalis-imx8.h | 9 | ||||
| -rw-r--r-- | include/configs/apalis-imx8x.h | 10 | ||||
| -rw-r--r-- | include/configs/colibri-imx8x.h | 10 | ||||
| -rw-r--r-- | include/configs/verdin-imx8mm.h | 9 | ||||
| -rw-r--r-- | include/configs/verdin-imx8mp.h | 9 |
5 files changed, 42 insertions, 5 deletions
diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h index 688856ce5f..ad859cb6b6 100644 --- a/include/configs/apalis-imx8.h +++ b/include/configs/apalis-imx8.h @@ -85,13 +85,20 @@ #define FDT_FILE "imx8qm-apalis-v1.1-eval.dtb" #define FDT_FILE_V1_0 "imx8qm-apalis-eval.dtb" +#if defined(CONFIG_TDX_EASY_INSTALLER) +# define BOOT_SCRIPT "boot-tezi.scr" +#else +# define BOOT_SCRIPT "boot.scr" +#endif + /* Initial environment variables */ #define CONFIG_EXTRA_ENV_SETTINGS \ AHAB_ENV \ BOOTENV \ M4_BOOT_ENV \ MEM_LAYOUT_ENV_SETTINGS \ - "boot_script_dhcp=boot.scr\0" \ + "boot_scripts=" BOOT_SCRIPT "\0" \ + "boot_script_dhcp=" BOOT_SCRIPT "\0" \ "bootcmd_mfg=select_dt_from_module_version && fastboot 0\0" \ "boot_file=Image\0" \ "console=ttyLP1 earlycon\0" \ diff --git a/include/configs/apalis-imx8x.h b/include/configs/apalis-imx8x.h index 376cd14bab..6fad7a1fa1 100644 --- a/include/configs/apalis-imx8x.h +++ b/include/configs/apalis-imx8x.h @@ -74,6 +74,13 @@ #define FDT_FILE "imx8qxp-apalis-eval.dtb" #include <config_distro_bootcmd.h> + +#if defined(CONFIG_TDX_EASY_INSTALLER) +# define BOOT_SCRIPT "boot-tezi.scr" +#else +# define BOOT_SCRIPT "boot.scr" +#endif + /* Initial environment variables */ #define CONFIG_EXTRA_ENV_SETTINGS \ BOOTENV \ @@ -81,7 +88,8 @@ M4_BOOT_ENV \ MEM_LAYOUT_ENV_SETTINGS \ "bootcmd_mfg=fastboot 0\0" \ - "boot_script_dhcp=boot.scr\0" \ + "boot_scripts=" BOOT_SCRIPT "\0" \ + "boot_script_dhcp=" BOOT_SCRIPT "\0" \ "boot_file=Image\0" \ "console=ttyLP1,115200\0" \ "fdt_addr=0x83000000\0" \ diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h index 720e70e1cc..f9eece3646 100644 --- a/include/configs/colibri-imx8x.h +++ b/include/configs/colibri-imx8x.h @@ -72,13 +72,21 @@ #define FDT_FILE "imx8qxp-colibri-eval-v3.dtb" #include <config_distro_bootcmd.h> + +#if defined(CONFIG_TDX_EASY_INSTALLER) +# define BOOT_SCRIPT "boot-tezi.scr" +#else +# define BOOT_SCRIPT "boot.scr" +#endif + /* Initial environment variables */ #define CONFIG_EXTRA_ENV_SETTINGS \ BOOTENV \ AHAB_ENV \ M4_BOOT_ENV \ MEM_LAYOUT_ENV_SETTINGS \ - "boot_script_dhcp=boot.scr\0" \ + "boot_scripts=" BOOT_SCRIPT "\0" \ + "boot_script_dhcp=" BOOT_SCRIPT "\0" \ "bootcmd_mfg=fastboot 0\0" \ "console=ttyLP3,115200 earlycon=lpuart32,0x5a090000,115200\0" \ "fdt_addr=0x83000000\0" \ diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h index 8a9140bc43..72e758ec8a 100644 --- a/include/configs/verdin-imx8mm.h +++ b/include/configs/verdin-imx8mm.h @@ -93,6 +93,12 @@ #define BOOTENV #endif +#if defined(CONFIG_TDX_EASY_INSTALLER) +# define BOOT_SCRIPT "boot-tezi.scr" +#else +# define BOOT_SCRIPT "boot.scr" +#endif + /* Initial environment variables */ #define CONFIG_EXTRA_ENV_SETTINGS \ BOOTENV \ @@ -102,7 +108,8 @@ "fdt_board=dev\0" \ "initrd_addr=0x43800000\0" \ "initrd_high=0xffffffffffffffff\0" \ - "boot_script_dhcp=boot.scr\0" \ + "boot_scripts=" BOOT_SCRIPT "\0" \ + "boot_script_dhcp=" BOOT_SCRIPT "\0" \ "boot_file=Image\0" \ "setup=setenv setupargs console=${console},${baudrate} console=tty1 consoleblank=0 earlycon\0" diff --git a/include/configs/verdin-imx8mp.h b/include/configs/verdin-imx8mp.h index 8ed49d3ff6..1d544e0b92 100644 --- a/include/configs/verdin-imx8mp.h +++ b/include/configs/verdin-imx8mp.h @@ -82,6 +82,12 @@ #define BOOTENV #endif +#if defined(CONFIG_TDX_EASY_INSTALLER) +# define BOOT_SCRIPT "boot-tezi.scr" +#else +# define BOOT_SCRIPT "boot.scr" +#endif + /* Initial environment variables */ #define CONFIG_EXTRA_ENV_SETTINGS \ BOOTENV \ @@ -91,7 +97,8 @@ "fdt_board=dev\0" \ "initrd_addr=0x43800000\0" \ "initrd_high=0xffffffffffffffff\0" \ - "boot_script_dhcp=boot.scr\0" \ + "boot_scripts=" BOOT_SCRIPT "\0" \ + "boot_script_dhcp=" BOOT_SCRIPT "\0" \ "boot_file=Image\0" \ "setup=setenv setupargs console=${console},${baudrate} console=tty1 consoleblank=0 earlycon\0" |