Merge branch 'origin/master' (early part)

2 files changed, 4 insertions, 2 deletions

diff --git a/scripts/defconfig b/scripts/defconfig
index 0a748febc..896571bd9 100644
--- a/scripts/defconfig
+++ b/scripts/defconfig
@@ -287,6 +287,7 @@ CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
 # Console Utilities
 #
 CONFIG_CHVT=y
+CONFIG_FGCONSOLE=y
 CONFIG_CLEAR=y
 CONFIG_DEALLOCVT=y
 CONFIG_DUMPKMAP=y
diff --git a/scripts/gen_build_files.sh b/scripts/gen_build_files.sh
index d2db907f3..b3aa132a3 100755
--- a/scripts/gen_build_files.sh
+++ b/scripts/gen_build_files.sh
@@ -8,10 +8,11 @@ cd -- "$2" || { echo "Syntax: $0 SRCTREE OBJTREE"; exit 1; }
 srctree="$1"
 
 find -type d | while read -r d; do
+        d="${d#./}"
         src="$srctree/$d/Kbuild.src"
         dst="$d/Kbuild"
         if test -f "$src"; then
-                echo "  CHK     $dst"
+                #echo "  CHK     $dst"
 
                 s=`sed -n 's@^//kbuild:@@p' -- "$srctree/$d"/*.c`
                 echo "# DO NOT EDIT. This file is generated from Kbuild.src" >"$dst.$$.tmp"
@@ -36,7 +37,7 @@ find -type d | while read -r d; do
         src="$srctree/$d/Config.src"
         dst="$d/Config.in"
         if test -f "$src"; then
-                echo "  CHK     $dst"
+                #echo "  CHK     $dst"
 
                 s=`sed -n 's@^//config:@@p' -- "$srctree/$d"/*.c`
                 echo "# DO NOT EDIT. This file is generated from Config.src" >"$dst.$$.tmp"