summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2014-02-26 14:52:10 +0100
committerGerd Hoffmann <kraxel@redhat.com>2014-02-26 14:52:10 +0100
commitb4086ae61cdcd8a5c24c28b858c4f50079f1955f (patch)
tree09c109b8bb460b8ecf6a0891371b20f2f6691237
parent30db6d85766c84eb1058fef8b1048323ab2f5dca (diff)
downloadkconfig-b4086ae61cdcd8a5c24c28b858c4f50079f1955f.tar.gz
more tweaks
-rw-r--r--hyperv.config2
-rwxr-xr-xkconfig7
-rw-r--r--need.config4
-rw-r--r--qemu.config3
4 files changed, 13 insertions, 3 deletions
diff --git a/hyperv.config b/hyperv.config
index 96d5f45..8ff0c5a 100644
--- a/hyperv.config
+++ b/hyperv.config
@@ -10,10 +10,10 @@ CONFIG_TULIP_NAPI=y
CONFIG_TULIP_NAPI_HW_MITIGATION=y
# vmbus
+CONFIG_HYPERV=m
CONFIG_HYPERV_STORAGE=m
CONFIG_HYPERV_NET=m
CONFIG_HYPERV_KEYBOARD=m
CONFIG_FB_HYPERV=m
CONFIG_HID_HYPERV_MOUSE=m
-CONFIG_HYPERV=m
CONFIG_HYPERV_UTILS=m
diff --git a/kconfig b/kconfig
index 9a098b8..4f1ce82 100755
--- a/kconfig
+++ b/kconfig
@@ -9,7 +9,12 @@ base=$(dirname $0)
for config in $configs; do
if test "$config" = "init"; then
echo "# init"
- cp -v "/boot/config-$(uname -r)" .config
+ if test -f /proc/config.gz; then
+ echo "from /proc/config.gz"
+ zcat /proc/config.gz > .config
+ else
+ cp -v "/boot/config-$(uname -r)" .config || exit 1
+ fi
echo "# oldconfig"
yes "" | make oldconfig >/dev/null
echo "# localmodconfig"
diff --git a/need.config b/need.config
index 0937630..6904c60 100644
--- a/need.config
+++ b/need.config
@@ -1,6 +1,10 @@
# stuff we want have even if "make localmodconfig"
# turns it off due to not being used at the moment
+# config
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+
# usb hid devices
CONFIG_HID_GENERIC=y
CONFIG_USB_HIDDEV=y
diff --git a/qemu.config b/qemu.config
index 17987fd..78df9d4 100644
--- a/qemu.config
+++ b/qemu.config
@@ -41,10 +41,11 @@ CONFIG_VMXNET3=m
# sound
CONFIG_SND_HDA_INTEL=m
-CONFIG_SND_HDA_GENERIC=y
+CONFIG_SND_HDA_GENERIC=m
CONFIG_SND_INTEL8X0=m
# video
+CONFIG_DRM=m
CONFIG_DRM_CIRRUS_QEMU=m
CONFIG_DRM_QXL=m
CONFIG_DRM_BOCHS=m