Clobber registers as appropriate in AMD CAR code, and

[coreboot.git] / Makefile

diff --git a/Makefile b/Makefile
index 88c912a34cbdf6be2c0260d8c8f01ab48366d284..f9f17f69e93fa4bb7a4a1ca719bc09c92dfc624b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@
 $(if $(wildcard .xcompile),,$(eval $(shell bash util/xcompile/xcompile > .xcompile)))
 include .xcompile
 
-export top := $(shell pwd)
+export top := $(PWD)
 export src := $(top)/src
 export srck := $(top)/util/kconfig
 export obj ?= $(top)/build
@@ -73,7 +73,7 @@ include $(top)/.config
 ARCHDIR-$(CONFIG_ARCH_X86)    := i386
 ARCHDIR-$(CONFIG_ARCH_POWERPC) := ppc
 
-MAINBOARDDIR=$(shell echo $(CONFIG_MAINBOARD_DIR))
+MAINBOARDDIR=$(subst ",,$(CONFIG_MAINBOARD_DIR))
 export MAINBOARDDIR
 
 PLATFORM-y += src/arch/$(ARCHDIR-y) src/cpu src/mainboard/$(MAINBOARDDIR)
@@ -84,7 +84,7 @@ BUILD-y += util/cbfstool
 BUILD-$(CONFIG_ARCH_X86) += src/pc80
 
 ifneq ($(CONFIG_LOCALVERSION),"")
-COREBOOT_EXTRA_VERSION := -$(shell echo $(CONFIG_LOCALVERSION))
+COREBOOT_EXTRA_VERSION := -$(subst ",,$(CONFIG_LOCALVERSION))
 endif
 
 # The primary target needs to be here before we include the
@@ -140,7 +140,7 @@ $(eval $(call evaluate_subdirs))
 
 define objs_dsl_template
 $(obj)/$(1)%.o: src/$(1)%.asl
-       @printf "    IASL       $$(subst $$(shell pwd)/,,$$(@))\n"
+       @printf "    IASL       $$(subst $(top)/,,$$(@))\n"
        $(CPP) -D__ACPI__ -P $(CPPFLAGS) -include $(obj)/config.h -I$(src) -I$(src)/mainboard/$(MAINBOARDDIR) $$< -o $$(basename $$@).asl
        iasl -p $$(basename $$@) -tc $$(basename $$@).asl
        mv $$(basename $$@).hex $$(basename $$@).c
@@ -148,31 +148,31 @@ $(obj)/$(1)%.o: src/$(1)%.asl
 endef
 
 define objs_c_template
-$(obj)/$(1)%.o: src/$(1)%.c $(obj)/build.h
+$(obj)/$(1)%.o: src/$(1)%.c $(obj)/config.h
        @printf "    CC         $$(subst $$(obj)/,,$$(@))\n"
        $(CC) -m32 $$(CFLAGS) -c -o $$@ $$<
 endef
 
 define objs_S_template
-$(obj)/$(1)%.o: src/$(1)%.S $(obj)/build.h
+$(obj)/$(1)%.o: src/$(1)%.S $(obj)/config.h
        @printf "    CC         $$(subst $$(obj)/,,$$(@))\n"
        $(CC) -m32 -DASSEMBLY $$(CFLAGS) -c -o $$@ $$<
 endef
 
 define initobjs_c_template
-$(obj)/$(1)%.o: src/$(1)%.c $(obj)/build.h
+$(obj)/$(1)%.o: src/$(1)%.c $(obj)/config.h
        @printf "    CC         $$(subst $$(obj)/,,$$(@))\n"
        $(CC) -m32 $$(CFLAGS) -c -o $$@ $$<
 endef
 
 define initobjs_S_template
-$(obj)/$(1)%.o: src/$(1)%.S $(obj)/build.h
+$(obj)/$(1)%.o: src/$(1)%.S $(obj)/config.h
        @printf "    CC         $$(subst $$(obj)/,,$$(@))\n"
        $(CC) -m32 -DASSEMBLY $$(CFLAGS) -c -o $$@ $$<
 endef
 
 define drivers_c_template
-$(obj)/$(1)%.o: src/$(1)%.c $(obj)/build.h
+$(obj)/$(1)%.o: src/$(1)%.c $(obj)/config.h
        @printf "    CC         $$(subst $$(obj)/,,$$(@))\n"
        $(CC) -m32 $$(CFLAGS) -c -o $$@ $$<
 endef
@@ -219,21 +219,9 @@ OBJS     := $(patsubst %,$(obj)/%,$(TARGETS-y))
 INCLUDES := -I$(top)/src -I$(top)/src/include -I$(obj) -I$(top)/src/arch/$(ARCHDIR-y)/include 
 INCLUDES += -I$(shell $(CC) -print-search-dirs | head -n 1 | cut -d' ' -f2)include
 INCLUDES += -I$(top)/util/x86emu/include
-INCLUDES += -include $(obj)/build.h
+INCLUDES += -include $(obj)/config.h
 
-try-run= $(shell set -e; \
-TMP=".$$$$.tmp"; \
-if ($(1)) > /dev/null 2>&1; \
-then echo "$(2)"; \
-else echo "$(3)"; \
-fi; rm -rf "$$TMP")
-
-cc-option= $(call try-run,\
-$(CC) $(1) -S -xc /dev/null -o "$$TMP", $(1), $(2))
-
-STACKPROTECT += $(call cc-option, -fno-stack-protector,)
-
-CFLAGS = $(STACKPROTECT) $(INCLUDES) -Os -nostdinc
+CFLAGS = $(INCLUDES) -Os -nostdinc
 CFLAGS += -nostdlib -Wall -Wundef -Wstrict-prototypes -Wmissing-prototypes
 CFLAGS += -Wwrite-strings -Wredundant-decls -Wno-trigraphs 
 CFLAGS += -Wstrict-aliasing -Wshadow 
@@ -254,7 +242,7 @@ endif
 
 prepare:
        mkdir -p $(obj)
-       mkdir -p $(obj)/util/kconfig/lxdialog
+       mkdir -p $(obj)/util/kconfig/lxdialog $(obj)/util/cbfstool
        test -n "$(alldirs)" && mkdir -p $(alldirs) || true
 
 prepare2: $(obj)/build.h
@@ -262,7 +250,10 @@ prepare2: $(obj)/build.h
 $(obj)/build.h:
        @printf "    GEN        build.h\n"
        rm -f $(obj)/build.h
-       printf "#define COREBOOT_VERSION \"$(KERNELVERSION)\"\n" > $(obj)/build.ht
+       printf "/* build system definitions (autogenerated) */\n" > $(obj)/build.ht
+       printf "#ifndef __BUILD_H\n" >> $(obj)/build.ht
+       printf "#define __BUILD_H\n\n" >> $(obj)/build.ht
+       printf "#define COREBOOT_VERSION \"$(KERNELVERSION)-r$(shell if [ -d $(top)/.svn -a -f `which svnversion` ]; then svnversion $(top); else if [ -d $(top)/.git -a -f `which git` ]; then git --git-dir=/$(top)/.git log|grep git-svn-id|cut -f 2 -d@|cut -f 1 -d' '|sort -g|tail -1; fi; fi)\"\n" >> $(obj)/build.ht
        printf "#define COREBOOT_EXTRA_VERSION \"$(COREBOOT_EXTRA_VERSION)\"\n" >> $(obj)/build.ht
        printf "#define COREBOOT_BUILD \"`LANG= date`\"\n" >> $(obj)/build.ht
        printf "\n" >> $(obj)/build.ht
@@ -273,7 +264,7 @@ $(obj)/build.h:
        printf "#define COREBOOT_COMPILE_BY \"$(subst \,@,$(shell PATH=$$PATH:/usr/ucb whoami))\"\n" >> $(obj)/build.ht
        printf "#define COREBOOT_COMPILE_HOST \"$(shell hostname -s)\"\n" >> $(obj)/build.ht
        printf "#define COREBOOT_COMPILE_DOMAIN \"$(shell test `uname -s` = "Linux" && dnsdomainname || domainname)\"\n" >> $(obj)/build.ht
-       printf "#include \"config.h\"\n" >> $(obj)/build.ht
+       printf "#endif\n" >> $(obj)/build.ht
        mv $(obj)/build.ht $(obj)/build.h
 
 doxy: doxygen
@@ -288,7 +279,7 @@ clean-for-update: doxygen-clean
        rm -f $(objs) $(initobjs) $(drivers) $(smmobjs) .xcompile
        rm -f $(obj)/coreboot_ram* $(obj)/coreboot.romstage $(obj)/coreboot.pre* $(obj)/coreboot.bootblock $(obj)/coreboot.a
        rm -rf $(obj)/bootblock* $(obj)/romstage* $(obj)/location.*
-       rm -f $(obj)/option_table.* $(obj)/crt0_includes.h $(obj)/ldscript $(obj)/config.h
+       rm -f $(obj)/option_table.* $(obj)/crt0_includes.h $(obj)/ldscript
        rm -f $(obj)/mainboard/$(MAINBOARDDIR)/static.c $(obj)/mainboard/$(MAINBOARDDIR)/config.py $(obj)/mainboard/$(MAINBOARDDIR)/static.dot
        rm -f $(obj)/mainboard/$(MAINBOARDDIR)/auto.inc $(obj)/mainboard/$(MAINBOARDDIR)/crt0.s $(obj)/mainboard/$(MAINBOARDDIR)/crt0.disasm
        rmdir -p $(alldirs) 2>/dev/null >/dev/null || true
@@ -321,7 +312,9 @@ ifeq ($(_OS),CYGWIN_)
 endif
 $(obj)/romcc: $(top)/util/romcc/romcc.c
        @printf "    HOSTCC     $(subst $(obj)/,,$(@)) (this may take a while)\n"
-       $(HOSTCC) -g -O2 $(STACK) -Wall -o $@ $<
+       @# Note: Adding -O2 here might cause problems. For details see:
+       @# http://www.coreboot.org/pipermail/coreboot/2010-February/055825.html
+       $(HOSTCC) -g $(STACK) -Wall -o $@ $<
 
 .PHONY: $(PHONY) prepare prepare2 clean distclean doxygen doxy coreboot