summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2019-05-14 19:22:44 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2019-05-14 19:34:35 +0200
commit384ad550e552b0d4d2907284b1fc904ad97acf12 (patch)
treef7b158488a9fc633d536001e31dab69f7b43e2f7 /conf
parent15badd4aac13483a4d6148af141cd54b2e1c2ebe (diff)
u-boot: fix mainline not providing a nand target
Our downstream U-Boot provides a u-boot-nand.imx target prepending the binary with a 1k block for easier flashing while the mainline U-Boot does not. Mimic the behaviour in a do_compile_append. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/colibri-imx6ull.conf2
-rw-r--r--conf/machine/include/colibri-imx7.inc1
2 files changed, 2 insertions, 1 deletions
diff --git a/conf/machine/colibri-imx6ull.conf b/conf/machine/colibri-imx6ull.conf
index e7f103b..b339093 100644
--- a/conf/machine/colibri-imx6ull.conf
+++ b/conf/machine/colibri-imx6ull.conf
@@ -21,7 +21,7 @@ RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""
PREFERRED_PROVIDER_u-boot ?= "u-boot-toradex"
PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-toradex"
UBOOT_BINARY = "u-boot-nand.imx"
-UBOOT_MAKE_TARGET = "u-boot-nand.imx"
+UBOOT_MAKE_TARGET = "u-boot.imx"
UBOOT_MACHINE ?= "colibri-imx6ull_defconfig"
IMAGE_FSTYPES += "wic.gz tar.xz"
diff --git a/conf/machine/include/colibri-imx7.inc b/conf/machine/include/colibri-imx7.inc
index 654f0fa..dcd8048 100644
--- a/conf/machine/include/colibri-imx7.inc
+++ b/conf/machine/include/colibri-imx7.inc
@@ -9,3 +9,4 @@ TORADEX_FLASH_TYPE = "rawnand"
MACHINE_FIRMWARE_remove = "firmware-imx-epdc"
PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
+UBOOT_MAKE_TARGET_colibri-imx7 = "u-boot.imx" \ No newline at end of file