aboutsummaryrefslogtreecommitdiffstats
path: root/xen/arch/x86/Makefile
diff options
context:
space:
mode:
authorkfraser@localhost.localdomain <kfraser@localhost.localdomain>2007-05-10 18:02:55 +0100
committerkfraser@localhost.localdomain <kfraser@localhost.localdomain>2007-05-10 18:02:55 +0100
commit369bafdb1c1dcd2b323206befd7fc4ac5e20816f (patch)
tree79ce88cf129a2b2afa76b7776ce89a95145eb13e /xen/arch/x86/Makefile
parent46f15346a6a2121c6319ec186114a2f5c1838e83 (diff)
downloadxen-369bafdb1c1dcd2b323206befd7fc4ac5e20816f.tar.gz
xen-369bafdb1c1dcd2b323206befd7fc4ac5e20816f.tar.bz2
xen-369bafdb1c1dcd2b323206befd7fc4ac5e20816f.zip
xen: Big changes to x86 start-of-day:
1. x86/64 Xen now relocates itself to physical high memory. This is useful if we have devices that need very low memory, or if in future we want to grant a 1:1 mapping of low physical memory to a special 'native client domain'. 2. We now only map low 16MB RAM statically. All other RAM is mapped dynamically within the constraints of the e820 map. It is recommended never to map MMIO regions, and this change means that Xen now obeys this constraint. 3. The CPU bootup trampoline is now permanently installed at 0x90000. This is necessary prereq for CPU hotplug. 4. Start-of-day asm is generally cleaned up and diff between x86/32 and x86/64 is reduced. Signed-off-by: Keir Fraser <keir@xensource.com>
Diffstat (limited to 'xen/arch/x86/Makefile')
-rw-r--r--xen/arch/x86/Makefile14
1 files changed, 6 insertions, 8 deletions
diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile
index c8cb3af177..c7ccbda0d5 100644
--- a/xen/arch/x86/Makefile
+++ b/xen/arch/x86/Makefile
@@ -39,7 +39,6 @@ obj-y += srat.o
obj-y += string.o
obj-y += sysctl.o
obj-y += time.o
-obj-y += trampoline.o
obj-y += traps.o
obj-y += usercopy.o
obj-y += x86_emulate.o
@@ -52,20 +51,19 @@ $(TARGET): $(TARGET)-syms boot/mkelf32
./boot/mkelf32 $(TARGET)-syms $(TARGET) 0x100000 \
`$(NM) -nr $(TARGET)-syms | head -n 1 | sed -e 's/^\([^ ]*\).*/0x\1/'`
-$(TARGET)-syms: boot/$(TARGET_SUBARCH).o $(ALL_OBJS) xen.lds
+ALL_OBJS := $(BASEDIR)/arch/x86/boot/built_in.o $(ALL_OBJS)
+
+$(TARGET)-syms: $(ALL_OBJS) xen.lds
$(MAKE) -f $(BASEDIR)/Rules.mk $(BASEDIR)/common/symbols-dummy.o
- $(LD) $(LDFLAGS) -T xen.lds -N \
- boot/$(TARGET_SUBARCH).o $(ALL_OBJS) \
+ $(LD) $(LDFLAGS) -T xen.lds -N $(ALL_OBJS) \
$(BASEDIR)/common/symbols-dummy.o -o $(@D)/.$(@F).0
$(NM) -n $(@D)/.$(@F).0 | $(BASEDIR)/tools/symbols >$(@D)/.$(@F).0.S
$(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).0.o
- $(LD) $(LDFLAGS) -T xen.lds -N \
- boot/$(TARGET_SUBARCH).o $(ALL_OBJS) \
+ $(LD) $(LDFLAGS) -T xen.lds -N $(ALL_OBJS) \
$(@D)/.$(@F).0.o -o $(@D)/.$(@F).1
$(NM) -n $(@D)/.$(@F).1 | $(BASEDIR)/tools/symbols >$(@D)/.$(@F).1.S
$(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).1.o
- $(LD) $(LDFLAGS) -T xen.lds -N \
- boot/$(TARGET_SUBARCH).o $(ALL_OBJS) \
+ $(LD) $(LDFLAGS) -T xen.lds -N $(ALL_OBJS) \
$(@D)/.$(@F).1.o -o $@
rm -f $(@D)/.$(@F).[0-9]*