From d61b27238a4b5bc0b2c22b0152f3be193a171405 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Sat, 17 Aug 2024 20:52:49 -0600 Subject: meta-xilinx-bsp: Move qemu BSPs to meta-xilinx-tools Signed-off-by: Mark Hatle --- meta-xilinx-bsp/conf/machine/qemu-zynqmp-cg.conf | 42 ---------------------- meta-xilinx-bsp/conf/machine/qemu-zynqmp-dr.conf | 42 ---------------------- meta-xilinx-bsp/conf/machine/qemu-zynqmp-eg.conf | 42 ---------------------- meta-xilinx-bsp/conf/machine/qemu-zynqmp-ev.conf | 42 ---------------------- meta-xilinx-bsp/conf/machine/qemu-zynqmp.conf | 45 ------------------------ 5 files changed, 213 deletions(-) delete mode 100644 meta-xilinx-bsp/conf/machine/qemu-zynqmp-cg.conf delete mode 100644 meta-xilinx-bsp/conf/machine/qemu-zynqmp-dr.conf delete mode 100644 meta-xilinx-bsp/conf/machine/qemu-zynqmp-eg.conf delete mode 100644 meta-xilinx-bsp/conf/machine/qemu-zynqmp-ev.conf delete mode 100644 meta-xilinx-bsp/conf/machine/qemu-zynqmp.conf 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 @@ -#@TYPE: Machine -#@NAME: QEMU ZynqMP CG machine -#@DESCRIPTION: Machine configuration for running a ZynqMP CG system on QEMU w/ testimage - -# This machine is NOT designed to be inherited by other machines or used as an -# example of how to create a machine. It is only useful for running testimage -# with runqemu. - -#### Preamble -MACHINEOVERRIDES =. "${@['', 'qemu-zynqmp-cg:']['qemu-zynqmp-cg' !='${MACHINE}']}" -#### Regular settings follow - -# The following is from conf/machine/include/qemu.inc, but we can not use it -# as it changes other values that need to come from the distro and the -# AMD machine settings -XSERVER ?= "xserver-xorg \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \ - xf86-video-fbdev \ - xf86-video-modesetting \ - " - -MACHINE_FEATURES = "alsa bluetooth usbgadget screen vfat" - -MACHINEOVERRIDES =. "qemuall:" - -IMAGE_FSTYPES += "tar.bz2 ext4" - -# Don't include kernels in standard images -RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" - -# Provide the nfs server kernel module for all qemu images -KERNEL_FEATURES:append:pn-linux-yocto = " features/nfsd/nfsd-enable.scc" -KERNEL_FEATURES:append:pn-linux-yocto-rt = " features/nfsd/nfsd-enable.scc" -KERNEL_FEATURES:append:pn-linux-xlnx = " features/nfsd/nfsd-enable.scc" - - -# Now include the generic machine which already supports QEMU booting -require conf/machine/zynqmp-cg-generic.conf - -#### No additional settings should be after the Postamble -#### Postamble -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 deleted file mode 100644 index 5fcb3541..00000000 --- a/meta-xilinx-bsp/conf/machine/qemu-zynqmp-dr.conf +++ /dev/null @@ -1,42 +0,0 @@ -#@TYPE: Machine -#@NAME: QEMU ZynqMP DR machine -#@DESCRIPTION: Machine configuration for running a ZynqMP DR system on QEMU w/ testimage - -# This machine is NOT designed to be inherited by other machines or used as an -# example of how to create a machine. It is only useful for running testimage -# with runqemu. - -#### Preamble -MACHINEOVERRIDES =. "${@['', 'qemu-zynqmp-dr:']['qemu-zynqmp-dr' !='${MACHINE}']}" -#### Regular settings follow - -# The following is from conf/machine/include/qemu.inc, but we can not use it -# as it changes other values that need to come from the distro and the -# AMD machine settings -XSERVER ?= "xserver-xorg \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \ - xf86-video-fbdev \ - xf86-video-modesetting \ - " - -MACHINE_FEATURES = "alsa bluetooth usbgadget screen vfat" - -MACHINEOVERRIDES =. "qemuall:" - -IMAGE_FSTYPES += "tar.bz2 ext4" - -# Don't include kernels in standard images -RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" - -# Provide the nfs server kernel module for all qemu images -KERNEL_FEATURES:append:pn-linux-yocto = " features/nfsd/nfsd-enable.scc" -KERNEL_FEATURES:append:pn-linux-yocto-rt = " features/nfsd/nfsd-enable.scc" -KERNEL_FEATURES:append:pn-linux-xlnx = " features/nfsd/nfsd-enable.scc" - - -# Now include the generic machine which already supports QEMU booting -require conf/machine/zynqmp-dr-generic.conf - -#### No additional settings should be after the Postamble -#### Postamble -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 deleted file mode 100644 index 5f4b972c..00000000 --- a/meta-xilinx-bsp/conf/machine/qemu-zynqmp-eg.conf +++ /dev/null @@ -1,42 +0,0 @@ -#@TYPE: Machine -#@NAME: QEMU ZynqMP EG machine -#@DESCRIPTION: Machine configuration for running a ZynqMP EG system on QEMU w/ testimage - -# This machine is NOT designed to be inherited by other machines or used as an -# example of how to create a machine. It is only useful for running testimage -# with runqemu. - -#### Preamble -MACHINEOVERRIDES =. "${@['', 'qemu-zynqmp-eg:']['qemu-zynqmp-eg' !='${MACHINE}']}" -#### Regular settings follow - -# The following is from conf/machine/include/qemu.inc, but we can not use it -# as it changes other values that need to come from the distro and the -# AMD machine settings -XSERVER ?= "xserver-xorg \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \ - xf86-video-fbdev \ - xf86-video-modesetting \ - " - -MACHINE_FEATURES = "alsa bluetooth usbgadget screen vfat" - -MACHINEOVERRIDES =. "qemuall:" - -IMAGE_FSTYPES += "tar.bz2 ext4" - -# Don't include kernels in standard images -RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" - -# Provide the nfs server kernel module for all qemu images -KERNEL_FEATURES:append:pn-linux-yocto = " features/nfsd/nfsd-enable.scc" -KERNEL_FEATURES:append:pn-linux-yocto-rt = " features/nfsd/nfsd-enable.scc" -KERNEL_FEATURES:append:pn-linux-xlnx = " features/nfsd/nfsd-enable.scc" - - -# Now include the generic machine which already supports QEMU booting -require conf/machine/zynqmp-eg-generic.conf - -#### No additional settings should be after the Postamble -#### Postamble -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 deleted file mode 100644 index 6058bfa4..00000000 --- a/meta-xilinx-bsp/conf/machine/qemu-zynqmp-ev.conf +++ /dev/null @@ -1,42 +0,0 @@ -#@TYPE: Machine -#@NAME: QEMU ZynqMP EV machine -#@DESCRIPTION: Machine configuration for running a ZynqMP EV system on QEMU w/ testimage - -# This machine is NOT designed to be inherited by other machines or used as an -# example of how to create a machine. It is only useful for running testimage -# with runqemu. - -#### Preamble -MACHINEOVERRIDES =. "${@['', 'qemu-zynqmp-ev:']['qemu-zynqmp-ev' !='${MACHINE}']}" -#### Regular settings follow - -# The following is from conf/machine/include/qemu.inc, but we can not use it -# as it changes other values that need to come from the distro and the -# AMD machine settings -XSERVER ?= "xserver-xorg \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \ - xf86-video-fbdev \ - xf86-video-modesetting \ - " - -MACHINE_FEATURES = "alsa bluetooth usbgadget screen vfat" - -MACHINEOVERRIDES =. "qemuall:" - -IMAGE_FSTYPES += "tar.bz2 ext4" - -# Don't include kernels in standard images -RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" - -# Provide the nfs server kernel module for all qemu images -KERNEL_FEATURES:append:pn-linux-yocto = " features/nfsd/nfsd-enable.scc" -KERNEL_FEATURES:append:pn-linux-yocto-rt = " features/nfsd/nfsd-enable.scc" -KERNEL_FEATURES:append:pn-linux-xlnx = " features/nfsd/nfsd-enable.scc" - - -# Now include the generic machine which already supports QEMU booting -require conf/machine/zynqmp-ev-generic.conf - -#### No additional settings should be after the Postamble -#### Postamble -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 deleted file mode 100644 index 91a96ede..00000000 --- a/meta-xilinx-bsp/conf/machine/qemu-zynqmp.conf +++ /dev/null @@ -1,45 +0,0 @@ -#@TYPE: Machine -#@NAME: QEMU ZynqMP machine -#@DESCRIPTION: Machine configuration for running a ZynqMP system on QEMU w/ testimage - -# This machine is NOT designed to be inherited by other machines or used as an -# example of how to create a machine. It is only useful for running testimage -# with runqemu. - -#### Preamble -MACHINEOVERRIDES =. "${@['', 'qemu-zynqmp:']['qemu-zynqmp' !='${MACHINE}']}" -#### Regular settings follow - -# The following is from conf/machine/include/qemu.inc, but we can not use it -# as it changes other values that need to come from the distro and the -# AMD machine settings -XSERVER ?= "xserver-xorg \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \ - xf86-video-fbdev \ - xf86-video-modesetting \ - " - -MACHINE_FEATURES = "alsa bluetooth usbgadget screen vfat" - -MACHINEOVERRIDES =. "qemuall:" - -IMAGE_FSTYPES += "tar.bz2 ext4" - -# Don't include kernels in standard images -RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" - -# Provide the nfs server kernel module for all qemu images -KERNEL_FEATURES:append:pn-linux-yocto = " features/nfsd/nfsd-enable.scc" -KERNEL_FEATURES:append:pn-linux-yocto-rt = " features/nfsd/nfsd-enable.scc" -KERNEL_FEATURES:append:pn-linux-xlnx = " features/nfsd/nfsd-enable.scc" - - -# Now include the generic machine which already supports QEMU booting -require conf/machine/zynqmp-generic.conf - -# This may break standalone runqemu, but allows testimage to work -QB_XILINX_SERIAL = "" - -#### No additional settings should be after the Postamble -#### Postamble -PACKAGE_EXTRA_ARCHS:append = "${@['', ' qemu_zynqmp']['qemu-zynqmp' != '${MACHINE}']}" -- cgit v1.2.3-54-g00ecf