dnyarri: Update kernel configuration to v3.10.0.

This also fixes a small error which caused the firmware to not be updated (as
the store path was hardcoded in the configuration).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>

1 files changed, 51 insertions, 15 deletions

diff --git a/machines/dnyarri-kconf.nix b/machines/dnyarri-kconf.nix
index e4ba00b4..2ba662bd 100644
--- a/machines/dnyarri-kconf.nix
+++ b/machines/dnyarri-kconf.nix
@@ -19,7 +19,6 @@
   "CONFIG_RWSEM_XCHGADD_ALGORITHM" = "y";
   "CONFIG_GENERIC_CALIBRATE_DELAY" = "y";
   "CONFIG_ARCH_HAS_CPU_RELAX" = "y";
-  "CONFIG_ARCH_HAS_DEFAULT_IDLE" = "y";
   "CONFIG_ARCH_HAS_CACHE_LINE_SIZE" = "y";
   "CONFIG_ARCH_HAS_CPU_AUTOPROBE" = "y";
   "CONFIG_HAVE_SETUP_PER_CPU_AREA" = "y";
@@ -36,10 +35,8 @@
   "CONFIG_ARCH_HWEIGHT_CFLAGS" = "-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11";
   "CONFIG_ARCH_SUPPORTS_UPROBES" = "y";
   "CONFIG_DEFCONFIG_LIST" = "/lib/modules/$UNAME_RELEASE/.config";
-  "CONFIG_HAVE_IRQ_WORK" = "y";
   "CONFIG_IRQ_WORK" = "y";
   "CONFIG_BUILDTIME_EXTABLE_SORT" = "y";
-  "CONFIG_EXPERIMENTAL" = "y";
   "CONFIG_INIT_ENV_ARG_LIMIT" = "32";
   "CONFIG_CROSS_COMPILE" = "";
   "CONFIG_LOCALVERSION" = "";
@@ -72,6 +69,8 @@
   "CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST" = "y";
   "CONFIG_GENERIC_CMOS_UPDATE" = "y";
   "CONFIG_TICK_ONESHOT" = "y";
+  "CONFIG_NO_HZ_COMMON" = "y";
+  "CONFIG_NO_HZ_IDLE" = "y";
   "CONFIG_NO_HZ" = "y";
   "CONFIG_HIGH_RES_TIMERS" = "y";
   "CONFIG_TICK_CPU_ACCOUNTING" = "y";
@@ -83,6 +82,7 @@
   "CONFIG_TASK_IO_ACCOUNTING" = "y";
   "CONFIG_TREE_PREEMPT_RCU" = "y";
   "CONFIG_PREEMPT_RCU" = "y";
+  "CONFIG_RCU_STALL_COMMON" = "y";
   "CONFIG_RCU_FANOUT" = "64";
   "CONFIG_RCU_FANOUT_LEAF" = "16";
   "CONFIG_RCU_BOOST" = "y";
@@ -120,15 +120,15 @@
   "CONFIG_SYSCTL" = "y";
   "CONFIG_ANON_INODES" = "y";
   "CONFIG_HAVE_UID16" = "y";
-  "CONFIG_UID16" = "y";
   "CONFIG_SYSCTL_EXCEPTION_TRACE" = "y";
-  "CONFIG_KALLSYMS" = "y";
   "CONFIG_HOTPLUG" = "y";
+  "CONFIG_HAVE_PCSPKR_PLATFORM" = "y";
+  "CONFIG_UID16" = "y";
+  "CONFIG_KALLSYMS" = "y";
   "CONFIG_PRINTK" = "y";
   "CONFIG_BUG" = "y";
   "CONFIG_ELF_CORE" = "y";
   "CONFIG_PCSPKR_PLATFORM" = "y";
-  "CONFIG_HAVE_PCSPKR_PLATFORM" = "y";
   "CONFIG_BASE_FULL" = "y";
   "CONFIG_FUTEX" = "y";
   "CONFIG_EPOLL" = "y";
@@ -137,20 +137,22 @@
   "CONFIG_EVENTFD" = "y";
   "CONFIG_SHMEM" = "y";
   "CONFIG_AIO" = "y";
