[PATCH v5 1/4] kernel: move xen.mk to virtual.mk

Move Xen kernel modules into a general virtualization category.
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22942 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/kernel/modules/virtual.mk b/package/kernel/modules/virtual.mk
new file mode 100644 (file)
index 0000000..f988c16
--- /dev/null
+++ b/package/kernel/modules/virtual.mk
@@ -0,0 +1,110 @@
+#
+# Copyright (C) 2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+VIRTUAL_MENU:=Virtualization Support
+
+define KernelPackage/xen-fs
+  SUBMENU:=$(VIRTUAL_MENU)
+  TITLE:=Xen filesystem
+  DEPENDS:=@TARGET_x86_xen_domu
+  KCONFIG:= \
+       CONFIG_XENFS \
+       CONFIG_XEN_COMPAT_XENFS=y
+  FILES:=$(LINUX_DIR)/drivers/xen/xenfs/xenfs.ko
+  AUTOLOAD:=$(call AutoLoad,05,xenfs)
+endef
+
+define KernelPackage/xen-fs/description
+  Kernel module for the Xen filesystem
+endef
+
+$(eval $(call KernelPackage,xen-fs))
+
+
+define KernelPackage/xen-evtchn
+  SUBMENU:=$(VIRTUAL_MENU)
+  TITLE:=Xen event channels
+  DEPENDS:=@TARGET_x86_xen_domu
+  KCONFIG:=CONFIG_XEN_DEV_EVTCHN
+  FILES:=$(LINUX_DIR)/drivers/xen/evtchn.ko
+  AUTOLOAD:=$(call AutoLoad,06,evtchn)
+endef
+
+define KernelPackage/xen-evtchn/description
+  Kernel module for the /dev/xen/evtchn device
+endef
+
+$(eval $(call KernelPackage,xen-evtchn))
+
+# FIXME: the FB support should be moved to a separate kmod
+define KernelPackage/xen-fbdev
+  SUBMENU:=$(VIRTUAL_MENU)
+  TITLE:=Xen virtual frame buffer
+  DEPENDS:=@TARGET_x86_xen_domu
+  KCONFIG:= \
+       CONFIG_XEN_FBDEV_FRONTEND \
+       CONFIG_FB \
+       CONFIG_FB_DEFERRED_IO=y \
+       CONFIG_FB_SYS_COPYAREA \
+       CONFIG_FB_SYS_FILLRECT \
+       CONFIG_FB_SYS_FOPS \
+       CONFIG_FB_SYS_IMAGEBLIT \
+       CONFIG_FIRMWARE_EDID=n
+  FILES:= \
+       $(LINUX_DIR)/drivers/video/xen-fbfront.ko \
+       $(LINUX_DIR)/drivers/video/fb.ko \
+       $(LINUX_DIR)/drivers/video/syscopyarea.ko \
+       $(LINUX_DIR)/drivers/video/sysfillrect.ko \
+       $(LINUX_DIR)/drivers/video/fb_sys_fops.ko \
+       $(LINUX_DIR)/drivers/video/sysimgblt.ko         
+  AUTOLOAD:=$(call AutoLoad,07, \
+       fb \
+       syscopyarea \
+       sysfillrect \
+       fb_sys_fops \
+       sysimgblt \
+       xen-fbfront \
+  )
+endef
+
+define KernelPackage/xen-fbdev/description
+  Kernel module for the Xen virtual frame buffer
+endef
+
+$(eval $(call KernelPackage,xen-fbdev))
+
+
+define KernelPackage/xen-kbddev
+  SUBMENU:=$(VIRTUAL_MENU)
+  TITLE:=Xen virtual keyboard and mouse
+  DEPENDS:=@TARGET_x86_xen_domu
+  KCONFIG:=CONFIG_XEN_KBDDEV_FRONTEND
+  FILES:=$(LINUX_DIR)/drivers/input/xen-kbdfront.ko
+  AUTOLOAD:=$(call AutoLoad,08,xen-kbdfront)
+endef
+
+define KernelPackage/xen-kbddev/description
+  Kernel module for the Xen virtual keyboard and mouse
+endef
+
+$(eval $(call KernelPackage,xen-kbddev))
+
+
+define KernelPackage/xen-netdev
+  SUBMENU:=$(VIRTUAL_MENU)
+  TITLE:=Xen network device frontend
+  DEPENDS:=@TARGET_x86_xen_domu
+  KCONFIG:=CONFIG_XEN_NETDEV_FRONTEND
+  FILES:=$(LINUX_DIR)/drivers/net/xen-netfront.ko
+  AUTOLOAD:=$(call AutoLoad,09,xen-netfront)
+endef
+
+define KernelPackage/xen-netdev/description
+  Kernel module for the Xen network device frontend
+endef
+
+$(eval $(call KernelPackage,xen-netdev))

