make cpu code future proof

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>



git-svn-id: svn://coreboot.org/repository/LinuxBIOSv3@387 f3766cd6-281f-0410-b1cd-43a5c92072e9

arch/x86/Makefile

@@ -83,7 +83,7 @@ ifeq ($(CONFIG_CPU_I586),y)
 	STAGE0_CAR_OBJ = stage0_i586.o
 else
 ifeq ($(CONFIG_CPU_AMD_GEODELX),y)
-	STAGE0_CAR_OBJ = stage0_amd_geodelx.o
+	STAGE0_CAR_OBJ = geodelx/stage0.o
 else
 	STAGE0_CAR_OBJ = stage0_i586.o
 endif
@@ -181,4 +181,13 @@ $(obj)/arch/x86/stage0%.o: $(src)/arch/x86/stage0%.S
 	$(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
+	$(Q)mkdir -p $(obj)/arch/x86/geodelx
+	$(Q)printf "  CC      $(subst $(shell pwd)/,,$(@))\n"
+	$(Q)$(CC) -E $(LINUXBIOSINCLUDE) $< \
+		-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 $@
+
 endif

arch/x86/geodelx/stage0.S

@@ -25,7 +25,7 @@
 
 /* Init code - Switch CPU to protected mode and enable Cache-as-Ram. */
 
-#include "macros.h"
+#include "../macros.h"
 #include <amd_geodelx.h>
 
 /* This is where the DCache will be mapped and be used as stack. It would be