summaryrefslogtreecommitdiffstats
path: root/meta-xilinx-bsp/conf
diff options
context:
space:
mode:
authorSandeep Gundlupet Raju <sandeep.gundlupet-raju@xilinx.com>2022-05-05 18:50:43 -0600
committerMark Hatle <mark.hatle@kernel.crashing.org>2022-07-28 14:45:08 -0500
commit4cd0ab00c97616b7a608f82c294176c153d94c43 (patch)
treedc849842123855d62cd429b868abf1afcc9e06b4 /meta-xilinx-bsp/conf
parentf8c539d132287876539e4e12c5eff6b55717e26e (diff)
downloadmeta-xilinx-4cd0ab00c97616b7a608f82c294176c153d94c43.tar.gz
meta-xilinx: Clean up vendor specific machine configuration files
1. Add new metal-xilinx-vendor layer which supports vendor specific machine configuration files, device-tree, kernel, platform-init etc. 2. Moved below vendor machine conf files, dt and related configs from meta-xilinx-bsp and meta-xilinx-contrib to meta-xilinx-vendor layer. - microzed-zynq7.conf - minized-zynq7.conf - picozed-zynq7.conf - zedboard-zynq7.conf - zybo-zynq7.conf - zybo-linux-bd-zynq7.conf - ultra96-zynqmp.conf 3. Obsolete qemu-zynq7, s3adsp1800-qemu-microblazeeb, v350-versal and vc-p-a2197-00-versal from meta-xilinx-bsp layer. Users should use zynq-generic.conf for zynq7000 qemu boot should be functionally equivalent to qemu-zynq7. 4. Add new MAINTAINERS.md file and move maintainers, Mailing list and Patches content from meta-xilinx-* README.md to MAINTAINERS.md file. 5. Updated README.md file for supported board machines files in meta-xilinx-bsp, meta-xilinx-contrib and meta-xilinx-vendor layers. 6. Disabled old drm kernel patches for zybo-linux-bd-zynq mahcine in meta-xilinx-contrib layer as these patches doesn't apply on 5.x kernel, if we don't hear from patch submitter we will remove these patches from meta-xilinx-contrib layer. 7. Removed drm kernel cache metadate for zybo-linux-bd-zynq7 machine as these configs are already available in xilinx_zynq_defconfig. 8. Fixed build issue for u-boot by changing PREFERRED_PROVIDER_virtual/bootloader from u-boot to u-boot-xlnx. 9. Add meta-xilinx-vendor to bblayers.conf.sample Signed-off-by: Sandeep Gundlupet Raju <sandeep.gundlupet-raju@xilinx.com> Signed-off-by: Mark Hatle <mhatle@xilinx.com>
Diffstat (limited to 'meta-xilinx-bsp/conf')
-rw-r--r--meta-xilinx-bsp/conf/machine/include/board/ultra96.inc12
-rw-r--r--meta-xilinx-bsp/conf/machine/microzed-zynq7.conf26
-rw-r--r--meta-xilinx-bsp/conf/machine/ml605-qemu-microblazeel.conf20
-rw-r--r--meta-xilinx-bsp/conf/machine/picozed-zynq7.conf28
-rw-r--r--meta-xilinx-bsp/conf/machine/qemu-zynq7.conf9
-rw-r--r--meta-xilinx-bsp/conf/machine/s3adsp1800-qemu-microblazeeb.conf21
-rw-r--r--meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf23
-rw-r--r--meta-xilinx-bsp/conf/machine/v350-versal.conf19
-rw-r--r--meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf10
-rw-r--r--meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf24
-rw-r--r--meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf27
-rw-r--r--meta-xilinx-bsp/conf/machine/zybo-zynq7.conf29
12 files changed, 0 insertions, 248 deletions
diff --git a/meta-xilinx-bsp/conf/machine/include/board/ultra96.inc b/meta-xilinx-bsp/conf/machine/include/board/ultra96.inc
deleted file mode 100644
index bfb57e00..00000000
--- a/meta-xilinx-bsp/conf/machine/include/board/ultra96.inc
+++ /dev/null
@@ -1,12 +0,0 @@
1# Ultra96 items that need to be configured from zynqmp-generic
2KERNEL_DEVICETREE:ultra96 = "xilinx/zynqmp-zcu100-revC.dtb"
3
4# Affects meta-xilinx-tools xsctyaml.bbclass related items
5YAML_SERIAL_CONSOLE_STDIN:ultra96 ?= "psu_uart_1"
6YAML_SERIAL_CONSOLE_STDOUT:ultra96 ?= "psu_uart_1"
7
8YAML_COMPILER_FLAGS:append:ultra96 = " -DBOARD_SHUTDOWN_PIN=2 -DBOARD_SHUTDOWN_PIN_STATE=0 "
9
10# Enable bluetooth and wifi module
11MACHINE_ESSENTIAL_EXTRA_RDEPENDS:append:ultra96 = " linux-firmware-wl18xx linux-firmware-ti-bt-wl180x"
12
diff --git a/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf b/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf
deleted file mode 100644
index c0e8e6dd..00000000
--- a/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf
+++ /dev/null
@@ -1,26 +0,0 @@
1#@TYPE: Machine
2#@NAME: microzed-zynq7
3#@DESCRIPTION: Machine support for microZed. (http://www.microzed.org/)
4
5require conf/machine/zynq-generic.conf
6
7# u-boot configuration
8PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
9
10SPL_BINARY ?= "spl/boot.bin"
11UBOOT_ELF = "u-boot"
12
13EXTRA_IMAGEDEPENDS += " \
14 u-boot-zynq-uenv \
15 virtual/boot-bin \
16 virtual/bootloader \
17 u-boot-zynq-scr \
18 "
19
20KERNEL_DEVICETREE = "zynq-microzed.dtb"
21
22IMAGE_BOOT_FILES += " \
23 boot.bin \
24 uEnv.txt \
25 "
26
diff --git a/meta-xilinx-bsp/conf/machine/ml605-qemu-microblazeel.conf b/meta-xilinx-bsp/conf/machine/ml605-qemu-microblazeel.conf
deleted file mode 100644
index 157a75c2..00000000
--- a/meta-xilinx-bsp/conf/machine/ml605-qemu-microblazeel.conf
+++ /dev/null
@@ -1,20 +0,0 @@
1#@TYPE: Machine
2#@NAME: ml605-qemu-microblazeel
3#@DESCRIPTION: MicroBlaze QEMU machine support ('petalogix-ml605' model)
4
5TUNE_FEATURES:tune-microblaze ?= "microblaze v8.50 barrel-shift reorder pattern-compare divide-hard multiply-high fpu-hard"
6
7require conf/machine/microblaze-generic.conf
8
9USE_VT = ""
10
11# Use the networking setup from qemuarm
12MACHINEOVERRIDES:prepend:pn-init-ifupdown = "qemuall:"
13FILESOVERRIDES:append:pn-init-ifupdown = ":qemuarm"
14
15# This machine is a targeting a QEMU model, runqemu setup:
16QB_MEM = "-m 256"
17QB_MACHINE = "-machine petalogix-ml605"
18QB_OPT_APPEND = "-nographic -serial mon:stdio"
19QB_NETWORK_DEVICE = "-net nic,netdev=net0,macaddr=@MAC@"
20
diff --git a/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf b/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf
deleted file mode 100644
index d4f63f95..00000000
--- a/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf
+++ /dev/null
@@ -1,28 +0,0 @@
1#@TYPE: Machine
2#@NAME: picozed-zynq7
3#@DESCRIPTION: Machine support for picoZed. (http://www.picozed.org/)
4#
5# Note: This machine configuration is intended as a generic config for
6# the picozed SOM. It also covers the multiple SKUs for the picoZed
7# including 7010, 7020, 7015 and 7030.
8
9require conf/machine/zynq-generic.conf
10
11# u-boot configuration
12PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
13
14SPL_BINARY ?= "spl/boot.bin"
15UBOOT_ELF = "u-boot"
16
17EXTRA_IMAGEDEPENDS += " \
18 u-boot-zynq-uenv \
19 virtual/boot-bin \
20 virtual/bootloader \
21 u-boot-zynq-scr \
22 "
23
24IMAGE_BOOT_FILES += " \
25 boot.bin \
26 uEnv.txt \
27 "
28
diff --git a/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf b/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf
deleted file mode 100644
index f28e3d4a..00000000
--- a/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf
+++ /dev/null
@@ -1,9 +0,0 @@
1#@TYPE: Machine
2#@NAME: qemu-zynq7
3#@DESCRIPTION: Zynq QEMU machine support ('xilinx-zynq-a9' model)
4
5require conf/machine/zynq-generic.conf
6
7# Use the networking setup from qemuarm
8MACHINEOVERRIDES:prepend:pn-init-ifupdown = "qemuall:"
9FILESOVERRIDES:append:pn-init-ifupdown = ":qemuarm"
diff --git a/meta-xilinx-bsp/conf/machine/s3adsp1800-qemu-microblazeeb.conf b/meta-xilinx-bsp/conf/machine/s3adsp1800-qemu-microblazeeb.conf
deleted file mode 100644
index 12621357..00000000
--- a/meta-xilinx-bsp/conf/machine/s3adsp1800-qemu-microblazeeb.conf
+++ /dev/null
@@ -1,21 +0,0 @@
1#@TYPE: Machine
2#@NAME: s3adsp1800-qemu-microblazeeb
3#@DESCRIPTION: MicroBlaze QEMU machine support ('petalogix-s3adsp1800' model)
4
5TUNE_FEATURES:tune-microblaze ?= "microblaze v8.00 bigendian barrel-shift pattern-compare multiply-low"
6
7require conf/machine/microblaze-generic.conf
8
9MACHINE_FEATURES = ""
10
11USE_VT = ""
12SERIAL_CONSOLES ?= "115200;ttyUL0"
13
14KERNEL_IMAGETYPE ?= "linux.bin.ub"
15
16# This machine is a targeting a QEMU model, runqemu setup:
17QB_MEM = "-m 256"
18QB_MACHINE = "-machine petalogix-s3adsp1800"
19QB_OPT_APPEND = "-nographic -serial mon:stdio"
20QB_NETWORK_DEVICE = "-net nic,netdev=net0,macaddr=@MAC@"
21
diff --git a/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf b/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf
deleted file mode 100644
index ff74ac3d..00000000
--- a/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf
+++ /dev/null
@@ -1,23 +0,0 @@
1#@TYPE: Machine
2#@NAME: ultra96-zynqmp
3#@DESCRIPTION: Machine support for Ultra96 Evaluation Board.
4#
5
6SOC_VARIANT = 'eg'
7
8require conf/machine/zynqmp-generic.conf
9
10# Add board compatibility override
11MACHINEOVERRIDES .= ":ultra96"
12
13KERNEL_DEVICETREE = "xilinx/zynqmp-zcu100-revC.dtb"
14
15# Affects meta-xilinx-tools xsctyaml.bbclass related items
16YAML_SERIAL_CONSOLE_STDIN ?= "psu_uart_1"
17YAML_SERIAL_CONSOLE_STDOUT ?= "psu_uart_1"
18
19YAML_COMPILER_FLAGS:append = " -DBOARD_SHUTDOWN_PIN=2 -DBOARD_SHUTDOWN_PIN_STATE=0 "
20
21# Enable bluetooth and wifi module
22MACHINE_ESSENTIAL_EXTRA_RDEPENDS:append = " linux-firmware-wl18xx linux-firmware-ti-bt-wl180x"
23
diff --git a/meta-xilinx-bsp/conf/machine/v350-versal.conf b/meta-xilinx-bsp/conf/machine/v350-versal.conf
deleted file mode 100644
index d865dc5a..00000000
--- a/meta-xilinx-bsp/conf/machine/v350-versal.conf
+++ /dev/null
@@ -1,19 +0,0 @@
1#@TYPE: Machine
2#@NAME: v350-versal
3##@DESCRIPTION: Machine support for v350 versal.
4
5SOC_VARIANT = "ai-core"
6
7require conf/machine/versal-generic.conf
8
9# Add board compatibility override
10MACHINEOVERRIDES .= ":v350"
11
12EXTRA_IMAGEDEPENDS += " \
13 arm-trusted-firmware \
14 virtual/boot-bin \
15 virtual/bootloader \
16 virtual/psm-firmware \
17 virtual/plm \
18 u-boot-zynq-scr \
19"
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
deleted file mode 100644
index c20166e3..00000000
--- a/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf
+++ /dev/null
@@ -1,10 +0,0 @@
1#@TYPE: Machine
2#@NAME: vc-p-a2197-versal
3##@DESCRIPTION: Machine support for vc-p-a2197 versal .
4
5SOC_VARIANT = "ai-core"
6
7require conf/machine/versal-generic.conf
8
9# Add board compatibility override
10MACHINEOVERRIDES .= ":vc-p-a2197-00"
diff --git a/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf b/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf
deleted file mode 100644
index 4da6bb4e..00000000
--- a/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf
+++ /dev/null
@@ -1,24 +0,0 @@
1#@TYPE: Machine
2#@NAME: zedboard-zynq7
3#@DESCRIPTION: Machine support for ZedBoard. (http://www.zedboard.org/)
4#
5# For details on the Evaluation board:
6# http://www.zedboard.org/content/overview
7# For design files (including 'zynq_fsbl_0.elf') for the ZedBoard:
8# http://www.zedboard.org/reference-designs-categories/zynq-concepts-tools-and-techniques-zedboard
9#
10
11require conf/machine/zynq-generic.conf
12
13# Add board compatibility override
14MACHINEOVERRIDES .= ":zedboard"
15
16SPL_BINARY ?= "spl/boot.bin"
17
18KERNEL_DEVICETREE = "zynq-zed.dtb"
19
20IMAGE_BOOT_FILES += " \
21 boot.bin \
22 uEnv.txt \
23 boot.scr \
24 "
diff --git a/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf b/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf
deleted file mode 100644
index df26ea0d..00000000
--- a/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf
+++ /dev/null
@@ -1,27 +0,0 @@
1#@TYPE: Machine
2#@NAME: zybo-linux-bd-zynq7
3#@DESCRIPTION: Machine support for zybo-linux-bd project.
4#
5# generated base on ZYBO linux-bd project
6#
7
8require conf/machine/zynq-generic.conf
9
10PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"
11
12MACHINE_FEATURES += "keyboard screen alsa sdio"
13
14SPL_BINARY ?= "spl/boot.bin"
15FORCE_PLATFORM_INIT = "1"
16UBOOT_ELF = "u-boot"
17
18IMAGE_BOOT_FILES += " \
19 boot.bin \
20 bitstream \
21 uEnv.txt \
22 "
23
24KERNEL_FEATURES += " \
25 bsp/xilinx/zybo-linux-bd-zynq7/zybo-linux-bd-zynq7.scc \
26 features/xilinx/v4l2/v4l2.scc \
27 "
diff --git a/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf b/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf
deleted file mode 100644
index aa1eafe4..00000000
--- a/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf
+++ /dev/null
@@ -1,29 +0,0 @@
1#@TYPE: Machine
2#@NAME: zybo-zynq7
3#@DESCRIPTION: Machine support for ZYBO.
4#
5# For details on the ZYBO board:
6# https://www.digilentinc.com/Products/Detail.cfm?Prod=ZYBO
7#
8
9require conf/machine/zynq-generic.conf
10
11# u-boot configuration
12PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
13SPL_BINARY ?= "spl/boot.bin"
14UBOOT_ELF = "u-boot"
15
16EXTRA_IMAGEDEPENDS += " \
17 u-boot-zynq-uenv \
18 virtual/boot-bin \
19 virtual/bootloader \
20 u-boot-zynq-scr \
21 "
22
23KERNEL_DEVICETREE = "zynq-zybo.dtb"
24
25IMAGE_BOOT_FILES += " \
26 boot.bin \
27 uEnv.txt \
28 "
29