*ping* On Fri, Oct 8, 2010 at 2:06 AM, Warren Turkal <[email protected]> wrote: > I did some test builds on a few intel boards using the tiny bootblock. I > think that this should be pretty low risk. > > Looking for an ack, > wt > 8<------------- > The file is actually just including a bunch of assembly. The build rule > for bootblock.c even states that the file will be "assembler-with-cpp." > > Signed-off-by: Warren Turkal <[email protected]> > --- > src/arch/i386/Makefile.bootblock.inc | 6 +++--- > 1 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/src/arch/i386/Makefile.bootblock.inc > b/src/arch/i386/Makefile.bootblock.inc > index face04c..6d975ac 100644 > --- a/src/arch/i386/Makefile.bootblock.inc > +++ b/src/arch/i386/Makefile.bootblock.inc > @@ -52,7 +52,7 @@ $(obj)/bootblock/ldscript.ld: $$(bootblock_lds) > $(obj)/ldoptions > mkdir -p $(obj)/bootblock > printf '$(foreach ldscript,ldoptions $(bootblock_lds),INCLUDE > "$(ldscript)"\n)' > $@ > > -$(obj)/bootblock/bootblock.c: $$(bootblock_inc) > +$(obj)/bootblock/bootblock.S: $$(bootblock_inc) > �...@printf " GEN $(subst $(obj)/,,$(@))\n" > mkdir -p $(obj)/bootblock > printf '$(foreach crt0,config.h $(bootblock_inc),#include > "$(crt0)"\n)' > $@ > @@ -61,9 +61,9 @@ $(obj)/mainboard/$(MAINBOARDDIR)/bootblock.o: > $(obj)/mainboard/$(MAINBOARDDIR)/b > �...@printf " CC $(subst $(obj)/,,$(@))\n" > $(CC) -I$(obj) -Wa,-acdlns -c -o $@ $< > $(dir $@)/crt0.disasm > > -$(obj)/mainboard/$(MAINBOARDDIR)/bootblock.s: $(obj)/bootblock/bootblock.c > +$(obj)/mainboard/$(MAINBOARDDIR)/bootblock.s: $(obj)/bootblock/bootblock.S > �...@printf " CC $(subst $(obj)/,,$(@))\n" > - $(CC) -MMD -x assembler-with-cpp -DASSEMBLY -E -I$(src)/include > -I$(src)/arch/i386/include -I$(obj) -I$(obj)/bootblock -include > $(obj)/config.h -I. -I$(src) $< -o $@ > + $(CC) -MMD -DASSEMBLY -E -I$(src)/include -I$(src)/arch/i386/include > -I$(obj) -I$(obj)/bootblock -include $(obj)/config.h -I. -I$(src) $< -o $@ > > $(obj)/mainboard/$(MAINBOARDDIR)/bootblock.inc: > $(src)/arch/i386/init/$(subst ",,$(CONFIG_BOOTBLOCK_SOURCE)) > $(objutil)/romcc/romcc > �...@printf " ROMCC $(subst $(obj)/,,$(@))\n" > -- > 1.7.1 > >
-- coreboot mailing list: [email protected] http://www.coreboot.org/mailman/listinfo/coreboot
