From 5d7c7d64c93f44b6112b19feed928100af1c3677 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Sun, 19 Dec 2021 09:40:47 -0800 Subject: meta-xilinx-bsp: Convert all BSPs to use the generic configs Signed-off-by: Mark Hatle --- meta-xilinx-bsp/conf/machine/microzed-zynq7.conf | 3 +-- meta-xilinx-bsp/conf/machine/picozed-zynq7.conf | 3 +-- meta-xilinx-bsp/conf/machine/qemu-zynq7.conf | 4 +--- meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf | 14 ++++++++++++-- meta-xilinx-bsp/conf/machine/v350-versal.conf | 3 +-- meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf | 6 ++---- meta-xilinx-bsp/conf/machine/vck190-versal.conf | 6 ++---- meta-xilinx-bsp/conf/machine/vck5000-versal.conf | 3 +-- meta-xilinx-bsp/conf/machine/vmk180-versal.conf | 4 +--- meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf | 3 +-- meta-xilinx-bsp/conf/machine/zc702-zynq7.conf | 4 +--- meta-xilinx-bsp/conf/machine/zc706-zynq7.conf | 4 +--- meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf | 4 +--- meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf | 3 +-- meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf | 3 +-- meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf | 3 +-- meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf | 3 +-- meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf | 3 +-- meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf | 3 +-- meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf | 3 +-- meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf | 3 +-- meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf | 3 +-- meta-xilinx-bsp/conf/machine/zybo-zynq7.conf | 3 +-- 23 files changed, 36 insertions(+), 55 deletions(-) (limited to 'meta-xilinx-bsp') diff --git a/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf b/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf index eac1b3dc..6e3c09d7 100644 --- a/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf @@ -2,8 +2,7 @@ #@NAME: microzed-zynq7 #@DESCRIPTION: Machine support for microZed. (http://www.microzed.org/) -require conf/machine/include/soc-zynq.inc -require conf/machine/include/machine-xilinx-default.inc +require conf/machine/zynq-generic.conf MACHINE_FEATURES = "ext2 vfat usbhost" diff --git a/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf b/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf index db9c20bd..d77a0a1c 100644 --- a/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf @@ -6,8 +6,7 @@ # the picozed SOM. It also covers the multiple SKUs for the picoZed # including 7010, 7020, 7015 and 7030. -require conf/machine/include/soc-zynq.inc -require conf/machine/include/machine-xilinx-default.inc +require conf/machine/zynq-generic.conf MACHINE_FEATURES = "ext2 vfat usbhost usbgadget" diff --git a/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf b/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf index 8697293d..6b7699bb 100644 --- a/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf @@ -2,9 +2,7 @@ #@NAME: qemu-zynq7 #@DESCRIPTION: Zynq QEMU machine support ('xilinx-zynq-a9' model) -require conf/machine/include/soc-zynq.inc -require conf/machine/include/machine-xilinx-default.inc -require conf/machine/include/machine-xilinx-qemu.inc +require conf/machine/zynq-generic.conf MACHINE_FEATURES = "ext2 vfat" diff --git a/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf b/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf index f724bbe3..8f549a56 100644 --- a/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf @@ -3,8 +3,18 @@ #@DESCRIPTION: Machine support for Ultra96 Evaluation Board. # -MACHINE = "zynqmp-generic" -BOARD = "ultra96" SOC_VARIANT = 'eg' require conf/machine/zynqmp-generic.conf + +KERNEL_DEVICETREE = "xilinx/zynqmp-zcu100-revC.dtb" + +# Affects meta-xilinx-tools xsctyaml.bbclass related items +YAML_SERIAL_CONSOLE_STDIN ?= "psu_uart_1" +YAML_SERIAL_CONSOLE_STDOUT ?= "psu_uart_1" + +YAML_COMPILER_FLAGS:append = " -DBOARD_SHUTDOWN_PIN=2 -DBOARD_SHUTDOWN_PIN_STATE=0 " + +# Enable bluetooth and wifi module +MACHINE_ESSENTIAL_EXTRA_RDEPENDS:append = " linux-firmware-wl18xx linux-firmware-ti-bt-wl180x" + diff --git a/meta-xilinx-bsp/conf/machine/v350-versal.conf b/meta-xilinx-bsp/conf/machine/v350-versal.conf index 6741e2f3..d3d254b2 100644 --- a/meta-xilinx-bsp/conf/machine/v350-versal.conf +++ b/meta-xilinx-bsp/conf/machine/v350-versal.conf @@ -2,8 +2,7 @@ #@NAME: v350-versal ##@DESCRIPTION: Machine support for v350 versal. -require conf/machine/include/soc-versal.inc -require conf/machine/include/machine-xilinx-default.inc +require conf/machine/versal-generic.conf MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" diff --git a/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf b/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf index 8603098e..f3140168 100644 --- a/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf +++ b/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf @@ -2,12 +2,10 @@ #@NAME: vc-p-a2197-versal ##@DESCRIPTION: Machine support for vc-p-a2197 versal . -require conf/machine/include/soc-versal.inc -require conf/machine/include/machine-xilinx-default.inc -require conf/machine/include/machine-xilinx-qemu.inc - SOC_VARIANT = "ai-core" +require conf/machine/versal-generic.conf + MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig" diff --git a/meta-xilinx-bsp/conf/machine/vck190-versal.conf b/meta-xilinx-bsp/conf/machine/vck190-versal.conf index 054bff88..7bcecd4f 100644 --- a/meta-xilinx-bsp/conf/machine/vck190-versal.conf +++ b/meta-xilinx-bsp/conf/machine/vck190-versal.conf @@ -2,12 +2,10 @@ #@NAME: vck-versal ##@DESCRIPTION: Machine support for vck-versal . -require conf/machine/include/soc-versal.inc -require conf/machine/include/machine-xilinx-default.inc -require conf/machine/include/machine-xilinx-qemu.inc - SOC_VARIANT = "ai-core" +require conf/machine/versal-generic.conf + MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig" diff --git a/meta-xilinx-bsp/conf/machine/vck5000-versal.conf b/meta-xilinx-bsp/conf/machine/vck5000-versal.conf index 97fb9cc7..1239c9e9 100644 --- a/meta-xilinx-bsp/conf/machine/vck5000-versal.conf +++ b/meta-xilinx-bsp/conf/machine/vck5000-versal.conf @@ -2,8 +2,7 @@ #@NAME: vck500-versal ##@DESCRIPTION: Machine support for vck5000 versal. -require conf/machine/include/soc-versal.inc -require conf/machine/include/machine-xilinx-default.inc +require conf/machine/versal-generic.conf MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" diff --git a/meta-xilinx-bsp/conf/machine/vmk180-versal.conf b/meta-xilinx-bsp/conf/machine/vmk180-versal.conf index 1996a36e..ebd6e451 100644 --- a/meta-xilinx-bsp/conf/machine/vmk180-versal.conf +++ b/meta-xilinx-bsp/conf/machine/vmk180-versal.conf @@ -2,9 +2,7 @@ #@NAME: vmk180-versal ##@DESCRIPTION: Machine support for vmk180-versal . -require conf/machine/include/soc-versal.inc -require conf/machine/include/machine-xilinx-default.inc -require conf/machine/include/machine-xilinx-qemu.inc +require conf/machine/versal-generic.conf MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" diff --git a/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf index d91d2ba3..b5b3b6f3 100644 --- a/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf @@ -5,8 +5,7 @@ SOC_VARIANT ?= "dr" -require conf/machine/include/soc-zynqmp.inc -require conf/machine/include/machine-xilinx-default.inc +require conf/machine/zynqmp-generic.conf MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" diff --git a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf index 224365fa..0d829669 100644 --- a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf @@ -9,9 +9,7 @@ # For the FSBL 'zynq_fsbl_0.elf' refer to UG873 and the associated design files. # -require conf/machine/include/soc-zynq.inc -require conf/machine/include/machine-xilinx-default.inc -require conf/machine/include/machine-xilinx-qemu.inc +require conf/machine/zynq-generic.conf MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" diff --git a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf index 3a182217..e0290cad 100644 --- a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf @@ -9,9 +9,7 @@ # For the FSBL 'zynq_fsbl_0.elf' refer to UG873 and the associated design files. # -require conf/machine/include/soc-zynq.inc -require conf/machine/include/machine-xilinx-default.inc -require conf/machine/include/machine-xilinx-qemu.inc +require conf/machine/zynq-generic.conf MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost usbgadget" diff --git a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf index 89c997f1..07edbce5 100644 --- a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf @@ -2,9 +2,7 @@ #@NAME: zcu102-zynqmp #@DESCRIPTION: Machine support for ZCU102 Evaluation Board. -require conf/machine/include/soc-zynqmp.inc -require conf/machine/include/machine-xilinx-default.inc -require conf/machine/include/machine-xilinx-qemu.inc +require conf/machine/zynqmp-generic.conf MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" diff --git a/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf index e6fa0b3f..19eca576 100644 --- a/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf @@ -5,8 +5,7 @@ SOC_VARIANT ?= "ev" -require conf/machine/include/soc-zynqmp.inc -require conf/machine/include/machine-xilinx-default.inc +require conf/machine/zynqmp-generic.conf MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" diff --git a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf index 25bfd3a8..d04dca97 100644 --- a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf @@ -4,8 +4,7 @@ SOC_VARIANT ?= "ev" -require conf/machine/include/soc-zynqmp.inc -require conf/machine/include/machine-xilinx-default.inc +require conf/machine/zynqmp-generic.conf MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" diff --git a/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf index cbe0a627..909d9331 100644 --- a/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf @@ -5,8 +5,7 @@ SOC_VARIANT ?= "dr" -require conf/machine/include/soc-zynqmp.inc -require conf/machine/include/machine-xilinx-default.inc +require conf/machine/zynqmp-generic.conf MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" diff --git a/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf index 672411ea..53ea16a2 100644 --- a/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf @@ -5,8 +5,7 @@ SOC_VARIANT ?= "dr" -require conf/machine/include/soc-zynqmp.inc -require conf/machine/include/machine-xilinx-default.inc +require conf/machine/zynqmp-generic.conf MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" diff --git a/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf index c23c8ca5..63da461f 100644 --- a/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf @@ -5,8 +5,7 @@ SOC_VARIANT ?= "dr" -require conf/machine/include/soc-zynqmp.inc -require conf/machine/include/machine-xilinx-default.inc +require conf/machine/zynqmp-generic.conf MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" diff --git a/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf index 92096220..2b2952fc 100644 --- a/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf @@ -5,8 +5,7 @@ SOC_VARIANT ?= "dr" -require conf/machine/include/soc-zynqmp.inc -require conf/machine/include/machine-xilinx-default.inc +require conf/machine/zynqmp-generic.conf MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" diff --git a/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf index 3ebb9897..2776f67c 100644 --- a/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf @@ -5,8 +5,7 @@ SOC_VARIANT ?= "dr" -require conf/machine/include/soc-zynqmp.inc -require conf/machine/include/machine-xilinx-default.inc +require conf/machine/zynqmp-generic.conf MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" diff --git a/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf b/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf index a824de2c..9a3682a8 100644 --- a/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf @@ -8,8 +8,7 @@ # http://www.zedboard.org/reference-designs-categories/zynq-concepts-tools-and-techniques-zedboard # -require conf/machine/include/soc-zynq.inc -require conf/machine/include/machine-xilinx-default.inc +require conf/machine/zynq-generic.conf # u-boot configuration UBOOT_MACHINE ?= "xilinx_zynq_virt_defconfig" diff --git a/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf b/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf index 137796c6..960bec5f 100644 --- a/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf @@ -5,8 +5,7 @@ # generated base on ZYBO linux-bd project # -require conf/machine/include/soc-zynq.inc -require conf/machine/include/machine-xilinx-default.inc +require conf/machine/zynq-generic.conf PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot" diff --git a/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf b/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf index c09cf519..1eeb56d7 100644 --- a/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf @@ -6,8 +6,7 @@ # https://www.digilentinc.com/Products/Detail.cfm?Prod=ZYBO # -require conf/machine/include/soc-zynq.inc -require conf/machine/include/machine-xilinx-default.inc +require conf/machine/zynq-generic.conf MACHINE_FEATURES = "ext2 vfat usbhost usbgadget" -- cgit v1.2.3-54-g00ecf