Factor out one identical makefile rule from all mainboard makefiles to the x86 arch makefile. This makes porting to a new mainboard less confusing.
Signed-off-by: Carl-Daniel Hailfinger c-d.hailfinger.devel.2006@gmx.net
Index: LinuxBIOSv3/mainboard/adl/msm800sev/Makefile =================================================================== --- LinuxBIOSv3/mainboard/adl/msm800sev/Makefile (Revision 527) +++ LinuxBIOSv3/mainboard/adl/msm800sev/Makefile (Arbeitskopie) @@ -32,11 +32,3 @@ $(obj)/southbridge/amd/cs5536/smbus_initram.o \ $(obj)/arch/x86/geodelx/geodelx.o
-$(obj)/linuxbios.initram.o $(obj)/linuxbios.initram.map: $(obj)/stage0.init $(obj)/stage0-prefixed.o $(patsubst %.o,%_xip.o,$(INITRAM_OBJ)) - $(Q)# initram links against stage0 - $(Q)printf " LD $(subst $(shell pwd)/,,$(@))\n" - $(Q)$(LD) -Ttext 0 --entry main -N -R $(obj)/stage0-prefixed.o \ - $(patsubst %.o,%_xip.o,$(INITRAM_OBJ)) -o $(obj)/linuxbios.initram.o - $(Q)printf " NM $(subst $(shell pwd)/,,$(@))\n" - $(Q)$(NM) $(obj)/linuxbios.initram.o | sort -u > $(obj)/linuxbios.initram.map - Index: LinuxBIOSv3/mainboard/amd/norwich/Makefile =================================================================== --- LinuxBIOSv3/mainboard/amd/norwich/Makefile (Revision 527) +++ LinuxBIOSv3/mainboard/amd/norwich/Makefile (Arbeitskopie) @@ -32,11 +32,3 @@ $(Q)printf " BUILD DUMMY VPD\n" $(Q)dd if=/dev/zero of=$(obj)/linuxbios.vpd bs=256 count=1 $(SILENT)
-$(obj)/linuxbios.initram.o $(obj)/linuxbios.initram.map: $(obj)/stage0.init $(obj)/stage0-prefixed.o $(patsubst %.o,%_xip.o,$(INITRAM_OBJ)) - $(Q)# initram links against stage0 - $(Q)printf " LD $(subst $(shell pwd)/,,$(@))\n" - $(Q)$(LD) -Ttext 0 --entry main -N -R $(obj)/stage0-prefixed.o \ - $(patsubst %.o,%_xip.o,$(INITRAM_OBJ)) -o $(obj)/linuxbios.initram.o - $(Q)printf " NM $(subst $(shell pwd)/,,$(@))\n" - $(Q)$(NM) $(obj)/linuxbios.initram.o | sort -u > $(obj)/linuxbios.initram.map - Index: LinuxBIOSv3/mainboard/artecgroup/dbe61/Makefile =================================================================== --- LinuxBIOSv3/mainboard/artecgroup/dbe61/Makefile (Revision 527) +++ LinuxBIOSv3/mainboard/artecgroup/dbe61/Makefile (Arbeitskopie) @@ -30,11 +30,3 @@ INITRAM_OBJ = $(obj)/mainboard/$(MAINBOARDDIR)/initram.o \ $(obj)/arch/x86/geodelx/geodelx.o
-$(obj)/linuxbios.initram.o $(obj)/linuxbios.initram.map: $(obj)/stage0.init $(obj)/stage0-prefixed.o $(patsubst %.o,%_xip.o,$(INITRAM_OBJ)) - $(Q)# initram links against stage0 - $(Q)printf " LD $(subst $(shell pwd)/,,$(@))\n" - $(Q)$(LD) -Ttext 0 --entry main -N -R $(obj)/stage0-prefixed.o \ - $(patsubst %.o,%_xip.o,$(INITRAM_OBJ)) -o $(obj)/linuxbios.initram.o - $(Q)printf " NM $(subst $(shell pwd)/,,$(@))\n" - $(Q)$(NM) $(obj)/linuxbios.initram.o | sort -u > $(obj)/linuxbios.initram.map - Index: LinuxBIOSv3/mainboard/pcengines/alix1c/Makefile =================================================================== --- LinuxBIOSv3/mainboard/pcengines/alix1c/Makefile (Revision 527) +++ LinuxBIOSv3/mainboard/pcengines/alix1c/Makefile (Arbeitskopie) @@ -31,11 +31,3 @@ $(Q)printf " BUILD DUMMY VPD\n" $(Q)dd if=/dev/zero of=$(obj)/linuxbios.vpd bs=256 count=1 $(SILENT)
-$(obj)/linuxbios.initram.o $(obj)/linuxbios.initram.map: $(obj)/stage0.init $(obj)/stage0-prefixed.o $(patsubst %.o,%_xip.o,$(INITRAM_OBJ)) - $(Q)# initram links against stage0 - $(Q)printf " LD $(subst $(shell pwd)/,,$(@))\n" - $(Q)$(LD) -Ttext 0 --entry main -N -R $(obj)/stage0-prefixed.o \ - $(patsubst %.o,%_xip.o,$(INITRAM_OBJ)) -o $(obj)/linuxbios.initram.o - $(Q)printf " NM $(subst $(shell pwd)/,,$(@))\n" - $(Q)$(NM) $(obj)/linuxbios.initram.o | sort -u > $(obj)/linuxbios.initram.map - Index: LinuxBIOSv3/mainboard/emulation/qemu-x86/Makefile =================================================================== --- LinuxBIOSv3/mainboard/emulation/qemu-x86/Makefile (Revision 527) +++ LinuxBIOSv3/mainboard/emulation/qemu-x86/Makefile (Arbeitskopie) @@ -42,11 +42,3 @@
INITRAM_OBJ = $(obj)/mainboard/$(MAINBOARDDIR)/initram.o
-$(obj)/linuxbios.initram.o $(obj)/linuxbios.initram.map: $(obj)/stage0.init $(obj)/stage0-prefixed.o $(patsubst %.o,%_xip.o,$(INITRAM_OBJ)) - $(Q)# initram links against stage0 - $(Q)printf " LD $(subst $(shell pwd)/,,$(@))\n" - $(Q)$(LD) -Ttext 0 --entry main -N -R $(obj)/stage0-prefixed.o \ - $(patsubst %.o,%_xip.o,$(INITRAM_OBJ)) -o $(obj)/linuxbios.initram.o - $(Q)printf " NM $(subst $(shell pwd)/,,$(@))\n" - $(Q)$(NM) $(obj)/linuxbios.initram.o | sort -u > $(obj)/linuxbios.initram.map - Index: LinuxBIOSv3/arch/x86/Makefile =================================================================== --- LinuxBIOSv3/arch/x86/Makefile (Revision 527) +++ LinuxBIOSv3/arch/x86/Makefile (Arbeitskopie) @@ -232,4 +232,12 @@ $(Q)printf " AS $(subst $(shell pwd)/,,$(@))\n" $(Q)$(AS) $(obj)/arch/x86/stage0_asm.s -o $@
+$(obj)/linuxbios.initram.o $(obj)/linuxbios.initram.map: $(obj)/stage0.init $(obj)/stage0-prefixed.o $(patsubst %.o,%_xip.o,$(INITRAM_OBJ)) + $(Q)# initram links against stage0 + $(Q)printf " LD $(subst $(shell pwd)/,,$(@))\n" + $(Q)$(LD) -Ttext 0 --entry main -N -R $(obj)/stage0-prefixed.o \ + $(patsubst %.o,%_xip.o,$(INITRAM_OBJ)) -o $(obj)/linuxbios.initram.o + $(Q)printf " NM $(subst $(shell pwd)/,,$(@))\n" + $(Q)$(NM) $(obj)/linuxbios.initram.o | sort -u > $(obj)/linuxbios.initram.map + endif
Acked-by: Ronald G. Minnich rminnich@gmail.com
On Nov 27, 2007 10:54 AM, Carl-Daniel Hailfinger c-d.hailfinger.devel.2006@gmx.net wrote:
Factor out one identical makefile rule from all mainboard makefiles to the x86 arch makefile. This makes porting to a new mainboard less confusing.
Signed-off-by: Carl-Daniel Hailfinger c-d.hailfinger.devel.2006@gmx.net
Index: LinuxBIOSv3/mainboard/adl/msm800sev/Makefile
--- LinuxBIOSv3/mainboard/adl/msm800sev/Makefile (Revision 527) +++ LinuxBIOSv3/mainboard/adl/msm800sev/Makefile (Arbeitskopie) @@ -32,11 +32,3 @@ $(obj)/southbridge/amd/cs5536/smbus_initram.o \ $(obj)/arch/x86/geodelx/geodelx.o
-$(obj)/linuxbios.initram.o $(obj)/linuxbios.initram.map: $(obj)/stage0.init $(obj)/stage0-prefixed.o $(patsubst %.o,%_xip.o,$(INITRAM_OBJ))
$(Q)# initram links against stage0$(Q)printf " LD $(subst $(shell pwd)/,,$(@))\n"$(Q)$(LD) -Ttext 0 --entry main -N -R $(obj)/stage0-prefixed.o \$(patsubst %.o,%_xip.o,$(INITRAM_OBJ)) -o $(obj)/linuxbios.initram.o$(Q)printf " NM $(subst $(shell pwd)/,,$(@))\n"$(Q)$(NM) $(obj)/linuxbios.initram.o | sort -u > $(obj)/linuxbios.initram.mapIndex: LinuxBIOSv3/mainboard/amd/norwich/Makefile
--- LinuxBIOSv3/mainboard/amd/norwich/Makefile (Revision 527) +++ LinuxBIOSv3/mainboard/amd/norwich/Makefile (Arbeitskopie) @@ -32,11 +32,3 @@ $(Q)printf " BUILD DUMMY VPD\n" $(Q)dd if=/dev/zero of=$(obj)/linuxbios.vpd bs=256 count=1 $(SILENT)
-$(obj)/linuxbios.initram.o $(obj)/linuxbios.initram.map: $(obj)/stage0.init $(obj)/stage0-prefixed.o $(patsubst %.o,%_xip.o,$(INITRAM_OBJ))
$(Q)# initram links against stage0$(Q)printf " LD $(subst $(shell pwd)/,,$(@))\n"$(Q)$(LD) -Ttext 0 --entry main -N -R $(obj)/stage0-prefixed.o \$(patsubst %.o,%_xip.o,$(INITRAM_OBJ)) -o $(obj)/linuxbios.initram.o$(Q)printf " NM $(subst $(shell pwd)/,,$(@))\n"$(Q)$(NM) $(obj)/linuxbios.initram.o | sort -u > $(obj)/linuxbios.initram.mapIndex: LinuxBIOSv3/mainboard/artecgroup/dbe61/Makefile
--- LinuxBIOSv3/mainboard/artecgroup/dbe61/Makefile (Revision 527) +++ LinuxBIOSv3/mainboard/artecgroup/dbe61/Makefile (Arbeitskopie) @@ -30,11 +30,3 @@ INITRAM_OBJ = $(obj)/mainboard/$(MAINBOARDDIR)/initram.o \ $(obj)/arch/x86/geodelx/geodelx.o
-$(obj)/linuxbios.initram.o $(obj)/linuxbios.initram.map: $(obj)/stage0.init $(obj)/stage0-prefixed.o $(patsubst %.o,%_xip.o,$(INITRAM_OBJ))
$(Q)# initram links against stage0$(Q)printf " LD $(subst $(shell pwd)/,,$(@))\n"$(Q)$(LD) -Ttext 0 --entry main -N -R $(obj)/stage0-prefixed.o \$(patsubst %.o,%_xip.o,$(INITRAM_OBJ)) -o $(obj)/linuxbios.initram.o$(Q)printf " NM $(subst $(shell pwd)/,,$(@))\n"$(Q)$(NM) $(obj)/linuxbios.initram.o | sort -u > $(obj)/linuxbios.initram.mapIndex: LinuxBIOSv3/mainboard/pcengines/alix1c/Makefile
--- LinuxBIOSv3/mainboard/pcengines/alix1c/Makefile (Revision 527) +++ LinuxBIOSv3/mainboard/pcengines/alix1c/Makefile (Arbeitskopie) @@ -31,11 +31,3 @@ $(Q)printf " BUILD DUMMY VPD\n" $(Q)dd if=/dev/zero of=$(obj)/linuxbios.vpd bs=256 count=1 $(SILENT)
-$(obj)/linuxbios.initram.o $(obj)/linuxbios.initram.map: $(obj)/stage0.init $(obj)/stage0-prefixed.o $(patsubst %.o,%_xip.o,$(INITRAM_OBJ))
$(Q)# initram links against stage0$(Q)printf " LD $(subst $(shell pwd)/,,$(@))\n"$(Q)$(LD) -Ttext 0 --entry main -N -R $(obj)/stage0-prefixed.o \$(patsubst %.o,%_xip.o,$(INITRAM_OBJ)) -o $(obj)/linuxbios.initram.o$(Q)printf " NM $(subst $(shell pwd)/,,$(@))\n"$(Q)$(NM) $(obj)/linuxbios.initram.o | sort -u > $(obj)/linuxbios.initram.mapIndex: LinuxBIOSv3/mainboard/emulation/qemu-x86/Makefile
--- LinuxBIOSv3/mainboard/emulation/qemu-x86/Makefile (Revision 527) +++ LinuxBIOSv3/mainboard/emulation/qemu-x86/Makefile (Arbeitskopie) @@ -42,11 +42,3 @@
INITRAM_OBJ = $(obj)/mainboard/$(MAINBOARDDIR)/initram.o
-$(obj)/linuxbios.initram.o $(obj)/linuxbios.initram.map: $(obj)/stage0.init $(obj)/stage0-prefixed.o $(patsubst %.o,%_xip.o,$(INITRAM_OBJ))
$(Q)# initram links against stage0$(Q)printf " LD $(subst $(shell pwd)/,,$(@))\n"$(Q)$(LD) -Ttext 0 --entry main -N -R $(obj)/stage0-prefixed.o \$(patsubst %.o,%_xip.o,$(INITRAM_OBJ)) -o $(obj)/linuxbios.initram.o$(Q)printf " NM $(subst $(shell pwd)/,,$(@))\n"$(Q)$(NM) $(obj)/linuxbios.initram.o | sort -u > $(obj)/linuxbios.initram.mapIndex: LinuxBIOSv3/arch/x86/Makefile
--- LinuxBIOSv3/arch/x86/Makefile (Revision 527) +++ LinuxBIOSv3/arch/x86/Makefile (Arbeitskopie) @@ -232,4 +232,12 @@ $(Q)printf " AS $(subst $(shell pwd)/,,$(@))\n" $(Q)$(AS) $(obj)/arch/x86/stage0_asm.s -o $@
+$(obj)/linuxbios.initram.o $(obj)/linuxbios.initram.map: $(obj)/stage0.init $(obj)/stage0-prefixed.o $(patsubst %.o,%_xip.o,$(INITRAM_OBJ))
$(Q)# initram links against stage0$(Q)printf " LD $(subst $(shell pwd)/,,$(@))\n"$(Q)$(LD) -Ttext 0 --entry main -N -R $(obj)/stage0-prefixed.o \$(patsubst %.o,%_xip.o,$(INITRAM_OBJ)) -o $(obj)/linuxbios.initram.o$(Q)printf " NM $(subst $(shell pwd)/,,$(@))\n"$(Q)$(NM) $(obj)/linuxbios.initram.o | sort -u > $(obj)/linuxbios.initram.mapendif
-- linuxbios mailing list linuxbios@linuxbios.org http://www.linuxbios.org/mailman/listinfo/linuxbios
On Tue, Nov 27, 2007 at 10:54:59AM -0800, ron minnich wrote:
Acked-by: Ronald G. Minnich rminnich@gmail.com
r529.
Uwe.
-
Carl-Daniel Hailfinger -
ron minnich -
Uwe Hermann