summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@amd.com>2024-08-17 20:52:49 -0600
committerMark Hatle <mark.hatle@amd.com>2024-09-13 07:13:30 -0600
commitd61b27238a4b5bc0b2c22b0152f3be193a171405 (patch)
tree2daa0b41f36a2d54e0e6798bde9f6f991b52bff3
parentdd65327ec173eeef99890e68245701d82aee4411 (diff)
downloadmeta-xilinx-d61b27238a4b5bc0b2c22b0152f3be193a171405.tar.gz
meta-xilinx-bsp: Move qemu BSPs to meta-xilinx-tools
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
-rw-r--r--meta-xilinx-bsp/conf/machine/qemu-zynqmp-cg.conf42
-rw-r--r--meta-xilinx-bsp/conf/machine/qemu-zynqmp-dr.conf42
-rw-r--r--meta-xilinx-bsp/conf/machine/qemu-zynqmp-eg.conf42
-rw-r--r--meta-xilinx-bsp/conf/machine/qemu-zynqmp-ev.conf42
-rw-r--r--meta-xilinx-bsp/conf/machine/qemu-zynqmp.conf45
5 files changed, 0 insertions, 213 deletions
diff --git a/meta-xilinx-bsp/conf/machine/qemu-zynqmp-cg.conf b/meta-xilinx-bsp/conf/machine/qemu-zynqmp-cg.conf
deleted file mode 100644
index cb92bc71..00000000
--- a/meta-xilinx-bsp/conf/machine/qemu-zynqmp-cg.conf
+++ /dev/null
@@ -1,42 +0,0 @@
1#@TYPE: Machine
2#@NAME: QEMU ZynqMP CG machine
3#@DESCRIPTION: Machine configuration for running a ZynqMP CG system on QEMU w/ testimage
4
5# This machine is NOT designed to be inherited by other machines or used as an
6# example of how to create a machine. It is only useful for running testimage
7# with runqemu.
8
9#### Preamble
10MACHINEOVERRIDES =. "${@['', 'qemu-zynqmp-cg:']['qemu-zynqmp-cg' !='${MACHINE}']}"
11#### Regular settings follow
12
13# The following is from conf/machine/include/qemu.inc, but we can not use it
14# as it changes other values that need to come from the distro and the
15# AMD machine settings
16XSERVER ?= "xserver-xorg \
17 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \
18 xf86-video-fbdev \
19 xf86-video-modesetting \
20 "
21
22MACHINE_FEATURES = "alsa bluetooth usbgadget screen vfat"
23
24MACHINEOVERRIDES =. "qemuall:"
25
26IMAGE_FSTYPES += "tar.bz2 ext4"
27
28# Don't include kernels in standard images
29RDEPENDS:${KERNEL_PACKAGE_NAME}-base = ""
30
31# Provide the nfs server kernel module for all qemu images
32KERNEL_FEATURES:append:pn-linux-yocto = " features/nfsd/nfsd-enable.scc"
33KERNEL_FEATURES:append:pn-linux-yocto-rt = " features/nfsd/nfsd-enable.scc"
34KERNEL_FEATURES:append:pn-linux-xlnx = " features/nfsd/nfsd-enable.scc"
35
36
37# Now include the generic machine which already supports QEMU booting
38require conf/machine/zynqmp-cg-generic.conf
39
40#### No additional settings should be after the Postamble
41#### Postamble
42PACKAGE_EXTRA_ARCHS:append = "${@['', ' qemu_zynqmp_cg']['qemu-zynqmp-cg' != '${MACHINE}']}"
diff --git a/meta-xilinx-bsp/conf/machine/qemu-zynqmp-dr.conf b/meta-xilinx-bsp/conf/machine/qemu-zynqmp-dr.conf
deleted file mode 100644
index 5fcb3541..00000000
--- a/meta-xilinx-bsp/conf/machine/qemu-zynqmp-dr.conf
+++ /dev/null
@@ -1,42 +0,0 @@
1#@TYPE: Machine
2#@NAME: QEMU ZynqMP DR machine
3#@DESCRIPTION: Machine configuration for running a ZynqMP DR system on QEMU w/ testimage
4
5# This machine is NOT designed to be inherited by other machines or used as an
6# example of how to create a machine. It is only useful for running testimage
7# with runqemu.
8
9#### Preamble
10MACHINEOVERRIDES =. "${@['', 'qemu-zynqmp-dr:']['qemu-zynqmp-dr' !='${MACHINE}']}"
11#### Regular settings follow
12
13# The following is from conf/machine/include/qemu.inc, but we can not use it
14# as it changes other values that need to come from the distro and the
15# AMD machine settings
16XSERVER ?= "xserver-xorg \
17 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \
18 xf86-video-fbdev \
19 xf86-video-modesetting \
20 "
21
22MACHINE_FEATURES = "alsa bluetooth usbgadget screen vfat"
23
24MACHINEOVERRIDES =. "qemuall:"
25
26IMAGE_FSTYPES += "tar.bz2 ext4"
27
28# Don't include kernels in standard images
29RDEPENDS:${KERNEL_PACKAGE_NAME}-base = ""
30
31# Provide the nfs server kernel module for all qemu images
32KERNEL_FEATURES:append:pn-linux-yocto = " features/nfsd/nfsd-enable.scc"
33KERNEL_FEATURES:append:pn-linux-yocto-rt = " features/nfsd/nfsd-enable.scc"
34KERNEL_FEATURES:append:pn-linux-xlnx = " features/nfsd/nfsd-enable.scc"
35
36
37# Now include the generic machine which already supports QEMU booting
38require conf/machine/zynqmp-dr-generic.conf
39
40#### No additional settings should be after the Postamble
41#### Postamble
42PACKAGE_EXTRA_ARCHS:append = "${@['', ' qemu_zynqmp_dr']['qemu-zynqmp-dr' != '${MACHINE}']}"
diff --git a/meta-xilinx-bsp/conf/machine/qemu-zynqmp-eg.conf b/meta-xilinx-bsp/conf/machine/qemu-zynqmp-eg.conf
deleted file mode 100644
index 5f4b972c..00000000
--- a/meta-xilinx-bsp/conf/machine/qemu-zynqmp-eg.conf
+++ /dev/null
@@ -1,42 +0,0 @@
1#@TYPE: Machine
2#@NAME: QEMU ZynqMP EG machine
3#@DESCRIPTION: Machine configuration for running a ZynqMP EG system on QEMU w/ testimage
4
5# This machine is NOT designed to be inherited by other machines or used as an
6# example of how to create a machine. It is only useful for running testimage
7# with runqemu.
8
9#### Preamble
10MACHINEOVERRIDES =. "${@['', 'qemu-zynqmp-eg:']['qemu-zynqmp-eg' !='${MACHINE}']}"
11#### Regular settings follow
12
13# The following is from conf/machine/include/qemu.inc, but we can not use it
14# as it changes other values that need to come from the distro and the
15# AMD machine settings
16XSERVER ?= "xserver-xorg \
17 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \
18 xf86-video-fbdev \
19 xf86-video-modesetting \
20 "
21
22MACHINE_FEATURES = "alsa bluetooth usbgadget screen vfat"
23
24MACHINEOVERRIDES =. "qemuall:"
25
26IMAGE_FSTYPES += "tar.bz2 ext4"
27
28# Don't include kernels in standard images
29RDEPENDS:${KERNEL_PACKAGE_NAME}-base = ""
30
31# Provide the nfs server kernel module for all qemu images
32KERNEL_FEATURES:append:pn-linux-yocto = " features/nfsd/nfsd-enable.scc"
33KERNEL_FEATURES:append:pn-linux-yocto-rt = " features/nfsd/nfsd-enable.scc"
34KERNEL_FEATURES:append:pn-linux-xlnx = " features/nfsd/nfsd-enable.scc"
35
36
37# Now include the generic machine which already supports QEMU booting
38require conf/machine/zynqmp-eg-generic.conf
39
40#### No additional settings should be after the Postamble
41#### Postamble
42PACKAGE_EXTRA_ARCHS:append = "${@['', ' qemu_zynqmp_eg']['qemu-zynqmp-eg' != '${MACHINE}']}"
diff --git a/meta-xilinx-bsp/conf/machine/qemu-zynqmp-ev.conf b/meta-xilinx-bsp/conf/machine/qemu-zynqmp-ev.conf
deleted file mode 100644
index 6058bfa4..00000000
--- a/meta-xilinx-bsp/conf/machine/qemu-zynqmp-ev.conf
+++ /dev/null
@@ -1,42 +0,0 @@
1#@TYPE: Machine
2#@NAME: QEMU ZynqMP EV machine
3#@DESCRIPTION: Machine configuration for running a ZynqMP EV system on QEMU w/ testimage
4
5# This machine is NOT designed to be inherited by other machines or used as an
6# example of how to create a machine. It is only useful for running testimage
7# with runqemu.
8
9#### Preamble
10MACHINEOVERRIDES =. "${@['', 'qemu-zynqmp-ev:']['qemu-zynqmp-ev' !='${MACHINE}']}"
11#### Regular settings follow
12
13# The following is from conf/machine/include/qemu.inc, but we can not use it
14# as it changes other values that need to come from the distro and the
15# AMD machine settings
16XSERVER ?= "xserver-xorg \
17 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \
18 xf86-video-fbdev \
19 xf86-video-modesetting \
20 "
21
22MACHINE_FEATURES = "alsa bluetooth usbgadget screen vfat"
23
24MACHINEOVERRIDES =. "qemuall:"
25
26IMAGE_FSTYPES += "tar.bz2 ext4"
27
28# Don't include kernels in standard images
29RDEPENDS:${KERNEL_PACKAGE_NAME}-base = ""
30
31# Provide the nfs server kernel module for all qemu images
32KERNEL_FEATURES:append:pn-linux-yocto = " features/nfsd/nfsd-enable.scc"
33KERNEL_FEATURES:append:pn-linux-yocto-rt = " features/nfsd/nfsd-enable.scc"
34KERNEL_FEATURES:append:pn-linux-xlnx = " features/nfsd/nfsd-enable.scc"
35
36
37# Now include the generic machine which already supports QEMU booting
38require conf/machine/zynqmp-ev-generic.conf
39
40#### No additional settings should be after the Postamble
41#### Postamble
42PACKAGE_EXTRA_ARCHS:append = "${@['', ' qemu_zynqmp_ev']['qemu-zynqmp-ev' != '${MACHINE}']}"
diff --git a/meta-xilinx-bsp/conf/machine/qemu-zynqmp.conf b/meta-xilinx-bsp/conf/machine/qemu-zynqmp.conf
deleted file mode 100644
index 91a96ede..00000000
--- a/meta-xilinx-bsp/conf/machine/qemu-zynqmp.conf
+++ /dev/null
@@ -1,45 +0,0 @@
1#@TYPE: Machine
2#@NAME: QEMU ZynqMP machine
3#@DESCRIPTION: Machine configuration for running a ZynqMP system on QEMU w/ testimage
4
5# This machine is NOT designed to be inherited by other machines or used as an
6# example of how to create a machine. It is only useful for running testimage
7# with runqemu.
8
9#### Preamble
10MACHINEOVERRIDES =. "${@['', 'qemu-zynqmp:']['qemu-zynqmp' !='${MACHINE}']}"
11#### Regular settings follow
12
13# The following is from conf/machine/include/qemu.inc, but we can not use it
14# as it changes other values that need to come from the distro and the
15# AMD machine settings
16XSERVER ?= "xserver-xorg \
17 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \
18 xf86-video-fbdev \
19 xf86-video-modesetting \
20 "
21
22MACHINE_FEATURES = "alsa bluetooth usbgadget screen vfat"
23
24MACHINEOVERRIDES =. "qemuall:"
25
26IMAGE_FSTYPES += "tar.bz2 ext4"
27
28# Don't include kernels in standard images
29RDEPENDS:${KERNEL_PACKAGE_NAME}-base = ""
30
31# Provide the nfs server kernel module for all qemu images
32KERNEL_FEATURES:append:pn-linux-yocto = " features/nfsd/nfsd-enable.scc"
33KERNEL_FEATURES:append:pn-linux-yocto-rt = " features/nfsd/nfsd-enable.scc"
34KERNEL_FEATURES:append:pn-linux-xlnx = " features/nfsd/nfsd-enable.scc"
35
36
37# Now include the generic machine which already supports QEMU booting
38require conf/machine/zynqmp-generic.conf
39
40# This may break standalone runqemu, but allows testimage to work
41QB_XILINX_SERIAL = ""
42
43#### No additional settings should be after the Postamble
44#### Postamble
45PACKAGE_EXTRA_ARCHS:append = "${@['', ' qemu_zynqmp']['qemu-zynqmp' != '${MACHINE}']}"