diff --git a/package/kernel/modules/xen.mk b/package/kernel/modules/xen.mk
deleted file mode 100644 (file)
index b0ce297..0000000
--- a/package/kernel/modules/xen.mk
+++ /dev/null
@@ -1,110 +0,0 @@
-#
-# Copyright (C) 2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-XEN_MENU:=Xen paravirtualized guest support
-
-define KernelPackage/xen-fs
-  SUBMENU:=$(XEN_MENU)
-  TITLE:=Xen filesystem
-  DEPENDS:=@TARGET_x86_xen_domu
-  KCONFIG:= \
-       CONFIG_XENFS \
-       CONFIG_XEN_COMPAT_XENFS=y
-  FILES:=$(LINUX_DIR)/drivers/xen/xenfs/xenfs.ko
-  AUTOLOAD:=$(call AutoLoad,05,xenfs)
-endef
-
-define KernelPackage/xen-fs/description
-  Kernel module for the Xen filesystem
-endef
-
-$(eval $(call KernelPackage,xen-fs))
-
-
-define KernelPackage/xen-evtchn
-  SUBMENU:=$(XEN_MENU)
-  TITLE:=Xen event channels
-  DEPENDS:=@TARGET_x86_xen_domu
-  KCONFIG:=CONFIG_XEN_DEV_EVTCHN
-  FILES:=$(LINUX_DIR)/drivers/xen/evtchn.ko
-  AUTOLOAD:=$(call AutoLoad,06,evtchn)
-endef
-
-define KernelPackage/xen-evtchn/description
-  Kernel module for the /dev/xen/evtchn device
-endef
-
-$(eval $(call KernelPackage,xen-evtchn))
-
-# FIXME: the FB support should be moved to a separate kmod
-define KernelPackage/xen-fbdev
-  SUBMENU:=$(XEN_MENU)
-  TITLE:=Xen virtual frame buffer
-  DEPENDS:=@TARGET_x86_xen_domu
-  KCONFIG:= \
-       CONFIG_XEN_FBDEV_FRONTEND \
-       CONFIG_FB \
-       CONFIG_FB_DEFERRED_IO=y \
-       CONFIG_FB_SYS_COPYAREA \
-       CONFIG_FB_SYS_FILLRECT \
-       CONFIG_FB_SYS_FOPS \
-       CONFIG_FB_SYS_IMAGEBLIT \
-       CONFIG_FIRMWARE_EDID=n
-  FILES:= \
-       $(LINUX_DIR)/drivers/video/xen-fbfront.ko \
-       $(LINUX_DIR)/drivers/video/fb.ko \
-       $(LINUX_DIR)/drivers/video/syscopyarea.ko \
-       $(LINUX_DIR)/drivers/video/sysfillrect.ko \
-       $(LINUX_DIR)/drivers/video/fb_sys_fops.ko \
-       $(LINUX_DIR)/drivers/video/sysimgblt.ko         
-  AUTOLOAD:=$(call AutoLoad,07, \
-       fb \
-       syscopyarea \
-       sysfillrect \
-       fb_sys_fops \
-       sysimgblt \
-       xen-fbfront \
-  )
-endef
-
-define KernelPackage/xen-fbdev/description
-  Kernel module for the Xen virtual frame buffer
-endef
-
-$(eval $(call KernelPackage,xen-fbdev))
-
-
-define KernelPackage/xen-kbddev
-  SUBMENU:=$(XEN_MENU)
-  TITLE:=Xen virtual keyboard and mouse
-  DEPENDS:=@TARGET_x86_xen_domu
-  KCONFIG:=CONFIG_XEN_KBDDEV_FRONTEND
-  FILES:=$(LINUX_DIR)/drivers/input/xen-kbdfront.ko
-  AUTOLOAD:=$(call AutoLoad,08,xen-kbdfront)
-endef
-
-define KernelPackage/xen-kbddev/description
-  Kernel module for the Xen virtual keyboard and mouse
-endef
-
-$(eval $(call KernelPackage,xen-kbddev))
-
-
-define KernelPackage/xen-netdev
-  SUBMENU:=$(XEN_MENU)
-  TITLE:=Xen network device frontend
-  DEPENDS:=@TARGET_x86_xen_domu
-  KCONFIG:=CONFIG_XEN_NETDEV_FRONTEND
-  FILES:=$(LINUX_DIR)/drivers/net/xen-netfront.ko
-  AUTOLOAD:=$(call AutoLoad,09,xen-netfront)
-endef
-
-define KernelPackage/xen-netdev/description
-  Kernel module for the Xen network device frontend
-endef
-
-$(eval $(call KernelPackage,xen-netdev))