From 18f7fb970ece3f8c80ae96e952db63c787de5a04 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Sun, 19 Dec 2021 14:34:55 -0800 Subject: meta-xilinx-bsp: Remove extra entries, already set by the included defaults Signed-off-by: Mark Hatle --- .../conf/machine/kc705-microblazeel.conf | 8 --- meta-xilinx-bsp/conf/machine/microzed-zynq7.conf | 6 +- .../conf/machine/ml605-qemu-microblazeel.conf | 5 -- meta-xilinx-bsp/conf/machine/picozed-zynq7.conf | 8 +-- meta-xilinx-bsp/conf/machine/qemu-zynq7.conf | 29 ---------- meta-xilinx-bsp/conf/machine/v350-versal.conf | 14 ----- .../conf/machine/vc-p-a2197-00-versal.conf | 63 --------------------- meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf | 20 ------- meta-xilinx-bsp/conf/machine/vck190-versal.conf | 64 ---------------------- meta-xilinx-bsp/conf/machine/vck5000-versal.conf | 23 -------- meta-xilinx-bsp/conf/machine/vmk180-versal.conf | 62 --------------------- meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf | 21 ------- meta-xilinx-bsp/conf/machine/zc702-zynq7.conf | 36 ------------ meta-xilinx-bsp/conf/machine/zc706-zynq7.conf | 27 --------- meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf | 60 -------------------- meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf | 21 ------- meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf | 21 ------- meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf | 21 ------- meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf | 21 ------- meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf | 21 ------- meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf | 20 ------- meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf | 20 ------- meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf | 12 ---- .../conf/machine/zybo-linux-bd-zynq7.conf | 14 +---- meta-xilinx-bsp/conf/machine/zybo-zynq7.conf | 5 -- 25 files changed, 3 insertions(+), 619 deletions(-) diff --git a/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf b/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf index 36cdc1e5..fa80b568 100644 --- a/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf +++ b/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf @@ -7,16 +7,8 @@ TUNE_FEATURES:tune-microblaze ?= "microblaze v11.0 barrel-shift reorder pattern- require conf/machine/microblaze-generic.conf -MACHINE_FEATURES = "" - USE_VT = "" -SERIAL_CONSOLES ?= "115200;ttyS0" - -KERNEL_IMAGETYPE ?= "linux.bin.ub" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree" EXTRA_IMAGEDEPENDS += "virtual/bitstream virtual/bootloader" - -UBOOT_MACHINE ?= "microblaze-generic_defconfig" -UBOOT_INITIAL_ENV = "" diff --git a/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf b/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf index 6e3c09d7..c0e8e6dd 100644 --- a/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf @@ -4,11 +4,9 @@ require conf/machine/zynq-generic.conf -MACHINE_FEATURES = "ext2 vfat usbhost" - # u-boot configuration PREFERRED_PROVIDER_virtual/bootloader = "u-boot" -UBOOT_MACHINE ?= "xilinx_zynq_virt_defconfig" + SPL_BINARY ?= "spl/boot.bin" UBOOT_ELF = "u-boot" @@ -19,8 +17,6 @@ EXTRA_IMAGEDEPENDS += " \ u-boot-zynq-scr \ " -SERIAL_CONSOLES ?= "115200;ttyPS0" - KERNEL_DEVICETREE = "zynq-microzed.dtb" IMAGE_BOOT_FILES += " \ diff --git a/meta-xilinx-bsp/conf/machine/ml605-qemu-microblazeel.conf b/meta-xilinx-bsp/conf/machine/ml605-qemu-microblazeel.conf index a16c707b..157a75c2 100644 --- a/meta-xilinx-bsp/conf/machine/ml605-qemu-microblazeel.conf +++ b/meta-xilinx-bsp/conf/machine/ml605-qemu-microblazeel.conf @@ -6,12 +6,7 @@ TUNE_FEATURES:tune-microblaze ?= "microblaze v8.50 barrel-shift reorder pattern- require conf/machine/microblaze-generic.conf -MACHINE_FEATURES = "" - USE_VT = "" -SERIAL_CONSOLES ?= "115200;ttyS0" - -KERNEL_IMAGETYPE ?= "linux.bin.ub" # Use the networking setup from qemuarm MACHINEOVERRIDES:prepend:pn-init-ifupdown = "qemuall:" diff --git a/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf b/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf index d77a0a1c..d4f63f95 100644 --- a/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf @@ -8,11 +8,9 @@ require conf/machine/zynq-generic.conf -MACHINE_FEATURES = "ext2 vfat usbhost usbgadget" - # u-boot configuration PREFERRED_PROVIDER_virtual/bootloader = "u-boot" -UBOOT_MACHINE ?= "xilinx_zynq_virt_defconfig" + SPL_BINARY ?= "spl/boot.bin" UBOOT_ELF = "u-boot" @@ -23,10 +21,6 @@ EXTRA_IMAGEDEPENDS += " \ u-boot-zynq-scr \ " -SERIAL_CONSOLES ?= "115200;ttyPS0" - -MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree" - IMAGE_BOOT_FILES += " \ boot.bin \ uEnv.txt \ diff --git a/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf b/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf index 6b7699bb..f28e3d4a 100644 --- a/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf @@ -4,35 +4,6 @@ require conf/machine/zynq-generic.conf -MACHINE_FEATURES = "ext2 vfat" - -SERIAL_CONSOLES ?= "115200;ttyPS0" - -MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree" - -HDF_MACHINE = "zc702-zynq7" - # Use the networking setup from qemuarm MACHINEOVERRIDES:prepend:pn-init-ifupdown = "qemuall:" FILESOVERRIDES:append:pn-init-ifupdown = ":qemuarm" - -QB_MEM = "-m 1024" -QB_NETWORK_DEVICE = "-net nic,netdev=eth0 -netdev user,id=eth0,tftp=/tftpboot -net nic" -QB_DEFAULT_KERNEL:qemuboot-xilinx = "zImage" - -QB_SYSTEM_NAME ?= "${@qemu_target_binary(d)}" -QB_DEFAULT_FSTYPE = "cpio.gz.u-boot" -QB_DTB = "system.dtb" -QB_ROOTFS_OPT:qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw" - -# Replicate BootROM like behaviour, having loaded SPL and PMU(ROM+FW) -QB_OPT_APPEND = " \ - -nographic -serial null -serial mon:stdio \ - -initrd ${DEPLOY_DIR_IMAGE}/petalinux-image-minimal-qemu-zynq7.cpio.gz.u-boot \ - -gdb tcp::9000 \ - -device loader,addr=0xf8000008,data=0xDF0D,data-len=4 \ - -device loader,addr=0xf8000140,data=0x00500801,data-len=4 \ - -device loader,addr=0xf800012c,data=0x1ed044d,data-len=4 \ - -device loader,addr=0xf8000108,data=0x0001e008,data-len=4 \ - -device loader,addr=0xF8000910,data=0xF,data-len=0x4 \ - " diff --git a/meta-xilinx-bsp/conf/machine/v350-versal.conf b/meta-xilinx-bsp/conf/machine/v350-versal.conf index d3d254b2..176183a6 100644 --- a/meta-xilinx-bsp/conf/machine/v350-versal.conf +++ b/meta-xilinx-bsp/conf/machine/v350-versal.conf @@ -4,12 +4,6 @@ require conf/machine/versal-generic.conf -MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" - -UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig" - -SERIAL_CONSOLES ?= "115200;ttyAMA0" - EXTRA_IMAGEDEPENDS += " \ arm-trusted-firmware \ virtual/boot-bin \ @@ -18,11 +12,3 @@ EXTRA_IMAGEDEPENDS += " \ virtual/plm \ u-boot-zynq-scr \ " - -IMAGE_BOOT_FILES += " \ - boot.bin \ - ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/dtb', 'device-tree', 'system.dtb', '', d)} \ - Image \ - boot.scr \ -" - 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 f3140168..c444105d 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 @@ -5,66 +5,3 @@ SOC_VARIANT = "ai-core" require conf/machine/versal-generic.conf - -MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" - -UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig" - -SERIAL_CONSOLES ?= "115200;ttyAMA0" - -# Default SD image build onfiguration, use qemu-sd to pad -IMAGE_CLASSES += "image-types-xilinx-qemu" -IMAGE_FSTYPES += "wic.qemu-sd" -WKS_FILES ?= "sdimage-bootpart.wks" - -EXTRA_IMAGEDEPENDS += " \ - arm-trusted-firmware \ - virtual/boot-bin \ - virtual/bootloader \ - virtual/psm-firmware \ - virtual/plm \ - u-boot-zynq-scr \ - qemu-devicetrees \ - virtual/cdo \ -" - -IMAGE_BOOT_FILES += " \ - boot.bin \ - system.dtb \ - Image \ - boot.scr \ -" -# This machine has a QEMU model, runqemu setup: -QB_MEM = "-m 8G" -QB_DEFAULT_KERNEL = "none" -QB_NETWORK_DEVICE = "" -QB_KERNEL_CMDLINE_APPEND ?= "" -QB_NET = "none" - -QB_DEFAULT_FSTYPE:qemuboot-xilinx = "wic.qemu-sd" -QB_OPT_APPEND:append:qemuboot-xilinx = " -boot mode=5" -QB_ROOTFS_OPT:qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw" - -# Use booti 80000 6000000 4000000 to launch -QB_OPT_APPEND ?= " -serial null -serial null -serial mon:stdio -display none" - -QB_OPT_APPEND:append:qemuboot-xilinx = " \ - -hw-dtb ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch/board-versal-ps-vc-p-a2197-00.dtb \ - -display none \ - -net nic -net user,tftp=${DEPLOY_DIR_IMAGE} \ - " -# PLM instance args -QB_PLM_OPT = " \ - -M microblaze-fdt \ - -device loader,file=${DEPLOY_DIR_IMAGE}/BOOT-${MACHINE}_bh.bin,addr=0xF201E000,force-raw \ - -device loader,addr=0xf0000000,data=0xba020004,data-len=4 \ - -device loader,addr=0xf0000004,data=0xb800fffc,data-len=4 \ - -device loader,file=${DEPLOY_DIR_IMAGE}/CDO/pmc_cdo.bin,addr=0xf2000000,force-raw \ - -device loader,file=${DEPLOY_DIR_IMAGE}/plm-${MACHINE}.elf,cpu-num=1 \ - -device loader,addr=0xF1110624,data=0x0,data-len=4 \ - -device loader,addr=0xF1110620,data=0x1,data-len=4 \ - -hw-dtb ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch/board-versal-pmc-vc-p-a2197-00.dtb \ - -display none \ - " -QB_OPT_APPEND:append:qemuboot-xilinx = " -plm-args '${QB_PLM_OPT}'" - diff --git a/meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf b/meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf index baaa2bd2..6d1fcb3f 100644 --- a/meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf @@ -6,23 +6,3 @@ require conf/machine/zynqmp-generic.conf # Add board compatibility override MACHINEOVERRIDES .= ":vck-sc" - -MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" - -UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig" -SPL_BINARY ?= "spl/boot.bin" - -SERIAL_CONSOLES ?= "115200;ttyPS0" - -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 \ -" diff --git a/meta-xilinx-bsp/conf/machine/vck190-versal.conf b/meta-xilinx-bsp/conf/machine/vck190-versal.conf index 7bcecd4f..8db3bd99 100644 --- a/meta-xilinx-bsp/conf/machine/vck190-versal.conf +++ b/meta-xilinx-bsp/conf/machine/vck190-versal.conf @@ -5,67 +5,3 @@ SOC_VARIANT = "ai-core" require conf/machine/versal-generic.conf - -MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" - -UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig" - -SERIAL_CONSOLES ?= "115200;ttyAMA0" - -# Default SD image build onfiguration, use qemu-sd to pad -IMAGE_CLASSES += "image-types-xilinx-qemu" -IMAGE_FSTYPES += "wic.qemu-sd" -WKS_FILES ?= "sdimage-bootpart.wks" - -EXTRA_IMAGEDEPENDS += " \ - arm-trusted-firmware \ - virtual/boot-bin \ - virtual/bootloader \ - virtual/psm-firmware \ - virtual/plm \ - u-boot-zynq-scr \ - qemu-devicetrees \ - virtual/cdo \ -" - -IMAGE_BOOT_FILES += " \ - boot.bin \ - ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/dtb', 'device-tree', 'system.dtb', '', d)} \ - Image \ - boot.scr \ -" - -# This machine has a QEMU model, runqemu setup: -QB_MEM = "-m 8G" -QB_DEFAULT_KERNEL = "none" -QB_NETWORK_DEVICE = "" -QB_KERNEL_CMDLINE_APPEND ?= "" -QB_NET = "none" - -QB_DEFAULT_FSTYPE:qemuboot-xilinx = "wic.qemu-sd" -QB_OPT_APPEND:append:qemuboot-xilinx = " -boot mode=5" -QB_ROOTFS_OPT:qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw" - -# Use booti 80000 6000000 4000000 to launch -QB_OPT_APPEND ?= " -serial null -serial null -serial mon:stdio -display none" - -QB_OPT_APPEND:append:qemuboot-xilinx = " \ - -hw-dtb ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch/board-versal-ps-vc-p-a2197-00.dtb \ - -display none \ - -net nic -net user,tftp=${DEPLOY_DIR_IMAGE} \ - " - -# PLM instance args -QB_PLM_OPT = " \ - -M microblaze-fdt \ - -device loader,file=${DEPLOY_DIR_IMAGE}/BOOT-${MACHINE}_bh.bin,addr=0xF201E000,force-raw \ - -device loader,addr=0xf0000000,data=0xba020004,data-len=4 \ - -device loader,addr=0xf0000004,data=0xb800fffc,data-len=4 \ - -device loader,file=${DEPLOY_DIR_IMAGE}/CDO/pmc_cdo.bin,addr=0xf2000000,force-raw \ - -device loader,file=${DEPLOY_DIR_IMAGE}/plm-${MACHINE}.elf,cpu-num=1 \ - -device loader,addr=0xF1110624,data=0x0,data-len=4 \ - -device loader,addr=0xF1110620,data=0x1,data-len=4 \ - -hw-dtb ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch/board-versal-pmc-vc-p-a2197-00.dtb \ - -display none \ - " -QB_OPT_APPEND:append:qemuboot-xilinx = " -plm-args '${QB_PLM_OPT}'" diff --git a/meta-xilinx-bsp/conf/machine/vck5000-versal.conf b/meta-xilinx-bsp/conf/machine/vck5000-versal.conf index 1239c9e9..eaf9ae7b 100644 --- a/meta-xilinx-bsp/conf/machine/vck5000-versal.conf +++ b/meta-xilinx-bsp/conf/machine/vck5000-versal.conf @@ -3,26 +3,3 @@ ##@DESCRIPTION: Machine support for vck5000 versal. require conf/machine/versal-generic.conf - -MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" - -UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig" - -SERIAL_CONSOLES ?= "115200;ttyAMA0" - -EXTRA_IMAGEDEPENDS += " \ - arm-trusted-firmware \ - virtual/boot-bin \ - virtual/bootloader \ - virtual/psm-firmware \ - virtual/plm \ - u-boot-zynq-scr \ -" - -IMAGE_BOOT_FILES += " \ - boot.bin \ - ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/dtb', 'device-tree', 'system.dtb', '', d)} \ - Image \ - boot.scr \ -" - diff --git a/meta-xilinx-bsp/conf/machine/vmk180-versal.conf b/meta-xilinx-bsp/conf/machine/vmk180-versal.conf index ebd6e451..b951652a 100644 --- a/meta-xilinx-bsp/conf/machine/vmk180-versal.conf +++ b/meta-xilinx-bsp/conf/machine/vmk180-versal.conf @@ -4,65 +4,3 @@ require conf/machine/versal-generic.conf -MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" - -UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig" - -SERIAL_CONSOLES ?= "115200;ttyAMA0" - -IMAGE_CLASSES += "image-types-xilinx-qemu" -IMAGE_FSTYPES += "wic.qemu-sd" -WKS_FILES ?= "sdimage-bootpart.wks" - -EXTRA_IMAGEDEPENDS += " \ - arm-trusted-firmware \ - virtual/boot-bin \ - virtual/bootloader \ - virtual/psm-firmware \ - virtual/plm \ - u-boot-zynq-scr \ - qemu-devicetrees \ - virtual/cdo \ -" - -IMAGE_BOOT_FILES += " \ - boot.bin \ - ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/dtb', 'device-tree', 'system.dtb', '', d)} \ - Image \ - boot.scr \ -" - -# This machine has a QEMU model, runqemu setup: -QB_MEM = "-m 8G" -QB_DEFAULT_KERNEL = "none" -QB_NETWORK_DEVICE = "" -QB_KERNEL_CMDLINE_APPEND ?= "" -QB_NET = "none" - -QB_DEFAULT_FSTYPE:qemuboot-xilinx = "wic.qemu-sd" -QB_OPT_APPEND:append:qemuboot-xilinx = " -boot mode=5" -QB_ROOTFS_OPT:qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw" - -# Use booti 80000 6000000 4000000 to launch -QB_OPT_APPEND ?= " -serial null -serial null -serial mon:stdio -display none" - -QB_OPT_APPEND:append:qemuboot-xilinx = " \ - -hw-dtb ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch/board-versal-ps-vc-p-a2197-00.dtb \ - -display none \ - -net nic -net user,tftp=${DEPLOY_DIR_IMAGE} \ - " - -# PLM instance args -QB_PLM_OPT = " \ - -M microblaze-fdt \ - -device loader,file=${DEPLOY_DIR_IMAGE}/BOOT-${MACHINE}_bh.bin,addr=0xF201E000,force-raw \ - -device loader,addr=0xf0000000,data=0xba020004,data-len=4 \ - -device loader,addr=0xf0000004,data=0xb800fffc,data-len=4 \ - -device loader,file=${DEPLOY_DIR_IMAGE}/CDO/pmc_cdo.bin,addr=0xf2000000,force-raw \ - -device loader,file=${DEPLOY_DIR_IMAGE}/plm-${MACHINE}.elf,cpu-num=1 \ - -device loader,addr=0xF1110624,data=0x0,data-len=4 \ - -device loader,addr=0xF1110620,data=0x1,data-len=4 \ - -hw-dtb ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch/board-versal-pmc-vc-p-a2197-00.dtb \ - -display none \ - " -QB_OPT_APPEND:append:qemuboot-xilinx = " -plm-args '${QB_PLM_OPT}'" diff --git a/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf index b5b3b6f3..0a34ea77 100644 --- a/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf @@ -7,25 +7,4 @@ SOC_VARIANT ?= "dr" require conf/machine/zynqmp-generic.conf -MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" - -UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig" -SPL_BINARY ?= "spl/boot.bin" - -SERIAL_CONSOLES ?= "115200;ttyPS0" - - KERNEL_DEVICETREE = "xilinx/zynqmp-zc1254-revA.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 \ - " diff --git a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf index 0d829669..e7d7faac 100644 --- a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf @@ -11,21 +11,6 @@ require conf/machine/zynq-generic.conf -MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" - -# u-boot configuration -UBOOT_MACHINE ?= "xilinx_zynq_virt_defconfig" -SPL_BINARY ?= "spl/boot.bin" - -EXTRA_IMAGEDEPENDS += " \ - u-boot-zynq-uenv \ - virtual/boot-bin \ - virtual/bootloader \ - u-boot-zynq-scr \ - " - -SERIAL_CONSOLES ?= "115200;ttyPS0" - KERNEL_DEVICETREE = "zynq-zc702.dtb" IMAGE_BOOT_FILES += " \ @@ -33,24 +18,3 @@ IMAGE_BOOT_FILES += " \ uEnv.txt \ boot.scr \ " - -QB_MEM = "-m 1024" -QB_NETWORK_DEVICE = "-net nic,netdev=eth0 -netdev user,id=eth0,tftp=/tftpboot -net nic" -QB_DEFAULT_KERNEL:qemuboot-xilinx = "zImage" - -QB_SYSTEM_NAME ?= "${@qemu_target_binary(d)}" -QB_DEFAULT_FSTYPE = "cpio.gz.u-boot" -QB_DTB = "system.dtb" -QB_ROOTFS_OPT:qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw" - -# Replicate BootROM like behaviour, having loaded SPL and PMU(ROM+FW) -QB_OPT_APPEND = " \ - -nographic -serial null -serial mon:stdio \ - -initrd ${DEPLOY_DIR_IMAGE}/petalinux-image-minimal-zc702-zynq7.cpio.gz.u-boot \ - -gdb tcp::9000 \ - -device loader,addr=0xf8000008,data=0xDF0D,data-len=4 \ - -device loader,addr=0xf8000140,data=0x00500801,data-len=4 \ - -device loader,addr=0xf800012c,data=0x1ed044d,data-len=4 \ - -device loader,addr=0xf8000108,data=0x0001e008,data-len=4 \ - -device loader,addr=0xF8000910,data=0xF,data-len=0x4 \ - " diff --git a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf index e0290cad..33071f17 100644 --- a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf @@ -11,10 +11,6 @@ require conf/machine/zynq-generic.conf -MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost usbgadget" - -# u-boot configuration -UBOOT_MACHINE ?= "xilinx_zynq_virt_defconfig" SPL_BINARY ?= "spl/boot.bin" EXTRA_IMAGEDEPENDS += " \ @@ -24,8 +20,6 @@ EXTRA_IMAGEDEPENDS += " \ u-boot-zynq-scr \ " -SERIAL_CONSOLES ?= "115200;ttyPS0" - KERNEL_DEVICETREE = "zynq-zc706.dtb" IMAGE_BOOT_FILES += " \ @@ -33,24 +27,3 @@ IMAGE_BOOT_FILES += " \ uEnv.txt \ boot.scr \ " - -QB_MEM = "-m 1024" -QB_NETWORK_DEVICE = "-net nic,netdev=eth0 -netdev user,id=eth0,tftp=/tftpboot -net nic" -QB_DEFAULT_KERNEL:qemuboot-xilinx = "zImage" - -QB_SYSTEM_NAME ?= "${@qemu_target_binary(d)}" -QB_DEFAULT_FSTYPE = "cpio.gz.u-boot" -QB_DTB = "system.dtb" -QB_ROOTFS_OPT:qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw" - -# Replicate BootROM like behaviour, having loaded SPL and PMU(ROM+FW) -QB_OPT_APPEND = " \ - -nographic -serial null -serial mon:stdio \ - -initrd ${DEPLOY_DIR_IMAGE}/petalinux-image-minimal-zc706-zynq7.cpio.gz.u-boot \ - -gdb tcp::9000 \ - -device loader,addr=0xf8000008,data=0xDF0D,data-len=4 \ - -device loader,addr=0xf8000140,data=0x00500801,data-len=4 \ - -device loader,addr=0xf800012c,data=0x1ed044d,data-len=4 \ - -device loader,addr=0xf8000108,data=0x0001e008,data-len=4 \ - -device loader,addr=0xF8000910,data=0xF,data-len=0x4 \ - " diff --git a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf index 07edbce5..2780312a 100644 --- a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf @@ -4,64 +4,4 @@ require conf/machine/zynqmp-generic.conf -MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" - -UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig" -SPL_BINARY ?= "spl/boot.bin" - -# Default SD image build onfiguration, use qemu-sd to pad -IMAGE_CLASSES += "image-types-xilinx-qemu" -IMAGE_FSTYPES += "wic.qemu-sd" -WKS_FILES ?= "sdimage-bootpart.wks" - -SERIAL_CONSOLES ?= "115200;ttyPS0" - KERNEL_DEVICETREE = "xilinx/zynqmp-zcu102-rev1.0.dtb" - -EXTRA_IMAGEDEPENDS += " \ - u-boot-zynq-uenv \ - arm-trusted-firmware \ - qemu-devicetrees \ - virtual/boot-bin \ - virtual/bootloader \ - u-boot-zynq-scr \ - " - -IMAGE_BOOT_FILES += " \ - uEnv.txt \ - atf-uboot.ub \ - ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/dtb', 'device-tree', 'system.dtb', '', d)} \ - boot.scr \ - " - -# This machine has a QEMU model, runqemu setup: -QB_MEM = "-m 4096" -QB_OPT_APPEND ?= "-nographic -serial mon:stdio -serial null" -QB_NETWORK_DEVICE = "-net nic -net nic -net nic -net nic,netdev=net0,macaddr=@MAC@" - -# Replicate BootROM like behaviour, having loaded SPL and PMU(ROM+FW) -QB_OPT_APPEND:append:qemuboot-xilinx = " \ - -hw-dtb ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch/zcu102-arm.dtb \ - ${@qemu_zynqmp_unhalt(d, True)} \ - -device loader,file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware.elf,cpu-num=0 \ - -device loader,file=${DEPLOY_DIR_IMAGE}/u-boot.elf \ - -device loader,file=${DEPLOY_DIR_IMAGE}/system.dtb,addr=0x100000 \ - " - -# Attach the rootfs disk image to the second SD interface of QEMU (which is SD0) -QB_DEFAULT_FSTYPE:qemuboot-xilinx = "wic.qemu-sd" -QB_OPT_APPEND:append:qemuboot-xilinx = " -boot mode=5" -QB_ROOTFS_OPT:qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw" - -QB_PMU_OPT = " \ - -M microblaze-fdt \ - -display none \ - -hw-dtb ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch/zynqmp-pmu.dtb \ - -kernel ${PMU_ROM} \ - -device loader,file=${PMU_FIRMWARE_DEPLOY_DIR}/${PMU_FIRMWARE_IMAGE_NAME}.elf \ - -device loader,addr=0xfd1a0074,data=0x1011003,data-len=4 \ - -device loader,addr=0xfd1a007C,data=0x1010f03,data-len=4 \ - " -QB_OPT_APPEND:append:qemuboot-xilinx = " -pmu-args '${QB_PMU_OPT}'" - -do_write_qemuboot_conf[depends] += "u-boot-zynq-uenv:do_deploy" diff --git a/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf index 19eca576..65ba28b8 100644 --- a/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf @@ -7,28 +7,7 @@ SOC_VARIANT ?= "ev" require conf/machine/zynqmp-generic.conf -MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" - -UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig" -SPL_BINARY ?= "spl/boot.bin" - -SERIAL_CONSOLES ?= "115200;ttyPS0" - - KERNEL_DEVICETREE = "xilinx/zynqmp-zcu104-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_HWCODECS = "libomxil-xlnx" diff --git a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf index d04dca97..eff97a2f 100644 --- a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf @@ -6,27 +6,6 @@ SOC_VARIANT ?= "ev" require conf/machine/zynqmp-generic.conf -MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" - -UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig" -SPL_BINARY ?= "spl/boot.bin" - -SERIAL_CONSOLES ?= "115200;ttyPS0" - KERNEL_DEVICETREE = "xilinx/zynqmp-zcu106-revA.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_HWCODECS = "libomxil-xlnx" diff --git a/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf index 909d9331..6001af5f 100644 --- a/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf @@ -7,25 +7,4 @@ SOC_VARIANT ?= "dr" require conf/machine/zynqmp-generic.conf -MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" - -UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig" -SPL_BINARY ?= "spl/boot.bin" - -SERIAL_CONSOLES ?= "115200;ttyPS0" - - KERNEL_DEVICETREE = "xilinx/zynqmp-zcu111-revA.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 \ - " diff --git a/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf index 53ea16a2..96ddc28f 100644 --- a/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf @@ -7,25 +7,4 @@ SOC_VARIANT ?= "dr" require conf/machine/zynqmp-generic.conf -MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" - -UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig" -SPL_BINARY ?= "spl/boot.bin" - -SERIAL_CONSOLES ?= "115200;ttyPS0" - - KERNEL_DEVICETREE = "xilinx/zynqmp-zcu1275-revB.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 \ - " diff --git a/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf index 63da461f..01c9789e 100644 --- a/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf @@ -7,25 +7,4 @@ SOC_VARIANT ?= "dr" require conf/machine/zynqmp-generic.conf -MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" - -UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig" -SPL_BINARY ?= "spl/boot.bin" - -SERIAL_CONSOLES ?= "115200;ttyPS0" - - KERNEL_DEVICETREE = "xilinx/zynqmp-zcu1285-revA.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 \ - " diff --git a/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf index 2b2952fc..d013d468 100644 --- a/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf @@ -6,23 +6,3 @@ SOC_VARIANT ?= "dr" require conf/machine/zynqmp-generic.conf - -MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" - -UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig" -SPL_BINARY ?= "spl/boot.bin" - -SERIAL_CONSOLES ?= "115200;ttyPS0" - -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 \ - " diff --git a/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf index 2776f67c..ae4c434b 100644 --- a/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf @@ -6,23 +6,3 @@ SOC_VARIANT ?= "dr" require conf/machine/zynqmp-generic.conf - -MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" - -UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig" -SPL_BINARY ?= "spl/boot.bin" - -SERIAL_CONSOLES ?= "115200;ttyPS0" - -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 \ - " diff --git a/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf b/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf index 9a3682a8..c7c2f7eb 100644 --- a/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf @@ -10,19 +10,8 @@ require conf/machine/zynq-generic.conf -# u-boot configuration -UBOOT_MACHINE ?= "xilinx_zynq_virt_defconfig" SPL_BINARY ?= "spl/boot.bin" -EXTRA_IMAGEDEPENDS += " \ - u-boot-zynq-uenv \ - virtual/boot-bin \ - virtual/bootloader \ - u-boot-zynq-scr \ - " - -SERIAL_CONSOLES ?= "115200;ttyPS0" - KERNEL_DEVICETREE = "zynq-zed.dtb" IMAGE_BOOT_FILES += " \ @@ -30,4 +19,3 @@ IMAGE_BOOT_FILES += " \ uEnv.txt \ boot.scr \ " - 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 960bec5f..df26ea0d 100644 --- a/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf @@ -9,24 +9,12 @@ require conf/machine/zynq-generic.conf PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot" -MACHINE_FEATURES = "ext2 vfat usbhost usbgadget keyboard screen alsa sdio" -SERIAL_CONSOLES ?= "115200;ttyPS0" +MACHINE_FEATURES += "keyboard screen alsa sdio" -MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree" - -UBOOT_MACHINE ?= "xilinx_zynq_virt_defconfig" SPL_BINARY ?= "spl/boot.bin" FORCE_PLATFORM_INIT = "1" UBOOT_ELF = "u-boot" -EXTRA_IMAGEDEPENDS += " \ - u-boot-zynq-uenv \ - virtual/boot-bin \ - virtual/bitstream \ - virtual/bootloader \ - u-boot-zynq-scr \ - " - IMAGE_BOOT_FILES += " \ boot.bin \ bitstream \ diff --git a/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf b/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf index 1eeb56d7..aa1eafe4 100644 --- a/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf @@ -8,11 +8,8 @@ require conf/machine/zynq-generic.conf -MACHINE_FEATURES = "ext2 vfat usbhost usbgadget" - # u-boot configuration PREFERRED_PROVIDER_virtual/bootloader = "u-boot" -UBOOT_MACHINE ?= "xilinx_zynq_virt_defconfig" SPL_BINARY ?= "spl/boot.bin" UBOOT_ELF = "u-boot" @@ -23,8 +20,6 @@ EXTRA_IMAGEDEPENDS += " \ u-boot-zynq-scr \ " -SERIAL_CONSOLES ?= "115200;ttyPS0" - KERNEL_DEVICETREE = "zynq-zybo.dtb" IMAGE_BOOT_FILES += " \ -- cgit v1.2.3-54-g00ecf