summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorTom Hochstein <tom.hochstein@nxp.com>2020-12-03 16:03:13 -0600
committerOtavio Salvador <otavio@ossystems.com.br>2021-01-21 08:37:58 -0300
commit913ae7c2fdb8a8458898012c7ea081782de28033 (patch)
tree39acd02bd741fe7f49092c406712ab443a697617 /conf
parent8d13ff6913b14dcda7e74872c513a3e3ff4f9e65 (diff)
downloadmeta-freescale-913ae7c2fdb8a8458898012c7ea081782de28033.tar.gz
imx6ulevk: 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 6UL EVK. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/imx6ulevk.conf18
1 files changed, 12 insertions, 6 deletions
diff --git a/conf/machine/imx6ulevk.conf b/conf/machine/imx6ulevk.conf
index 18b6b04b..a8acb43d 100644
--- a/conf/machine/imx6ulevk.conf
+++ b/conf/machine/imx6ulevk.conf
@@ -9,7 +9,7 @@ MACHINEOVERRIDES =. "mx6:mx6ul:"
9include conf/machine/include/imx-base.inc 9include conf/machine/include/imx-base.inc
10include conf/machine/include/tune-cortexa7.inc 10include conf/machine/include/tune-cortexa7.inc
11 11
12MACHINE_FEATURES += " pci wifi bluetooth" 12MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455"
13 13
14KERNEL_DEVICETREE = " \ 14KERNEL_DEVICETREE = " \
15 imx6ul-14x14-evk-btwifi.dtb \ 15 imx6ul-14x14-evk-btwifi.dtb \
@@ -29,8 +29,14 @@ UBOOT_SUFFIX = "img"
29SPL_BINARY = "SPL" 29SPL_BINARY = "SPL"
30WKS_FILE = "imx-uboot-spl-bootpart.wks.in" 30WKS_FILE = "imx-uboot-spl-bootpart.wks.in"
31 31
32UBOOT_CONFIG ??= "sd" 32UBOOT_CONFIG ??= " \
33UBOOT_CONFIG[sd] = "mx6ul_14x14_evk_config,sdcard" 33 sd \
34UBOOT_CONFIG[emmc] = "mx6ul_14x14_evk_emmc_config,sdcard" 34 ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \
35UBOOT_CONFIG[qspi1] = "mx6ul_14x14_evk_qspi1_config" 35"
36UBOOT_CONFIG[mfgtool] = "mx6ul_14x14_evk_config" 36UBOOT_CONFIG[sd] = "mx6ul_14x14_evk_config,sdcard"
37UBOOT_CONFIG[sd-optee] = "mx6ul_14x14_evk_optee_config,sdcard"
38UBOOT_CONFIG[emmc] = "mx6ul_14x14_evk_emmc_config,sdcard"
39UBOOT_CONFIG[qspi1] = "mx6ul_14x14_evk_qspi1_config"
40UBOOT_CONFIG[mfgtool] = "mx6ul_14x14_evk_config"
41
42OPTEE_BIN_EXT = "6ulevk"