From 3de26cd3041552fc7852a266c6c020c5cf35b030 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Tue, 7 Sep 2021 10:11:16 -0700 Subject: ultra96-zynqmp/zynqmp-generic: Specify the ultra96 so BOARD can select it Move the ultra96-zynqmp.conf into the zynqmp-generic (via a require). This approach can be used for other board specific overrides if necessary. Move MACHINE_FEATURES to the generic zynqmp-generic file, as that is requried to make a superset. Signed-off-by: Mark Hatle --- meta-xilinx-bsp/conf/machine/include/board/ultra96.inc | 7 +++++++ meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf | 8 -------- meta-xilinx-bsp/conf/machine/zynqmp-generic.conf | 7 +++++++ 3 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 meta-xilinx-bsp/conf/machine/include/board/ultra96.inc diff --git a/meta-xilinx-bsp/conf/machine/include/board/ultra96.inc b/meta-xilinx-bsp/conf/machine/include/board/ultra96.inc new file mode 100644 index 00000000..97c850cd --- /dev/null +++ b/meta-xilinx-bsp/conf/machine/include/board/ultra96.inc @@ -0,0 +1,7 @@ +# Ultra96 items that need to be configured from zynqmp-generic +PACKAGE_ARCH_pn-linux-xlnx_ultra96 = "${BOARDVARIANT_ARCH}" +KERNEL_DEVICETREE_ultra96 = "xilinx/zynqmp-zcu100-revC.dtb" + +# Enable bluetooth and wifi module +MACHINE_ESSENTIAL_EXTRA_RDEPENDS_append_ultra96 = " linux-firmware-wl18xx linux-firmware-ti-bt-wl180x" + diff --git a/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf b/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf index 8699cd50..88b3fc61 100644 --- a/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf @@ -7,11 +7,3 @@ require conf/machine/zynqmp-generic.conf MACHINE = "zynqmp-generic" BOARD = "ultra96" - -MACHINE_FEATURES += "usbgadget wifi bluetooth" - -KERNEL_DEVICETREE = "xilinx/zynqmp-zcu100-revC.dtb" - -# Enable bluetooth and wifi module -MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "linux-firmware-wl18xx linux-firmware-ti-bt-wl180x" - diff --git a/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf b/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf index fe05321b..0ff25ac0 100644 --- a/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf +++ b/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf @@ -10,7 +10,11 @@ require conf/machine/include/machine-xilinx-default.inc require conf/machine/include/machine-xilinx-qemu.inc require conf/machine/include/xilinx-board.inc +# Machine features must result in a superset +# Basic features: MACHINE_FEATURES += "rtc ext2 ext3 vfat usbhost" +# Ultra96 features: +MACHINE_FEATURES += " usbgadget wifi bluetooth" EXTRA_IMAGEDEPENDS += "libyaml-native python3-cython-native python3-pyyaml-native" @@ -77,3 +81,6 @@ QB_PMU_OPT = " \ QB_OPT_APPEND_append_qemuboot-xilinx = " -pmu-args '${QB_PMU_OPT}'" do_write_qemuboot_conf[depends] += "u-boot-zynq-uenv:do_deploy" + +# Board specific overrides +require conf/machine/include/board/ultra96.inc -- cgit v1.2.3-54-g00ecf