+  "CONFIG_PCI_QUIRKS" = "y";
   "CONFIG_HAVE_PERF_EVENTS" = "y";
   "CONFIG_PERF_EVENTS" = "y";
   "CONFIG_VM_EVENT_COUNTERS" = "y";
-  "CONFIG_PCI_QUIRKS" = "y";
   "CONFIG_SLUB_DEBUG" = "y";
   "CONFIG_SLUB" = "y";
   "CONFIG_HAVE_OPROFILE" = "y";
   "CONFIG_OPROFILE_NMI_TIMER" = "y";
   "CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS" = "y";
+  "CONFIG_ARCH_USE_BUILTIN_BSWAP" = "y";
   "CONFIG_USER_RETURN_NOTIFIER" = "y";
   "CONFIG_HAVE_IOREMAP_PROT" = "y";
   "CONFIG_HAVE_KPROBES" = "y";
   "CONFIG_HAVE_KRETPROBES" = "y";
   "CONFIG_HAVE_OPTPROBES" = "y";
+  "CONFIG_HAVE_KPROBES_ON_FTRACE" = "y";
   "CONFIG_HAVE_ARCH_TRACEHOOK" = "y";
   "CONFIG_HAVE_DMA_ATTRS" = "y";
   "CONFIG_USE_GENERIC_SMP_HELPERS" = "y";
@@ -176,7 +178,8 @@
   "CONFIG_HAVE_IRQ_TIME_ACCOUNTING" = "y";
   "CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE" = "y";
   "CONFIG_MODULES_USE_ELF_RELA" = "y";
-  "CONFIG_GENERIC_SIGALTSTACK" = "y";
+  "CONFIG_OLD_SIGSUSPEND3" = "y";
+  "CONFIG_COMPAT_OLD_SIGACTION" = "y";
   "CONFIG_SLABINFO" = "y";
   "CONFIG_RT_MUTEXES" = "y";
   "CONFIG_BASE_SMALL" = "0";
@@ -245,6 +248,9 @@
   "CONFIG_MICROCODE" = "y";
   "CONFIG_MICROCODE_INTEL" = "y";
   "CONFIG_MICROCODE_OLD_INTERFACE" = "y";
+  "CONFIG_MICROCODE_INTEL_LIB" = "y";
+  "CONFIG_MICROCODE_INTEL_EARLY" = "y";
+  "CONFIG_MICROCODE_EARLY" = "y";
   "CONFIG_X86_MSR" = "m";
   "CONFIG_X86_CPUID" = "m";
   "CONFIG_ARCH_PHYS_ADDR_T_64BIT" = "y";
@@ -277,6 +283,7 @@
   "CONFIG_PHYS_ADDR_T_64BIT" = "y";
   "CONFIG_ZONE_DMA_FLAG" = "1";
   "CONFIG_BOUNCE" = "y";
+  "CONFIG_NEED_BOUNCE_POOL" = "y";
   "CONFIG_VIRT_TO_BUS" = "y";
   "CONFIG_MMU_NOTIFIER" = "y";
   "CONFIG_KSM" = "y";
@@ -338,6 +345,7 @@
   "CONFIG_BINFMT_ELF" = "y";
   "CONFIG_COMPAT_BINFMT_ELF" = "y";
   "CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE" = "y";
+  "CONFIG_BINFMT_SCRIPT" = "y";
   "CONFIG_BINFMT_MISC" = "y";
   "CONFIG_COREDUMP" = "y";
   "CONFIG_IA32_EMULATION" = "y";
@@ -359,6 +367,7 @@
   "CONFIG_INET" = "y";
   "CONFIG_IP_MULTICAST" = "y";
   "CONFIG_IP_ROUTE_CLASSID" = "y";
+  "CONFIG_NET_IP_TUNNEL" = "m";
   "CONFIG_INET_TUNNEL" = "m";
   "CONFIG_INET_LRO" = "y";
   "CONFIG_INET_DIAG" = "y";
@@ -386,6 +395,7 @@
   "CONFIG_NF_CONNTRACK_ZONES" = "y";
   "CONFIG_NF_CONNTRACK_EVENTS" = "y";
   "CONFIG_NF_CONNTRACK_TIMEOUT" = "y";
+  "CONFIG_NF_CONNTRACK_LABELS" = "y";
   "CONFIG_NF_CT_PROTO_DCCP" = "m";
   "CONFIG_NF_CT_PROTO_GRE" = "m";
   "CONFIG_NF_CT_PROTO_SCTP" = "m";
