Drop \r\n and \n\r as both print_XXX and printk now do this internally.

[coreboot.git] / Makefile

diff --git a/Makefile b/Makefile
index f1acda42859d0e3f4adeaa761a8aefb4d3f24450..2a7eac954bab72a38304abc3db23835795905886 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -136,7 +136,7 @@ all:
        chmod +x .ccwrap
        scan-build $(CONFIG_SCANBUILD_REPORT_LOCATION) -analyze-headers --use-cc=$(top)/.ccwrap --use-c++=$(top)/.ccwrap $(MAKE) INNER_SCANBUILD=y
 else
-all: $(obj)/config.h $(obj)/build.h coreboot
+all: $(obj)/config.h coreboot
 endif
 
 # must come rather early
@@ -165,8 +165,6 @@ objs:=$(obj)/mainboard/$(MAINBOARDDIR)/static.o
 initobjs:=
 drivers:=
 smmobjs:=
-crt0s:=
-ldscripts:=
 types:=obj initobj driver smmobj
 
 # Clean -y variables, include Makefile.inc
@@ -222,7 +220,7 @@ define create_cc_template
 # $3 .o infix ("" ".initobj", ...)
 # $4 additional compiler flags
 de$(EMPTY)fine $(1)_$(2)_template
-$(obj)/$$(1)%$(3).o: src/$$(1)%.$(2) | $(obj)/build.h $(obj)/config.h
+$(obj)/$$(1)%$(3).o: src/$$(1)%.$(2) $(obj)/config.h
        printf "    CC         $$$$(subst $$$$(obj)/,,$$$$(@))\n"
        $(CC) $(4) -MMD $$$$(CFLAGS) -c -o $$$$@ $$$$<
 en$(EMPTY)def
@@ -230,8 +228,8 @@ endef
 
 $(eval $(call create_cc_template,objs,c))
 $(eval $(call create_cc_template,objs,S,,-DASSEMBLY))
-$(eval $(call create_cc_template,initobjs,c,.initobj))
-$(eval $(call create_cc_template,initobjs,S,.initobj,-DASSEMBLY))
+$(eval $(call create_cc_template,initobjs,c,.initobj,-D__PRE_RAM__))
+$(eval $(call create_cc_template,initobjs,S,.initobj,-DASSEMBLY -D__PRE_RAM__))
 $(eval $(call create_cc_template,drivers,c,.driver))
 $(eval $(call create_cc_template,drivers,S,.driver,-DASSEMBLY))
 $(eval $(call create_cc_template,smmobjs,c,.smmobj))
@@ -263,13 +261,14 @@ printall:
        @echo LIBGCC_FILE_NAME=$(LIBGCC_FILE_NAME)
 
 printcrt0s:
-       @echo $(patsubst $(top)/%,%,$(crt0s))
+       @echo crt0s=$(crt0s)
+       @echo ldscripts=$(ldscripts)
 
 OBJS     := $(patsubst %,$(obj)/%,$(TARGETS-y))
 INCLUDES := -Isrc -Isrc/include -I$(obj) -Isrc/arch/$(ARCHDIR-y)/include 
 INCLUDES += -Isrc/devices/oprom/include
 # abspath is a workaround for romcc
-INCLUDES += -include $(abspath $(obj)/config.h) -include $(abspath $(obj)/build.h)
+INCLUDES += -include $(abspath $(obj)/config.h)
 
 CFLAGS = $(INCLUDES) -Os -nostdinc -pipe
 CFLAGS += -nostdlib -Wall -Wundef -Wstrict-prototypes -Wmissing-prototypes
@@ -295,7 +294,7 @@ prepare:
        mkdir -p $(obj)/util/kconfig/lxdialog $(obj)/util/cbfstool
        test -n "$(alldirs)" && mkdir -p $(alldirs) || true
 
-$(obj)/build.h $(abspath $(obj)/build.h): .xcompile
+$(obj)/build.h: .xcompile
        @printf "    GEN        build.h\n"
        rm -f $(obj)/build.h
        printf "/* build system definitions (autogenerated) */\n" > $(obj)/build.ht