summaryrefslogtreecommitdiff
path: root/conf/machine/include/colibri-imx6ull.inc
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2021-11-10 10:40:48 +0100
committerMax Krummenacher <max.krummenacher@toradex.com>2021-11-16 17:51:29 +0100
commit7140ef471f0575414297a1a2b6aadd0ff8ae263b (patch)
tree92676efbddd3e1178ce01ee62133620bd3a4ff0a /conf/machine/include/colibri-imx6ull.inc
parentc61312eed913173b0c2f52367096dd647d9dfec1 (diff)
machines: use mainline u-boot
For the machines functional in mainline (sources.denx.de) switch to build directly from the mainline repo. While at it drop setting PREFERRED_PROVIDER for u-boot-fw-utils as this is no longer used and replaced by libubootenv. Related-to: ELB-4090 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'conf/machine/include/colibri-imx6ull.inc')
-rw-r--r--conf/machine/include/colibri-imx6ull.inc5
1 files changed, 2 insertions, 3 deletions
diff --git a/conf/machine/include/colibri-imx6ull.inc b/conf/machine/include/colibri-imx6ull.inc
index f9639df..f80fb9b 100644
--- a/conf/machine/include/colibri-imx6ull.inc
+++ b/conf/machine/include/colibri-imx6ull.inc
@@ -11,12 +11,11 @@ WIC_CREATE_EXTRA_ARGS:append = " --no-fstab-update"
MACHINE_NAME = "Colibri-iMX6ULL"
-PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
-UBOOT_ENTRYPOINT:colibri-imx6ull = "0x81000000"
-
MACHINEOVERRIDES:append:upstream = ":use-mainline-bsp"
MACHINE_FIRMWARE:remove:use-mainline-bsp = "firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d"
+IMX_DEFAULT_BOOTLOADER:colibri-imx6ull = "u-boot"
+PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
UBOOT_MAKE_TARGET:colibri-imx6ull = "u-boot.imx"
UBOOT_ENTRYPOINT:colibri-imx6ull = "0x81000000"
UBOOT_DTB_LOADADDRESS:colibri-imx6ull = "0x82100000"