mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 18:50:05 +01:00
[LINUX] Converge ia64 versions of xen/drivers Makefiles with general versions.
This patch converges the ia64-specific and general versions of xen/drivers/Makefile and xen/drivers/core/Makefile, using Kconfig settings instead to control whether specific pieces are built. Signed-off-by: Aron Griffis <aron@hp.com>
This commit is contained in:
kaf24@firebug.cl.cam.ac.uk committed
1 parent
d884b10778
commit
296d1a2fd4
7 files changed
+68
-67
No files matched your search
@@ -73,7 +73,7 @@ config XEN_IA64_DOM0_VP
|
||||
|
||||
config XEN_IA64_DOM0_NON_VP
|
||||
bool
|
||||
depends on !(XEN && XEN_IA64_DOM0_VP)
|
||||
depends on XEN && !XEN_IA64_DOM0_VP
|
||||
default y
|
||||
help
|
||||
dom0 P=M model
|
||||
@@ -496,15 +496,39 @@ source "security/Kconfig"
|
||||
|
||||
source "crypto/Kconfig"
|
||||
|
||||
#
|
||||
# override default values of drivers/xen/Kconfig
|
||||
if !XEN_IA64_DOM0_VP
|
||||
#
|
||||
if XEN
|
||||
config XEN_UTIL
|
||||
default n if XEN_IA64_DOM0_VP
|
||||
|
||||
config HAVE_ARCH_ALLOC_SKB
|
||||
bool
|
||||
default n
|
||||
default n if !XEN_IA64_DOM0_VP
|
||||
|
||||
config HAVE_ARCH_DEV_ALLOC_SKB
|
||||
bool
|
||||
default n
|
||||
default n if !XEN_IA64_DOM0_VP
|
||||
|
||||
config XEN_BALLOON
|
||||
default n if !XEN_IA64_DOM0_VP
|
||||
|
||||
config XEN_SKBUFF
|
||||
default n if !XEN_IA64_DOM0_VP
|
||||
|
||||
config XEN_NETDEV_BACKEND
|
||||
default n if !XEN_IA64_DOM0_VP
|
||||
|
||||
config XEN_NETDEV_FRONTEND
|
||||
default n if !XEN_IA64_DOM0_VP
|
||||
|
||||
config XEN_DEVMEM
|
||||
default n
|
||||
|
||||
config XEN_REBOOT
|
||||
default n
|
||||
|
||||
config XEN_SMPBOOT
|
||||
default n
|
||||
endif
|
||||
|
||||
source "drivers/xen/Kconfig"
|
||||
@@ -10,12 +10,6 @@
|
||||
#eventually asm-xsi-offsets needs to be part of hypervisor.h/hypercall.h
|
||||
ln -sf ../../../../xen/include/asm-ia64/asm-xsi-offsets.h include/asm-ia64/xen/
|
||||
|
||||
#ia64 drivers/xen isn't fully functional yet, workaround...
|
||||
#also ignore core/evtchn.c which uses a different irq mechanism than ia64
|
||||
#(warning: there be dragons here if these files diverge)
|
||||
ln -sf ../../arch/ia64/xen/drivers/Makefile drivers/xen/Makefile
|
||||
ln -sf ../../../arch/ia64/xen/drivers/coreMakefile drivers/xen/core/Makefile
|
||||
|
||||
#not sure where these ia64-specific files will end up in the future
|
||||
ln -sf ../../../arch/ia64/xen/drivers/xenia64_init.c drivers/xen/core
|
||||
|
||||
|
||||
@@ -1,22 +0,0 @@
|
||||
|
||||
ifneq ($(CONFIG_XEN_IA64_DOM0_VP),y)
|
||||
obj-y += util.o
|
||||
endif
|
||||
|
||||
obj-y += core/
|
||||
#obj-y += char/
|
||||
obj-y += console/
|
||||
obj-y += evtchn/
|
||||
obj-$(CONFIG_XEN_IA64_DOM0_VP) += balloon/
|
||||
obj-y += privcmd/
|
||||
obj-y += xenbus/
|
||||
|
||||
obj-$(CONFIG_XEN_BLKDEV_BACKEND) += blkback/
|
||||
obj-$(CONFIG_XEN_NETDEV_BACKEND) += netback/
|
||||
obj-$(CONFIG_XEN_TPMDEV_BACKEND) += tpmback/
|
||||
obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += blkfront/
|
||||
obj-$(CONFIG_XEN_NETDEV_FRONTEND) += netfront/
|
||||
obj-$(CONFIG_XEN_BLKDEV_TAP) += blktap/
|
||||
obj-$(CONFIG_XEN_TPMDEV_FRONTEND) += tpmfront/
|
||||
obj-$(CONFIG_XEN_PCIDEV_BACKEND) += pciback/
|
||||
obj-$(CONFIG_XEN_PCIDEV_FRONTEND) += pcifront/
|
||||
@@ -1,20 +0,0 @@
|
||||
#
|
||||
# Makefile for the linux kernel.
|
||||
#
|
||||
|
||||
obj-y := gnttab.o features.o
|
||||
obj-$(CONFIG_PROC_FS) += xen_proc.o
|
||||
|
||||
ifeq ($(ARCH),ia64)
|
||||
obj-y += evtchn.o
|
||||
obj-y += xenia64_init.o
|
||||
ifeq ($(CONFIG_XEN_IA64_DOM0_VP),y)
|
||||
obj-$(CONFIG_NET) += skbuff.o
|
||||
endif
|
||||
else
|
||||
obj-y += reboot.o evtchn.o fixup.o
|
||||
obj-$(CONFIG_SMP) += smp.o # setup_profiling_timer def'd in ia64
|
||||
obj-$(CONFIG_NET) += skbuff.o # until networking is up on ia64
|
||||
endif
|
||||
obj-$(CONFIG_SYSFS) += hypervisor_sysfs.o
|
||||
obj-$(CONFIG_XEN_SYSFS) += xen_sysfs.o
|
||||
@@ -228,4 +228,30 @@ config NO_IDLE_HZ
|
||||
bool
|
||||
default y
|
||||
|
||||
config XEN_UTIL
|
||||
bool
|
||||
default y
|
||||
|
||||
config XEN_BALLOON
|
||||
bool
|
||||
default y
|
||||
|
||||
config XEN_DEVMEM
|
||||
bool
|
||||
default y
|
||||
|
||||
config XEN_SKBUFF
|
||||
bool
|
||||
default y
|
||||
depends on NET
|
||||
|
||||
config XEN_REBOOT
|
||||
bool
|
||||
default y
|
||||
|
||||
config XEN_SMPBOOT
|
||||
bool
|
||||
default y
|
||||
depends on SMP
|
||||
|
||||
endif
|
||||
@@ -1,14 +1,12 @@
|
||||
|
||||
obj-y += util.o
|
||||
|
||||
obj-y += core/
|
||||
obj-y += char/
|
||||
obj-y += console/
|
||||
obj-y += evtchn/
|
||||
obj-y += balloon/
|
||||
obj-y += privcmd/
|
||||
obj-y += xenbus/
|
||||
|
||||
obj-$(CONFIG_XEN_UTIL) += util.o
|
||||
obj-$(CONFIG_XEN_BALLOON) += balloon/
|
||||
obj-$(CONFIG_XEN_DEVMEM) += char/
|
||||
obj-$(CONFIG_XEN_BLKDEV_BACKEND) += blkback/
|
||||
obj-$(CONFIG_XEN_NETDEV_BACKEND) += netback/
|
||||
obj-$(CONFIG_XEN_TPMDEV_BACKEND) += tpmback/
|
||||
@@ -17,4 +15,3 @@ obj-$(CONFIG_XEN_NETDEV_FRONTEND) += netfront/
|
||||
obj-$(CONFIG_XEN_BLKDEV_TAP) += blktap/
|
||||
obj-$(CONFIG_XEN_PCIDEV_BACKEND) += pciback/
|
||||
obj-$(CONFIG_XEN_PCIDEV_FRONTEND) += pcifront/
|
||||
|
||||
@@ -2,11 +2,13 @@
|
||||
# Makefile for the linux kernel.
|
||||
#
|
||||
|
||||
obj-y := evtchn.o reboot.o gnttab.o features.o
|
||||
obj-y := evtchn.o gnttab.o features.o
|
||||
|
||||
obj-$(CONFIG_PROC_FS) += xen_proc.o
|
||||
obj-$(CONFIG_NET) += skbuff.o
|
||||
obj-$(CONFIG_SMP) += smpboot.o
|
||||
obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o
|
||||
obj-$(CONFIG_SYSFS) += hypervisor_sysfs.o
|
||||
obj-$(CONFIG_XEN_SYSFS) += xen_sysfs.o
|
||||
obj-$(CONFIG_PROC_FS) += xen_proc.o
|
||||
obj-$(CONFIG_SYSFS) += hypervisor_sysfs.o
|
||||
obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o
|
||||
obj-$(CONFIG_XEN_SYSFS) += xen_sysfs.o
|
||||
obj-$(CONFIG_IA64) += xenia64_init.o
|
||||
obj-$(CONFIG_XEN_SKBUFF) += skbuff.o
|
||||
obj-$(CONFIG_XEN_REBOOT) += reboot.o
|
||||
obj-$(CONFIG_XEN_SMPBOOT) += smpboot.o
|
||||