From 12419ca68eea182f9f6892092dacdb5bf2b26fbb Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Thu, 5 Mar 2020 17:42:16 +0100 Subject: 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 --- board/toradex/apalis-tk1/apalis-tk1.c | 2 +- board/toradex/apalis_t30/apalis_t30.c | 2 +- include/configs/apalis-tk1.h | 5 ----- include/configs/colibri_imx7.h | 6 +++--- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/board/toradex/apalis-tk1/apalis-tk1.c b/board/toradex/apalis-tk1/apalis-tk1.c index 92ce1a9592..9732314133 100644 --- a/board/toradex/apalis-tk1/apalis-tk1.c +++ b/board/toradex/apalis-tk1/apalis-tk1.c @@ -48,7 +48,7 @@ int arch_misc_init(void) setenv("vidargs", "video=HDMI-A-1:640x480-16@60 hotplugfb"); setenv("bootcmd", "run setup; setenv bootargs ${defargs} " \ "${setupargs} ${vidargs} ${teziargs}; " \ - "bootm 0x80208000#config@${fdt_module}"); + "bootm 0x80208000#config@${soc}-${fdt_module}-${fdt_board}.dtb"); #else /* CONFIG_TDX_EASY_INSTALLER */ setenv("bootdelay", "-1"); #endif /* CONFIG_TDX_EASY_INSTALLER */ diff --git a/board/toradex/apalis_t30/apalis_t30.c b/board/toradex/apalis_t30/apalis_t30.c index a03bc22ab5..18ce27d151 100644 --- a/board/toradex/apalis_t30/apalis_t30.c +++ b/board/toradex/apalis_t30/apalis_t30.c @@ -68,7 +68,7 @@ int arch_misc_init(void) setenv("vidargs", "video=HDMI-A-1:640x480-16@60 hotplugfb"); setenv("bootcmd", "run setup; setenv bootargs ${defargs} " \ "${setupargs} ${vidargs} ${teziargs}; " \ - "bootm 0x80208000#config@1"); + "bootm 0x80208000"); #else /* CONFIG_TDX_EASY_INSTALLER */ setenv("bootdelay", "-1"); #endif /* CONFIG_TDX_EASY_INSTALLER */ diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h index 3d7c80d17b..7b9d01e931 100644 --- a/include/configs/apalis-tk1.h +++ b/include/configs/apalis-tk1.h @@ -76,14 +76,9 @@ #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/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 "" -- cgit v1.2.3