meta-xilinx-bsp: Remove extra entries, already set by the included defaults

Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>

1 files changed, 0 insertions, 63 deletions

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}'"
-