From 59020031deadf07fe9c32dbf790da93d3b1a49ee Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Tue, 1 Dec 2020 17:20:32 -0600 Subject: [PATCH] imx6slevk: Add OP-TEE and Broadcom WiFi 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. Signed-off-by: Tom Hochstein --- conf/machine/imx6slevk.conf | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/conf/machine/imx6slevk.conf b/conf/machine/imx6slevk.conf index 5d81272f..d1c0e457 100644 --- a/conf/machine/imx6slevk.conf +++ b/conf/machine/imx6slevk.conf @@ -9,18 +9,28 @@ MACHINEOVERRIDES =. "mx6:mx6sl:" include conf/machine/include/imx-base.inc include conf/machine/include/tune-cortexa9.inc -KERNEL_DEVICETREE = "imx6sl-evk.dtb imx6sl-evk-csi.dtb imx6sl-evk-ldo.dtb \ - imx6sl-evk-uart.dtb imx6sl-evk-btwifi.dtb" -KERNEL_DEVICETREE_use-mainline-bsp = "imx6sl-evk.dtb" +KERNEL_DEVICETREE = "imx6sl-evk.dtb" +KERNEL_DEVICETREE_append_use-nxp-bsp = " \ + imx6sl-evk-btwifi.dtb \ + imx6sl-evk-csi.dtb \ + imx6sl-evk-ldo.dtb \ + imx6sl-evk-uart.dtb \ +" -UBOOT_CONFIG ??= "sd" -UBOOT_CONFIG[sd] = "mx6slevk_config,sdcard" -UBOOT_CONFIG[epdc] = "mx6slevk_epdc_config" -UBOOT_CONFIG[spinor] = "mx6slevk_spinor_config" -UBOOT_CONFIG[mfgtool] = "mx6slevk_config" +UBOOT_CONFIG ??= " \ + sd \ + ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \ +" +UBOOT_CONFIG[sd] = "mx6slevk_config,sdcard" +UBOOT_CONFIG[sd-optee] = "mx6slevk_optee_config,sdcard" +UBOOT_CONFIG[epdc] = "mx6slevk_epdc_config" +UBOOT_CONFIG[spinor] = "mx6slevk_spinor_config" +UBOOT_CONFIG[mfgtool] = "mx6slevk_config" + +OPTEE_BIN_EXT = "6slevk" SERIAL_CONSOLES = "115200;ttymxc0" -MACHINE_FEATURES += " pci wifi bluetooth" +MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455" MACHINE_FIRMWARE += "linux-firmware-ath6k firmware-imx-epdc" -- 2.40.1