[coreboot] [PATCH] v3: move generic intel x86 init code to arch/x86/intel
Carl-Daniel Hailfinger
c-d.hailfinger.devel.2006 at gmx.net
Mon Oct 6 23:04:05 CEST 2008
Move the generic intel x86 init code in arch/x86/stage0_i586.S to
arch/x86/intel/stage0.S to make it consistent with the other variants of
that code.
Clean up two superfluous rules from arch/x86/Makefile which were needed
before.
You need to run the following command in addition to the patch:
svn mv arch/x86/stage0_i586.S arch/x86/intel/stage0.S
Compile tested on all arches.
Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006 at gmx.net>
Index: corebootv3-arch_x86_cleanup/arch/x86/Makefile
===================================================================
--- corebootv3-arch_x86_cleanup/arch/x86/Makefile (Revision 898)
+++ corebootv3-arch_x86_cleanup/arch/x86/Makefile (Arbeitskopie)
@@ -112,7 +112,7 @@
endif
ifeq ($(CONFIG_CPU_I586),y)
- STAGE0_CAR_OBJ = stage0_i586.o
+ STAGE0_CAR_OBJ = intel/stage0.o
else
ifeq ($(CONFIG_CPU_AMD_GEODELX),y)
STAGE0_CAR_OBJ = geodelx/stage0.o
@@ -243,15 +243,7 @@
$(Q)$(CC) $(INITCFLAGS) -c $< -o $@
# Building asm stub.
-$(obj)/arch/x86/stage0%.o: $(src)/arch/x86/stage0%.S
- $(Q)printf " CC $(subst $(shell pwd)/,,$(@))\n"
- $(Q)$(CC) -E $(COREBOOTINCLUDE) $< \
- -o $(obj)/arch/x86/stage0_asm.s -DBOOTBLK=0x1f00 \
- -DRESRVED=0xf0 -DDATE=\"`date +%Y/%m/%d`\"
- $(Q)printf " AS $(subst $(shell pwd)/,,$(@))\n"
- $(Q)$(AS) $(obj)/arch/x86/stage0_asm.s -o $@
-
-$(obj)/arch/x86/geodelx/stage0.o: $(src)/arch/x86/geodelx/stage0.S
+$(obj)/arch/x86/%/stage0.o: $(src)/arch/x86/%/stage0.S
$(Q)mkdir -p $(dir $@)
$(Q)printf " CC $(subst $(shell pwd)/,,$(@))\n"
$(Q)$(CC) -E $(COREBOOTINCLUDE) $< \
@@ -260,18 +252,6 @@
$(Q)printf " AS $(subst $(shell pwd)/,,$(@))\n"
$(Q)$(AS) $(obj)/arch/x86/stage0_asm.s -o $@
-
-# NOTE HACK. Stefan will fix this :-)
-$(obj)/arch/x86/amd/stage0.o: $(src)/arch/x86/amd/stage0.S
- $(Q)mkdir -p $(dir $@)
- $(Q)printf " CC $(subst $(shell pwd)/,,$(@))\n"
- $(Q)$(CC) -E $(COREBOOTINCLUDE) $< \
- -I $(src)/include/arch/x86/amd/k8 \
- -o $(obj)/arch/x86/stage0_asm.s -DBOOTBLK=0x1f00 \
- -DRESRVED=0xf0 -DDATE=\"`date +%Y/%m/%d`\"
- $(Q)printf " AS $(subst $(shell pwd)/,,$(@))\n"
- $(Q)$(AS) $(obj)/arch/x86/stage0_asm.s -o $@
-
$(obj)/coreboot.initram $(obj)/coreboot.initram.map: $(obj)/stage0.init $(obj)/stage0-prefixed.o $(INITRAM_SRC)
$(Q)printf " CC $(subst $(shell pwd)/,,$(@)) (XIP)\n"
$(Q)$(CC) $(INITCFLAGS) -fPIE -c -combine $(COMBINEFLAGS) $(INITRAM_SRC) -o $(obj)/coreboot.initram_partiallylinked.o
--
http://www.hailfinger.org/
More information about the coreboot
mailing list