From 879d59d68c834727e29edcd20949d2f60db7b14c Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Thu, 3 Dec 2020 15:38:06 -0600 Subject: imx6sllevk: Add OP-TEE and Broadcom WiFi, remove pci Add OP-TEE support. Add optee to MACHINE_FEATURES to enable OP-TEE in u-boot-imx. OP-TEE is currently not supported by u-boot-fslc. Enable Broadcom 4339 and 43455 WiFi modules. Remove pci which is not supported by 6SLL EVK. Signed-off-by: Tom Hochstein --- conf/machine/imx6sllevk.conf | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'conf/machine/imx6sllevk.conf') diff --git a/conf/machine/imx6sllevk.conf b/conf/machine/imx6sllevk.conf index 7981a457..23724f5e 100644 --- a/conf/machine/imx6sllevk.conf +++ b/conf/machine/imx6sllevk.conf @@ -11,14 +11,20 @@ include conf/machine/include/tune-cortexa9.inc KERNEL_DEVICETREE = "imx6sll-evk.dtb" -UBOOT_CONFIG ??= "sd" -UBOOT_CONFIG[sd] = "mx6sllevk_config,sdcard" -UBOOT_CONFIG[epdc] = "mx6sllevk_epdc_config" -UBOOT_CONFIG[mfgtool] = "mx6sllevk_config" +UBOOT_CONFIG ??= " \ + sd \ + ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \ +" +UBOOT_CONFIG[sd] = "mx6sllevk_config,sdcard" +UBOOT_CONFIG[sd-optee] = "mx6sllevk_optee_config,sdcard" +UBOOT_CONFIG[epdc] = "mx6sllevk_epdc_config" +UBOOT_CONFIG[mfgtool] = "mx6sllevk_config" + +OPTEE_BIN_EXT_imx6sllevk = "6sllevk" SERIAL_CONSOLES = "115200;ttymxc0" -MACHINE_FEATURES += " pci wifi bluetooth" +MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455" # MESA DRI library XSERVER += "mesa-driver-swrast" -- cgit v1.2.3-54-g00ecf