1 files changed, 5 insertions, 23 deletions

diff --git a/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf b/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf
index c79e1fb3..620d6762 100644
--- a/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf
@@ -3,33 +3,15 @@
 #@DESCRIPTION: Machine support for Ultra96 Evaluation Board.
 #
 
-require conf/machine/include/soc-zynqmp.inc
-require conf/machine/include/machine-xilinx-default.inc
-require conf/machine/include/xilinx-board.inc
+require conf/machine/zynqmp-generic.conf
 
+MACHINE = "zynqmp-generic"
 BOARD = "ultra96"
 
-MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost usbgadget wifi bluetooth mipi"
-
-UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig"
-SPL_BINARY ?= "spl/boot.bin"
-
-SERIAL_CONSOLES ?= "115200;ttyPS0"
-
+MACHINE_FEATURES += "usbgadget wifi bluetooth"
 
 KERNEL_DEVICETREE = "xilinx/zynqmp-zcu100-revC.dtb"
 
-EXTRA_IMAGEDEPENDS += " \
-                u-boot-zynq-uenv \
-                arm-trusted-firmware \
-                virtual/boot-bin \
-                virtual/bootloader \
-                u-boot-zynq-scr \
-                "
-IMAGE_BOOT_FILES += " \
-               uEnv.txt \
-               atf-uboot.ub \
-               boot.scr \
-               "
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "linux-firmware-wl18xx"
+# Enable bluetooth and wifi module
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "linux-firmware-wl18xx linux-firmware-ti-bt-wl180x"