From bd3eef37c819b28a074d6ed842f54d1f8a4f2317 Mon Sep 17 00:00:00 2001 From: Josep Orga Date: Fri, 12 Feb 2021 10:02:29 +0100 Subject: [PATCH] meta-somdevices: Updated machine to somdevices configuration. Signed-off-by: Josep Orga --- conf/machine/imx6ullsomdevices.conf | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/conf/machine/imx6ullsomdevices.conf b/conf/machine/imx6ullsomdevices.conf index 78d583a..e79f8da 100644 --- a/conf/machine/imx6ullsomdevices.conf +++ b/conf/machine/imx6ullsomdevices.conf @@ -11,19 +11,15 @@ include conf/machine/include/tune-cortexa7.inc MACHINE_FIRMWARE_append = " firmware-imx-epdc" -KERNEL_DEVICETREE = "imx6ull-14x14-evk.dtb imx6ull-14x14-evk-btwifi.dtb \ - imx6ull-14x14-evk-btwifi-oob.dtb imx6ull-14x14-evk-emmc.dtb \ - imx6ull-14x14-evk-gpmi-weim.dtb imx6ull-14x14-evk-usb-certi.dtb \ -" +KERNEL_DEVICETREE = "imx6ull-somdevices-C0P1.dtb" -MACHINE_FEATURES_append = " optee bcm4339 bcm43455" - -UBOOT_CONFIG ??= "${@bb.utils.contains('COMBINED_FEATURES', 'optee', 'sd-optee', 'sd', d)}" -UBOOT_CONFIG[sd] = "mx6ull_14x14_evk_config,sdcard" -UBOOT_CONFIG[emmc] = "mx6ull_14x14_evk_emmc_config,sdcard" -UBOOT_CONFIG[nand] = "mx6ull_14x14_evk_nand_config,ubifs" -UBOOT_CONFIG[qspi1] = "mx6ull_14x14_evk_qspi1_config" -UBOOT_CONFIG[mfgtool] = "mx6ull_14x14_evk_config" -UBOOT_CONFIG[sd-optee] = "mx6ull_14x14_evk_optee_config,sdcard" +UBOOT_CONFIG[emmc] = "imx6ull_somdevices_defconfig,sdcard" +UBOOT_CONFIG ??= "emmc" OPTEE_BIN_EXT = "6ullevk" + +PREFERRED_PROVIDER_virtual/kernel_imx6ullsomdevices ?= "linux-somdevices" +PREFERRED_VERSION_linux-somdevices = "4.19.35" + +PREFERRED_PROVIDER_u-boot_imx6ullsomdevices = "u-boot-somdevices" +PREFERRED_PROVIDER_virtual/bootloader_imx6ullsomdevices = "u-boot-somdevices" -- 2.17.1