From 2c48c909e0c81060efb5890044a5954d7c303c4b Mon Sep 17 00:00:00 2001 From: Carl-Daniel Hailfinger Date: Fri, 30 Nov 2007 22:43:42 +0000 Subject: [PATCH] Reorder the rules in mainboard/*/*/Makefile so their order is identical across all of these makefiles. The rules are now in order of execution during boot, that is: STAGE0_MAINBOARD_OBJ INITRAM_OBJ STAGE2_MAINBOARD_OBJ As added benefit, mainboard makefiles are now almost identical. Signed-off-by: Carl-Daniel Hailfinger Acked-by: Stefan Reinauer git-svn-id: svn://coreboot.org/repository/LinuxBIOSv3@533 f3766cd6-281f-0410-b1cd-43a5c92072e9 --- mainboard/adl/msm800sev/Makefile | 10 +++++----- mainboard/artecgroup/dbe61/Makefile | 6 +++--- mainboard/emulation/qemu-x86/Makefile | 18 +++++++++--------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/mainboard/adl/msm800sev/Makefile b/mainboard/adl/msm800sev/Makefile index df2af08e5e..e20a41a59d 100644 --- a/mainboard/adl/msm800sev/Makefile +++ b/mainboard/adl/msm800sev/Makefile @@ -21,14 +21,14 @@ STAGE0_MAINBOARD_OBJ := $(obj)/mainboard/$(MAINBOARDDIR)/stage1.o +INITRAM_OBJ = $(obj)/mainboard/$(MAINBOARDDIR)/initram.o \ + $(obj)/northbridge/amd/geodelx/raminit.o \ + $(obj)/southbridge/amd/cs5536/smbus_initram.o \ + $(obj)/arch/x86/geodelx/geodelx.o + STAGE2_MAINBOARD_OBJ = $(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)/mainboard/$(MAINBOARDDIR)/initram.o \ - $(obj)/northbridge/amd/geodelx/raminit.o \ - $(obj)/southbridge/amd/cs5536/smbus_initram.o \ - $(obj)/arch/x86/geodelx/geodelx.o - diff --git a/mainboard/artecgroup/dbe61/Makefile b/mainboard/artecgroup/dbe61/Makefile index 4ff044239c..e44cd6f582 100644 --- a/mainboard/artecgroup/dbe61/Makefile +++ b/mainboard/artecgroup/dbe61/Makefile @@ -21,12 +21,12 @@ STAGE0_MAINBOARD_OBJ := $(obj)/mainboard/$(MAINBOARDDIR)/stage1.o +INITRAM_OBJ = $(obj)/mainboard/$(MAINBOARDDIR)/initram.o \ + $(obj)/arch/x86/geodelx/geodelx.o + STAGE2_MAINBOARD_OBJ = $(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)/mainboard/$(MAINBOARDDIR)/initram.o \ - $(obj)/arch/x86/geodelx/geodelx.o - diff --git a/mainboard/emulation/qemu-x86/Makefile b/mainboard/emulation/qemu-x86/Makefile index 1a123aa6fd..bdc742f78c 100644 --- a/mainboard/emulation/qemu-x86/Makefile +++ b/mainboard/emulation/qemu-x86/Makefile @@ -21,6 +21,15 @@ STAGE0_MAINBOARD_OBJ := $(obj)/mainboard/$(MAINBOARDDIR)/stage1.o +# +# This is going to be the init RAM code. +# +# The initram file is always uncompressed. It belongs into the mainboard +# directory and is built from what was auto.c in v2. +# + +INITRAM_OBJ = $(obj)/mainboard/$(MAINBOARDDIR)/initram.o + STAGE2_MAINBOARD_OBJ = vga.o # @@ -33,12 +42,3 @@ $(obj)/linuxbios.vpd: $(Q)printf " BUILD DUMMY VPD\n" $(Q)dd if=/dev/zero of=$(obj)/linuxbios.vpd bs=256 count=1 $(SILENT) -# -# This is going to be the init RAM code. -# -# The initram file is always uncompressed. It belongs into the mainboard -# directory and is built from what was auto.c in v2. -# - -INITRAM_OBJ = $(obj)/mainboard/$(MAINBOARDDIR)/initram.o -