From a7f384fb4e1c4315452900ea5683739924ea6215 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Mon, 13 May 2019 15:01:14 +0200 Subject: machines: use mainline u-boot Use for all Toradex machines exept apalis-imx8 a mainline based U-Boot. (For the i.MX8QM mainline is not yet able to boot the kernel) Signed-off-by: Max Krummenacher --- conf/machine/apalis-imx8.conf | 2 +- conf/machine/colibri-imx8qxp.conf | 2 +- conf/machine/include/apalis-imx6.inc | 1 + conf/machine/include/colibri-imx6.inc | 1 + conf/machine/include/colibri-imx6ull.inc | 2 ++ conf/machine/include/colibri-imx7-emmc.inc | 2 ++ conf/machine/include/colibri-imx7.inc | 2 ++ 7 files changed, 10 insertions(+), 2 deletions(-) diff --git a/conf/machine/apalis-imx8.conf b/conf/machine/apalis-imx8.conf index 6a47a9f..63038a6 100644 --- a/conf/machine/apalis-imx8.conf +++ b/conf/machine/apalis-imx8.conf @@ -44,7 +44,7 @@ MACHINE_FIRMWARE_append = " linux-firmware-pcie8997" MACHINE_FIRMWARE_append = " firmware-imx-vpu-imx8" IMXBOOT_TARGETS = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', 'flash_b0_flexspi', \ - 'flash_b0', d)}" + 'flash_b0', d)}" IMXBOOT_TARGETS_mx8qma0 = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', 'flash_flexspi', \ bb.utils.contains('UBOOT_CONFIG', 'nand', 'flash_nand', \ diff --git a/conf/machine/colibri-imx8qxp.conf b/conf/machine/colibri-imx8qxp.conf index 6cb0233..ff1063c 100644 --- a/conf/machine/colibri-imx8qxp.conf +++ b/conf/machine/colibri-imx8qxp.conf @@ -37,7 +37,7 @@ IMAGE_BOOTLOADER = "imx-boot" IMX_BOOT_SEEK = "32" PREFERRED_PROVIDER_virtual/kernel = "linux-toradex" -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex" +PREFERRED_PROVIDER_virtual/bootloader = "u-boot" MACHINE_FIRMWARE_append = " linux-firmware-pcie8997" MACHINE_FIRMWARE_append = " firmware-imx-vpu-imx8" diff --git a/conf/machine/include/apalis-imx6.inc b/conf/machine/include/apalis-imx6.inc index ad004a3..bb87263 100644 --- a/conf/machine/include/apalis-imx6.inc +++ b/conf/machine/include/apalis-imx6.inc @@ -9,6 +9,7 @@ KERNEL_DEVICETREE_remove = "imx6q-apalis_v1_0-eval.dtb imx6q-apalis_v1_0-ixora.d KERNEL_IMAGETYPE_${MACHINE} = "zImage" UBOOT_SUFFIX = "img" +PREFERRED_PROVIDER_virtual/bootloader = "u-boot" 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 7340c49..2ed7bf3 100644 --- a/conf/machine/include/colibri-imx6.inc +++ b/conf/machine/include/colibri-imx6.inc @@ -8,6 +8,7 @@ OFFSET_SPL_PAYLOAD = "138" KERNEL_IMAGETYPE_${MACHINE} = "zImage" UBOOT_SUFFIX = "img" +PREFERRED_PROVIDER_virtual/bootloader = "u-boot" PREFERRED_PROVIDER_virtual/libg2d_mx6 ?= "imx-gpu-g2d" diff --git a/conf/machine/include/colibri-imx6ull.inc b/conf/machine/include/colibri-imx6ull.inc index 2af982a..ed60b6d 100644 --- a/conf/machine/include/colibri-imx6ull.inc +++ b/conf/machine/include/colibri-imx6ull.inc @@ -6,3 +6,5 @@ TORADEX_PRODUCT_IDS[0040] = "imx6ull-colibri-wifi-eval-v3.dtb" TORADEX_PRODUCT_IDS[0044] = "imx6ull-colibri-eval-v3.dtb" TORADEX_PRODUCT_IDS[0045] = "imx6ull-colibri-wifi-eval-v3.dtb" TORADEX_FLASH_TYPE = "rawnand" + +PREFERRED_PROVIDER_virtual/bootloader = "u-boot" diff --git a/conf/machine/include/colibri-imx7-emmc.inc b/conf/machine/include/colibri-imx7-emmc.inc index 3297d9b..89d7dab 100644 --- a/conf/machine/include/colibri-imx7-emmc.inc +++ b/conf/machine/include/colibri-imx7-emmc.inc @@ -6,3 +6,5 @@ TORADEX_PRODUCT_IDS = "0039" TORADEX_FLASH_TYPE = "emmc" MACHINE_FIRMWARE_remove = "firmware-imx-epdc" + +PREFERRED_PROVIDER_virtual/bootloader = "u-boot" diff --git a/conf/machine/include/colibri-imx7.inc b/conf/machine/include/colibri-imx7.inc index 487b91c..654f0fa 100644 --- a/conf/machine/include/colibri-imx7.inc +++ b/conf/machine/include/colibri-imx7.inc @@ -7,3 +7,5 @@ TORADEX_PRODUCT_IDS[0041] = "imx7d-colibri-eval-v3.dtb" TORADEX_FLASH_TYPE = "rawnand" MACHINE_FIRMWARE_remove = "firmware-imx-epdc" + +PREFERRED_PROVIDER_virtual/bootloader = "u-boot" -- cgit v1.2.3