diff options
| author | cl349@firebug.cl.cam.ac.uk[cl349] <cl349@firebug.cl.cam.ac.uk[cl349]> | 2005-04-02 19:39:22 +0000 |
|---|---|---|
| committer | cl349@firebug.cl.cam.ac.uk[cl349] <cl349@firebug.cl.cam.ac.uk[cl349]> | 2005-04-02 19:39:22 +0000 |
| commit | 22449341238b4a64c9550621b1da06ac13814770 (patch) | |
| tree | a686ff83541206e522d53ad4893f8b0b006935f3 | |
| parent | 39d08bc1ba61719872d817f859d52a3c4bdbe00f (diff) | |
| download | xen-22449341238b4a64c9550621b1da06ac13814770.tar.gz xen-22449341238b4a64c9550621b1da06ac13814770.tar.bz2 xen-22449341238b4a64c9550621b1da06ac13814770.zip | |
bitkeeper revision 1.1236.1.199 (424ef4eahp9zc9DUf9tycOmpkfA2Bw)
Add TARGET_ARCH suffix to defconfig files.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
| -rw-r--r-- | .rootkeys | 4 | ||||
| -rw-r--r-- | Config.mk | 7 | ||||
| -rw-r--r-- | buildconfigs/Rules.mk | 2 | ||||
| -rw-r--r-- | buildconfigs/mk.linux-2.6-xen0 | 2 | ||||
| -rw-r--r-- | buildconfigs/mk.linux-2.6-xenU | 2 | ||||
| -rw-r--r-- | linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32 (renamed from linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig) | 0 | ||||
| -rw-r--r-- | linux-2.6.11-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32 (renamed from linux-2.6.11-xen-sparse/arch/xen/configs/xenU_defconfig) | 0 |
7 files changed, 13 insertions, 4 deletions
@@ -209,8 +209,8 @@ 40f56237utH41NPukqHksuNf29IC9A linux-2.6.11-xen-sparse/arch/xen/Kconfig.drivers 40f56237penAAlWVBVDpeQZNFIg8CA linux-2.6.11-xen-sparse/arch/xen/Makefile 40f56237JTc60m1FRlUxkUaGSQKrNw linux-2.6.11-xen-sparse/arch/xen/boot/Makefile -40f56237hRxbacU_3PdoAl6DjZ3Jnw linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig -40f56237wubfjJKlfIzZlI3ZM2VgGA linux-2.6.11-xen-sparse/arch/xen/configs/xenU_defconfig +40f56237hRxbacU_3PdoAl6DjZ3Jnw linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32 +40f56237wubfjJKlfIzZlI3ZM2VgGA linux-2.6.11-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32 40f56237Mta0yHNaMS_qtM2rge0qYA linux-2.6.11-xen-sparse/arch/xen/i386/Kconfig 40f56238u2CJdXNpjsZgHBxeVyY-2g linux-2.6.11-xen-sparse/arch/xen/i386/Makefile 40f56238eczveJ86k_4hNxCLRQIF-g linux-2.6.11-xen-sparse/arch/xen/i386/kernel/Makefile @@ -1,8 +1,15 @@ # -*- mode: Makefile; -*- + # Currently supported architectures: x86_32, x86_64 XEN_COMPILE_ARCH ?= $(shell uname -m | sed -e s/i.86/x86_32/) XEN_TARGET_ARCH ?= $(XEN_COMPILE_ARCH) +# Set ARCH/SUBARCH appropriately. +override COMPILE_SUBARCH := $(XEN_COMPILE_ARCH) +override TARGET_SUBARCH := $(XEN_TARGET_ARCH) +override COMPILE_ARCH := $(patsubst x86%,x86,$(XEN_COMPILE_ARCH)) +override TARGET_ARCH := $(patsubst x86%,x86,$(XEN_TARGET_ARCH)) + # # Tool configuration Makefile fragment # diff --git a/buildconfigs/Rules.mk b/buildconfigs/Rules.mk index cf71d07595..58109fd619 100644 --- a/buildconfigs/Rules.mk +++ b/buildconfigs/Rules.mk @@ -1,4 +1,6 @@ +include Config.mk + # We expect these two to already be set if people # are using the top-level Makefile DISTDIR ?= $(CURDIR)/dist diff --git a/buildconfigs/mk.linux-2.6-xen0 b/buildconfigs/mk.linux-2.6-xen0 index 7849714ea2..c6992c96f1 100644 --- a/buildconfigs/mk.linux-2.6-xen0 +++ b/buildconfigs/mk.linux-2.6-xen0 @@ -32,7 +32,7 @@ $(LINUX_DIR)/include/linux/autoconf.h: pristine-linux-$(LINUX_VER) # Re-use config from install dir if one exits else use default config [ -r $(DESTDIR)/boot/config-$(FULLVERSION) ] && \ cp $(DESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \ - || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig \ + || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig_$(TARGET_SUBARCH) \ $(LINUX_DIR)/.config $(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig diff --git a/buildconfigs/mk.linux-2.6-xenU b/buildconfigs/mk.linux-2.6-xenU index 89799ee844..9a600170f8 100644 --- a/buildconfigs/mk.linux-2.6-xenU +++ b/buildconfigs/mk.linux-2.6-xenU @@ -32,7 +32,7 @@ $(LINUX_DIR)/include/linux/autoconf.h: pristine-linux-$(LINUX_VER) # Re-use config from install dir if one exits else use default config [ -r $(DESTDIR)/boot/config-$(FULLVERSION) ] && \ cp $(DESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \ - || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig \ + || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig_$(TARGET_SUBARCH) \ $(LINUX_DIR)/.config $(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig diff --git a/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig b/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32 index a781740c94..a781740c94 100644 --- a/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig +++ b/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32 diff --git a/linux-2.6.11-xen-sparse/arch/xen/configs/xenU_defconfig b/linux-2.6.11-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32 index b1fc951a81..b1fc951a81 100644 --- a/linux-2.6.11-xen-sparse/arch/xen/configs/xenU_defconfig +++ b/linux-2.6.11-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32 |