diff --git a/mainboard/amd/norwich/Makefile b/mainboard/amd/norwich/Makefile
index 943e105def..4efdfbee36 100644
--- a/mainboard/amd/norwich/Makefile
+++ b/mainboard/amd/norwich/Makefile
@@ -23,22 +23,17 @@ $(obj)/linuxbios.vpd:
 	$(Q)printf "  BUILD   DUMMY VPD\n"
 	$(Q)dd if=/dev/zero of=$(obj)/linuxbios.vpd bs=256 count=1 $(SILENT)
 
-INITRAM_OBJ=$(obj)/stage0.init $(obj)/stage0.o $(obj)/mainboard/$(MAINBOARDDIR)/initram.o \
+INITRAM_OBJ =   $(obj)/mainboard/$(MAINBOARDDIR)/initram.o \
 		$(obj)/northbridge/amd/geodelx/raminit.o \
 		$(obj)/southbridge/amd/cs5536/smbus_initram.o \
 		$(obj)/southbridge/amd/cs5536/cs5536_early_setup.o\
 		$(obj)/device/pnp_raw.o \
-		$(obj)/arch/x86/geodelx.o
-$(obj)/linuxbios.initram: $(INITRAM_OBJ)
+		$(obj)/arch/x86/geodelx/geodelx.o
+
+$(obj)/linuxbios.initram: $(obj)/stage0.init $(obj)/stage0.o $(INITRAM_OBJ)
 	$(Q)# initram links against stage0
 	$(Q)printf "  LD      $(subst $(shell pwd)/,,$(@))\n"
-	$(Q)$(LD) -R $(obj)/stage0.o -Ttext 0x80000 \
-		$(obj)/mainboard/$(MAINBOARDDIR)/initram.o \
-		$(obj)/northbridge/amd/geodelx/raminit.o \
-		$(obj)/southbridge/amd/cs5536/smbus_initram.o \
-		$(obj)/southbridge/amd/cs5536/cs5536_early_setup.o\
-		$(obj)/device/pnp_raw.o \
-		$(obj)/arch/x86/geodelx.o\
+	$(Q)$(LD) -R $(obj)/stage0.o -Ttext 0x80000 $(INITRAM_OBJ) \
 		--entry=main -o $(obj)/linuxbios.initram.o
 	$(Q)printf "  OBJCOPY $(subst $(shell pwd)/,,$(@))\n"
 	$(Q)$(OBJCOPY) -O binary $(obj)/linuxbios.initram.o \
@@ -75,7 +70,7 @@ $(obj)/option_table: $(obj)/mainboard/$(MAINBOARDDIR)/option_table.o
 
 STAGE2_MAINBOARD_OBJ = mainboard.o 
 
-STAGE2_CHIPSET_OBJ =  		$(obj)/arch/x86/geodecpu.o
+STAGE2_CHIPSET_OBJ =  		$(obj)/arch/x86/geodelx/cpu.o
 
 $(obj)/mainboard/$(MAINBOARDDIR)/%.o: $(src)/mainboard/$(MAINBOARDDIR)/%.c
 	$(Q)mkdir -p $(obj)/mainboard/$(MAINBOARDDIR)