--- /dev/null
+#@TYPE: Machine
+#@NAME: NXP i.MX6ULL µSMARC SOMDEVICES
+#@SOC: i.MX6ULL
+#@DESCRIPTION: Machine configuration for NXP i.MX6ULL µSMARC SOMDEVICES
+#@MAINTAINER: Josep Orga <jorga@somdevices.com>
+
+MACHINEOVERRIDES =. "mx6:mx6ul:mx6ull:"
+
+include conf/machine/include/imx-base.inc
+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 \
+"
+
+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"
+
+OPTEE_BIN_EXT = "6ullevk"