diff options
author | Ming Liu <ming.liu@toradex.com> | 2020-03-05 17:42:16 +0100 |
---|---|---|
committer | Ming Liu <ming.liu@toradex.com> | 2020-03-05 17:43:57 +0100 |
commit | 12419ca68eea182f9f6892092dacdb5bf2b26fbb (patch) | |
tree | 0d5d2ada8191d0b04f57e05326445d285a1b1a60 /include/configs/colibri_imx7.h | |
parent | 0ece8702d4b097cd837cfcabba980c358874aef4 (diff) |
fitimage: adapt to the changes in tezi meta layer
- Drop "config@1" for apalis-t30, since that's the only config, we do
not have to explicitly set it to config 1.
- Change the configuration for apalis-tk1 to use the actual fdt files.
- Change the configuration for colibri_imx7 to use the actual fdt
files.
- Also fix a wrong fdtfile setting for colibri_imx7.
Related-to: TEI-498
Signed-off-by: Ming Liu <ming.liu@toradex.com>
Diffstat (limited to 'include/configs/colibri_imx7.h')
-rw-r--r-- | include/configs/colibri_imx7.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index 6c91951878..202d99e81b 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -110,7 +110,7 @@ "${teziargs}; echo Booting Toradex Easy Installer...; " \ "ubi part ubi && " \ "ubi read ${ramdisk_addr_r} rootfs && " \ - "bootm ${ramdisk_addr_r}#config@${soc}\0" + "bootm ${ramdisk_addr_r}#config@${soc}-colibri${variant}-${fdt_board}.dtb\0" #else /* CONFIG_TDX_EASY_INSTALLER */ #define UBI_BOOTCMD \ "ubiargs=ubi.mtd=ubi root=ubi0:rootfs rw rootfstype=ubifs " \ @@ -125,11 +125,11 @@ #endif /* CONFIG_TDX_EASY_INSTALLER */ #ifdef CONFIG_TDX_EASY_INSTALLER -#define CONFIG_BOOTCOMMAND "setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && " \ +#define CONFIG_BOOTCOMMAND "setenv fdtfile ${soc}-colibri${variant}-${fdt_board}.dtb && " \ "run bootcmd_mmc0; run ubiboot; run distro_bootcmd" #else #define CONFIG_BOOTCOMMAND "run ubiboot; " \ - "setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && run distro_bootcmd" + "setenv fdtfile ${soc}-colibri${variant}-${fdt_board}.dtb && run distro_bootcmd" #endif #define BOOTENV_RUN_NET_USB_START "" |