summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-07-21 04:06:50 (GMT)
committerH. Peter Anvin <hpa@zytor.com>2009-07-21 04:06:50 (GMT)
commitb6845582e32f05fadd280730a67357848ed6d769 (patch)
tree56592dbc9af7a5aea0b27998d777fd8667f75172
parentc03ac567c15ad6453c0fcb8e9b45d597b625ea2a (diff)
parent61866d4b7db1e1a320d23986174e3d5bd5428ee4 (diff)
downloadktest-b6845582e32f05fadd280730a67357848ed6d769.zip
ktest-b6845582e32f05fadd280730a67357848ed6d769.tar.gz
ktest-b6845582e32f05fadd280730a67357848ed6d769.tar.bz2
ktest-b6845582e32f05fadd280730a67357848ed6d769.tar.xz
Merge commit 'origin/override'
Conflicts: allmake.sh
-rwxr-xr-xallmake.sh8
-rw-r--r--override.no0
-rw-r--r--override.yes5
3 files changed, 9 insertions, 4 deletions
diff --git a/allmake.sh b/allmake.sh
index 6a47f75..c01de51 100755
--- a/allmake.sh
+++ b/allmake.sh
@@ -43,17 +43,17 @@ done
for a in x86_64 i386; do
if [ "$a" = i386 ]; then gccopt=' -m32'; else gccopt=''; fi
mkdir -p o.$a-allconfig o.$a-noconfig
+ export KCONFIG_ALLCONFIG="$here"/override.yes
make ARCH=$a O=o.$a-allconfig CC="$gcc$gccopt" allyesconfig
- sed -r \
- -e 's/^CONFIG_(DEBUG_INFO|CMDLINE_BOOL|BROKEN|SERIAL_MAX3100)=./\1=n/' \
- -i o.$a-allconfig/.config
+ export KCONFIG_ALLCONFIG="$here"/override.no
make ARCH=$a O=o.$a-noconfig CC="$gcc$gccopt" allnoconfig
+ unset KCONFIG_ALLCONFIG
done
MKFILE=/tmp/allmake.$$
rm -f $MKFILE
-fdargs='ro root=/dev/sda1 console=ttyS0,115200 earlyprintk=serial,ttyS0'
+fdargs='ro root=/dev/sda1 console=ttyS0,115200 earlyprintk=serial,ttyS0 disable_mtrr_trim'
cat > $MKFILE <<EOF
TARGET=all
diff --git a/override.no b/override.no
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/override.no
diff --git a/override.yes b/override.yes
new file mode 100644
index 0000000..00ee024
--- /dev/null
+++ b/override.yes
@@ -0,0 +1,5 @@
+CONFIG_DEBUG_INFO=n
+CONFIG_CMDLINE_BOOL=n
+CONFIG_BROKEN=n
+CONFIG_SERIAL_MAX3100=n
+CONFIG_FEALNX=n