Merge enable_rom.c files into bootblock.c files.

[coreboot.git] / Makefile

diff --git a/Makefile b/Makefile
index 50421a65fde1ac1510c4837ef6bd99c6bf6dc8e2..8a441db80186443f00487bcb25196e28562eade7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -47,7 +47,10 @@ export KCONFIG_AUTOCONFIG := $(obj)/auto.conf
 CONFIG_SHELL := sh
 KBUILD_DEFCONFIG := configs/defconfig
 UNAME_RELEASE := $(shell uname -r)
-HAVE_DOTCONFIG := $(wildcard .config)
+DOTCONFIG ?= .config
+KCONFIG_CONFIG = $(DOTCONFIG)
+export KCONFIG_CONFIG
+HAVE_DOTCONFIG := $(wildcard $(DOTCONFIG))
 MAKEFLAGS += -rR --no-print-directory
 
 # Make is silent per default, but 'make V=1' will show all compiler calls.
@@ -367,9 +370,9 @@ update:
        dongle.py -c /dev/term/1 $(obj)/coreboot.rom EOF
 
 lint:
-       LINTLOG=`mktemp`; \
+       FAILED=0; LINTLOG=`mktemp`; \
        for script in util/lint/lint-*; do \
-               echo `basename $$script`; \
+               echo; echo `basename $$script`; \
                grep "^# DESCR:" $$script | sed "s,.*DESCR: *,," ; \
                echo ========; \
                $$script > $$LINTLOG; \
@@ -379,9 +382,11 @@ lint:
                        echo test failed: ; \
                        cat $$LINTLOG; \
                        rm -f $$LINTLOG; \
-                       exit 1; \
-               fi \
+                       FAILED=$$(( $$FAILED + 1 )); \
+               fi; \
+               echo ========; \
        done; \
+       test $$FAILED -eq 0 || { echo "ERROR: $$FAILED test(s) failed." &&  exit 1; }; \
        rm -f $$LINTLOG
 
 # This include must come _before_ the pattern rules below!