ia64/xen-unstable

changeset 5894:4c52791a0444

Frob the Linux-2.6 configs to enable PAE (HIGHMEM_64G) if XEN_TARGET_X86_PAE=y

Signed-off-by: ian@xensource.com
author iap10@freefall.cl.cam.ac.uk
date Wed Jul 27 00:27:36 2005 +0000 (2005-07-27)
parents 2333f6616d18
children a0a14aedfa68
files buildconfigs/Rules.mk buildconfigs/mk.linux-2.6-xen buildconfigs/mk.linux-2.6-xen0 buildconfigs/mk.linux-2.6-xenU
line diff
     1.1 --- a/buildconfigs/Rules.mk	Tue Jul 26 18:41:39 2005 +0000
     1.2 +++ b/buildconfigs/Rules.mk	Wed Jul 27 00:27:36 2005 +0000
     1.3 @@ -111,5 +111,12 @@ netbsd-%-mrproper-extra:
     1.4  %-mrproper-extra:
     1.5  	@: # do nothing
     1.6  
     1.7 +config-update-pae:
     1.8 +ifeq ($(XEN_TARGET_X86_PAE),y)
     1.9 +	sed -e 's!^CONFIG_HIGHMEM4G=y$$!\# CONFIG_HIGHMEM4G is not set!;s!^\# CONFIG_HIGHMEM64G is not set$$!CONFIG_HIGHMEM64G=y!' $(CONFIG_FILE) > $(CONFIG_FILE)- && mv $(CONFIG_FILE)- $(CONFIG_FILE)
    1.10 +else
    1.11 +	@: # do nothing yet
    1.12 +endif
    1.13 +
    1.14  # never delete any intermediate files.
    1.15  .SECONDARY:
     2.1 --- a/buildconfigs/mk.linux-2.6-xen	Tue Jul 26 18:41:39 2005 +0000
     2.2 +++ b/buildconfigs/mk.linux-2.6-xen	Wed Jul 27 00:27:36 2005 +0000
     2.3 @@ -32,6 +32,8 @@ build: $(LINUX_DIR)/include/linux/autoco
     2.4  	  cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION-$(EXTRAVERSION) $(LINUX_DIR)/.config \
     2.5  	  || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig_$(XEN_TARGET_ARCH) \
     2.6  		$(LINUX_DIR)/.config
     2.7 +	# See if we need to munge config to enable PAE
     2.8 +	$(MAKE) CONFIG_FILE=$(LINUX_DIR)/.config -f buildconfigs/Rules.mk config-update-pae
     2.9  	# Patch kernel Makefile to set EXTRAVERSION
    2.10  	( cd $(LINUX_DIR) ; \
    2.11  	  sed -e 's/^EXTRAVERSION.*/&$$(XENGUEST)\nXENGUEST = -$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
     3.1 --- a/buildconfigs/mk.linux-2.6-xen0	Tue Jul 26 18:41:39 2005 +0000
     3.2 +++ b/buildconfigs/mk.linux-2.6-xen0	Wed Jul 27 00:27:36 2005 +0000
     3.3 @@ -32,6 +32,8 @@ build: $(LINUX_DIR)/include/linux/autoco
     3.4  	  cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION-$(EXTRAVERSION) $(LINUX_DIR)/.config \
     3.5  	  || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig_$(XEN_TARGET_ARCH) \
     3.6  		$(LINUX_DIR)/.config
     3.7 +	# See if we need to munge config to enable PAE
     3.8 +	$(MAKE) CONFIG_FILE=$(LINUX_DIR)/.config -f buildconfigs/Rules.mk config-update-pae
     3.9  	# Patch kernel Makefile to set EXTRAVERSION
    3.10  	( cd $(LINUX_DIR) ; \
    3.11  	  sed -e 's/^EXTRAVERSION.*/&$$(XENGUEST)\nXENGUEST = -$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
     4.1 --- a/buildconfigs/mk.linux-2.6-xenU	Tue Jul 26 18:41:39 2005 +0000
     4.2 +++ b/buildconfigs/mk.linux-2.6-xenU	Wed Jul 27 00:27:36 2005 +0000
     4.3 @@ -32,6 +32,8 @@ build: $(LINUX_DIR)/include/linux/autoco
     4.4  	  cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION-$(EXTRAVERSION) $(LINUX_DIR)/.config \
     4.5  	  || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig_$(XEN_TARGET_ARCH) \
     4.6  		$(LINUX_DIR)/.config
     4.7 +	# See if we need to munge config to enable PAE
     4.8 +	$(MAKE) CONFIG_FILE=$(LINUX_DIR)/.config -f buildconfigs/Rules.mk config-update-pae
     4.9  	# Patch kernel Makefile to set EXTRAVERSION
    4.10  	( cd $(LINUX_DIR) ; \
    4.11  	  sed -e 's/^EXTRAVERSION.*/&$$(XENGUEST)\nXENGUEST = -$(EXTRAVERSION)/' Makefile >Mk.tmp ; \