@@ -440,9 +450,11 @@
   "CONFIG_NETFILTER_XT_TARGET_TCPMSS" = "m";
   "CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP" = "m";
   "CONFIG_NETFILTER_XT_MATCH_ADDRTYPE" = "m";
+  "CONFIG_NETFILTER_XT_MATCH_BPF" = "m";
   "CONFIG_NETFILTER_XT_MATCH_CLUSTER" = "m";
   "CONFIG_NETFILTER_XT_MATCH_COMMENT" = "m";
   "CONFIG_NETFILTER_XT_MATCH_CONNBYTES" = "m";
+  "CONFIG_NETFILTER_XT_MATCH_CONNLABEL" = "m";
   "CONFIG_NETFILTER_XT_MATCH_CONNLIMIT" = "m";
   "CONFIG_NETFILTER_XT_MATCH_CONNMARK" = "m";
   "CONFIG_NETFILTER_XT_MATCH_CONNTRACK" = "m";
@@ -493,7 +505,6 @@
   "CONFIG_IP_SET_LIST_SET" = "m";
   "CONFIG_NF_DEFRAG_IPV4" = "m";
   "CONFIG_NF_CONNTRACK_IPV4" = "m";
-  "CONFIG_IP_NF_QUEUE" = "m";
   "CONFIG_IP_NF_IPTABLES" = "m";
   "CONFIG_IP_NF_MATCH_AH" = "m";
   "CONFIG_IP_NF_MATCH_ECN" = "m";
@@ -602,6 +613,9 @@
   "CONFIG_BATMAN_ADV" = "m";
   "CONFIG_BATMAN_ADV_BLA" = "y";
   "CONFIG_OPENVSWITCH" = "m";
+  "CONFIG_VSOCKETS" = "m";
+  "CONFIG_NETLINK_MMAP" = "y";
+  "CONFIG_NETLINK_DIAG" = "m";
   "CONFIG_RPS" = "y";
   "CONFIG_RFS_ACCEL" = "y";
   "CONFIG_XPS" = "y";
@@ -617,7 +631,7 @@
   "CONFIG_FW_LOADER" = "y";
   "CONFIG_FIRMWARE_IN_KERNEL" = "y";
   "CONFIG_EXTRA_FIRMWARE" = "radeon/R600_rlc.bin radeon/R700_rlc.bin patch51.fw";
-  "CONFIG_EXTRA_FIRMWARE_DIR" = "/nix/store/4rwz950z05w6ah2dvinxyyk2s9ifm8my-builtin-firmware";
+  "CONFIG_EXTRA_FIRMWARE_DIR" = "@builtin_firmware@";
   "CONFIG_DMA_SHARED_BUFFER" = "y";
   "CONFIG_CONNECTOR" = "y";
   "CONFIG_PROC_EVENTS" = "y";
@@ -657,6 +671,7 @@
   "CONFIG_NET_TEAM" = "m";
   "CONFIG_NET_TEAM_MODE_BROADCAST" = "m";
   "CONFIG_NET_TEAM_MODE_ROUNDROBIN" = "m";
+  "CONFIG_NET_TEAM_MODE_RANDOM" = "m";
   "CONFIG_NET_TEAM_MODE_ACTIVEBACKUP" = "m";
   "CONFIG_NET_TEAM_MODE_LOADBALANCE" = "m";
   "CONFIG_VXLAN" = "m";
@@ -664,6 +679,8 @@
   "CONFIG_NETPOLL" = "y";
   "CONFIG_NET_POLL_CONTROLLER" = "y";
   "CONFIG_TUN" = "m";
+  "CONFIG_VHOST_NET" = "m";
+  "CONFIG_VHOST_RING" = "m";
   "CONFIG_ETHERNET" = "y";
   "CONFIG_NET_VENDOR_INTEL" = "y";
   "CONFIG_E1000E" = "y";
@@ -691,6 +708,7 @@
   "CONFIG_SERIO" = "y";
   "CONFIG_SERIO_I8042" = "y";
   "CONFIG_SERIO_LIBPS2" = "y";
