Fix Fam14 AGESA ACPI table generation

[coreboot.git] / Makefile.inc

diff --git a/Makefile.inc b/Makefile.inc
index 89467db6d939d21279244538cd8f0ff8eab1736f..e12cc923924edb20f727308837dc022aa52c5786 100644 (file)
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -19,8 +19,7 @@
 
 #######################################################################
 # misleadingly named, this is the coreboot version
-REV=-r$(shell if [ -d $(top)/.git -a -f "`which git`" ]; then git --git-dir=/$(top)/.git show -s --pretty=format:%h; fi)
-export KERNELVERSION      := 4.0$(REV)
+export KERNELVERSION := $(shell if [ -d "$(top)/.git" -a -f "`which git`" ]; then git describe --dirty; else echo unknown; fi)
 
 #######################################################################
 # Basic component discovery
@@ -39,19 +38,26 @@ PHONY+= clean-abuild coreboot
 
 #######################################################################
 # root source directories of coreboot
-subdirs-y := src/lib src/boot src/console src/devices src/ec src/southbridge src/northbridge src/superio src/drivers src/cpu
+subdirs-y := src/lib src/boot src/console src/devices src/ec src/southbridge
+subdirs-y += src/northbridge src/superio src/drivers src/cpu src/vendorcode
 subdirs-y += util/cbfstool util/sconfig
 subdirs-y += src/arch/$(ARCHDIR-y)
 subdirs-y += src/mainboard/$(MAINBOARDDIR)
 
 subdirs-$(CONFIG_ARCH_X86) += src/pc80
 
+subdirs-y += site-local
+
 #######################################################################
 # Add source classes and their build options
 classes-y := ramstage romstage driver smm
 
 romstage-c-ccopts:=-D__PRE_RAM__
 romstage-S-ccopts:=-D__PRE_RAM__
+ifeq ($(CONFIG_TRACE),y)
+ramstage-c-ccopts:= -finstrument-functions
+endif
+
 smm-c-ccopts:=-D__SMM__
 smm-S-ccopts:=-D__SMM__
 
@@ -128,6 +134,7 @@ $(obj)/build.h: .xcompile
        printf "#define COREBOOT_VERSION \"$(KERNELVERSION)\"\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 "#define COREBOOT_DMI_DATE \"`LANG= date +"%m/%d/%Y"`\"\n" >> $(obj)/build.ht
        printf "\n" >> $(obj)/build.ht
        printf "#define COREBOOT_COMPILER \"$(shell LANG= $(CC) --version | head -n1)\"\n" >> $(obj)/build.ht
        printf "#define COREBOOT_ASSEMBLER \"$(shell LANG= $(AS) --version | head -n1)\"\n" >> $(obj)/build.ht