summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@xilinx.com>2021-12-19 14:34:55 -0800
committerMark Hatle <mark.hatle@xilinx.com>2022-01-14 15:37:05 -0800
commit58205ff04948596d6fdd8e815699baffb83510b7 (patch)
tree23b9ecd6cc0673256f9ebd3cb3c0b44b94ba9423
parentc55d616c997c36022b092a30e16f1b225482b8a1 (diff)
downloadmeta-xilinx-58205ff04948596d6fdd8e815699baffb83510b7.tar.gz
meta-xilinx-bsp: Remove extra entries, already set by the included defaults
Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
Diffstat
-rw-r--r--meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf8
-rw-r--r--meta-xilinx-bsp/conf/machine/microzed-zynq7.conf6
-rw-r--r--meta-xilinx-bsp/conf/machine/ml605-qemu-microblazeel.conf5
-rw-r--r--meta-xilinx-bsp/conf/machine/picozed-zynq7.conf8
-rw-r--r--meta-xilinx-bsp/conf/machine/qemu-zynq7.conf29
-rw-r--r--meta-xilinx-bsp/conf/machine/v350-versal.conf14
-rw-r--r--meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf63
-rw-r--r--meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf20
-rw-r--r--meta-xilinx-bsp/conf/machine/vck190-versal.conf64
-rw-r--r--meta-xilinx-bsp/conf/machine/vck5000-versal.conf23
-rw-r--r--meta-xilinx-bsp/conf/machine/vmk180-versal.conf62
-rw-r--r--meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf21
-rw-r--r--meta-xilinx-bsp/conf/machine/zc702-zynq7.conf36
-rw-r--r--meta-xilinx-bsp/conf/machine/zc706-zynq7.conf27
-rw-r--r--meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf60
-rw-r--r--meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf21
-rw-r--r--meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf21
-rw-r--r--meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf21
-rw-r--r--meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf21
-rw-r--r--meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf21
-rw-r--r--meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf20
-rw-r--r--meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf20
-rw-r--r--meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf12
-rw-r--r--meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf14
-rw-r--r--meta-xilinx-bsp/conf/machine/zybo-zynq7.conf5
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-
7 7
8require conf/machine/microblaze-generic.conf 8require conf/machine/microblaze-generic.conf
9 9
10MACHINE_FEATURES = ""
11
12USE_VT = "" 10USE_VT = ""
13SERIAL_CONSOLES ?= "115200;ttyS0"
14
15KERNEL_IMAGETYPE ?= "linux.bin.ub"
16 11
17MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree" 12MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree"
18 13
19EXTRA_IMAGEDEPENDS += "virtual/bitstream virtual/bootloader" 14EXTRA_IMAGEDEPENDS += "virtual/bitstream virtual/bootloader"
20
21UBOOT_MACHINE ?= "microblaze-generic_defconfig"
22UBOOT_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 @@
4 4
5require conf/machine/zynq-generic.conf 5require conf/machine/zynq-generic.conf
6 6
7MACHINE_FEATURES = "ext2 vfat usbhost"
8
9# u-boot configuration 7# u-boot configuration
10PREFERRED_PROVIDER_virtual/bootloader = "u-boot" 8PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
11UBOOT_MACHINE ?= "xilinx_zynq_virt_defconfig" 9
12SPL_BINARY ?= "spl/boot.bin" 10SPL_BINARY ?= "spl/boot.bin"
13UBOOT_ELF = "u-boot" 11UBOOT_ELF = "u-boot"
14 12
@@ -19,8 +17,6 @@ EXTRA_IMAGEDEPENDS += " \
19 u-boot-zynq-scr \ 17 u-boot-zynq-scr \
20 " 18 "
21 19
22SERIAL_CONSOLES ?= "115200;ttyPS0"
23
24KERNEL_DEVICETREE = "zynq-microzed.dtb" 20KERNEL_DEVICETREE = "zynq-microzed.dtb"
25 21
26IMAGE_BOOT_FILES += " \ 22IMAGE_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-
6 6
7require conf/machine/microblaze-generic.conf 7require conf/machine/microblaze-generic.conf
8 8
9MACHINE_FEATURES = ""
10
11USE_VT = "" 9USE_VT = ""
12SERIAL_CONSOLES ?= "115200;ttyS0"
13
14KERNEL_IMAGETYPE ?= "linux.bin.ub"
15 10
16# Use the networking setup from qemuarm 11# Use the networking setup from qemuarm
17MACHINEOVERRIDES:prepend:pn-init-ifupdown = "qemuall:" 12MACHINEOVERRIDES: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 @@
8 8
9require conf/machine/zynq-generic.conf 9require conf/machine/zynq-generic.conf
10 10
11MACHINE_FEATURES = "ext2 vfat usbhost usbgadget"
12
13# u-boot configuration 11# u-boot configuration
14PREFERRED_PROVIDER_virtual/bootloader = "u-boot" 12PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
15UBOOT_MACHINE ?= "xilinx_zynq_virt_defconfig" 13
16SPL_BINARY ?= "spl/boot.bin" 14SPL_BINARY ?= "spl/boot.bin"
17UBOOT_ELF = "u-boot" 15UBOOT_ELF = "u-boot"
18 16
@@ -23,10 +21,6 @@ EXTRA_IMAGEDEPENDS += " \
23 u-boot-zynq-scr \ 21 u-boot-zynq-scr \
24 " 22 "
25 23
26SERIAL_CONSOLES ?= "115200;ttyPS0"
27
28MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree"
29
30IMAGE_BOOT_FILES += " \ 24IMAGE_BOOT_FILES += " \
31 boot.bin \ 25 boot.bin \
32 uEnv.txt \ 26 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 @@
4 4
5require conf/machine/zynq-generic.conf 5require conf/machine/zynq-generic.conf
6 6
7MACHINE_FEATURES = "ext2 vfat"
8
9SERIAL_CONSOLES ?= "115200;ttyPS0"
10
11MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree"
12
13HDF_MACHINE = "zc702-zynq7"
14
15# Use the networking setup from qemuarm 7# Use the networking setup from qemuarm
16MACHINEOVERRIDES:prepend:pn-init-ifupdown = "qemuall:" 8MACHINEOVERRIDES:prepend:pn-init-ifupdown = "qemuall:"
17FILESOVERRIDES:append:pn-init-ifupdown = ":qemuarm" 9FILESOVERRIDES:append:pn-init-ifupdown = ":qemuarm"
18
19QB_MEM = "-m 1024"
20QB_NETWORK_DEVICE = "-net nic,netdev=eth0 -netdev user,id=eth0,tftp=/tftpboot -net nic"
21QB_DEFAULT_KERNEL:qemuboot-xilinx = "zImage"
22
23QB_SYSTEM_NAME ?= "${@qemu_target_binary(d)}"
24QB_DEFAULT_FSTYPE = "cpio.gz.u-boot"
25QB_DTB = "system.dtb"
26QB_ROOTFS_OPT:qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
27
28# Replicate BootROM like behaviour, having loaded SPL and PMU(ROM+FW)
29QB_OPT_APPEND = " \
30 -nographic -serial null -serial mon:stdio \
31 -initrd ${DEPLOY_DIR_IMAGE}/petalinux-image-minimal-qemu-zynq7.cpio.gz.u-boot \
32 -gdb tcp::9000 \
33 -device loader,addr=0xf8000008,data=0xDF0D,data-len=4 \
34 -device loader,addr=0xf8000140,data=0x00500801,data-len=4 \
35 -device loader,addr=0xf800012c,data=0x1ed044d,data-len=4 \
36 -device loader,addr=0xf8000108,data=0x0001e008,data-len=4 \
37 -device loader,addr=0xF8000910,data=0xF,data-len=0x4 \
38 "
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 @@
4 4
5require conf/machine/versal-generic.conf 5require conf/machine/versal-generic.conf
6 6
7MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
8
9UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig"
10
11SERIAL_CONSOLES ?= "115200;ttyAMA0"
12
13EXTRA_IMAGEDEPENDS += " \ 7EXTRA_IMAGEDEPENDS += " \
14 arm-trusted-firmware \ 8 arm-trusted-firmware \
15 virtual/boot-bin \ 9 virtual/boot-bin \
@@ -18,11 +12,3 @@ EXTRA_IMAGEDEPENDS += " \
18 virtual/plm \ 12 virtual/plm \
19 u-boot-zynq-scr \ 13 u-boot-zynq-scr \
20" 14"
21
22IMAGE_BOOT_FILES += " \
23 boot.bin \
24 ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/dtb', 'device-tree', 'system.dtb', '', d)} \
25 Image \
26 boot.scr \
27"
28
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 @@
5SOC_VARIANT = "ai-core" 5SOC_VARIANT = "ai-core"
6 6
7require conf/machine/versal-generic.conf 7require conf/machine/versal-generic.conf
8
9MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
10
11UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig"
12
13SERIAL_CONSOLES ?= "115200;ttyAMA0"
14
15# Default SD image build onfiguration, use qemu-sd to pad
16IMAGE_CLASSES += "image-types-xilinx-qemu"
17IMAGE_FSTYPES += "wic.qemu-sd"
18WKS_FILES ?= "sdimage-bootpart.wks"
19
20EXTRA_IMAGEDEPENDS += " \
21 arm-trusted-firmware \
22 virtual/boot-bin \
23 virtual/bootloader \
24 virtual/psm-firmware \
25 virtual/plm \
26 u-boot-zynq-scr \
27 qemu-devicetrees \
28 virtual/cdo \
29"
30
31IMAGE_BOOT_FILES += " \
32 boot.bin \
33 system.dtb \
34 Image \
35 boot.scr \
36"
37# This machine has a QEMU model, runqemu setup:
38QB_MEM = "-m 8G"
39QB_DEFAULT_KERNEL = "none"
40QB_NETWORK_DEVICE = ""
41QB_KERNEL_CMDLINE_APPEND ?= ""
42QB_NET = "none"
43
44QB_DEFAULT_FSTYPE:qemuboot-xilinx = "wic.qemu-sd"
45QB_OPT_APPEND:append:qemuboot-xilinx = " -boot mode=5"
46QB_ROOTFS_OPT:qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
47
48# Use booti 80000 6000000 4000000 to launch
49QB_OPT_APPEND ?= " -serial null -serial null -serial mon:stdio -display none"
50
51QB_OPT_APPEND:append:qemuboot-xilinx = " \
52 -hw-dtb ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch/board-versal-ps-vc-p-a2197-00.dtb \
53 -display none \
54 -net nic -net user,tftp=${DEPLOY_DIR_IMAGE} \
55 "
56# PLM instance args
57QB_PLM_OPT = " \
58 -M microblaze-fdt \
59 -device loader,file=${DEPLOY_DIR_IMAGE}/BOOT-${MACHINE}_bh.bin,addr=0xF201E000,force-raw \
60 -device loader,addr=0xf0000000,data=0xba020004,data-len=4 \
61 -device loader,addr=0xf0000004,data=0xb800fffc,data-len=4 \
62 -device loader,file=${DEPLOY_DIR_IMAGE}/CDO/pmc_cdo.bin,addr=0xf2000000,force-raw \
63 -device loader,file=${DEPLOY_DIR_IMAGE}/plm-${MACHINE}.elf,cpu-num=1 \
64 -device loader,addr=0xF1110624,data=0x0,data-len=4 \
65 -device loader,addr=0xF1110620,data=0x1,data-len=4 \
66 -hw-dtb ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch/board-versal-pmc-vc-p-a2197-00.dtb \
67 -display none \
68 "
69QB_OPT_APPEND:append:qemuboot-xilinx = " -plm-args '${QB_PLM_OPT}'"
70
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
6 6
7# Add board compatibility override 7# Add board compatibility override
8MACHINEOVERRIDES .= ":vck-sc" 8MACHINEOVERRIDES .= ":vck-sc"
9
10MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
11
12UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig"
13SPL_BINARY ?= "spl/boot.bin"
14
15SERIAL_CONSOLES ?= "115200;ttyPS0"
16
17EXTRA_IMAGEDEPENDS += " \
18 u-boot-zynq-uenv \
19 arm-trusted-firmware \
20 virtual/boot-bin \
21 virtual/bootloader \
22 u-boot-zynq-scr \
23"
24IMAGE_BOOT_FILES += " \
25 uEnv.txt \
26 atf-uboot.ub \
27 boot.scr \
28"
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 @@
5SOC_VARIANT = "ai-core" 5SOC_VARIANT = "ai-core"
6 6
7require conf/machine/versal-generic.conf 7require conf/machine/versal-generic.conf
8
9MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
10
11UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig"
12
13SERIAL_CONSOLES ?= "115200;ttyAMA0"
14
15# Default SD image build onfiguration, use qemu-sd to pad
16IMAGE_CLASSES += "image-types-xilinx-qemu"
17IMAGE_FSTYPES += "wic.qemu-sd"
18WKS_FILES ?= "sdimage-bootpart.wks"
19
20EXTRA_IMAGEDEPENDS += " \
21 arm-trusted-firmware \
22 virtual/boot-bin \
23 virtual/bootloader \
24 virtual/psm-firmware \
25 virtual/plm \
26 u-boot-zynq-scr \
27 qemu-devicetrees \
28 virtual/cdo \
29"
30
31IMAGE_BOOT_FILES += " \
32 boot.bin \
33 ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/dtb', 'device-tree', 'system.dtb', '', d)} \
34 Image \
35 boot.scr \
36"
37
38# This machine has a QEMU model, runqemu setup:
39QB_MEM = "-m 8G"
40QB_DEFAULT_KERNEL = "none"
41QB_NETWORK_DEVICE = ""
42QB_KERNEL_CMDLINE_APPEND ?= ""
43QB_NET = "none"
44
45QB_DEFAULT_FSTYPE:qemuboot-xilinx = "wic.qemu-sd"
46QB_OPT_APPEND:append:qemuboot-xilinx = " -boot mode=5"
47QB_ROOTFS_OPT:qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
48
49# Use booti 80000 6000000 4000000 to launch
50QB_OPT_APPEND ?= " -serial null -serial null -serial mon:stdio -display none"
51
52QB_OPT_APPEND:append:qemuboot-xilinx = " \
53 -hw-dtb ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch/board-versal-ps-vc-p-a2197-00.dtb \
54 -display none \
55 -net nic -net user,tftp=${DEPLOY_DIR_IMAGE} \
56 "
57
58# PLM instance args
59QB_PLM_OPT = " \
60 -M microblaze-fdt \
61 -device loader,file=${DEPLOY_DIR_IMAGE}/BOOT-${MACHINE}_bh.bin,addr=0xF201E000,force-raw \
62 -device loader,addr=0xf0000000,data=0xba020004,data-len=4 \
63 -device loader,addr=0xf0000004,data=0xb800fffc,data-len=4 \
64 -device loader,file=${DEPLOY_DIR_IMAGE}/CDO/pmc_cdo.bin,addr=0xf2000000,force-raw \
65 -device loader,file=${DEPLOY_DIR_IMAGE}/plm-${MACHINE}.elf,cpu-num=1 \
66 -device loader,addr=0xF1110624,data=0x0,data-len=4 \
67 -device loader,addr=0xF1110620,data=0x1,data-len=4 \
68 -hw-dtb ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch/board-versal-pmc-vc-p-a2197-00.dtb \
69 -display none \
70 "
71QB_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 @@
3##@DESCRIPTION: Machine support for vck5000 versal. 3##@DESCRIPTION: Machine support for vck5000 versal.
4 4
5require conf/machine/versal-generic.conf 5require conf/machine/versal-generic.conf
6
7MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
8
9UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig"
10
11SERIAL_CONSOLES ?= "115200;ttyAMA0"
12
13EXTRA_IMAGEDEPENDS += " \
14 arm-trusted-firmware \
15 virtual/boot-bin \
16 virtual/bootloader \
17 virtual/psm-firmware \
18 virtual/plm \
19 u-boot-zynq-scr \
20"
21
22IMAGE_BOOT_FILES += " \
23 boot.bin \
24 ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/dtb', 'device-tree', 'system.dtb', '', d)} \
25 Image \
26 boot.scr \
27"
28
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 @@
4 4
5require conf/machine/versal-generic.conf 5require conf/machine/versal-generic.conf
6 6
7MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
8
9UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig"
10
11SERIAL_CONSOLES ?= "115200;ttyAMA0"
12
13IMAGE_CLASSES += "image-types-xilinx-qemu"
14IMAGE_FSTYPES += "wic.qemu-sd"
15WKS_FILES ?= "sdimage-bootpart.wks"
16
17EXTRA_IMAGEDEPENDS += " \
18 arm-trusted-firmware \
19 virtual/boot-bin \
20 virtual/bootloader \
21 virtual/psm-firmware \
22 virtual/plm \
23 u-boot-zynq-scr \
24 qemu-devicetrees \
25 virtual/cdo \
26"
27
28IMAGE_BOOT_FILES += " \
29 boot.bin \
30 ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/dtb', 'device-tree', 'system.dtb', '', d)} \
31 Image \
32 boot.scr \
33"
34
35# This machine has a QEMU model, runqemu setup:
36QB_MEM = "-m 8G"
37QB_DEFAULT_KERNEL = "none"
38QB_NETWORK_DEVICE = ""
39QB_KERNEL_CMDLINE_APPEND ?= ""
40QB_NET = "none"
41
42QB_DEFAULT_FSTYPE:qemuboot-xilinx = "wic.qemu-sd"
43QB_OPT_APPEND:append:qemuboot-xilinx = " -boot mode=5"
44QB_ROOTFS_OPT:qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
45
46# Use booti 80000 6000000 4000000 to launch
47QB_OPT_APPEND ?= " -serial null -serial null -serial mon:stdio -display none"
48
49QB_OPT_APPEND:append:qemuboot-xilinx = " \
50 -hw-dtb ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch/board-versal-ps-vc-p-a2197-00.dtb \
51 -display none \
52 -net nic -net user,tftp=${DEPLOY_DIR_IMAGE} \
53 "
54
55# PLM instance args
56QB_PLM_OPT = " \
57 -M microblaze-fdt \
58 -device loader,file=${DEPLOY_DIR_IMAGE}/BOOT-${MACHINE}_bh.bin,addr=0xF201E000,force-raw \
59 -device loader,addr=0xf0000000,data=0xba020004,data-len=4 \
60 -device loader,addr=0xf0000004,data=0xb800fffc,data-len=4 \
61 -device loader,file=${DEPLOY_DIR_IMAGE}/CDO/pmc_cdo.bin,addr=0xf2000000,force-raw \
62 -device loader,file=${DEPLOY_DIR_IMAGE}/plm-${MACHINE}.elf,cpu-num=1 \
63 -device loader,addr=0xF1110624,data=0x0,data-len=4 \
64 -device loader,addr=0xF1110620,data=0x1,data-len=4 \
65 -hw-dtb ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch/board-versal-pmc-vc-p-a2197-00.dtb \
66 -display none \
67 "
68QB_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"
7 7
8require conf/machine/zynqmp-generic.conf 8require conf/machine/zynqmp-generic.conf
9 9
10MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
11
12UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig"
13SPL_BINARY ?= "spl/boot.bin"
14
15SERIAL_CONSOLES ?= "115200;ttyPS0"
16
17
18KERNEL_DEVICETREE = "xilinx/zynqmp-zc1254-revA.dtb" 10KERNEL_DEVICETREE = "xilinx/zynqmp-zc1254-revA.dtb"
19
20EXTRA_IMAGEDEPENDS += " \
21 u-boot-zynq-uenv \
22 arm-trusted-firmware \
23 virtual/boot-bin \
24 virtual/bootloader \
25 u-boot-zynq-scr \
26 "
27IMAGE_BOOT_FILES += " \
28 uEnv.txt \
29 atf-uboot.ub \
30 boot.scr \
31 "
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 @@
11 11
12require conf/machine/zynq-generic.conf 12require conf/machine/zynq-generic.conf
13 13
14MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
15
16# u-boot configuration
17UBOOT_MACHINE ?= "xilinx_zynq_virt_defconfig"
18SPL_BINARY ?= "spl/boot.bin"
19
20EXTRA_IMAGEDEPENDS += " \
21 u-boot-zynq-uenv \
22 virtual/boot-bin \
23 virtual/bootloader \
24 u-boot-zynq-scr \
25 "
26
27SERIAL_CONSOLES ?= "115200;ttyPS0"
28
29KERNEL_DEVICETREE = "zynq-zc702.dtb" 14KERNEL_DEVICETREE = "zynq-zc702.dtb"
30 15
31IMAGE_BOOT_FILES += " \ 16IMAGE_BOOT_FILES += " \
@@ -33,24 +18,3 @@ IMAGE_BOOT_FILES += " \
33 uEnv.txt \ 18 uEnv.txt \
34 boot.scr \ 19 boot.scr \
35 " 20 "
36
37QB_MEM = "-m 1024"
38QB_NETWORK_DEVICE = "-net nic,netdev=eth0 -netdev user,id=eth0,tftp=/tftpboot -net nic"
39QB_DEFAULT_KERNEL:qemuboot-xilinx = "zImage"
40
41QB_SYSTEM_NAME ?= "${@qemu_target_binary(d)}"
42QB_DEFAULT_FSTYPE = "cpio.gz.u-boot"
43QB_DTB = "system.dtb"
44QB_ROOTFS_OPT:qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
45
46# Replicate BootROM like behaviour, having loaded SPL and PMU(ROM+FW)
47QB_OPT_APPEND = " \
48 -nographic -serial null -serial mon:stdio \
49 -initrd ${DEPLOY_DIR_IMAGE}/petalinux-image-minimal-zc702-zynq7.cpio.gz.u-boot \
50 -gdb tcp::9000 \
51 -device loader,addr=0xf8000008,data=0xDF0D,data-len=4 \
52 -device loader,addr=0xf8000140,data=0x00500801,data-len=4 \
53 -device loader,addr=0xf800012c,data=0x1ed044d,data-len=4 \
54 -device loader,addr=0xf8000108,data=0x0001e008,data-len=4 \
55 -device loader,addr=0xF8000910,data=0xF,data-len=0x4 \
56 "
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 @@
11 11
12require conf/machine/zynq-generic.conf 12require conf/machine/zynq-generic.conf
13 13
14MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost usbgadget"
15
16# u-boot configuration
17UBOOT_MACHINE ?= "xilinx_zynq_virt_defconfig"
18SPL_BINARY ?= "spl/boot.bin" 14SPL_BINARY ?= "spl/boot.bin"
19 15
20EXTRA_IMAGEDEPENDS += " \ 16EXTRA_IMAGEDEPENDS += " \
@@ -24,8 +20,6 @@ EXTRA_IMAGEDEPENDS += " \
24 u-boot-zynq-scr \ 20 u-boot-zynq-scr \
25 " 21 "
26 22
27SERIAL_CONSOLES ?= "115200;ttyPS0"
28
29KERNEL_DEVICETREE = "zynq-zc706.dtb" 23KERNEL_DEVICETREE = "zynq-zc706.dtb"
30 24
31IMAGE_BOOT_FILES += " \ 25IMAGE_BOOT_FILES += " \
@@ -33,24 +27,3 @@ IMAGE_BOOT_FILES += " \
33 uEnv.txt \ 27 uEnv.txt \
34 boot.scr \ 28 boot.scr \
35 " 29 "
36
37QB_MEM = "-m 1024"
38QB_NETWORK_DEVICE = "-net nic,netdev=eth0 -netdev user,id=eth0,tftp=/tftpboot -net nic"
39QB_DEFAULT_KERNEL:qemuboot-xilinx = "zImage"
40
41QB_SYSTEM_NAME ?= "${@qemu_target_binary(d)}"
42QB_DEFAULT_FSTYPE = "cpio.gz.u-boot"
43QB_DTB = "system.dtb"
44QB_ROOTFS_OPT:qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
45
46# Replicate BootROM like behaviour, having loaded SPL and PMU(ROM+FW)
47QB_OPT_APPEND = " \
48 -nographic -serial null -serial mon:stdio \
49 -initrd ${DEPLOY_DIR_IMAGE}/petalinux-image-minimal-zc706-zynq7.cpio.gz.u-boot \
50 -gdb tcp::9000 \
51 -device loader,addr=0xf8000008,data=0xDF0D,data-len=4 \
52 -device loader,addr=0xf8000140,data=0x00500801,data-len=4 \
53 -device loader,addr=0xf800012c,data=0x1ed044d,data-len=4 \
54 -device loader,addr=0xf8000108,data=0x0001e008,data-len=4 \
55 -device loader,addr=0xF8000910,data=0xF,data-len=0x4 \
56 "
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 @@
4 4
5require conf/machine/zynqmp-generic.conf 5require conf/machine/zynqmp-generic.conf
6 6
7MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
8
9UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig"
10SPL_BINARY ?= "spl/boot.bin"
11
12# Default SD image build onfiguration, use qemu-sd to pad
13IMAGE_CLASSES += "image-types-xilinx-qemu"
14IMAGE_FSTYPES += "wic.qemu-sd"
15WKS_FILES ?= "sdimage-bootpart.wks"
16
17SERIAL_CONSOLES ?= "115200;ttyPS0"
18
19KERNEL_DEVICETREE = "xilinx/zynqmp-zcu102-rev1.0.dtb" 7KERNEL_DEVICETREE = "xilinx/zynqmp-zcu102-rev1.0.dtb"
20
21EXTRA_IMAGEDEPENDS += " \
22 u-boot-zynq-uenv \
23 arm-trusted-firmware \
24 qemu-devicetrees \
25 virtual/boot-bin \
26 virtual/bootloader \
27 u-boot-zynq-scr \
28 "
29
30IMAGE_BOOT_FILES += " \
31 uEnv.txt \
32 atf-uboot.ub \
33 ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/dtb', 'device-tree', 'system.dtb', '', d)} \
34 boot.scr \
35 "
36
37# This machine has a QEMU model, runqemu setup:
38QB_MEM = "-m 4096"
39QB_OPT_APPEND ?= "-nographic -serial mon:stdio -serial null"
40QB_NETWORK_DEVICE = "-net nic -net nic -net nic -net nic,netdev=net0,macaddr=@MAC@"
41
42# Replicate BootROM like behaviour, having loaded SPL and PMU(ROM+FW)
43QB_OPT_APPEND:append:qemuboot-xilinx = " \
44 -hw-dtb ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch/zcu102-arm.dtb \
45 ${@qemu_zynqmp_unhalt(d, True)} \
46 -device loader,file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware.elf,cpu-num=0 \
47 -device loader,file=${DEPLOY_DIR_IMAGE}/u-boot.elf \
48 -device loader,file=${DEPLOY_DIR_IMAGE}/system.dtb,addr=0x100000 \
49 "
50
51# Attach the rootfs disk image to the second SD interface of QEMU (which is SD0)
52QB_DEFAULT_FSTYPE:qemuboot-xilinx = "wic.qemu-sd"
53QB_OPT_APPEND:append:qemuboot-xilinx = " -boot mode=5"
54QB_ROOTFS_OPT:qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
55
56QB_PMU_OPT = " \
57 -M microblaze-fdt \
58 -display none \
59 -hw-dtb ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch/zynqmp-pmu.dtb \
60 -kernel ${PMU_ROM} \
61 -device loader,file=${PMU_FIRMWARE_DEPLOY_DIR}/${PMU_FIRMWARE_IMAGE_NAME}.elf \
62 -device loader,addr=0xfd1a0074,data=0x1011003,data-len=4 \
63 -device loader,addr=0xfd1a007C,data=0x1010f03,data-len=4 \
64 "
65QB_OPT_APPEND:append:qemuboot-xilinx = " -pmu-args '${QB_PMU_OPT}'"
66
67do_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"
7 7
8require conf/machine/zynqmp-generic.conf 8require conf/machine/zynqmp-generic.conf
9 9
10MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
11
12UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig"
13SPL_BINARY ?= "spl/boot.bin"
14
15SERIAL_CONSOLES ?= "115200;ttyPS0"
16
17
18KERNEL_DEVICETREE = "xilinx/zynqmp-zcu104-revC.dtb" 10KERNEL_DEVICETREE = "xilinx/zynqmp-zcu104-revC.dtb"
19 11
20EXTRA_IMAGEDEPENDS += " \
21 u-boot-zynq-uenv \
22 arm-trusted-firmware \
23 virtual/boot-bin \
24 virtual/bootloader \
25 u-boot-zynq-scr \
26 "
27IMAGE_BOOT_FILES += " \
28 uEnv.txt \
29 atf-uboot.ub \
30 boot.scr \
31 "
32
33MACHINE_HWCODECS = "libomxil-xlnx" 12MACHINE_HWCODECS = "libomxil-xlnx"
34 13
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"
6 6
7require conf/machine/zynqmp-generic.conf 7require conf/machine/zynqmp-generic.conf
8 8
9MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
10
11UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig"
12SPL_BINARY ?= "spl/boot.bin"
13
14SERIAL_CONSOLES ?= "115200;ttyPS0"
15
16KERNEL_DEVICETREE = "xilinx/zynqmp-zcu106-revA.dtb" 9KERNEL_DEVICETREE = "xilinx/zynqmp-zcu106-revA.dtb"
17 10
18EXTRA_IMAGEDEPENDS += " \
19 u-boot-zynq-uenv \
20 arm-trusted-firmware \
21 virtual/boot-bin \
22 virtual/bootloader \
23 u-boot-zynq-scr \
24 "
25
26IMAGE_BOOT_FILES += " \
27 uEnv.txt \
28 atf-uboot.ub \
29 boot.scr \
30 "
31
32MACHINE_HWCODECS = "libomxil-xlnx" 11MACHINE_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"
7 7
8require conf/machine/zynqmp-generic.conf 8require conf/machine/zynqmp-generic.conf
9 9
10MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
11
12UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig"
13SPL_BINARY ?= "spl/boot.bin"
14
15SERIAL_CONSOLES ?= "115200;ttyPS0"
16
17
18KERNEL_DEVICETREE = "xilinx/zynqmp-zcu111-revA.dtb" 10KERNEL_DEVICETREE = "xilinx/zynqmp-zcu111-revA.dtb"
19
20EXTRA_IMAGEDEPENDS += " \
21 u-boot-zynq-uenv \
22 arm-trusted-firmware \
23 virtual/boot-bin \
24 virtual/bootloader \
25 u-boot-zynq-scr \
26 "
27IMAGE_BOOT_FILES += " \
28 uEnv.txt \
29 atf-uboot.ub \
30 boot.scr \
31 "
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"
7 7
8require conf/machine/zynqmp-generic.conf 8require conf/machine/zynqmp-generic.conf
9 9
10MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
11
12UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig"
13SPL_BINARY ?= "spl/boot.bin"
14
15SERIAL_CONSOLES ?= "115200;ttyPS0"
16
17
18KERNEL_DEVICETREE = "xilinx/zynqmp-zcu1275-revB.dtb" 10KERNEL_DEVICETREE = "xilinx/zynqmp-zcu1275-revB.dtb"
19
20EXTRA_IMAGEDEPENDS += " \
21 u-boot-zynq-uenv \
22 arm-trusted-firmware \
23 virtual/boot-bin \
24 virtual/bootloader \
25 u-boot-zynq-scr \
26 "
27IMAGE_BOOT_FILES += " \
28 uEnv.txt \
29 atf-uboot.ub \
30 boot.scr \
31 "
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"
7 7
8require conf/machine/zynqmp-generic.conf 8require conf/machine/zynqmp-generic.conf
9 9
10MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
11
12UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig"
13SPL_BINARY ?= "spl/boot.bin"
14
15SERIAL_CONSOLES ?= "115200;ttyPS0"
16
17
18KERNEL_DEVICETREE = "xilinx/zynqmp-zcu1285-revA.dtb" 10KERNEL_DEVICETREE = "xilinx/zynqmp-zcu1285-revA.dtb"
19
20EXTRA_IMAGEDEPENDS += " \
21 u-boot-zynq-uenv \
22 arm-trusted-firmware \
23 virtual/boot-bin \
24 virtual/bootloader \
25 u-boot-zynq-scr \
26 "
27IMAGE_BOOT_FILES += " \
28 uEnv.txt \
29 atf-uboot.ub \
30 boot.scr \
31 "
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 @@
6SOC_VARIANT ?= "dr" 6SOC_VARIANT ?= "dr"
7 7
8require conf/machine/zynqmp-generic.conf 8require conf/machine/zynqmp-generic.conf
9
10MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
11
12UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig"
13SPL_BINARY ?= "spl/boot.bin"
14
15SERIAL_CONSOLES ?= "115200;ttyPS0"
16
17EXTRA_IMAGEDEPENDS += " \
18 u-boot-zynq-uenv \
19 arm-trusted-firmware \
20 virtual/boot-bin \
21 virtual/bootloader \
22 u-boot-zynq-scr \
23 "
24IMAGE_BOOT_FILES += " \
25 uEnv.txt \
26 atf-uboot.ub \
27 boot.scr \
28 "
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 @@
6SOC_VARIANT ?= "dr" 6SOC_VARIANT ?= "dr"
7 7
8require conf/machine/zynqmp-generic.conf 8require conf/machine/zynqmp-generic.conf
9
10MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
11
12UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig"
13SPL_BINARY ?= "spl/boot.bin"
14
15SERIAL_CONSOLES ?= "115200;ttyPS0"
16
17EXTRA_IMAGEDEPENDS += " \
18 u-boot-zynq-uenv \
19 arm-trusted-firmware \
20 virtual/boot-bin \
21 virtual/bootloader \
22 u-boot-zynq-scr \
23 "
24IMAGE_BOOT_FILES += " \
25 uEnv.txt \
26 atf-uboot.ub \
27 boot.scr \
28 "
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 @@
10 10
11require conf/machine/zynq-generic.conf 11require conf/machine/zynq-generic.conf
12 12
13# u-boot configuration
14UBOOT_MACHINE ?= "xilinx_zynq_virt_defconfig"
15SPL_BINARY ?= "spl/boot.bin" 13SPL_BINARY ?= "spl/boot.bin"
16 14
17EXTRA_IMAGEDEPENDS += " \
18 u-boot-zynq-uenv \
19 virtual/boot-bin \
20 virtual/bootloader \
21 u-boot-zynq-scr \
22 "
23
24SERIAL_CONSOLES ?= "115200;ttyPS0"
25
26KERNEL_DEVICETREE = "zynq-zed.dtb" 15KERNEL_DEVICETREE = "zynq-zed.dtb"
27 16
28IMAGE_BOOT_FILES += " \ 17IMAGE_BOOT_FILES += " \
@@ -30,4 +19,3 @@ IMAGE_BOOT_FILES += " \
30 uEnv.txt \ 19 uEnv.txt \
31 boot.scr \ 20 boot.scr \
32 " 21 "
33
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
9 9
10PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot" 10PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"
11 11
12MACHINE_FEATURES = "ext2 vfat usbhost usbgadget keyboard screen alsa sdio" 12MACHINE_FEATURES += "keyboard screen alsa sdio"
13SERIAL_CONSOLES ?= "115200;ttyPS0"
14 13
15MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree"
16
17UBOOT_MACHINE ?= "xilinx_zynq_virt_defconfig"
18SPL_BINARY ?= "spl/boot.bin" 14SPL_BINARY ?= "spl/boot.bin"
19FORCE_PLATFORM_INIT = "1" 15FORCE_PLATFORM_INIT = "1"
20UBOOT_ELF = "u-boot" 16UBOOT_ELF = "u-boot"
21 17
22EXTRA_IMAGEDEPENDS += " \
23 u-boot-zynq-uenv \
24 virtual/boot-bin \
25 virtual/bitstream \
26 virtual/bootloader \
27 u-boot-zynq-scr \
28 "
29
30IMAGE_BOOT_FILES += " \ 18IMAGE_BOOT_FILES += " \
31 boot.bin \ 19 boot.bin \
32 bitstream \ 20 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 @@
8 8
9require conf/machine/zynq-generic.conf 9require conf/machine/zynq-generic.conf
10 10
11MACHINE_FEATURES = "ext2 vfat usbhost usbgadget"
12
13# u-boot configuration 11# u-boot configuration
14PREFERRED_PROVIDER_virtual/bootloader = "u-boot" 12PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
15UBOOT_MACHINE ?= "xilinx_zynq_virt_defconfig"
16SPL_BINARY ?= "spl/boot.bin" 13SPL_BINARY ?= "spl/boot.bin"
17UBOOT_ELF = "u-boot" 14UBOOT_ELF = "u-boot"
18 15
@@ -23,8 +20,6 @@ EXTRA_IMAGEDEPENDS += " \
23 u-boot-zynq-scr \ 20 u-boot-zynq-scr \
24 " 21 "
25 22
26SERIAL_CONSOLES ?= "115200;ttyPS0"
27
28KERNEL_DEVICETREE = "zynq-zybo.dtb" 23KERNEL_DEVICETREE = "zynq-zybo.dtb"
29 24
30IMAGE_BOOT_FILES += " \ 25IMAGE_BOOT_FILES += " \
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2026-07-27 23:19:19 +0000