diff options
author | Max Krummenacher <max.krummenacher@toradex.com> | 2021-11-10 10:40:48 +0100 |
---|---|---|
committer | Max Krummenacher <max.krummenacher@toradex.com> | 2021-11-16 17:51:29 +0100 |
commit | 7140ef471f0575414297a1a2b6aadd0ff8ae263b (patch) | |
tree | 92676efbddd3e1178ce01ee62133620bd3a4ff0a | |
parent | c61312eed913173b0c2f52367096dd647d9dfec1 (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>
-rw-r--r-- | conf/machine/colibri-imx6ull-emmc.conf | 7 | ||||
-rw-r--r-- | conf/machine/include/apalis-imx6.inc | 1 | ||||
-rw-r--r-- | conf/machine/include/colibri-imx6.inc | 1 | ||||
-rw-r--r-- | conf/machine/include/colibri-imx6ull-emmc.inc | 6 | ||||
-rw-r--r-- | conf/machine/include/colibri-imx6ull.inc | 5 | ||||
-rw-r--r-- | conf/machine/include/colibri-imx7-emmc.inc | 1 | ||||
-rw-r--r-- | conf/machine/include/colibri-imx7.inc | 1 | ||||
-rw-r--r-- | conf/machine/verdin-imx8mm.conf | 7 |
8 files changed, 16 insertions, 13 deletions
diff --git a/conf/machine/colibri-imx6ull-emmc.conf b/conf/machine/colibri-imx6ull-emmc.conf index 0027049..e12dfe3 100644 --- a/conf/machine/colibri-imx6ull-emmc.conf +++ b/conf/machine/colibri-imx6ull-emmc.conf @@ -30,14 +30,11 @@ KERNEL_IMAGETYPE = "zImage" # The kernel lives in its own ubi volume. RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" -PREFERRED_PROVIDER_u-boot ?= "u-boot-toradex" -PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-toradex" -PREFERRED_PROVIDER_u-boot-fw-utils ?= "u-boot-toradex-fw-utils" -PREFERRED_RPROVIDER_u-boot-fw-utils ?= "u-boot-toradex-fw-utils" +IMX_DEFAULT_BOOTLOADER = "u-boot-toradex" PREFERRED_PROVIDER_u-boot-default-script ?= "u-boot-script-toradex" - UBOOT_MAKE_TARGET = "u-boot.imx" UBOOT_MACHINE ?= "colibri-imx6ull-emmc_defconfig" +UBOOT_SUFFIX = "imx" IMAGE_FSTYPES += "tar.xz" # wic support diff --git a/conf/machine/include/apalis-imx6.inc b/conf/machine/include/apalis-imx6.inc index 7451ebf..303541f 100644 --- a/conf/machine/include/apalis-imx6.inc +++ b/conf/machine/include/apalis-imx6.inc @@ -19,6 +19,7 @@ PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp = "linux-toradex-mainline" PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp:preempt-rt = "linux-toradex-mainline" PREFERRED_PROVIDER_virtual/dtb:use-mainline-bsp = "device-tree-overlays-mainline" +IMX_DEFAULT_BOOTLOADER:apalis-imx6 = "u-boot" PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot" UBOOT_SUFFIX = "img" diff --git a/conf/machine/include/colibri-imx6.inc b/conf/machine/include/colibri-imx6.inc index 04a5cd8..6a5b577 100644 --- a/conf/machine/include/colibri-imx6.inc +++ b/conf/machine/include/colibri-imx6.inc @@ -21,6 +21,7 @@ PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp = "linux-toradex-mainline" PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp:preempt-rt = "linux-toradex-mainline" PREFERRED_PROVIDER_virtual/dtb:use-mainline-bsp = "device-tree-overlays-mainline" +IMX_DEFAULT_BOOTLOADER:colibri-imx6 = "u-boot" PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot" UBOOT_SUFFIX = "img" diff --git a/conf/machine/include/colibri-imx6ull-emmc.inc b/conf/machine/include/colibri-imx6ull-emmc.inc index 393ff24..f71c6a3 100644 --- a/conf/machine/include/colibri-imx6ull-emmc.inc +++ b/conf/machine/include/colibri-imx6ull-emmc.inc @@ -9,12 +9,12 @@ WIC_CREATE_EXTRA_ARGS:append = " --no-fstab-update" MACHINE_NAME = "Colibri-iMX6ULL-eMMC" -PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot" - MACHINEOVERRIDES:append:upstream = ":use-mainline-bsp" +IMX_DEFAULT_BOOTLOADER:colibri-imx6ull-emmc = "u-boot" +PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot" UBOOT_MAKE_TARGET:colibri-imx6ull-emmc = "u-boot.imx" -UBOOT_SUFFIX:${MACHINE} = "imx" +UBOOT_SUFFIX:colibri-imx6ull-emmc = "imx" UBOOT_ENTRYPOINT:colibri-imx6ull-emmc = "0x81000000" UBOOT_DTB_LOADADDRESS:colibri-imx6ull-emmc = "0x82100000" UBOOT_DTBO_LOADADDRESS:colibri-imx6ull-emmc = "0x87000000" 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" diff --git a/conf/machine/include/colibri-imx7-emmc.inc b/conf/machine/include/colibri-imx7-emmc.inc index 21595e9..c7c3b21 100644 --- a/conf/machine/include/colibri-imx7-emmc.inc +++ b/conf/machine/include/colibri-imx7-emmc.inc @@ -26,6 +26,7 @@ KERNEL_DEVICETREE:append:use-mainline-bsp = " \ imx7d-colibri-emmc-aster.dtb \ " +IMX_DEFAULT_BOOTLOADER:colibri-imx7-emmc = "u-boot" PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot" TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = "colibri-imx7_lcd-vga_overlay.dtbo colibri-imx7_ad7879_overlay.dtbo" diff --git a/conf/machine/include/colibri-imx7.inc b/conf/machine/include/colibri-imx7.inc index ef61866..54608fc 100644 --- a/conf/machine/include/colibri-imx7.inc +++ b/conf/machine/include/colibri-imx7.inc @@ -30,6 +30,7 @@ PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp = "linux-toradex-mainline" PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp:preempt-rt = "linux-toradex-mainline" PREFERRED_PROVIDER_virtual/dtb:use-mainline-bsp = "device-tree-overlays-mainline" +IMX_DEFAULT_BOOTLOADER:colibri-imx7 = "u-boot" PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot" UBOOT_MAKE_TARGET:colibri-imx7 = "u-boot.imx" diff --git a/conf/machine/verdin-imx8mm.conf b/conf/machine/verdin-imx8mm.conf index b673b6b..5dd4503 100644 --- a/conf/machine/verdin-imx8mm.conf +++ b/conf/machine/verdin-imx8mm.conf @@ -68,11 +68,14 @@ MACHINE_FIRMWARE:append = " linux-firmware-ath10k linux-firmware-imx-sdma-imx7d" PREFERRED_PROVIDER_virtual/kernel = "linux-toradex" PREFERRED_PROVIDER_virtual/kernel:preempt-rt = "linux-toradex" -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex" -PREFERRED_PROVIDER_u-boot = "u-boot-toradex" + +IMX_DEFAULT_BOOTLOADER = "u-boot-toradex" # Currently we use the nxp 2020.04 downstream for mx8 as some features are # not yet available in 2020.07. PREFERRED_VERSION_u-boot-toradex = "2020.04%" +# With use-head-next build mainline U-Boot even if USB functionality is +# currently (Nov 2021) missing. +IMX_DEFAULT_BOOTLOADER:use-head-next = "u-boot" MACHINE_FIRMWARE:append = " linux-firmware-sd8997" MACHINE_FIRMWARE:append = " firmware-imx-vpu-imx8" |