diff options
author | Mark Hatle <mark.hatle@amd.com> | 2023-12-12 15:43:47 -0700 |
---|---|---|
committer | Mark Hatle <mark.hatle@amd.com> | 2023-12-12 15:43:47 -0700 |
commit | 043fe924b10ec881baa3aeeca1a8181d6604c180 (patch) | |
tree | ba682be6bd626d2c527035280425d5f96c4d1f6b | |
parent | b3d89aa7c1078d6768a0ffe01281596b6c859d58 (diff) | |
download | meta-xilinx-043fe924b10ec881baa3aeeca1a8181d6604c180.tar.gz |
meta-xilinx-bsp: qemu-zynqmp*.conf: Add qemu/testimage machines
Testimage has specific requirements about how the filesystem, qemu and other
components are configured. Create a special QEMU bsp for the ZynqMP and
it's variants. Note, eg/ev can not emulate the Mali, so may fail mesa and
OpenGL/GLES testing.
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
-rw-r--r-- | meta-xilinx-bsp/conf/machine/qemu-zynqmp-cg.conf | 42 | ||||
-rw-r--r-- | meta-xilinx-bsp/conf/machine/qemu-zynqmp-dr.conf | 42 | ||||
-rw-r--r-- | meta-xilinx-bsp/conf/machine/qemu-zynqmp-eg.conf | 42 | ||||
-rw-r--r-- | meta-xilinx-bsp/conf/machine/qemu-zynqmp-ev.conf | 42 | ||||
-rw-r--r-- | meta-xilinx-bsp/conf/machine/qemu-zynqmp.conf | 45 |
5 files changed, 213 insertions, 0 deletions
diff --git a/meta-xilinx-bsp/conf/machine/qemu-zynqmp-cg.conf b/meta-xilinx-bsp/conf/machine/qemu-zynqmp-cg.conf new file mode 100644 index 00000000..cb92bc71 --- /dev/null +++ b/meta-xilinx-bsp/conf/machine/qemu-zynqmp-cg.conf | |||
@@ -0,0 +1,42 @@ | |||
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 | ||
10 | MACHINEOVERRIDES =. "${@['', '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 | ||
16 | XSERVER ?= "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 | |||
22 | MACHINE_FEATURES = "alsa bluetooth usbgadget screen vfat" | ||
23 | |||
24 | MACHINEOVERRIDES =. "qemuall:" | ||
25 | |||
26 | IMAGE_FSTYPES += "tar.bz2 ext4" | ||
27 | |||
28 | # Don't include kernels in standard images | ||
29 | RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" | ||
30 | |||
31 | # Provide the nfs server kernel module for all qemu images | ||
32 | KERNEL_FEATURES:append:pn-linux-yocto = " features/nfsd/nfsd-enable.scc" | ||
33 | KERNEL_FEATURES:append:pn-linux-yocto-rt = " features/nfsd/nfsd-enable.scc" | ||
34 | KERNEL_FEATURES:append:pn-linux-xlnx = " features/nfsd/nfsd-enable.scc" | ||
35 | |||
36 | |||
37 | # Now include the generic machine which already supports QEMU booting | ||
38 | require conf/machine/zynqmp-cg-generic.conf | ||
39 | |||
40 | #### No additional settings should be after the Postamble | ||
41 | #### Postamble | ||
42 | PACKAGE_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 new file mode 100644 index 00000000..5fcb3541 --- /dev/null +++ b/meta-xilinx-bsp/conf/machine/qemu-zynqmp-dr.conf | |||
@@ -0,0 +1,42 @@ | |||
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 | ||
10 | MACHINEOVERRIDES =. "${@['', '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 | ||
16 | XSERVER ?= "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 | |||
22 | MACHINE_FEATURES = "alsa bluetooth usbgadget screen vfat" | ||
23 | |||
24 | MACHINEOVERRIDES =. "qemuall:" | ||
25 | |||
26 | IMAGE_FSTYPES += "tar.bz2 ext4" | ||
27 | |||
28 | # Don't include kernels in standard images | ||
29 | RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" | ||
30 | |||
31 | # Provide the nfs server kernel module for all qemu images | ||
32 | KERNEL_FEATURES:append:pn-linux-yocto = " features/nfsd/nfsd-enable.scc" | ||
33 | KERNEL_FEATURES:append:pn-linux-yocto-rt = " features/nfsd/nfsd-enable.scc" | ||
34 | KERNEL_FEATURES:append:pn-linux-xlnx = " features/nfsd/nfsd-enable.scc" | ||
35 | |||
36 | |||
37 | # Now include the generic machine which already supports QEMU booting | ||
38 | require conf/machine/zynqmp-dr-generic.conf | ||
39 | |||
40 | #### No additional settings should be after the Postamble | ||
41 | #### Postamble | ||
42 | PACKAGE_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 new file mode 100644 index 00000000..5f4b972c --- /dev/null +++ b/meta-xilinx-bsp/conf/machine/qemu-zynqmp-eg.conf | |||
@@ -0,0 +1,42 @@ | |||
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 | ||
10 | MACHINEOVERRIDES =. "${@['', '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 | ||
16 | XSERVER ?= "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 | |||
22 | MACHINE_FEATURES = "alsa bluetooth usbgadget screen vfat" | ||
23 | |||
24 | MACHINEOVERRIDES =. "qemuall:" | ||
25 | |||
26 | IMAGE_FSTYPES += "tar.bz2 ext4" | ||
27 | |||
28 | # Don't include kernels in standard images | ||
29 | RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" | ||
30 | |||
31 | # Provide the nfs server kernel module for all qemu images | ||
32 | KERNEL_FEATURES:append:pn-linux-yocto = " features/nfsd/nfsd-enable.scc" | ||
33 | KERNEL_FEATURES:append:pn-linux-yocto-rt = " features/nfsd/nfsd-enable.scc" | ||
34 | KERNEL_FEATURES:append:pn-linux-xlnx = " features/nfsd/nfsd-enable.scc" | ||
35 | |||
36 | |||
37 | # Now include the generic machine which already supports QEMU booting | ||
38 | require conf/machine/zynqmp-eg-generic.conf | ||
39 | |||
40 | #### No additional settings should be after the Postamble | ||
41 | #### Postamble | ||
42 | PACKAGE_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 new file mode 100644 index 00000000..6058bfa4 --- /dev/null +++ b/meta-xilinx-bsp/conf/machine/qemu-zynqmp-ev.conf | |||
@@ -0,0 +1,42 @@ | |||
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 | ||
10 | MACHINEOVERRIDES =. "${@['', '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 | ||
16 | XSERVER ?= "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 | |||
22 | MACHINE_FEATURES = "alsa bluetooth usbgadget screen vfat" | ||
23 | |||
24 | MACHINEOVERRIDES =. "qemuall:" | ||
25 | |||
26 | IMAGE_FSTYPES += "tar.bz2 ext4" | ||
27 | |||
28 | # Don't include kernels in standard images | ||
29 | RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" | ||
30 | |||
31 | # Provide the nfs server kernel module for all qemu images | ||
32 | KERNEL_FEATURES:append:pn-linux-yocto = " features/nfsd/nfsd-enable.scc" | ||
33 | KERNEL_FEATURES:append:pn-linux-yocto-rt = " features/nfsd/nfsd-enable.scc" | ||
34 | KERNEL_FEATURES:append:pn-linux-xlnx = " features/nfsd/nfsd-enable.scc" | ||
35 | |||
36 | |||
37 | # Now include the generic machine which already supports QEMU booting | ||
38 | require conf/machine/zynqmp-ev-generic.conf | ||
39 | |||
40 | #### No additional settings should be after the Postamble | ||
41 | #### Postamble | ||
42 | PACKAGE_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 new file mode 100644 index 00000000..91a96ede --- /dev/null +++ b/meta-xilinx-bsp/conf/machine/qemu-zynqmp.conf | |||
@@ -0,0 +1,45 @@ | |||
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 | ||
10 | MACHINEOVERRIDES =. "${@['', '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 | ||
16 | XSERVER ?= "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 | |||
22 | MACHINE_FEATURES = "alsa bluetooth usbgadget screen vfat" | ||
23 | |||
24 | MACHINEOVERRIDES =. "qemuall:" | ||
25 | |||
26 | IMAGE_FSTYPES += "tar.bz2 ext4" | ||
27 | |||
28 | # Don't include kernels in standard images | ||
29 | RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" | ||
30 | |||
31 | # Provide the nfs server kernel module for all qemu images | ||
32 | KERNEL_FEATURES:append:pn-linux-yocto = " features/nfsd/nfsd-enable.scc" | ||
33 | KERNEL_FEATURES:append:pn-linux-yocto-rt = " features/nfsd/nfsd-enable.scc" | ||
34 | KERNEL_FEATURES:append:pn-linux-xlnx = " features/nfsd/nfsd-enable.scc" | ||
35 | |||
36 | |||
37 | # Now include the generic machine which already supports QEMU booting | ||
38 | require conf/machine/zynqmp-generic.conf | ||
39 | |||
40 | # This may break standalone runqemu, but allows testimage to work | ||
41 | QB_XILINX_SERIAL = "" | ||
42 | |||
43 | #### No additional settings should be after the Postamble | ||
44 | #### Postamble | ||
45 | PACKAGE_EXTRA_ARCHS:append = "${@['', ' qemu_zynqmp']['qemu-zynqmp' != '${MACHINE}']}" | ||