ia64/xen-unstable

changeset 10282:0f5b8f1b0eac

[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>
author kaf24@firebug.cl.cam.ac.uk
date Thu Jun 01 18:29:23 2006 +0100 (2006-06-01)
parents 6993a0f91efc
children bcfbbca9cf08
files linux-2.6-xen-sparse/arch/ia64/Kconfig linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre linux-2.6-xen-sparse/drivers/xen/Kconfig linux-2.6-xen-sparse/drivers/xen/Makefile linux-2.6-xen-sparse/drivers/xen/core/Makefile
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/ia64/Kconfig	Thu Jun 01 18:10:00 2006 +0100
     1.2 +++ b/linux-2.6-xen-sparse/arch/ia64/Kconfig	Thu Jun 01 18:29:23 2006 +0100
     1.3 @@ -73,7 +73,7 @@ config XEN_IA64_DOM0_VP
     1.4  
     1.5  config XEN_IA64_DOM0_NON_VP
     1.6  	bool
     1.7 -	depends on !(XEN && XEN_IA64_DOM0_VP)
     1.8 +	depends on XEN && !XEN_IA64_DOM0_VP
     1.9  	default y
    1.10  	help
    1.11  	  dom0 P=M model
    1.12 @@ -496,15 +496,39 @@ source "security/Kconfig"
    1.13  
    1.14  source "crypto/Kconfig"
    1.15  
    1.16 +#
    1.17  # override default values of drivers/xen/Kconfig
    1.18 -if !XEN_IA64_DOM0_VP
    1.19 +#
    1.20 +if XEN
    1.21 +config XEN_UTIL
    1.22 +	default n if XEN_IA64_DOM0_VP
    1.23 +
    1.24  config HAVE_ARCH_ALLOC_SKB
    1.25 -        bool
    1.26 -        default n
    1.27 +	default n if !XEN_IA64_DOM0_VP
    1.28  
    1.29  config HAVE_ARCH_DEV_ALLOC_SKB
    1.30 -        bool
    1.31 -        default n
    1.32 +	default n if !XEN_IA64_DOM0_VP
    1.33 +
    1.34 +config XEN_BALLOON
    1.35 +	default n if !XEN_IA64_DOM0_VP
    1.36 +
    1.37 +config XEN_SKBUFF
    1.38 +	default n if !XEN_IA64_DOM0_VP
    1.39 +
    1.40 +config XEN_NETDEV_BACKEND
    1.41 +	default n if !XEN_IA64_DOM0_VP
    1.42 +
    1.43 +config XEN_NETDEV_FRONTEND
    1.44 +	default n if !XEN_IA64_DOM0_VP
    1.45 +
    1.46 +config XEN_DEVMEM
    1.47 +	default n
    1.48 +
    1.49 +config XEN_REBOOT
    1.50 +	default n
    1.51 +
    1.52 +config XEN_SMPBOOT
    1.53 +	default n
    1.54  endif
    1.55  
    1.56  source "drivers/xen/Kconfig"
     2.1 --- a/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre	Thu Jun 01 18:10:00 2006 +0100
     2.2 +++ b/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre	Thu Jun 01 18:29:23 2006 +0100
     2.3 @@ -10,12 +10,6 @@
     2.4  #eventually asm-xsi-offsets needs to be part of hypervisor.h/hypercall.h
     2.5  ln -sf ../../../../xen/include/asm-ia64/asm-xsi-offsets.h include/asm-ia64/xen/
     2.6  
     2.7 -#ia64 drivers/xen isn't fully functional yet, workaround...
     2.8 -#also ignore core/evtchn.c which uses a different irq mechanism than ia64
     2.9 -#(warning: there be dragons here if these files diverge)
    2.10 -ln -sf ../../arch/ia64/xen/drivers/Makefile drivers/xen/Makefile
    2.11 -ln -sf ../../../arch/ia64/xen/drivers/coreMakefile drivers/xen/core/Makefile
    2.12 -
    2.13  #not sure where these ia64-specific files will end up in the future
    2.14  ln -sf ../../../arch/ia64/xen/drivers/xenia64_init.c drivers/xen/core
    2.15  
     3.1 --- a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/Makefile	Thu Jun 01 18:10:00 2006 +0100
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,22 +0,0 @@
     3.4 -
     3.5 -ifneq ($(CONFIG_XEN_IA64_DOM0_VP),y)
     3.6 -obj-y   += util.o
     3.7 -endif
     3.8 -
     3.9 -obj-y	+= core/
    3.10 -#obj-y	+= char/
    3.11 -obj-y	+= console/
    3.12 -obj-y	+= evtchn/
    3.13 -obj-$(CONFIG_XEN_IA64_DOM0_VP)	+= balloon/
    3.14 -obj-y	+= privcmd/
    3.15 -obj-y	+= xenbus/
    3.16 -
    3.17 -obj-$(CONFIG_XEN_BLKDEV_BACKEND)	+= blkback/
    3.18 -obj-$(CONFIG_XEN_NETDEV_BACKEND)	+= netback/
    3.19 -obj-$(CONFIG_XEN_TPMDEV_BACKEND)	+= tpmback/
    3.20 -obj-$(CONFIG_XEN_BLKDEV_FRONTEND)	+= blkfront/
    3.21 -obj-$(CONFIG_XEN_NETDEV_FRONTEND)	+= netfront/
    3.22 -obj-$(CONFIG_XEN_BLKDEV_TAP)		+= blktap/
    3.23 -obj-$(CONFIG_XEN_TPMDEV_FRONTEND)	+= tpmfront/
    3.24 -obj-$(CONFIG_XEN_PCIDEV_BACKEND)	+= pciback/
    3.25 -obj-$(CONFIG_XEN_PCIDEV_FRONTEND)	+= pcifront/
     4.1 --- a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/coreMakefile	Thu Jun 01 18:10:00 2006 +0100
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,20 +0,0 @@
     4.4 -#
     4.5 -# Makefile for the linux kernel.
     4.6 -#
     4.7 -
     4.8 -obj-y   := gnttab.o features.o
     4.9 -obj-$(CONFIG_PROC_FS) += xen_proc.o
    4.10 -
    4.11 -ifeq ($(ARCH),ia64)
    4.12 -obj-y   += evtchn.o
    4.13 -obj-y   += xenia64_init.o
    4.14 -ifeq ($(CONFIG_XEN_IA64_DOM0_VP),y)
    4.15 -obj-$(CONFIG_NET)     += skbuff.o
    4.16 -endif
    4.17 -else
    4.18 -obj-y   += reboot.o evtchn.o fixup.o 
    4.19 -obj-$(CONFIG_SMP)     += smp.o		# setup_profiling_timer def'd in ia64
    4.20 -obj-$(CONFIG_NET)     += skbuff.o	# until networking is up on ia64
    4.21 -endif
    4.22 -obj-$(CONFIG_SYSFS)   += hypervisor_sysfs.o
    4.23 -obj-$(CONFIG_XEN_SYSFS) += xen_sysfs.o
     5.1 --- a/linux-2.6-xen-sparse/drivers/xen/Kconfig	Thu Jun 01 18:10:00 2006 +0100
     5.2 +++ b/linux-2.6-xen-sparse/drivers/xen/Kconfig	Thu Jun 01 18:29:23 2006 +0100
     5.3 @@ -228,4 +228,30 @@ config NO_IDLE_HZ
     5.4  	bool
     5.5  	default y
     5.6  
     5.7 +config XEN_UTIL
     5.8 +	bool
     5.9 +	default y
    5.10 +
    5.11 +config XEN_BALLOON
    5.12 +	bool
    5.13 +	default y
    5.14 +
    5.15 +config XEN_DEVMEM
    5.16 +	bool
    5.17 +	default y
    5.18 +
    5.19 +config XEN_SKBUFF
    5.20 +	bool
    5.21 +	default y
    5.22 +	depends on NET
    5.23 +
    5.24 +config XEN_REBOOT
    5.25 +	bool
    5.26 +	default y
    5.27 +
    5.28 +config XEN_SMPBOOT
    5.29 +	bool
    5.30 +	default y
    5.31 +	depends on SMP
    5.32 +
    5.33  endif
     6.1 --- a/linux-2.6-xen-sparse/drivers/xen/Makefile	Thu Jun 01 18:10:00 2006 +0100
     6.2 +++ b/linux-2.6-xen-sparse/drivers/xen/Makefile	Thu Jun 01 18:29:23 2006 +0100
     6.3 @@ -1,14 +1,12 @@
     6.4 -
     6.5 -obj-y	+= util.o
     6.6 -
     6.7  obj-y	+= core/
     6.8 -obj-y	+= char/
     6.9  obj-y	+= console/
    6.10  obj-y	+= evtchn/
    6.11 -obj-y	+= balloon/
    6.12  obj-y	+= privcmd/
    6.13  obj-y	+= xenbus/
    6.14  
    6.15 +obj-$(CONFIG_XEN_UTIL)			+= util.o
    6.16 +obj-$(CONFIG_XEN_BALLOON)		+= balloon/
    6.17 +obj-$(CONFIG_XEN_DEVMEM)		+= char/
    6.18  obj-$(CONFIG_XEN_BLKDEV_BACKEND)	+= blkback/
    6.19  obj-$(CONFIG_XEN_NETDEV_BACKEND)	+= netback/
    6.20  obj-$(CONFIG_XEN_TPMDEV_BACKEND)	+= tpmback/
    6.21 @@ -17,4 +15,3 @@ obj-$(CONFIG_XEN_NETDEV_FRONTEND)	+= net
    6.22  obj-$(CONFIG_XEN_BLKDEV_TAP)    	+= blktap/
    6.23  obj-$(CONFIG_XEN_PCIDEV_BACKEND)	+= pciback/
    6.24  obj-$(CONFIG_XEN_PCIDEV_FRONTEND)	+= pcifront/
    6.25 -
     7.1 --- a/linux-2.6-xen-sparse/drivers/xen/core/Makefile	Thu Jun 01 18:10:00 2006 +0100
     7.2 +++ b/linux-2.6-xen-sparse/drivers/xen/core/Makefile	Thu Jun 01 18:29:23 2006 +0100
     7.3 @@ -2,11 +2,13 @@
     7.4  # Makefile for the linux kernel.
     7.5  #
     7.6  
     7.7 -obj-y   := evtchn.o reboot.o gnttab.o features.o
     7.8 +obj-y := evtchn.o gnttab.o features.o
     7.9  
    7.10 -obj-$(CONFIG_PROC_FS)     += xen_proc.o
    7.11 -obj-$(CONFIG_NET)         += skbuff.o
    7.12 -obj-$(CONFIG_SMP)         += smpboot.o
    7.13 -obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o
    7.14 -obj-$(CONFIG_SYSFS)       += hypervisor_sysfs.o
    7.15 -obj-$(CONFIG_XEN_SYSFS)   += xen_sysfs.o
    7.16 +obj-$(CONFIG_PROC_FS)		+= xen_proc.o
    7.17 +obj-$(CONFIG_SYSFS)		+= hypervisor_sysfs.o
    7.18 +obj-$(CONFIG_HOTPLUG_CPU)	+= cpu_hotplug.o
    7.19 +obj-$(CONFIG_XEN_SYSFS)		+= xen_sysfs.o
    7.20 +obj-$(CONFIG_IA64)		+= xenia64_init.o
    7.21 +obj-$(CONFIG_XEN_SKBUFF)	+= skbuff.o
    7.22 +obj-$(CONFIG_XEN_REBOOT)	+= reboot.o
    7.23 +obj-$(CONFIG_XEN_SMPBOOT)	+= smpboot.o