From 56ae59dc5f34dc8fa07884a0d2cb0c3e795287cc Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Wed, 17 Jan 2018 19:20:36 +0100 Subject: u-boot-toradex: drop building a recovery u-boot We move to use SPL/u-boot.img also in the recovery case. Drop building the u-boot-recover.imx and no longer rename the u-boot-spl.img file to the misleading name u-boot-spl.imx. Signed-off-by: Max Krummenacher Acked-by: Marcel Ziswiler --- conf/machine/include/apalis-imx6.inc | 9 +-------- conf/machine/include/colibri-imx6.inc | 5 +---- 2 files changed, 2 insertions(+), 12 deletions(-) (limited to 'conf/machine/include') diff --git a/conf/machine/include/apalis-imx6.inc b/conf/machine/include/apalis-imx6.inc index 8d2ad67..6d6cbfa 100644 --- a/conf/machine/include/apalis-imx6.inc +++ b/conf/machine/include/apalis-imx6.inc @@ -7,14 +7,7 @@ OFFSET_SPL_PAYLOAD = "138" KERNEL_DEVICETREE_remove = "imx6q-apalis_v1_0-eval.dtb imx6q-apalis_v1_0-ixora.dtb" -# The SPL configures the DDR RAM depending on the module it runs on. Thus there -# is no need to distingush between the different module types. -# For recovery mode we build a U-Boot with IVT which runs without SPL. It uses -# save timings for all known Apalis iMX6. -# Note: The last config will be symlinked to UBOOT_BINARY which is crucial for -# certain image formats. -UBOOT_CONFIG ?= "recover spl" -UBOOT_CONFIG[recover] = "apalis_imx6_nospl_it_defconfig,,u-boot.imx" +UBOOT_SUFFIX = "img" PREFERRED_PROVIDER_virtual/libg2d_mx6 ?= "imx-gpu-g2d" diff --git a/conf/machine/include/colibri-imx6.inc b/conf/machine/include/colibri-imx6.inc index 6538ab0..a20afe7 100644 --- a/conf/machine/include/colibri-imx6.inc +++ b/conf/machine/include/colibri-imx6.inc @@ -5,10 +5,7 @@ TORADEX_PRODUCT_IDS = "0014 0015 0016 0017" OFFSET_BOOTROM_PAYLOAD = "2" OFFSET_SPL_PAYLOAD = "138" -# Note: The last config will be symlinked to UBOOT_BINARY which is crucial for -# certain image formats. -UBOOT_CONFIG ?= "recover spl" -UBOOT_CONFIG[recover] = "colibri_imx6_nospl_defconfig,,u-boot.imx" +UBOOT_SUFFIX = "img" PREFERRED_PROVIDER_virtual/libg2d_mx6 ?= "imx-gpu-g2d" -- cgit v1.2.3