diff options
| -rw-r--r-- | machines/mmrnmhrm-kconf.nix | 52 | ||||
| -rw-r--r-- | overrides/default.nix | 6 |
2 files changed, 40 insertions, 18 deletions
diff --git a/machines/mmrnmhrm-kconf.nix b/machines/mmrnmhrm-kconf.nix index ef5ed8a9..7d2866dd 100644 --- a/machines/mmrnmhrm-kconf.nix +++ b/machines/mmrnmhrm-kconf.nix @@ -26,6 +26,8 @@ "CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK" = "y"; "CONFIG_ARCH_HIBERNATION_POSSIBLE" = "y"; "CONFIG_ARCH_SUSPEND_POSSIBLE" = "y"; + "CONFIG_ARCH_WANT_HUGE_PMD_SHARE" = "y"; + "CONFIG_ARCH_WANT_GENERAL_HUGETLB" = "y"; "CONFIG_ZONE_DMA32" = "y"; "CONFIG_AUDIT_ARCH" = "y"; "CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING" = "y"; @@ -45,7 +47,8 @@ "CONFIG_HAVE_KERNEL_LZMA" = "y"; "CONFIG_HAVE_KERNEL_XZ" = "y"; "CONFIG_HAVE_KERNEL_LZO" = "y"; - "CONFIG_KERNEL_GZIP" = "y"; + "CONFIG_HAVE_KERNEL_LZ4" = "y"; + "CONFIG_KERNEL_XZ" = "y"; "CONFIG_DEFAULT_HOSTNAME" = "mmrnmhrm"; "CONFIG_SWAP" = "y"; "CONFIG_SYSVIPC" = "y"; @@ -121,11 +124,11 @@ "CONFIG_RD_LZMA" = "y"; "CONFIG_RD_XZ" = "y"; "CONFIG_RD_LZO" = "y"; + "CONFIG_RD_LZ4" = "y"; "CONFIG_SYSCTL" = "y"; "CONFIG_ANON_INODES" = "y"; "CONFIG_HAVE_UID16" = "y"; "CONFIG_SYSCTL_EXCEPTION_TRACE" = "y"; - "CONFIG_HOTPLUG" = "y"; "CONFIG_HAVE_PCSPKR_PLATFORM" = "y"; "CONFIG_UID16" = "y"; "CONFIG_KALLSYMS" = "y"; @@ -181,6 +184,7 @@ "CONFIG_HAVE_CONTEXT_TRACKING" = "y"; "CONFIG_HAVE_IRQ_TIME_ACCOUNTING" = "y"; "CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE" = "y"; + "CONFIG_HAVE_ARCH_SOFT_DIRTY" = "y"; "CONFIG_MODULES_USE_ELF_RELA" = "y"; "CONFIG_OLD_SIGSUSPEND3" = "y"; "CONFIG_COMPAT_OLD_SIGACTION" = "y"; @@ -447,8 +451,10 @@ "CONFIG_RFS_ACCEL" = "y"; "CONFIG_XPS" = "y"; "CONFIG_NETPRIO_CGROUP" = "m"; + "CONFIG_NET_RX_BUSY_POLL" = "y"; "CONFIG_BQL" = "y"; "CONFIG_BPF_JIT" = "y"; + "CONFIG_NET_FLOW_LIMIT" = "y"; "CONFIG_HAVE_BPF_JIT" = "y"; "CONFIG_UEVENT_HELPER_PATH" = ""; "CONFIG_DEVTMPFS" = "y"; @@ -485,11 +491,12 @@ "CONFIG_DM_UEVENT" = "y"; "CONFIG_NETDEVICES" = "y"; "CONFIG_NET_CORE" = "y"; - "CONFIG_MII" = "y"; "CONFIG_VXLAN" = "m"; "CONFIG_VIRTIO_NET" = "m"; + "CONFIG_NLMON" = "m"; "CONFIG_VHOST_NET" = "m"; "CONFIG_VHOST_RING" = "m"; + "CONFIG_VHOST" = "m"; "CONFIG_ETHERNET" = "y"; "CONFIG_NET_VENDOR_INTEL" = "y"; "CONFIG_E1000E" = "y"; @@ -545,6 +552,7 @@ "CONFIG_THERMAL_GOV_STEP_WISE" = "y"; "CONFIG_THERMAL_GOV_USER_SPACE" = "y"; "CONFIG_INTEL_POWERCLAMP" = "m"; + "CONFIG_X86_PKG_TEMP_THERMAL" = "m"; "CONFIG_SSB_POSSIBLE" = "y"; "CONFIG_BCMA_POSSIBLE" = "y"; "CONFIG_MFD_CORE" = "y"; @@ -590,8 +598,6 @@ "CONFIG_DUMMY_CONSOLE" = "y"; "CONFIG_FRAMEBUFFER_CONSOLE" = "y"; "CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY" = "y"; - "CONFIG_FONT_8x8" = "y"; - "CONFIG_FONT_8x16" = "y"; "CONFIG_SOUND" = "y"; "CONFIG_SOUND_OSS_CORE" = "y"; "CONFIG_SOUND_OSS_CORE_PRECLAIM" = "y"; @@ -611,6 +617,7 @@ "CONFIG_SND_HRTIMER" = "y"; "CONFIG_SND_SEQ_HRTIMER_DEFAULT" = "y"; "CONFIG_SND_DYNAMIC_MINORS" = "y"; + "CONFIG_SND_MAX_CARDS" = "32"; "CONFIG_SND_VMASTER" = "y"; "CONFIG_SND_KCTL_JACK" = "y"; "CONFIG_SND_DMA_SGBUF" = "y"; @@ -646,9 +653,6 @@ "CONFIG_USB_HID" = "y"; "CONFIG_USB_HIDDEV" = "y"; "CONFIG_I2C_HID" = "m"; - "CONFIG_USB_ARCH_HAS_OHCI" = "y"; - "CONFIG_USB_ARCH_HAS_EHCI" = "y"; - "CONFIG_USB_ARCH_HAS_XHCI" = "y"; "CONFIG_USB_SUPPORT" = "y"; "CONFIG_USB_COMMON" = "y"; "CONFIG_USB_ARCH_HAS_HCD" = "y"; @@ -733,6 +737,8 @@ "CONFIG_USB_SERIAL_ZTE" = "m"; "CONFIG_USB_SERIAL_SSU100" = "m"; "CONFIG_USB_SERIAL_QT2" = "m"; + "CONFIG_USB_SERIAL_FLASHLOADER" = "m"; + "CONFIG_USB_SERIAL_SUUNTO" = "m"; "CONFIG_USB_EZUSB_FX2" = "m"; "CONFIG_USB_GADGET" = "m"; "CONFIG_USB_GADGET_VBUS_DRAW" = "2"; @@ -748,8 +754,14 @@ "CONFIG_USB_LIBCOMPOSITE" = "m"; "CONFIG_USB_F_ACM" = "m"; "CONFIG_USB_U_SERIAL" = "m"; + "CONFIG_USB_U_ETHER" = "m"; + "CONFIG_USB_U_RNDIS" = "m"; "CONFIG_USB_F_SERIAL" = "m"; "CONFIG_USB_F_OBEX" = "m"; + "CONFIG_USB_F_NCM" = "m"; + "CONFIG_USB_F_ECM" = "m"; + "CONFIG_USB_F_SUBSET" = "m"; + "CONFIG_USB_F_RNDIS" = "m"; "CONFIG_USB_AUDIO" = "m"; "CONFIG_USB_ETH" = "m"; "CONFIG_USB_ETH_RNDIS" = "y"; @@ -911,12 +923,14 @@ "CONFIG_TRACE_IRQFLAGS_SUPPORT" = "y"; "CONFIG_DEFAULT_MESSAGE_LOGLEVEL" = "4"; "CONFIG_FRAME_WARN" = "2048"; + "CONFIG_ARCH_WANT_FRAME_POINTERS" = "y"; "CONFIG_MAGIC_SYSRQ" = "y"; - "CONFIG_PANIC_ON_OOPS_VALUE" = "0"; "CONFIG_HAVE_DEBUG_KMEMLEAK" = "y"; - "CONFIG_DEBUG_BUGVERBOSE" = "y"; "CONFIG_DEBUG_MEMORY_INIT" = "y"; - "CONFIG_ARCH_WANT_FRAME_POINTERS" = "y"; + "CONFIG_HAVE_DEBUG_STACKOVERFLOW" = "y"; + "CONFIG_HAVE_ARCH_KMEMCHECK" = "y"; + "CONFIG_PANIC_ON_OOPS_VALUE" = "0"; + "CONFIG_DEBUG_BUGVERBOSE" = "y"; "CONFIG_RCU_CPU_STALL_TIMEOUT" = "60"; "CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS" = "y"; "CONFIG_USER_STACKTRACE_SUPPORT" = "y"; @@ -932,10 +946,10 @@ "CONFIG_HAVE_C_RECORDMCOUNT" = "y"; "CONFIG_TRACING_SUPPORT" = "y"; "CONFIG_HAVE_ARCH_KGDB" = "y"; - "CONFIG_HAVE_ARCH_KMEMCHECK" = "y"; "CONFIG_STRICT_DEVMEM" = "y"; "CONFIG_X86_VERBOSE_BOOTUP" = "y"; "CONFIG_EARLY_PRINTK" = "y"; + "CONFIG_DOUBLEFAULT" = "y"; "CONFIG_HAVE_MMIOTRACE_SUPPORT" = "y"; "CONFIG_IO_DELAY_TYPE_0X80" = "0"; "CONFIG_IO_DELAY_TYPE_0XED" = "1"; @@ -984,7 +998,7 @@ "CONFIG_CRYPTO_LRW" = "y"; "CONFIG_CRYPTO_PCBC" = "y"; "CONFIG_CRYPTO_XTS" = "y"; - "CONFIG_CRYPTO_CMAC" = "m"; + "CONFIG_CRYPTO_CMAC" = "y"; "CONFIG_CRYPTO_HMAC" = "y"; "CONFIG_CRYPTO_XCBC" = "y"; "CONFIG_CRYPTO_VMAC" = "y"; @@ -1017,7 +1031,6 @@ "CONFIG_CRYPTO_BLOWFISH" = "y"; "CONFIG_CRYPTO_BLOWFISH_COMMON" = "y"; "CONFIG_CRYPTO_BLOWFISH_X86_64" = "y"; - "CONFIG_CRYPTO_BLOWFISH_AVX2_X86_64" = "y"; "CONFIG_CRYPTO_CAMELLIA" = "m"; "CONFIG_CRYPTO_CAMELLIA_X86_64" = "y"; "CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64" = "y"; @@ -1043,10 +1056,11 @@ "CONFIG_CRYPTO_TWOFISH_X86_64" = "y"; "CONFIG_CRYPTO_TWOFISH_X86_64_3WAY" = "y"; "CONFIG_CRYPTO_TWOFISH_AVX_X86_64" = "y"; - "CONFIG_CRYPTO_TWOFISH_AVX2_X86_64" = "y"; "CONFIG_CRYPTO_DEFLATE" = "y"; "CONFIG_CRYPTO_ZLIB" = "y"; "CONFIG_CRYPTO_LZO" = "y"; + "CONFIG_CRYPTO_LZ4" = "y"; + "CONFIG_CRYPTO_LZ4HC" = "y"; "CONFIG_CRYPTO_ANSI_CPRNG" = "m"; "CONFIG_CRYPTO_USER_API" = "m"; "CONFIG_CRYPTO_USER_API_HASH" = "m"; @@ -1071,6 +1085,7 @@ "CONFIG_BITREVERSE" = "y"; "CONFIG_GENERIC_STRNCPY_FROM_USER" = "y"; "CONFIG_GENERIC_STRNLEN_USER" = "y"; + "CONFIG_GENERIC_NET_UTILS" = "y"; "CONFIG_GENERIC_FIND_FIRST_BIT" = "y"; "CONFIG_GENERIC_PCI_IOMAP" = "y"; "CONFIG_GENERIC_IOMAP" = "y"; @@ -1089,6 +1104,9 @@ "CONFIG_ZLIB_DEFLATE" = "y"; "CONFIG_LZO_COMPRESS" = "y"; "CONFIG_LZO_DECOMPRESS" = "y"; + "CONFIG_LZ4_COMPRESS" = "y"; + "CONFIG_LZ4HC_COMPRESS" = "y"; + "CONFIG_LZ4_DECOMPRESS" = "y"; "CONFIG_XZ_DEC" = "y"; "CONFIG_XZ_DEC_X86" = "y"; "CONFIG_XZ_DEC_POWERPC" = "y"; @@ -1103,6 +1121,7 @@ "CONFIG_DECOMPRESS_LZMA" = "y"; "CONFIG_DECOMPRESS_XZ" = "y"; "CONFIG_DECOMPRESS_LZO" = "y"; + "CONFIG_DECOMPRESS_LZ4" = "y"; "CONFIG_TEXTSEARCH" = "y"; "CONFIG_TEXTSEARCH_KMP" = "m"; "CONFIG_TEXTSEARCH_BM" = "m"; @@ -1119,4 +1138,7 @@ "CONFIG_CORDIC" = "y"; "CONFIG_MPILIB" = "m"; "CONFIG_OID_REGISTRY" = "y"; + "CONFIG_FONT_SUPPORT" = "y"; + "CONFIG_FONT_8x8" = "y"; + "CONFIG_FONT_8x16" = "y"; } diff --git a/overrides/default.nix b/overrides/default.nix index 6a6133ae..3fb53607 100644 --- a/overrides/default.nix +++ b/overrides/default.nix @@ -85,11 +85,11 @@ let # misc misc = { kernelSourceAszlig = { - version = "3.10.0-rc6"; + version = "3.11.0-rc5"; src = everything.fetchgit { url = /home/aszlig/linux; - rev = "a3d5c3460a86f52ea435b3fb98be112bd18faabc"; - sha256 = "0vqa4j6wayr1h2z4vxrb1md6y495lkwqm7rqvqibxcjl9lr4nxl1"; + rev = "28fbc8b6a29c849a3f03a6b05010d4b584055665"; + sha256 = "17bp3z18k4sa3zvk465qd8njycarv5wc28k6mc8fp46am198zqsd"; }; }; |