MTRR: add alternate allocation method for odd memory maps

[coreboot.git] / Makefile.inc

diff --git a/Makefile.inc b/Makefile.inc
index 0f040e91b51f3bd1b87816c46075b074b1704856..b4855d0b6831802b68708973045d2612079db0f0 100644 (file)
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -69,7 +69,7 @@ romstage-c-deps:=$$(OPTION_TABLE_H)
 define ramstage-objs_asl_template
 $(obj)/$(1).ramstage.o: src/$(1).asl $(obj)/config.h
        @printf "    IASL       $$(subst $(top)/,,$$(@))\n"
-       $(CC) -x assembler-with-cpp -E -MMD -MT $$(@) -D__ACPI__ -P -include $(abspath $(obj)/config.h) -I$(src) -I$(src)/mainboard/$(MAINBOARDDIR) $$< -o $$(basename $$@).asl
+       $(CC) -x assembler-with-cpp -E -MMD -MT $$(@) -D__ACPI__ -P -include $(abspath $(obj)/config.h) -I$(src) -I$(src)/include -I$(src)/arch/$(ARCHDIR-y)/include -I$(src)/mainboard/$(MAINBOARDDIR) $$< -o $$(basename $$@).asl
        cd $$(dir $$@); $(IASL) -p $$(notdir $$@) -tc $$(notdir $$(basename $$@)).asl
        mv $$(basename $$@).hex $$(basename $$@).c
        $(CC) $$(CFLAGS) $$(if $$(subst dsdt,,$$(basename $$(notdir $(1)))), -DAmlCode=AmlCode_$$(basename $$(notdir $(1)))) -c -o $$@ $$(basename $$@).c
@@ -204,7 +204,7 @@ clean-for-update-target:
        rm -f $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc
        rm -f $(obj)/mainboard/$(MAINBOARDDIR)/bootblock.* $(obj)/mainboard/$(MAINBOARDDIR)/dsdt.*
        rm -f $(obj)/cpu/x86/smm/smm_bin.c $(obj)/cpu/x86/smm/smm.* $(obj)/cpu/x86/smm/smm
-       $(MAKE) -C payloads/external/SeaBIOS -f Makefile.inc clean
+       $(MAKE) -C payloads/external/SeaBIOS -f Makefile.inc clean OUT=$(abspath $(obj)) HOSTCC="$(HOSTCC)" CC="$(CC)" LD="$(LD)"
 
 clean-target:
        rm -f $(obj)/coreboot*
@@ -225,7 +225,7 @@ lint lint-stable:
                grep "^# DESCR:" $$script | sed "s,.*DESCR: *,," ; \
                echo ========; \
                $$script > $$LINTLOG; \
-               if [ `wc -l $$LINTLOG | cut -d' ' -f1` -eq 0 ]; then \
+               if [ `cat $$LINTLOG | wc -l` -eq 0 ]; then \
                        printf "success\n\n"; \
                else \
                        echo test failed: ; \
@@ -239,7 +239,7 @@ lint lint-stable:
        rm -f $$LINTLOG
 
 gitconfig:
-       if ! [ -x .git/hooks/commit-msg ]; then cp util/gitconfig/commit-msg .git/hooks/commit-msg; chmod +x .git/hooks/commit-msg; fi
+       for hook in commit-msg pre-commit; do if ! [ -x .git/hooks/$$hook ]; then cp util/gitconfig/$$hook .git/hooks/$$hook; chmod +x .git/hooks/$$hook; fi; done
        (git config --global user.name >/dev/null && git config --global user.email >/dev/null) || (printf 'Please configure your name and email in git:\n\n git config --global user.name "Your Name Comes Here"\n git config --global user.email your.email@example.com\n'; exit 1)
 
 crossgcc: clean-for-update