Merge branch 'master' of git+ssh://openadk.org/git/openadk

14 files changed, 73 insertions, 43 deletions

diff --git a/TODO b/TODO
index fa8a07fef..dbed99035 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,6 @@
 - netbsd build
 - macos x build
-- make rpm package backend working
-- network scripts for wireless client / ap
+- implement rpm package backend 
+- implement update for MTD devices (foxboard,rb532,ag241)
+- network scripts for wireless client and acess point
 - customise mconf help texts to better fit for OpenADK
diff --git a/package/.template/Makefile b/package/.template/Makefile
index 66064ce81..67d1cc183 100644
--- a/package/.template/Makefile
+++ b/package/.template/Makefile
@@ -23,12 +23,14 @@ $(eval $(call PKG_template,@UPKG@,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PK
 CONFIGURE_STYLE:=	gnu
 # use following to add ./configure options
 #CONFIGURE_ARGS+=	--disable-foo
+# overwrite any configure variables
+#CONFIGURE_ENV+=	ac_cv_func_setpgrp_void=yes
 BUILD_STYLE:=		auto
 INSTALL_STYLE:=		auto
 
 # please install all files and directories to the package dir
 post-install:
-	$(INSTALL_DIR) $(IDIR_@UPKG@)/bin
+	$(INSTALL_DIR) $(IDIR_@UPKG@)/usr/bin
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/@PKG@ $(IDIR_@UPKG@)/usr/bin
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/apr/Makefile b/package/apr/Makefile
index 5a481234f..53048e334 100644
--- a/package/apr/Makefile
+++ b/package/apr/Makefile
@@ -28,7 +28,8 @@ endif
 $(eval $(call PKG_template,APR,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE:=	gnu
-CONFIGURE_ENV+=		ac_cv_func_setpgrp_void=no
+# uClibc setpgrp does not take arguments
+CONFIGURE_ENV+=		ac_cv_func_setpgrp_void=yes
 CONFIGURE_ENV+=		ac_cv_sizeof_size_t=4
 CONFIGURE_ENV+=		ac_cv_sizeof_ssize_t=4
 CONFIGURE_ENV+=		ac_cv_file__dev_zero=yes
diff --git a/package/digitemp/Makefile b/package/digitemp/Makefile
index a03d7e1f1..a291c127c 100644
--- a/package/digitemp/Makefile
+++ b/package/digitemp/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		digitemp
 PKG_VERSION:=		3.6.0
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		libusb libusb-compat
 PKG_MD5SUM:=		9be2e48db37920f21925ae6e88f83b84
-PKG_DESCR:=		simple to use program for reading values from 1-wire devices
+PKG_DESCR:=		program for reading values from 1-wire devices
 PKG_SECTION:=		misc
 PKG_DEPENDS:=		libusb
+PKG_BUILDDEP+=		libusb libusb-compat
 PKG_URL:=		http://www.digitemp.com/software/linux
 PKG_SITES:=		http://www.digitemp.com/software/linux/
 
@@ -20,7 +20,7 @@ $(eval $(call PKG_template,DIGITEMP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${
 
 TCFLAGS+=		-I./src -I./userial
 ALL_TARGET=		ds2490
-BUILD_STYLE=		auto
+BUILD_STYLE:=		auto
 
 do-install:
 	${INSTALL_DIR} ${IDIR_DIGITEMP}/usr/sbin
diff --git a/package/igmpproxy/Makefile b/package/igmpproxy/Makefile
index 90a61257a..cfa09f93e 100644
--- a/package/igmpproxy/Makefile
+++ b/package/igmpproxy/Makefile
@@ -12,6 +12,8 @@ PKG_SECTION:=		net
 PKG_URL:=		http://sourceforge.net/projects/igmpproxy/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=igmpproxy/}
 
+CFLINE_IGMPPROXY=	select ADK_KERNEL_IP_MULTICAST\n\tselect ADK_KERNEL_IP_MROUTE
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,IGMPPROXY,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/libdaemon/Makefile b/package/libdaemon/Makefile
index 587a76ef4..1e5eaeae5 100644
--- a/package/libdaemon/Makefile
+++ b/package/libdaemon/Makefile
@@ -14,16 +14,17 @@ PKG_SITES:=		http://0pointer.de/lennart/projects/libdaemon/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBDAEMON,libdaemon,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBDAEMON,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
+CONFIGURE_STYLE:=	gnu
+# uClibc setpgrp does not take arguments
 CONFIGURE_ENV+=		ac_cv_func_setpgrp_void=yes
 CONFIGURE_ARGS+=	--disable-lynx
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto confprog
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBDAEMON}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libdaemon.so.* ${IDIR_LIBDAEMON}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libdaemon.so* ${IDIR_LIBDAEMON}/usr/lib/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/mt-daapd/Makefile b/package/mt-daapd/Makefile
index 213dcee68..531b93311 100644
--- a/package/mt-daapd/Makefile
+++ b/package/mt-daapd/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		mt-daapd
 PKG_VERSION:=		0.2.4
 PKG_RELEASE:=		10
-PKG_BUILDDEP+=		gdbm libid3tag
 PKG_MD5SUM:=		2e1cdbe6b94ef153e915806f80a28dca
 PKG_DESCR:=		a multi-threaded DAAP (Digital Audio Access Protocol) daemon
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libgdbm libid3tag libpthread
+PKG_BUILDDEP+=		gdbm libid3tag
 PKG_URL:=		http://www.fireflymediaserver.org
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=mt-daapd/}
 
@@ -19,6 +19,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,MT_DAAPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE:=	gnu
+# uClibc setpgrp does not take arguments
 CONFIGURE_ENV+=		ac_cv_func_setpgrp_void=yes
 CONFIGURE_ARGS+=	--enable-mdns \
 			--disable-howl \
diff --git a/package/netperf/Makefile b/package/netperf/Makefile
index fbec25d18..9dac7fbd4 100644
--- a/package/netperf/Makefile
+++ b/package/netperf/Makefile
@@ -17,7 +17,8 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,NETPERF,${PKG_NAME},${PKG_VERSION}${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_ENV+=		ac_cv_func_setpgrp_void=no
+# uClibc setpgrp does not take arguments
+CONFIGURE_ENV+=		ac_cv_func_setpgrp_void=yes
 CONFIGURE_STYLE:=	gnu
 BUILD_STYLE:=		auto
 INSTALL_STYLE:=		auto
diff --git a/package/privoxy/Makefile b/package/privoxy/Makefile
index aa6fa2b2f..985ac546e 100644
--- a/package/privoxy/Makefile
+++ b/package/privoxy/Makefile
@@ -6,12 +6,12 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		privoxy
 PKG_VERSION:=		3.0.15
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		pcre
 PKG_VARIANT:=		beta
 PKG_MD5SUM:=		6571dc9524e945e79c2af62fefe7b107
 PKG_DESCR:=		web proxy with advanced filtering capabilities
 PKG_SECTION:=		net
-PKG_DEPENDS:=		libpthread
+PKG_DEPENDS:=		libpthread libpcre
+PKG_BUILDDEP+=		pcre
 PKG_URL:=		http://www.privoxy.org
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=ijbswa/}
 
@@ -27,7 +27,8 @@ CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--disable-editor \
 			--disable-jar-files \
 			--sysconfdir=/etc/privoxy
-CONFIGURE_ENV+=		ac_cv_func_setpgrp_void=no \
+# uClibc setpgrp does not take arguments
+CONFIGURE_ENV+=		ac_cv_func_setpgrp_void=yes \
 			ac_cv_lib_nsl_gethostbyname=no
 BUILD_STYLE:=		auto
 MAKE_FLAGS+=		SPECIAL_CFLAGS='${TLDFLAGS}'
diff --git a/package/ruby/Makefile b/package/ruby/Makefile
index 349d86c15..4bda5691e 100644
--- a/package/ruby/Makefile
+++ b/package/ruby/Makefile
@@ -20,6 +20,7 @@ MAKE_FILE:=		GNUmakefile
 XAKE_FLAGS+=		optflags='' debugflags=''
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--enable-wide-getaddrinfo
+# uClibc setpgrp does not take arguments
 CONFIGURE_ENV+=         ac_cv_func_setpgrp_void=yes
 BUILD_STYLE:=		auto
 INSTALL_STYLE:=		auto
diff --git a/package/wccpd/Makefile b/package/wccpd/Makefile
index 3997829ee..b55011567 100644
--- a/package/wccpd/Makefile
+++ b/package/wccpd/Makefile
@@ -16,9 +16,8 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,WCCPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE:=	gnu
+# uClibc setpgrp does not take arguments
 CONFIGURE_ENV+=		ac_cv_func_setpgrp_void=yes
-CONFIGURE_ARGS+=	--enable-static \
-			--with-gnu-ld
 BUILD_STYLE:=		auto
 INSTALL_STYLE:=		auto
 
diff --git a/target/Config.in b/target/Config.in
index e86554474..12ab8eb64 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -814,7 +814,7 @@ config ADK_TARGET_PACKAGE_RPM
 	prompt "rpm package format"
 	help
 	  Create rpm packages and use rpm package management on the
-          target.
+          target. WARNING: NOT YET IMPLEMENTED
 
 endchoice
 
diff --git a/target/linux/config/Config.in.network b/target/linux/config/Config.in.network
index 0f38986d5..19f09b05a 100644
--- a/target/linux/config/Config.in.network
+++ b/target/linux/config/Config.in.network
@@ -40,6 +40,16 @@ config ADK_KERNEL_LLC
 	tristate
 	default n
 
+config ADK_KERNEL_IP_MULTICAST
+	prompt "Enable IP Multicasting"
+	boolean
+	default n
+
+config ADK_KERNEL_IP_MROUTE
+	prompt "Enable IP Multicasting Routing"
+	boolean
+	default n
+
 config ADK_KPACKAGE_KMOD_ATM
 	prompt "kmod-atm.......................... Asynchronous Transfer Mode (ATM)"
 	tristate
diff --git a/target/wrap/kernel.config b/target/wrap/kernel.config
index 51c8272c9..50f0a6b6e 100644
--- a/target/wrap/kernel.config
+++ b/target/wrap/kernel.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.31.5
-# Sun Nov 22 19:32:12 2009
+# Linux kernel version: 2.6.32
+# Wed Jan  6 19:38:11 2010
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -16,7 +16,6 @@ CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_FAST_CMPXCHG_LOCAL=y
 CONFIG_MMU=y
 CONFIG_ZONE_DMA=y
 CONFIG_GENERIC_ISA_DMA=y
@@ -33,7 +32,8 @@ CONFIG_ARCH_HAS_CPU_RELAX=y
 CONFIG_ARCH_HAS_DEFAULT_IDLE=y
 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
 CONFIG_HAVE_SETUP_PER_CPU_AREA=y
-CONFIG_HAVE_DYNAMIC_PER_CPU_AREA=y
+CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
+CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
 # CONFIG_HAVE_CPUMASK_OF_CPU_MAP is not set
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
@@ -76,11 +76,12 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y
 #
 # RCU Subsystem
 #
-CONFIG_CLASSIC_RCU=y
-# CONFIG_TREE_RCU is not set
-# CONFIG_PREEMPT_RCU is not set
+CONFIG_TREE_RCU=y
+# CONFIG_TREE_PREEMPT_RCU is not set
+# CONFIG_RCU_TRACE is not set
+CONFIG_RCU_FANOUT=32
+# CONFIG_RCU_FANOUT_EXACT is not set
 # CONFIG_TREE_RCU_TRACE is not set
-# CONFIG_PREEMPT_RCU_TRACE is not set
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=14
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
@@ -112,17 +113,15 @@ CONFIG_SHMEM=y
 # CONFIG_AIO is not set
 
 #
-# Performance Counters
+# Kernel Performance Events And Counters
 #
 # CONFIG_VM_EVENT_COUNTERS is not set
 # CONFIG_PCI_QUIRKS is not set
-CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_COMPAT_BRK is not set
 CONFIG_SLAB=y
 # CONFIG_SLUB is not set
 # CONFIG_SLOB is not set
 # CONFIG_PROFILING is not set
-# CONFIG_MARKERS is not set
 CONFIG_HAVE_OPROFILE=y
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
 CONFIG_HAVE_IOREMAP_PROT=y
@@ -200,6 +199,7 @@ CONFIG_M486=y
 # CONFIG_MVIAC7 is not set
 # CONFIG_MPSC is not set
 # CONFIG_MCORE2 is not set
+# CONFIG_MATOM is not set
 # CONFIG_GENERIC_CPU is not set
 CONFIG_X86_GENERIC=y
 CONFIG_X86_CPU=y
@@ -234,7 +234,6 @@ CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT is not set
 # CONFIG_X86_UP_APIC is not set
 # CONFIG_X86_MCE is not set
-# CONFIG_X86_ANCIENT_MCE is not set
 # CONFIG_VM86 is not set
 # CONFIG_TOSHIBA is not set
 # CONFIG_I8K is not set
@@ -272,6 +271,7 @@ CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
 CONFIG_HAVE_MLOCK=y
 CONFIG_HAVE_MLOCKED_PAGE_BIT=y
+# CONFIG_KSM is not set
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 CONFIG_X86_CHECK_BIOS_CORRUPTION=y
 # CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set
@@ -299,6 +299,7 @@ CONFIG_CMDLINE="console=ttyS0,38400"
 # Power management and ACPI options
 #
 # CONFIG_PM is not set
+# CONFIG_SFI is not set
 
 #
 # CPU Frequency scaling
@@ -349,8 +350,13 @@ CONFIG_UNIX=y
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set
-# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_ASK_IP_FIB_HASH=y
+# CONFIG_IP_FIB_TRIE is not set
 CONFIG_IP_FIB_HASH=y
+# CONFIG_IP_MULTIPLE_TABLES is not set
+# CONFIG_IP_ROUTE_MULTIPATH is not set
+# CONFIG_IP_ROUTE_VERBOSE is not set
 # CONFIG_IP_PNP is not set
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_IPGRE is not set
@@ -375,6 +381,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_NETFILTER is not set
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
+# CONFIG_RDS is not set
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -476,6 +483,7 @@ CONFIG_SCSI_WAIT_SCAN=m
 # CONFIG_SCSI_OSD_INITIATOR is not set
 CONFIG_ATA=y
 # CONFIG_ATA_NONSTANDARD is not set
+# CONFIG_ATA_VERBOSE_ERROR is not set
 # CONFIG_SATA_PMP is not set
 # CONFIG_SATA_AHCI is not set
 # CONFIG_SATA_SIL24 is not set
@@ -497,6 +505,7 @@ CONFIG_ATA_SFF=y
 # CONFIG_PATA_ALI is not set
 # CONFIG_PATA_AMD is not set
 # CONFIG_PATA_ARTOP is not set
+# CONFIG_PATA_ATP867X is not set
 # CONFIG_PATA_ATIIXP is not set
 # CONFIG_PATA_CMD640_PCI is not set
 # CONFIG_PATA_CMD64X is not set
@@ -526,6 +535,7 @@ CONFIG_ATA_SFF=y
 # CONFIG_PATA_OPTIDMA is not set
 # CONFIG_PATA_PDC_OLD is not set
 # CONFIG_PATA_RADISYS is not set
+# CONFIG_PATA_RDC is not set
 # CONFIG_PATA_RZ1000 is not set
 CONFIG_PATA_SC1200=y
 # CONFIG_PATA_SERVERWORKS is not set
@@ -619,16 +629,14 @@ CONFIG_NATSEMI=y
 # CONFIG_SUNDANCE is not set
 # CONFIG_TLAN is not set
 # CONFIG_KS8842 is not set
+# CONFIG_KS8851_MLL is not set
 # CONFIG_VIA_RHINE is not set
 # CONFIG_SC92031 is not set
 # CONFIG_ATL2 is not set
 # CONFIG_NETDEV_1000 is not set
 # CONFIG_NETDEV_10000 is not set
 # CONFIG_TR is not set
-
-#
-# Wireless LAN
-#
+CONFIG_WLAN=y
 # CONFIG_WLAN_PRE80211 is not set
 # CONFIG_WLAN_80211 is not set
 
@@ -644,6 +652,7 @@ CONFIG_NATSEMI=y
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_VMXNET3 is not set
 # CONFIG_ISDN is not set
 # CONFIG_PHONE is not set
 
@@ -737,7 +746,6 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 # CONFIG_POWER_SUPPLY is not set
 # CONFIG_HWMON is not set
 # CONFIG_THERMAL is not set
-# CONFIG_THERMAL_HWMON is not set
 # CONFIG_WATCHDOG is not set
 CONFIG_SSB_POSSIBLE=y
 
@@ -760,6 +768,7 @@ CONFIG_SSB_POSSIBLE=y
 # Graphics support
 #
 # CONFIG_AGP is not set
+CONFIG_VGA_ARB=y
 # CONFIG_DRM is not set
 # CONFIG_VGASTATE is not set
 # CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -877,6 +886,8 @@ CONFIG_EXT2_FS=y
 # CONFIG_XFS_FS is not set
 # CONFIG_OCFS2_FS is not set
 # CONFIG_BTRFS_FS is not set
+# CONFIG_NILFS2_FS is not set
+# CONFIG_AUFS_FS is not set
 CONFIG_FILE_LOCKING=y
 CONFIG_FSNOTIFY=y
 # CONFIG_DNOTIFY is not set
@@ -936,8 +947,6 @@ CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_ROMFS_FS is not set
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
-# CONFIG_NILFS2_FS is not set
-# CONFIG_AUFS_FS is not set
 CONFIG_NETWORK_FILESYSTEMS=y
 # CONFIG_NFS_FS is not set
 # CONFIG_NFSD is not set
@@ -980,6 +989,7 @@ CONFIG_PRINTK_TIME=y
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_FRAME_WARN=1024
 CONFIG_MAGIC_SYSRQ=y
+CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_UNUSED_SYMBOLS is not set
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
@@ -998,7 +1008,7 @@ CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
 CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_FTRACE_SYSCALLS=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 CONFIG_TRACING_SUPPORT=y
 # CONFIG_FTRACE is not set
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
@@ -1036,7 +1046,6 @@ CONFIG_CRYPTO=y
 #
 # Crypto core or helper
 #
-# CONFIG_CRYPTO_FIPS is not set
 # CONFIG_CRYPTO_MANAGER is not set
 # CONFIG_CRYPTO_MANAGER2 is not set
 # CONFIG_CRYPTO_GF128MUL is not set
@@ -1068,12 +1077,14 @@ CONFIG_CRYPTO=y
 #
 # CONFIG_CRYPTO_HMAC is not set
 # CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_VMAC is not set
 
 #
 # Digest
 #
 # CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CRC32C_INTEL is not set
+# CONFIG_CRYPTO_GHASH is not set
 # CONFIG_CRYPTO_MD4 is not set
 # CONFIG_CRYPTO_MD5 is not set
 # CONFIG_CRYPTO_MICHAEL_MIC is not set
@@ -1130,7 +1141,6 @@ CONFIG_CRYPTO_HW=y
 #
 # CONFIG_OCF_OCF is not set
 CONFIG_HAVE_KVM=y
-CONFIG_HAVE_KVM_IRQCHIP=y
 # CONFIG_VIRTUALIZATION is not set
 # CONFIG_BINARY_PRINTF is not set