summaryrefslogtreecommitdiff
path: root/conf/machine
diff options
context:
space:
mode:
authorStefan Agner <stefan.agner@toradex.com>2016-12-09 10:31:02 -0800
committerStefan Agner <stefan.agner@toradex.com>2017-01-09 15:06:27 -0800
commitb74c9fb06753373ea10c218d3c7f5eba2da70921 (patch)
tree5c9ac31a200c19870d0735ee729948348710ff30 /conf/machine
parent0eb94bd30c1d3e1bbbc0a66db521a2d3e4cf3e19 (diff)
apalis/colibri-imx6: reorder U-Boot binaries to fix sdcard/tezi image
Image formats which include the U-Boot binary rely on U_BOOT_BINARY pointing to a U-Boot binary working with SPL. U_BOOT_BINARY seems to point to the last U-Boot binary built, hence move the "spl" configuration to the end to make sure U_BOOT_BINARY points to the U-Boot binary which works with SPL. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/apalis-imx6.conf4
-rw-r--r--conf/machine/colibri-imx6.conf4
2 files changed, 6 insertions, 2 deletions
diff --git a/conf/machine/apalis-imx6.conf b/conf/machine/apalis-imx6.conf
index 1ea7ece..de77ff7 100644
--- a/conf/machine/apalis-imx6.conf
+++ b/conf/machine/apalis-imx6.conf
@@ -20,7 +20,9 @@ SPL_BINARY = "SPL"
# 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 save timings for all known Apalis iMX6
-UBOOT_CONFIG ??= "spl recover"
+# Note: The last config will be symlinked to U_BOOT_BINARY which is crucial for
+# certain image formats.
+UBOOT_CONFIG ??= "recover spl"
UBOOT_CONFIG[spl] = "apalis_imx6_defconfig,,u-boot.img"
UBOOT_CONFIG[recover] = "apalis_imx6_nospl_it_defconfig,,u-boot.imx"
UBOOT_MAKE_TARGET = ""
diff --git a/conf/machine/colibri-imx6.conf b/conf/machine/colibri-imx6.conf
index 52c718c..2b3e85c 100644
--- a/conf/machine/colibri-imx6.conf
+++ b/conf/machine/colibri-imx6.conf
@@ -19,7 +19,9 @@ SPL_BINARY = "SPL"
# 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 save timings for all known Apalis iMX6
-UBOOT_CONFIG ??= "spl recover"
+# Note: The last config will be symlinked to U_BOOT_BINARY which is crucial for
+# certain image formats.
+UBOOT_CONFIG ??= "recover spl"
UBOOT_CONFIG[spl] = "colibri_imx6_defconfig,,u-boot.img"
UBOOT_CONFIG[recover] = "colibri_imx6_nospl_defconfig,,u-boot.imx"
UBOOT_MAKE_TARGET = ""