From: Tom Hochstein <tom.hochstein@nxp.com>
Date: Thu, 3 Dec 2020 22:45:19 +0000 (-0600)
Subject: imx7dsabresd: Add OP-TEE, Broadcom WiFi, nonsec, device trees, and XSERVER
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=1d8e0f97a0dc240790b827f4fa6c417ad5c515b4;p=meta-freescale.git

imx7dsabresd: Add OP-TEE, Broadcom WiFi, nonsec, device trees, and XSERVER

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.

Add non-secure boot configuration option.

Add device trees for PCIE EP and USD WiFi.

Add mesa-driver-swrast to XSERVER.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
---

diff --git a/conf/machine/imx7dsabresd.conf b/conf/machine/imx7dsabresd.conf
index 84de3862..a172aa49 100644
--- a/conf/machine/imx7dsabresd.conf
+++ b/conf/machine/imx7dsabresd.conf
@@ -9,25 +9,34 @@ MACHINEOVERRIDES =. "mx7:mx7d:"
 require conf/machine/include/imx-base.inc
 require conf/machine/include/tune-cortexa7.inc
 
-MACHINE_FEATURES += " pci wifi bluetooth"
+MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455"
 
-KERNEL_DEVICETREE = " \
-	imx7d-sdb.dtb \
+KERNEL_DEVICETREE = "imx7d-sdb.dtb"
+KERNEL_DEVICETREE_append_use-nxp-bsp = " \
 	imx7d-sdb-epdc.dtb \
 	imx7d-sdb-gpmi-weim.dtb \
 	imx7d-sdb-m4.dtb \
 	imx7d-sdb-mipi-dsi.dtb \
+	imx7d-sdb-pcie-ep.dtb \
 	imx7d-sdb-qspi.dtb \
 	imx7d-sdb-reva.dtb \
 	imx7d-sdb-sht11.dtb \
+	imx7d-sdb-usd-wifi.dtb \
 "
 
-KERNEL_DEVICETREE_use-mainline-bsp = "imx7d-sdb.dtb"
 
-UBOOT_CONFIG ??= "sd"
-UBOOT_CONFIG[sd] = "mx7dsabresd_config,sdcard"
-UBOOT_CONFIG[qspi1] = "mx7dsabresd_qspi1_config"
-UBOOT_CONFIG[nand] = "mx7dsabresd_nand_config,ubifs"
-UBOOT_CONFIG[epdc] = "mx7dsabresd_epdc_config"
-UBOOT_CONFIG[mfgtool] = "mx7dsabresd_config"
+UBOOT_CONFIG ??= " \
+    sd \
+    ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \
+"
+UBOOT_CONFIG[sd]       = "mx7dsabresd_config,sdcard"
+UBOOT_CONFIG[sd-optee] = "mx7dsabresd_optee_config,sdcard"
+UBOOT_CONFIG[nonsec]   = "mx7dsabresd_nonsec_config,sdcard"
+UBOOT_CONFIG[qspi1]    = "mx7dsabresd_qspi1_config"
+UBOOT_CONFIG[nand]     = "mx7dsabresd_nand_config,ubifs"
+UBOOT_CONFIG[epdc]     = "mx7dsabresd_epdc_config"
+UBOOT_CONFIG[mfgtool]  = "mx7dsabresd_config"
+
+OPTEE_BIN_EXT = "7dsdb"
 
+XSERVER += "mesa-driver-swrast"