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 c-d.hailfinger.devel.2006@gmx.net
Index: LinuxBIOSv3-filteroutduplicatedshared/mainboard/adl/msm800sev/Makefile =================================================================== --- LinuxBIOSv3-filteroutduplicatedshared/mainboard/adl/msm800sev/Makefile (Revision 529) +++ LinuxBIOSv3-filteroutduplicatedshared/mainboard/adl/msm800sev/Makefile (Arbeitskopie) @@ -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 - Index: LinuxBIOSv3-filteroutduplicatedshared/mainboard/artecgroup/dbe61/Makefile =================================================================== --- LinuxBIOSv3-filteroutduplicatedshared/mainboard/artecgroup/dbe61/Makefile (Revision 529) +++ LinuxBIOSv3-filteroutduplicatedshared/mainboard/artecgroup/dbe61/Makefile (Arbeitskopie) @@ -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 - Index: LinuxBIOSv3-filteroutduplicatedshared/mainboard/emulation/qemu-x86/Makefile =================================================================== --- LinuxBIOSv3-filteroutduplicatedshared/mainboard/emulation/qemu-x86/Makefile (Revision 529) +++ LinuxBIOSv3-filteroutduplicatedshared/mainboard/emulation/qemu-x86/Makefile (Arbeitskopie) @@ -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 @@ $(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 -
* Carl-Daniel Hailfinger c-d.hailfinger.devel.2006@gmx.net [071128 01:20]:
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 c-d.hailfinger.devel.2006@gmx.net
While you are at it, could you also change the _OBJ collections to gather source files instead?
In case of initram, the filenames in INITRAM_OBJ are changed on the fly, so that's misleading. Generating a list of source files looks clearer, and can accordingly replaced when being used $(patsubst %.c,$(obj)/%_xip.o,$(INITRAM_SOURCE))
+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.oSTAGE2_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.oIndex: LinuxBIOSv3-filteroutduplicatedshared/mainboard/artecgroup/dbe61/Makefile
--- LinuxBIOSv3-filteroutduplicatedshared/mainboard/artecgroup/dbe61/Makefile (Revision 529) +++ LinuxBIOSv3-filteroutduplicatedshared/mainboard/artecgroup/dbe61/Makefile (Arbeitskopie) @@ -21,12 +21,12 @@
STAGE0_MAINBOARD_OBJ := $(obj)/mainboard/$(MAINBOARDDIR)/stage1.o
+INITRAM_OBJ = $(obj)/mainboard/$(MAINBOARDDIR)/initram.o \
$(obj)/arch/x86/geodelx/geodelx.oSTAGE2_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.oIndex: LinuxBIOSv3-filteroutduplicatedshared/mainboard/emulation/qemu-x86/Makefile
--- LinuxBIOSv3-filteroutduplicatedshared/mainboard/emulation/qemu-x86/Makefile (Revision 529) +++ LinuxBIOSv3-filteroutduplicatedshared/mainboard/emulation/qemu-x86/Makefile (Arbeitskopie) @@ -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 @@ $(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
-- linuxbios mailing list linuxbios@linuxbios.org http://www.linuxbios.org/mailman/listinfo/linuxbios
On 29.11.2007 11:23, Stefan Reinauer wrote:
- Carl-Daniel Hailfinger c-d.hailfinger.devel.2006@gmx.net [071128 01:20]:
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 c-d.hailfinger.devel.2006@gmx.net
While you are at it, could you also change the _OBJ collections to gather source files instead?
In case of initram, the filenames in INITRAM_OBJ are changed on the fly, so that's misleading. Generating a list of source files looks clearer, and can accordingly replaced when being used $(patsubst %.c,$(obj)/%_xip.o,$(INITRAM_SOURCE))
I'd prefer to do that in a separate patch. Is that OK for you?
Regards, Carl-Daniel
On 29.11.2007 11:23, Stefan Reinauer wrote:
- Carl-Daniel Hailfinger c-d.hailfinger.devel.2006@gmx.net [071128 01:20]:
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 c-d.hailfinger.devel.2006@gmx.net
While you are at it, could you also change the _OBJ collections to gather source files instead?
In case of initram, the filenames in INITRAM_OBJ are changed on the fly, so that's misleading. Generating a list of source files looks clearer, and can accordingly replaced when being used $(patsubst %.c,$(obj)/%_xip.o,$(INITRAM_SOURCE))
I'd prefer to do that in a separate patch. Is that OK for you?
Regards, Carl-Daniel
Carl-Daniel Hailfinger wrote:
On 29.11.2007 11:23, Stefan Reinauer wrote:
- Carl-Daniel Hailfinger c-d.hailfinger.devel.2006@gmx.net [071128 01:20]:
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 c-d.hailfinger.devel.2006@gmx.net
While you are at it, could you also change the _OBJ collections to gather source files instead?
In case of initram, the filenames in INITRAM_OBJ are changed on the fly, so that's misleading. Generating a list of source files looks clearer, and can accordingly replaced when being used $(patsubst %.c,$(obj)/%_xip.o,$(INITRAM_SOURCE))
I'd prefer to do that in a separate patch. Is that OK for you?
Regards, Carl-Daniel
any time :-)
On 30.11.2007 23:00, Stefan Reinauer wrote:
Carl-Daniel Hailfinger wrote:
On 29.11.2007 11:23, Stefan Reinauer wrote:
- Carl-Daniel Hailfinger c-d.hailfinger.devel.2006@gmx.net [071128 01:20]:
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 c-d.hailfinger.devel.2006@gmx.net
While you are at it, could you also change the _OBJ collections to gather source files instead?
In case of initram, the filenames in INITRAM_OBJ are changed on the fly, so that's misleading. Generating a list of source files looks clearer, and can accordingly replaced when being used $(patsubst %.c,$(obj)/%_xip.o,$(INITRAM_SOURCE))
I'd prefer to do that in a separate patch. Is that OK for you?
any time :-)
Do I get an Ack for this patch?
Regards, Carl-Daniel
Carl-Daniel Hailfinger wrote:
On 30.11.2007 23:00, Stefan Reinauer wrote:
Carl-Daniel Hailfinger wrote:
On 29.11.2007 11:23, Stefan Reinauer wrote:
- Carl-Daniel Hailfinger c-d.hailfinger.devel.2006@gmx.net [071128 01:20]:
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 c-d.hailfinger.devel.2006@gmx.net
While you are at it, could you also change the _OBJ collections to gather source files instead?
In case of initram, the filenames in INITRAM_OBJ are changed on the fly, so that's misleading. Generating a list of source files looks clearer, and can accordingly replaced when being used $(patsubst %.c,$(obj)/%_xip.o,$(INITRAM_SOURCE))
I'd prefer to do that in a separate patch. Is that OK for you?
any time :-)
Do I get an Ack for this patch?
Regards, Carl-Daniel
Acked-by: Stefan Reinauer stepan@coresystems.de
On 30.11.2007 23:33, Stefan Reinauer wrote:
Carl-Daniel Hailfinger wrote:
On 30.11.2007 23:00, Stefan Reinauer wrote:
Carl-Daniel Hailfinger wrote:
On 29.11.2007 11:23, Stefan Reinauer wrote:
- Carl-Daniel Hailfinger c-d.hailfinger.devel.2006@gmx.net [071128 01:20]:
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 c-d.hailfinger.devel.2006@gmx.net
While you are at it, could you also change the _OBJ collections to gather source files instead?
In case of initram, the filenames in INITRAM_OBJ are changed on the fly, so that's misleading. Generating a list of source files looks clearer, and can accordingly replaced when being used $(patsubst %.c,$(obj)/%_xip.o,$(INITRAM_SOURCE))
I'd prefer to do that in a separate patch. Is that OK for you?
any time :-)
Do I get an Ack for this patch?
Regards, Carl-Daniel
Acked-by: Stefan Reinauer stepan@coresystems.de
Thanks, r533.
Regards, Carl-Daniel
On 29.11.2007 11:23, Stefan Reinauer wrote:
- Carl-Daniel Hailfinger c-d.hailfinger.devel.2006@gmx.net [071128 01:20]:
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 c-d.hailfinger.devel.2006@gmx.net
While you are at it, could you also change the _OBJ collections to gather source files instead?
In case of initram, the filenames in INITRAM_OBJ are changed on the fly, so that's misleading. Generating a list of source files looks clearer, and can accordingly replaced when being used $(patsubst %.c,$(obj)/%_xip.o,$(INITRAM_SOURCE))
Something similar was necessary anyway in the patch that fixes absolute calls from initram.
Regards, Carl-Daniel
-
Carl-Daniel Hailfinger -
Stefan Reinauer