+  "CONFIG_TTY" = "y";
   "CONFIG_VT" = "y";
   "CONFIG_CONSOLE_TRANSLATIONS" = "y";
   "CONFIG_VT_CONSOLE" = "y";
@@ -709,7 +727,10 @@
   "CONFIG_I2C_HELPER_AUTO" = "y";
   "CONFIG_I2C_ALGOBIT" = "y";
   "CONFIG_I2C_I801" = "y";
+  "CONFIG_PPS" = "y";
+  "CONFIG_PTP_1588_CLOCK" = "y";
   "CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB" = "y";
+  "CONFIG_GPIO_DEVRES" = "y";
   "CONFIG_POWER_SUPPLY" = "y";
   "CONFIG_HWMON" = "y";
   "CONFIG_HWMON_VID" = "y";
@@ -719,7 +740,9 @@
   "CONFIG_THERMAL" = "y";
   "CONFIG_THERMAL_HWMON" = "y";
   "CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE" = "y";
-  "CONFIG_STEP_WISE" = "y";
+  "CONFIG_THERMAL_GOV_STEP_WISE" = "y";
+  "CONFIG_THERMAL_GOV_USER_SPACE" = "y";
+  "CONFIG_INTEL_POWERCLAMP" = "m";
   "CONFIG_SSB_POSSIBLE" = "y";
   "CONFIG_BCMA_POSSIBLE" = "y";
   "CONFIG_MEDIA_SUPPORT" = "y";
@@ -788,7 +811,7 @@
   "CONFIG_DRM_KMS_HELPER" = "y";
   "CONFIG_DRM_TTM" = "y";
   "CONFIG_DRM_RADEON" = "y";
-  "CONFIG_DRM_RADEON_KMS" = "y";
+  "CONFIG_HDMI" = "y";
   "CONFIG_FB" = "y";
   "CONFIG_FB_CFB_FILLRECT" = "y";
   "CONFIG_FB_CFB_COPYAREA" = "y";
@@ -870,6 +893,7 @@
   "CONFIG_USB_ARCH_HAS_HCD" = "y";
   "CONFIG_USB" = "y";
   "CONFIG_USB_ANNOUNCE_NEW_DEVICES" = "y";
+  "CONFIG_USB_DEFAULT_PERSIST" = "y";
   "CONFIG_USB_MON" = "m";
   "CONFIG_USB_EHCI_HCD" = "y";
   "CONFIG_USB_EHCI_ROOT_HUB_TT" = "y";
@@ -949,6 +973,8 @@
   "CONFIG_USB_SERIAL_OMNINET" = "m";
   "CONFIG_USB_SERIAL_OPTICON" = "m";
   "CONFIG_USB_SERIAL_VIVOPAY_SERIAL" = "m";
+  "CONFIG_USB_SERIAL_XSENS_MT" = "m";
+  "CONFIG_USB_SERIAL_WISHBONE" = "m";
   "CONFIG_USB_SERIAL_ZTE" = "m";
   "CONFIG_USB_SERIAL_SSU100" = "m";
   "CONFIG_USB_SERIAL_QT2" = "m";
@@ -957,6 +983,7 @@
   "CONFIG_RTC_LIB" = "y";
   "CONFIG_RTC_CLASS" = "y";
   "CONFIG_RTC_HCTOSYS" = "y";
+  "CONFIG_RTC_SYSTOHC" = "y";
   "CONFIG_RTC_HCTOSYS_DEVICE" = "rtc0";
   "CONFIG_RTC_INTF_SYSFS" = "y";
   "CONFIG_RTC_INTF_PROC" = "y";
@@ -1082,12 +1109,14 @@
   "CONFIG_DEBUG_MEMORY_INIT" = "y";
   "CONFIG_ARCH_WANT_FRAME_POINTERS" = "y";
   "CONFIG_RCU_CPU_STALL_TIMEOUT" = "60";
+  "CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS" = "y";
   "CONFIG_USER_STACKTRACE_SUPPORT" = "y";
   "CONFIG_HAVE_FUNCTION_TRACER" = "y";
   "CONFIG_HAVE_FUNCTION_GRAPH_TRACER" = "y";
   "CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST" = "y";
   "CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST" = "y";
   "CONFIG_HAVE_DYNAMIC_FTRACE" = "y";
+  "CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS" = "y";
   "CONFIG_HAVE_FTRACE_MCOUNT_RECORD" = "y";
   "CONFIG_HAVE_SYSCALL_TRACEPOINTS" = "y";
   "CONFIG_HAVE_FENTRY" = "y";
@@ -1145,12 +1174,14 @@
   "CONFIG_CRYPTO_LRW" = "y";
   "CONFIG_CRYPTO_PCBC" = "y";
   "CONFIG_CRYPTO_XTS" = "y";
+  "CONFIG_CRYPTO_CMAC" = "y";
   "CONFIG_CRYPTO_HMAC" = "y";
   "CONFIG_CRYPTO_XCBC" = "m";
   "CONFIG_CRYPTO_VMAC" = "m";
   "CONFIG_CRYPTO_CRC32C" = "y";
-  "CONFIG_CRYPTO_CRC32C_X86_64" = "y";
   "CONFIG_CRYPTO_CRC32C_INTEL" = "y";
+  "CONFIG_CRYPTO_CRC32" = "y";
+  "CONFIG_CRYPTO_CRC32_PCLMUL" = "y";
   "CONFIG_CRYPTO_GHASH" = "y";
   "CONFIG_CRYPTO_MD4" = "y";
   "CONFIG_CRYPTO_MD5" = "y";
@@ -1161,6 +1192,8 @@
   "CONFIG_CRYPTO_RMD320" = "m";
   "CONFIG_CRYPTO_SHA1" = "y";
   "CONFIG_CRYPTO_SHA1_SSSE3" = "y";
+  "CONFIG_CRYPTO_SHA256_SSSE3" = "y";
+  "CONFIG_CRYPTO_SHA512_SSSE3" = "y";
   "CONFIG_CRYPTO_SHA256" = "y";
   "CONFIG_CRYPTO_SHA512" = "y";
   "CONFIG_CRYPTO_TGR192" = "m";
@@ -1174,9 +1207,11 @@
   "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";
+  "CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64" = "y";
   "CONFIG_CRYPTO_CAST_COMMON" = "y";
   "CONFIG_CRYPTO_CAST5" = "y";
   "CONFIG_CRYPTO_CAST5_AVX_X86_64" = "y";
@@ -1191,12 +1226,14 @@
   "CONFIG_CRYPTO_SERPENT" = "y";
   "CONFIG_CRYPTO_SERPENT_SSE2_X86_64" = "y";
   "CONFIG_CRYPTO_SERPENT_AVX_X86_64" = "y";
+  "CONFIG_CRYPTO_SERPENT_AVX2_X86_64" = "y";
   "CONFIG_CRYPTO_TEA" = "m";
   "CONFIG_CRYPTO_TWOFISH" = "y";
   "CONFIG_CRYPTO_TWOFISH_COMMON" = "y";
   "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";
@@ -1210,6 +1247,7 @@
   "CONFIG_X509_CERTIFICATE_PARSER" = "y";
   "CONFIG_HAVE_KVM" = "y";
   "CONFIG_HAVE_KVM_IRQCHIP" = "y";
+  "CONFIG_HAVE_KVM_IRQ_ROUTING" = "y";
   "CONFIG_HAVE_KVM_EVENTFD" = "y";
   "CONFIG_KVM_APIC_ARCHITECTURE" = "y";
   "CONFIG_KVM_MMIO" = "y";
@@ -1219,7 +1257,6 @@
   "CONFIG_VIRTUALIZATION" = "y";
   "CONFIG_KVM" = "m";
   "CONFIG_KVM_INTEL" = "m";
-  "CONFIG_VHOST_NET" = "m";
   "CONFIG_BITREVERSE" = "y";
   "CONFIG_GENERIC_STRNCPY_FROM_USER" = "y";
   "CONFIG_GENERIC_STRNLEN_USER" = "y";
@@ -1227,7 +1264,6 @@
   "CONFIG_GENERIC_PCI_IOMAP" = "y";
   "CONFIG_GENERIC_IOMAP" = "y";
   "CONFIG_GENERIC_IO" = "y";
-  "CONFIG_PERCPU_RWSEM" = "y";
   "CONFIG_CRC_CCITT" = "y";
   "CONFIG_CRC16" = "y";
   "CONFIG_CRC_T10DIF" = "y";