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

author: Waldemar Brodkorb <wbx@openadk.org> 2014-12-26 15:15:43 +0100
committer: Waldemar Brodkorb <wbx@openadk.org> 2014-12-26 15:15:43 +0100
commit: f8f4789eb00ad9e7768a98bed5f598f36c6679f4 (patch)
tree: 23e1e1aaa58b147f21e3ee19a25886edf7960cb9
parent: ad9e0b66c9f717f3cdcc4a265fd2a41a37b8ed1b (diff)
parent: 6967ec40538c8b4f8646dfc38aa355dc70a84dab (diff)
25 files changed, 167 insertions, 292 deletions
diff --git a/docs/images/menuconfig-configured.png b/docs/images/menuconfig-configured.png
deleted file mode 100644
index cad536cc9..000000000
--- a/docs/images/menuconfig-configured.png
+++ /dev/null
diff --git a/docs/images/menuconfig.png b/docs/images/menuconfig.png
deleted file mode 100644
index 5624a2982..000000000
--- a/docs/images/menuconfig.png
+++ /dev/null
diff --git a/docs/images/openadk-appliance.png b/docs/images/openadk-appliance.png
new file mode 100644
index 000000000..3e590b39c
--- /dev/null
+++ b/docs/images/openadk-appliance.png
diff --git a/docs/images/openadk-target.png b/docs/images/openadk-target.png
new file mode 100644
index 000000000..97c04d07e
--- /dev/null
+++ b/docs/images/openadk-target.png
diff --git a/docs/using.txt b/docs/using.txt
index 7cf109609..44537087b 100644
--- a/docs/using.txt
+++ b/docs/using.txt
@@ -18,16 +18,18 @@ assistant:
 For each menu entry in the configuration tool, you can find associated
 help that describes the purpose of the entry.
 
-image::menuconfig.png[]
+image::openadk-appliance.png[]
 
-First of all you need to choose your target architecture, your target
-system, your target C library, your target firmware type and your target
-package format. After that you can select individual packages and kernel
-settings or just use one of the predefined package collections. When you
-are ready exit and save.  You can always redefine the configuration
-using +make menuconfig+.
+First of all you need to choose a new or predefined appliance. 
+This is a collection of different packages and configuration options
+for specific appliance.
 
-image::menuconfig-configured.png[]
+image::openadk-target.png[]
+
+After that you can choose your target architecture, your target system and
+other general stuff.  Then you can select individual packages and kernel
+settings. When you are ready exit and save. You can always redefine the
+configuration using +make menuconfig+.
 
 Once everything is configured, the configuration tool generates a
 +.config+ file that contains the description of your configuration. It
diff --git a/mk/build.mk b/mk/build.mk
index 751aa2ae4..6ac3a77f5 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -10,6 +10,8 @@ DEFCONFIG=		ADK_DEBUG=n \
 			ADK_PACKAGE_BUSYBOX_HIDE=n \
 			ADK_DISABLE_KERNEL_PATCHES=n \
 			ADK_DISABLE_TARGET_KERNEL_PATCHES=n \
+			ADK_DISABLE_TCP_FASTOPEN=n \
+			ADK_KERNEL_FB_CON_DECOR=n \
 			ADK_CHOOSE_APPLIANCE=n \
 			ADK_WGET_TIMEOUT=180 \
 			ADK_MAKE_PARALLEL=y \
diff --git a/mk/modules.mk b/mk/modules.mk
index 598c46392..84d5beb10 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -591,11 +591,6 @@ $(eval $(call KMOD_template,IP_NF_TARGET_REJECT,ip-nf-target-reject,\
 	$(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_REJECT \
 ,60))
 
-
-$(eval $(call KMOD_template,IP_NF_TARGET_ULOG,ip-nf-target-ulog,\
-	$(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_ULOG \
-,60))
-
 $(eval $(call KMOD_template,IP_NF_TARGET_TCPMSS,ip-nf-target-tcpmss,\
 	$(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_TCPMSS \
 ,60))
diff --git a/package/aiccu/Makefile b/package/aiccu/Makefile
index 33563aa5b..f20c82635 100644
--- a/package/aiccu/Makefile
+++ b/package/aiccu/Makefile
@@ -12,8 +12,9 @@ PKG_SECTION:=		net/ipv6
 PKG_DEPENDS:=		libpthread
 PKG_URL:=		http://www.sixxs.net/
 PKG_SITES:=		http://www.sixxs.net/archive/sixxs/aiccu/unix/
+PKG_CFLINE_AICCU:=	select ADK_KERNEL_TUN m
 
-PKG_LIBC_DEPENDS:=	uclibc glibc
+PKG_LIBC_DEPENDS:=	uclibc-ng uclibc glibc
 
 DISTFILES:=		$(PKG_NAME)_$(PKG_VERSION).tar.gz
 WRKDIST=		${WRKDIR}/$(PKG_NAME)
diff --git a/package/bridge-utils/Makefile b/package/bridge-utils/Makefile
index 2afc30709..fbf5c22dd 100644
--- a/package/bridge-utils/Makefile
+++ b/package/bridge-utils/Makefile
@@ -12,6 +12,7 @@ PKG_SECTION:=		net/route
 PKG_URL:=		http://www.linuxfoundation.org/en/Net:Bridge
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=bridge/}
 PKG_BB:=		1
+PKG_CFLINE_BRIDGE_UTILS:=select ADK_KERNEL_BRIDGE
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in
index 21628221f..cdc765d97 100644
--- a/package/busybox/config/networking/Config.in
+++ b/package/busybox/config/networking/Config.in
@@ -435,6 +435,7 @@ config BUSYBOX_FEATURE_IFCONFIG_BROADCAST_PLUS
 
 config BUSYBOX_IFENSLAVE
 	bool "ifenslave"
+	select ADK_KERNEL_BONDING m
 	default n
 	select BUSYBOX_PLATFORM_LINUX
 	help
diff --git a/package/chillispot/Makefile b/package/chillispot/Makefile
index a031a1c5d..02fc2a941 100644
--- a/package/chillispot/Makefile
+++ b/package/chillispot/Makefile
@@ -10,7 +10,8 @@ PKG_MD5SUM:=		9d2597756af3fa14d7331b4a3651fc9b
 PKG_DESCR:=		wireless lan access point controller
 PKG_SECTION:=		net/wifi
 PKG_URL:=		http://www.chillispot.info/
-PKG_SITES=		http://www.chillispot.info/download/
+PKG_SITES:=		http://www.chillispot.info/download/
+PKG_CFLINE_CHILLISPOT:=	select ADK_KERNEL_TUN m
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
diff --git a/package/mtd-utils/Makefile b/package/mtd-utils/Makefile
index 6d2e2a165..2498fc007 100644
--- a/package/mtd-utils/Makefile
+++ b/package/mtd-utils/Makefile
@@ -9,6 +9,7 @@ PKG_RELEASE:=		2
 PKG_MD5SUM:=		fd929de593acadd658d45feb07f993aa
 PKG_DESCR:=		flash filesystem utilities
 PKG_SECTION:=		sys/fs
+PKG_BUILDDEP:=		zlib
 HOST_BUILDDEP:=		liblzo-host
 PKG_URL:=		http://www.linux-mtd.infradead.org
 PKG_SITES:=		http://git.infradead.org/mtd-utils.git/snapshot/
diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile
index 044d86a71..1ec1112aa 100644
--- a/package/openvpn/Makefile
+++ b/package/openvpn/Makefile
@@ -13,6 +13,7 @@ PKG_DEPENDS:=		ip
 PKG_BUILDDEP:=		openssl
 PKG_URL:=		http://openvpn.net/
 PKG_SITES:=		http://swupdate.openvpn.org/community/releases/
+PKG_CFLINE_OPENVPN:=	select ADK_KERNEL_TUN m
 
 PKG_FLAVOURS_OPENVPN:=	WITH_LZO WITH_MANAGEMENT WITH_HTTPPROXY WITH_SOCKS
 PKGFD_WITH_LZO:=	enable lzo compression support
diff --git a/package/ppp/Makefile b/package/ppp/Makefile
index 9d84efe81..b9207e877 100644
--- a/package/ppp/Makefile
+++ b/package/ppp/Makefile
@@ -12,6 +12,7 @@ PKG_SECTION:=		net/ppp
 PKG_BUILDDEP:=		libpcap
 PKG_URL:=		http://ppp.samba.org/
 PKG_SITES:=		ftp://ftp.samba.org/pub/ppp/
+PKG_CFLINE_PPP:=	select ADK_KERNEL_PPP m
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
diff --git a/package/pptp/Makefile b/package/pptp/Makefile
index 46faa1d85..64819bbe8 100644
--- a/package/pptp/Makefile
+++ b/package/pptp/Makefile
@@ -11,6 +11,8 @@ PKG_DESCR:=		point-to-point tunneling protocol client
 PKG_SECTION:=		net/ppp
 PKG_DEPENDS:=		ppp
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=pptpclient/}
+PKG_CFLINE_PPTP:=	select ADK_KERNEL_NET_IPGRE m@
+PKG_CFLINE_PPTP+=	select ADK_KERNEL_PPP m
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
diff --git a/package/pptpd/Makefile b/package/pptpd/Makefile
index 05b4dc3de..1d4a53b0e 100644
--- a/package/pptpd/Makefile
+++ b/package/pptpd/Makefile
@@ -12,10 +12,13 @@ PKG_SECTION:=		net/ppp
 PKG_DEPENDS:=		ppp
 PKG_URL:=		http://www.poptop.org/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=poptop/}
+PKG_CFLINE_PPTPD:=	select ADK_KERNEL_NET_IPGRE m@
+PKG_CFLINE_PPTPD+=	select ADK_KERNEL_PPP m@
+PKG_CFLINE_PPTPD+=	select ADK_KERNEL_PPP_MPPE m
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-PKG_LIBC_DEPENDS:=	uclibc glibc
+PKG_LIBC_DEPENDS:=	uclibc-ng uclibc glibc
 
 include ${ADK_TOPDIR}/mk/package.mk
 
diff --git a/package/tinc/Makefile b/package/tinc/Makefile
index 0a7661a6c..a9adad559 100644
--- a/package/tinc/Makefile
+++ b/package/tinc/Makefile
@@ -13,6 +13,7 @@ PKG_DEPENDS:=		zlib liblzo libopenssl
 PKG_BUILDDEP:=		zlib liblzo openssl
 PKG_URL:=		http://www.tinc-vpn.org/
 PKG_SITES:=		http://www.tinc-vpn.org/packages/
+PKG_CFLINE_TINC:=	select ADK_KERNEL_TUN m
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
diff --git a/package/vpnc/Makefile b/package/vpnc/Makefile
index a2beed52c..51e975b6c 100644
--- a/package/vpnc/Makefile
+++ b/package/vpnc/Makefile
@@ -13,6 +13,7 @@ PKG_DEPENDS:=		libgcrypt libgpg-error
 PKG_BUILDDEP:=		libgcrypt libgpg-error
 PKG_URL:=		http://www.unix-ag.uni-kl.de/~massar/vpnc/
 PKG_SITES:=		http://www.unix-ag.uni-kl.de/~massar/vpnc/
+PKG_CFLINE_VPNC:=	select ADK_KERNEL_TUN m
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
diff --git a/package/vtun/Makefile b/package/vtun/Makefile
index 15d1f7c6e..05c7e6706 100644
--- a/package/vtun/Makefile
+++ b/package/vtun/Makefile
@@ -12,6 +12,7 @@ PKG_SECTION:=		net/security
 PKG_DEPENDS:=		zlib libopenssl liblzo
 PKG_BUILDDEP:=		zlib openssl liblzo
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=vtun/}
+PKG_CFLINE_VTUN:=	select ADK_KERNEL_TUN m
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio
index d8888be5a..e367d9115 100644
--- a/target/linux/config/Config.in.audio
+++ b/target/linux/config/Config.in.audio
@@ -2,76 +2,76 @@ menu "Audio devices support"
 depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_USB || ADK_TARGET_WITH_SOUND || ADK_TARGET_QEMU
 
 config ADK_KERNEL_SND_PCI
-	boolean
+	bool
 
 config ADK_KERNEL_SND_USB
-	boolean
+	bool
 
 config ADK_KERNEL_SND_SOC
-	boolean
+	bool
 
 config ADK_KERNEL_SND_ARM
-	boolean
+	bool
 
 config ADK_KERNEL_SND_SOC_GENERIC_DMAENGINE_PCM
-	boolean
+	bool
 
 config ADK_KERNEL_SND_DMAENGINE_PCM
-	boolean
+	bool
 
 config ADK_KERNEL_SND_SOC_SPDIF
-	boolean
+	bool
 
 config ADK_KERNEL_SND_SOC_FSL_ASRC
-	boolean
+	bool
 
 config ADK_KERNEL_SND_SOC_FSL_SPDIF
-	boolean
+	bool
 
 config ADK_KERNEL_SND_SOC_IMX_SGTL5000
-	boolean
+	bool
 
 config ADK_KERNEL_SND_SOC_IMX_PCM_DMA
-	boolean
+	bool
 
 config ADK_KERNEL_SND_SOC_IMX_HDMI_DMA
-	boolean
+	bool
 
 config ADK_KERNEL_SND_SOC_IMX_SPDIF
-	boolean
+	bool
 
 config ADK_KERNEL_SND_SOC_IMX_HDMI
-	boolean
+	bool
 
 config ADK_KERNEL_SND_PXA2XX_AC97
-	boolean
+	bool
 
 config ADK_KERNEL_SND_PXA2XX_SOC
-	boolean
+	bool
 
 config ADK_KERNEL_SND_TIMER
-	boolean
+	bool
 
 config ADK_KERNEL_SND_PCM
+	bool
 	select ADK_KERNEL_SND_TIMER
 	select ADK_KERNEL_SND_DMAENGINE_PCM
 	select ADK_KERNEL_SND_PCM_DMAENGINE
-	boolean
 
 config ADK_KERNEL_SND_HWDEP
-	boolean
+	bool
 
 config ADK_KERNEL_SOUND
-	boolean
+	bool
 
 config ADK_KERNEL_SND_RAWMIDI
-	boolean
+	bool
 
 config ADK_KERNEL_SND_AC97_CODEC
-	boolean
+	bool
 
 config ADK_KERNEL_SND_SOC_I2C_AND_SPI
-	boolean
+	bool
 
 config ADK_KERNEL_SND_SOC_WM8731
 	tristate
@@ -100,18 +100,16 @@ config ADK_KERNEL_SND_SOC_PCM512x_SPI
 	select ADK_KERNEL_SND_SOC_I2C_AND_SPI
 
 config ADK_KERNEL_SND_PCM_DMAENGINE
-	boolean
+	bool
 
 config ADK_KERNEL_SND
-	boolean
+	bool
 	select ADK_KERNEL_SOUND
 	select ADK_KERNEL_SND_PCM
 	select ADK_KERNEL_SND_HWDEP
-	default n
 
 config ADK_KERNEL_SND_INTEL8X0
-	prompt "Intel AC97 driver"
-	boolean
+	bool "Intel AC97 driver"
 	select ADK_KERNEL_SND
 	select ADK_KERNEL_SND_PCI
 	select ADK_KERNEL_SND_AC97_CODEC
@@ -123,39 +121,32 @@ config ADK_KERNEL_SND_INTEL8X0
 	  Driver for intel chipsets.
 
 config ADK_KERNEL_SND_VIA82XX
-	prompt "VIA82XX driver"
-	boolean
+	bool "VIA82XX driver"
 	select ADK_KERNEL_SND
-	default n
 	depends on ADK_TARGET_WITH_PCI
 	help
 	 ALSA VIA82XX driver
 
 config ADK_KERNEL_SND_ENS1370
-	prompt "Ensoniq 1370 driver"
-	boolean
+	bool "Ensoniq 1370 driver"
 	select ADK_KERNEL_SND
-	default n
 	depends on ADK_TARGET_WITH_PCI
 	help
 	 ALSA Ensonique 1370 driver
 
 config ADK_KERNEL_SND_CS5535AUDIO
-	prompt "AMD CS5535 driver"
-	boolean
+	bool "AMD CS5535 driver"
 	select ADK_KERNEL_SND_PCI
 	select ADK_KERNEL_SND_AC97_CODEC
 	select ADK_KERNEL_SND
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
-	default n
 	depends on ADK_TARGET_WITH_PCI
 	help
 	 ALSA AMD CS5535 driver
 
 config ADK_KERNEL_SND_PXA2XX_SOC_SPITZ
-	prompt "Sharp Zaurus SoC"
-	boolean
+	bool "Sharp Zaurus SoC"
 	select ADK_KERNEL_SND
 	select ADK_KERNEL_SND_ARM
 	select ADK_KERNEL_SND_PXA2XX_AC97
@@ -167,8 +158,7 @@ config ADK_KERNEL_SND_PXA2XX_SOC_SPITZ
 	default n
 
 config ADK_KERNEL_SND_BCM2835
-	prompt "Raspberry PI onboard soundcard"
-	boolean
+	bool "Raspberry PI onboard soundcard"
 	select ADK_KERNEL_SND
 	select ADK_KERNEL_SND_ARM
 	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
@@ -189,47 +179,37 @@ config ADK_KERNEL_SND_BCM2708_SOC_I2S
 	default n
 
 config ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DAC
-	prompt "Hifiberry DAC"
-	tristate
+	tristate "Hifiberry DAC"
 	select ADK_KERNEL_SND_BCM2708_SOC_I2S
 	select ADK_KERNEL_SND_SOC_PCM5102A
 	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
-	default n
 
 config ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DIGI
-	prompt "Hifiberry DIGI"
-	tristate
+	tristate "Hifiberry DIGI"
 	select ADK_KERNEL_SND_BCM2708_SOC_I2S
 	select ADK_KERNEL_SND_SOC_WM8804
 	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
-	default n
 
 config ADK_KERNEL_SND_BCM2708_SOC_RPI_DAC
-	prompt "RPI-DAC"
-	tristate
+	tristate "RPI-DAC"
 	select ADK_KERNEL_SND_BCM2708_SOC_I2S
 	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
-	default n
 
 config ADK_KERNEL_SND_BCM2708_SOC_IQAUDIO_DAC
-	prompt "IQAudio-DAC"
-	tristate
+	tristate "IQAudio-DAC"
 	select ADK_KERNEL_SND_BCM2708_SOC_I2S
 	select ADK_KERNEL_SND_SOC_PCM512x_I2C
 	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
-	default n
 
 config ADK_KERNEL_SND_BCM2708_SOC_RPI_CODEC_PROTO
-	prompt "Rpi-Codec-Proto"
-	tristate
+	tristate "Rpi-Codec-Proto"
 	select ADK_KERNEL_SND_BCM2708_SOC_I2S
 	select ADK_KERNEL_SND_SOC_WM8731
 	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
-	default n
+	depends on ADK_KERNEL_VERSION_3_12
 
 config ADK_KERNEL_SND_IMX_SOC
-	prompt "Solidrun SoC sound chip"
-	boolean
+	bool "Solidrun SoC sound chip"
 	select ADK_KERNEL_SND
 	select ADK_KERNEL_SND_SOC
 	select ADK_KERNEL_SND_SOC_GENERIC_DMAENGINE_PCM
diff --git a/target/linux/config/Config.in.netfilter.ip4 b/target/linux/config/Config.in.netfilter.ip4
index a29c212cd..77617ea12 100644
--- a/target/linux/config/Config.in.netfilter.ip4
+++ b/target/linux/config/Config.in.netfilter.ip4
@@ -89,22 +89,6 @@ config ADK_KERNEL_IP_NF_TARGET_REJECT
 	  error should be issued in response to an incoming packet, rather
 	  than silently being dropped.
 
-config ADK_KERNEL_IP_NF_TARGET_ULOG
-	tristate 'ULOG target support'
-	depends on ADK_KERNEL_IP_NF_FILTER
-	help
-	  This option enables the old IPv4-only "ipt_ULOG" implementation
-	  which has been obsoleted by the new "nfnetlink_log" code (see
-	  CONFIG_NETFILTER_NETLINK_LOG).
-
-	  This option adds a `ULOG' target, which allows you to create rules in
-	  any iptables table. The packet is passed to a userspace logging
-	  daemon using netlink multicast sockets; unlike the LOG target
-	  which can only be viewed through syslog.
-
-	  The appropriate userspace logging daemon (ulogd) may be obtained from
-	  <http://www.gnumonks.org/projects/ulogd/>
-
 config ADK_KERNEL_IP_NF_TARGET_REDIRECT
 	tristate 'REDIRECT target support'
 	depends on ADK_KERNEL_NF_NAT
diff --git a/target/linux/config/Config.in.network b/target/linux/config/Config.in.network
index 6e20a190e..a9980d50d 100644
--- a/target/linux/config/Config.in.network
+++ b/target/linux/config/Config.in.network
@@ -1,67 +1,75 @@
 menu "Network support"
 
+config ADK_KERNEL_CONFIG_INET
+	bool "Enable TCP/IP support"
+	select ADK_KERNEL_CRYPTO_AES
+	default y
+
 config ADK_KERNEL_IP_FIB_HASH
-	boolean
+	bool
 	default y
 
 config ADK_DISABLE_TCP_FASTOPEN
-	prompt "Disable TCP Fastopen"
-	boolean
+	bool "Disable TCP Fastopen"
 	select ADK_KERNEL_ADDON_DIETNET
-	default n
+
+config ADK_KERNEL_IPV6
+	tristate "Enable IPv6 support"
+	help
+	  This is complemental support for the IP version 6.
+	  You will still be able to do traditional IPv4 networking as well.
+
+	  For general information about IPv6, see
+	  <http://playground.sun.com/pub/ipng/html/ipng-main.html>.
+	  For Linux IPv6 development information, see <http://www.linux-ipv6.org>.
+	  For specific information about IPv6 under Linux, read the HOWTO at
+	  <http://www.bieringer.de/linux/IPv6/>.
+
+config ADK_KERNEL_IPV6_SIT
+	tristate "IPv6-in-IPv4 tunnel (SIT driver)"
+	select ADK_KERNEL_INET_TUNNEL
+	help
+	  Tunneling means encapsulating data of one protocol type within
+	  another protocol and sending it over a channel that understands the
+	  encapsulating protocol. This driver implements encapsulation of IPv6
+	  into IPv4 packets. This is useful if you want to connect two IPv6
+	  networks over an IPv4-only path.
 
 config ADK_KERNEL_SYN_COOKIES
-	prompt "IP: TCP syncookie support"
-	boolean
-	default n
+	bool "TCP syncookie support"
 
 config ADK_KERNEL_IP_PNP_BOOTP
-	boolean
-	default n
+	bool
 
 config ADK_KERNEL_IP_PNP_RARP
-	boolean
-	default n
+	bool
 
 config ADK_KERNEL_NET_IPGRE_BROADCAST
-	boolean
-	default n
+	bool
 
 config ADK_KERNEL_NET_IPGRE_DEMUX
-	boolean
-	default n
+	bool
 
 config ADK_KERNEL_PPP_ASYNC
-	boolean
-	default n
+	bool
 
 config ADK_KERNEL_SLHC
-	boolean
-	default n
+	bool
 
 config ADK_KERNEL_IMQ
 	tristate
-	default n
 
 config ADK_KERNEL_LLC
 	tristate
-	default n
-
 
 config ADK_KERNEL_IP_MULTICAST
-	prompt "Enable IP Multicasting"
-	boolean
-	default n
+	bool "Enable IP Multicasting"
 
 config ADK_KERNEL_IP_MROUTE
-	prompt "Enable IP Multicasting Routing"
-	boolean
-	default n
+	bool "Enable IP Multicasting Routing"
 
 config ADK_KERNEL_ATM
-	prompt "Asynchronous Transfer Mode (ATM)"
-	tristate
-	default n
+	tristate "Asynchronous Transfer Mode (ATM)"
 	help
 	 ATM is a high-speed networking technology for Local Area Networks
 	 and Wide Area Networks.  It uses a fixed packet size and is
@@ -77,18 +85,12 @@ config ADK_KERNEL_ATM
 	 further details.
 
 config ADK_KERNEL_ATM_BR2684
-	prompt "BR2684 ATM module"
-	tristate
+	tristate "BR2684 ATM module"
 	select ADK_KERNEL_ATM
-	default n
-	help
 
 config ADK_KERNEL_BRIDGE
-	prompt "802.1d Ethernet Bridging"
-	tristate
+	tristate "802.1d Ethernet Bridging"
 	select ADK_KERNEL_LLC
-	default m if ADK_PACKAGE_BRIDGE_UTILS
-	default n
 	help
 	  If you say Y here, then your Linux box will be able to act as an
 	  Ethernet bridge, which means that the different Ethernet segments it
@@ -111,9 +113,7 @@ config ADK_KERNEL_BRIDGE
 	  bridged ARP traffic in the arptables FORWARD chain.
 
 config ADK_KERNEL_VLAN_8021Q
-	prompt "802.1q VLAN support"
-	tristate
-	default n
+	tristate "802.1q VLAN support"
 	help
           Select this and you will be able to create 802.1Q VLAN interfaces
           on your ethernet interfaces.  802.1Q VLAN supports almost
@@ -125,14 +125,10 @@ config ADK_KERNEL_VLAN_8021Q
 
 config ADK_KERNEL_INET_TUNNEL
 	tristate
-	default n
-	help
 
 config ADK_KERNEL_NET_IPIP
-	prompt "IP in IP encapsulation support"
-	tristate
+	tristate "IP in IP encapsulation support"
 	select ADK_KERNEL_INET_TUNNEL
-	default n
 	help
 	  Tunneling means encapsulating data of one protocol type within
 	  another protocol and sending it over a channel that understands the
@@ -144,13 +140,9 @@ config ADK_KERNEL_NET_IPIP
 	  networks without changing their IP addresses).
 
 config ADK_KERNEL_NET_IPGRE
-	prompt "GRE tunnels over IP"
-	tristate
+	tristate "GRE tunnels over IP"
 	select ADK_KERNEL_NET_IPGRE_BROADCAST
 	select ADK_KERNEL_NET_IPGRE_DEMUX
-	default m if ADK_PACKAGE_PPTP
-	default m if ADK_PACKAGE_PPTPD
-	default n
 	help
 	  Tunneling means encapsulating data of one protocol type within
 	  another protocol and sending it over a channel that understands the
@@ -162,42 +154,11 @@ config ADK_KERNEL_NET_IPGRE
 	  tunneling" above). In addition, GRE allows multicast redistribution
 	  through the tunnel.
 
-config ADK_KERNEL_IPV6
-	prompt "IPv6 support"
-	tristate
-	default n
-	help
-	  This is complemental support for the IP version 6.
-	  You will still be able to do traditional IPv4 networking as well.
-
-	  For general information about IPv6, see
-	  <http://playground.sun.com/pub/ipng/html/ipng-main.html>.
-	  For Linux IPv6 development information, see <http://www.linux-ipv6.org>.
-	  For specific information about IPv6 under Linux, read the HOWTO at
-	  <http://www.bieringer.de/linux/IPv6/>.
-
-config ADK_KERNEL_IPV6_SIT
-	prompt "IPv6-in-IPv4 tunnel (SIT driver)"
-	tristate
-	select ADK_KERNEL_INET_TUNNEL
-	default n
-	help
-	  Tunneling means encapsulating data of one protocol type within
-	  another protocol and sending it over a channel that understands the
-	  encapsulating protocol. This driver implements encapsulation of IPv6
-	  into IPv4 packets. This is useful if you want to connect two IPv6
-	  networks over an IPv4-only path.
-
 config ADK_KERNEL_PPP
-	prompt "PPP support"
-	tristate
+	tristate "PPP support"
 	select ADK_KERNEL_PPP_ASYNC
 	select ADK_KERNEL_SLHC
 	select ADK_KERNEL_CRC_CCITT
-	default m if ADK_PACKAGE_PPTP
-	default m if ADK_PACKAGE_PPTPD
-	default m if ADK_PACKAGE_PPP
-	default n
 	help
 	  PPP (Point to Point Protocol) is a newer and better SLIP.  It serves
 	  the same purpose: sending Internet traffic over telephone (and other
@@ -221,15 +182,12 @@ config ADK_KERNEL_PPP
 	  synchronous PPP", below.
 
 config ADK_KERNEL_PPP_MPPE
-	prompt "PPP MPPE/MPPC module"
-	tristate
+	tristate "PPP MPPE/MPPC module"
 	depends on ADK_KERNEL_PPP
 	select ADK_KERNEL_CRYPTO
 	select ADK_KERNEL_CRYPTO_ARC4
 	select ADK_KERNEL_CRYPTO_SHA1
 	select ADK_KERNEL_CRYPTO_ECB
-	default m if ADK_PACKAGE_PPTPD
-	default n
 	help
          Support for the MPPE Encryption protocol, as employed by the
 	 Microsoft Point-to-Point Tunneling Protocol.
@@ -238,41 +196,25 @@ config ADK_KERNEL_PPP_MPPE
 	 configuring PPTP clients and servers to utilize this method.
 
 config ADK_KERNEL_PPPOATM
-	prompt "PPPoA (PPP over ATM) kernel support"
-	tristate
+	tristate "PPPoA (PPP over ATM) kernel support"
 	depends on ADK_KERNEL_PPP
 	select ADK_KERNEL_ATM
-	default n
 	help
 	  Support for PPP over ATM
 
 config ADK_KERNEL_PPPOE
-	prompt "PPPoE (PPP over Ethernet) kernel support"
-	tristate
+	tristate "PPPoE (PPP over Ethernet) kernel support"
 	depends on ADK_KERNEL_PPP
-	default m if ADK_PACKAGE_PPP_MOD_PPPOE
-	default n
 	help
 	  Support for PPP over Ethernet
 
 config ADK_KERNEL_TUN
-	prompt "Universal TUN/TAP driver"
-	tristate
-	default m if ADK_PACKAGE_CHILLISPOT
-	default m if ADK_PACKAGE_AICCU
-	default m if ADK_PACKAGE_TINC
-	default m if ADK_PACKAGE_VTUN
-	default m if ADK_PACKAGE_VPNC
-	default m if ADK_PACKAGE_OPENVPN
-	default n
+	tristate "Universal TUN/TAP driver"
 	help
 	  Kernel support for the TUN/TAP tunneling device
 
 config ADK_KERNEL_BONDING
-	prompt "Bonding driver support"
-	tristate
-	select BUSYBOX_IFENSLAVE
-	default n
+	tristate "Bonding driver support"
 	help
   	  Say 'Y' or 'M' if you wish to be able to 'bond' multiple Ethernet
 	  Channels together. This is called 'Etherchannel' by Cisco,
@@ -285,8 +227,7 @@ config ADK_KERNEL_BONDING
 	  information.
 
 config ADK_KERNEL_MPTCP
-	prompt "Multipath TCP support"
-	boolean
+	bool "Multipath TCP support"
 	select ADK_KERNEL_IPV6
 	select ADK_KERNEL_ADDON_MPTCP
 	help
diff --git a/target/linux/config/Config.in.spi b/target/linux/config/Config.in.spi
index d57869c70..06781c0ce 100644
--- a/target/linux/config/Config.in.spi
+++ b/target/linux/config/Config.in.spi
@@ -2,19 +2,19 @@ menu "SPI driver support"
 depends on ADK_TARGET_WITH_SPI
 
 config ADK_KERNEL_SPI
-	boolean
+	bool
 
 config ADK_KERNEL_SPI_DEBUG
-	boolean
+	bool
 
 config ADK_KERNEL_SPI_MASTER
-	boolean
+	bool
 
 config ADK_KERNEL_SPI_BITBANG
 	tristate
 
 config ADK_KERNEL_BCM2708_SPIDEV
-	tristate
+	bool
 
 config ADK_KERNEL_SPI_AR71XX
 	tristate
@@ -33,8 +33,7 @@ config ADK_KERNEL_SPI_PXA2XX
 	select ADK_KERNEL_SPI
 
 config ADK_KERNEL_SPI_BCM2708
-	prompt "SPI driver for Raspberry PI"
-	tristate
+	tristate "SPI driver for Raspberry PI"
 	select ADK_KERNEL_SPI
 	select ADK_KERNEL_SPI_MASTER
 	select ADK_KERNEL_SPI_BITBANG
@@ -45,8 +44,7 @@ config ADK_KERNEL_SPI_BCM2708
 	default n
 
 config ADK_KERNEL_SPI_IMX
-	prompt "SPI driver for Solidrun IMX6"
-	tristate
+	tristate "SPI driver for Solidrun IMX6"
 	select ADK_KERNEL_SPI
 	select ADK_KERNEL_SPI_MASTER
 	select ADK_KERNEL_SPI_BITBANG
@@ -56,17 +54,13 @@ config ADK_KERNEL_SPI_IMX
 	default n
 
 config ADK_KERNEL_SPI_SPIDEV
-	prompt "SPI userland driver"
-	tristate
+	tristate "SPI userland driver"
 	select ADK_KERNEL_SPI
 	select ADK_KERNEL_SPI_MASTER
-	default n
 
 config ADK_KERNEL_SPI_GPIO
-	prompt "GPIO support"
-	tristate
+	tristate "SPI GPIO support"
 	select ADK_KERNEL_SPI
 	select ADK_KERNEL_SPI_MASTER
-	default n
-	
+
 endmenu
diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb
index 853724c63..0577d277b 100644
--- a/target/linux/config/Config.in.usb
+++ b/target/linux/config/Config.in.usb
@@ -2,19 +2,19 @@ menu "USB support"
 depends on ADK_TARGET_WITH_USB || ADK_TARGET_SYSTEM_QEMU_X86_64 || ADK_TARGET_SYSTEM_QEMU_X86
 
 config ADK_KERNEL_USB_SUPPORT
-	boolean
+	bool
 
 config ADK_KERNEL_USB_EHCI_ROOT_HUB_TT
-	boolean
+	bool
 
 config ADK_KERNEL_USB_EHCI_TT_NEWSCHED
-	boolean
+	bool
 
 config ADK_KERNEL_USB_GADGET
 	tristate
 
 config ADK_KERNEL_USB_PHY
-	boolean
+	bool
 
 config ADK_KERNEL_USB_MXS_PHY
 	tristate
@@ -23,16 +23,14 @@ config ADK_KERNEL_USB_MXS_PHY
 	default n
 
 config ADK_KERNEL_USB_OHCI_HCD_PLATFORM
-	boolean
+	bool
 	select ADK_KERNEL_USB_OHCI_HCD
-	default n
 
 config ADK_KERNEL_USB_LIBUSUAL
 	tristate
 
 config ADK_KERNEL_USB
-	prompt "USB support"
-	tristate
+	tristate "USB support"
 	select ADK_KERNEL_NLS
 	select ADK_KERNEL_USB_SUPPORT
 	default m if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
@@ -75,8 +73,7 @@ config ADK_KERNEL_USB
 menu "USB controller support"
 
 config ADK_KERNEL_USB_EHCI_HCD
-	prompt "Support for USB EHCI 2.0 controllers"
-	tristate
+	tristate "Support for USB EHCI 2.0 controllers"
 	select ADK_KERNEL_USB_EHCI_ROOT_HUB_TT
 	select ADK_KERNEL_USB_EHCI_TT_NEWSCHED
 	select ADK_KERNEL_USB_MXS_PHY if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
@@ -111,8 +108,7 @@ config ADK_KERNEL_USB_EHCI_HCD
 
 
 config ADK_KERNEL_USB_UHCI_HCD
-	prompt "Support for UHCI controllers"
-	tristate
+	tristate "Support for UHCI controllers"
 	depends on ADK_KERNEL_USB
 	depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
@@ -130,8 +126,7 @@ config ADK_KERNEL_USB_UHCI_HCD
 	  133). If unsure, say Y.
 
 config ADK_KERNEL_USB_OHCI_HCD
-	prompt "Support for OHCI controllers"
-	tristate
+	tristate "Support for OHCI controllers"
 	depends on ADK_KERNEL_USB
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default m if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
@@ -151,24 +146,23 @@ config ADK_KERNEL_USB_OHCI_HCD
 	  right "prog-if" for your USB controller(s):  EHCI, OHCI, or UHCI.
 
 config ADK_KERNEL_USB_DWCOTG
-	prompt "Support for DWCOTG controller"
-	boolean
+	bool "Support for DWCOTG controller"
 	select ADK_KERNEL_USB
 	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
-	default y
+	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
+	default n
 	help
 	  The Synopsis DWC controller is a dual-role
           host/peripheral/OTG ("On The Go") USB controllers.
 
 config ADK_KERNEL_USB_CHIPIDEA_UDC
-	boolean
+	bool
 
 config ADK_KERNEL_USB_CHIPIDEA_HOST
-	boolean
+	bool
 
 config ADK_KERNEL_USB_CHIPIDEA
-	prompt "Support for ChipIdea controller"
-	tristate
+	tristate "Support for ChipIdea controller"
 	select ADK_KERNEL_USB_CHIPIDEA_UDC
 	select ADK_KERNEL_USB_CHIPIDEA_HOST
 	select ADK_KERNEL_USB_GADGET
@@ -178,12 +172,10 @@ config ADK_KERNEL_USB_CHIPIDEA
 	default n
 
 config ADK_KERNEL_USB_ISP116X_HCD
-	prompt "Support for ISP116X"
-	tristate
+	tristate "Support for ISP116X"
 	depends on ADK_KERNEL_USB
 	depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
-	default n
 	help
 	  The ISP1160 and ISP1161 chips are USB host controllers. Enable this
 	  option if your board has this chip. If unsure, say N.
@@ -191,8 +183,7 @@ config ADK_KERNEL_USB_ISP116X_HCD
 	  This driver does not support isochronous transfers.
 
 config ADK_KERNEL_USB_SL811_HCD
-	prompt "Support for SL811HS"
-	tristate
+	tristate "Support for SL811HS"
 	depends on ADK_KERNEL_USB
 	depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
@@ -207,47 +198,37 @@ endmenu
 
 menu "USB devices support"
 
-config ADK_KERNEL_USB_STORAGE
-	prompt "Support for USB storage devices"
+config ADK_KERNEL_USB_NET_DRIVERS
 	tristate
+
+config ADK_KERNEL_USB_STORAGE
+	tristate "Support for USB storage devices"
 	select ADK_KERNEL_SCSI
 	select ADK_KERNEL_BLK_DEV_SD
-	default n
 
 config ADK_KERNEL_SND_USB_AUDIO
-	prompt "Support for USB sound adapter"
-	tristate
+	tristate "Support for USB sound adapter"
 	select ADK_KERNEL_SND
 	select ADK_KERNEL_SND_USB
 	select ADK_KERNEL_SND_RAWMIDI
-	default n
 
 config ADK_KERNEL_USB_HSO
-	prompt "Support for USB HSO devices"
-	tristate
+	tristate "Support for USB HSO devices"
 	select ADK_KERNEL_RFKILL
 	select ADK_KERNEL_USB_STORAGE
-	default n
 
 config ADK_KERNEL_USB_PRINTER
-	prompt "Support for USB printers"
-	tristate
-	default n
+	tristate "Support for USB printers"
 
 config ADK_KERNEL_USB_ACM
-	prompt "Support for USB modems/isdn controllers"
-	tristate
-	default n
+	tristate "Support for USB modems/isdn controllers"
 
 config ADK_KERNEL_USB_PEGASUS
-	prompt "Support for USB Pegasus network cards"
-	tristate
-	default n
+	tristate "Support for USB Pegasus network cards"
+	select ADK_KERNEL_USB_NET_DRIVERS
 
 config ADK_KERNEL_USB_SERIAL
-	prompt "Support for USB-to-serial converters"
-	tristate
-	default n
+	tristate "Support for USB-to-serial converters"
 	help
 	  Say Y here if you have a USB device that provides normal serial
 	  ports, or acts like a serial device, and you want to connect it to
@@ -258,20 +239,16 @@ config ADK_KERNEL_USB_SERIAL
 	  supported, and on how to use them.
 
 config ADK_KERNEL_USB_SERIAL_BELKIN
-	prompt "Support for Belkin USB-to-serial converters"
-	tristate
+	tristate "Support for Belkin USB-to-serial converters"
 	depends on ADK_KERNEL_USB_SERIAL
-	default n
 	help
 	  Say Y here if you want to use a Belkin USB Serial single port
 	  adaptor (F5U103 is one of the model numbers) or the Peracom single
 	  port USB to serial adapter.
 
 config ADK_KERNEL_USB_SERIAL_FTDI_SIO
-	prompt "Support for FTDI USB-to-serial converter"
-	tristate
+	tristate "Support for FTDI USB-to-serial converter"
 	depends on ADK_KERNEL_USB_SERIAL
-	default n
 	help
 	  Say Y here if you want to use a FTDI SIO single port USB to serial
 	  converter device. The implementation I have is called the USC-1000.
@@ -281,10 +258,8 @@ config ADK_KERNEL_USB_SERIAL_FTDI_SIO
 	  information on this driver and the device.
 
 config ADK_KERNEL_USB_SERIAL_MCT_U232
-	prompt "Support for Magic Control Technology USB-to-Serial converters"
-	tristate
+	tristate "Support for Magic Control Technology USB-to-Serial converters"
 	depends on ADK_KERNEL_USB_SERIAL
-	default n
 	help
 	  Say Y here if you want to use a USB Serial single port adapter from
 	  Magic Control Technology Corp. (U232 is one of the model numbers).
@@ -293,19 +268,15 @@ config ADK_KERNEL_USB_SERIAL_MCT_U232
 	  BAY, Belkin F5U109, and Belkin F5U409 devices.
 
 config ADK_KERNEL_USB_SERIAL_PL2303
-	prompt "Support for Prolific PL2303 USB-to-Serial converters"
-	tristate
+	tristate "Support for Prolific PL2303 USB-to-Serial converters"
 	depends on ADK_KERNEL_USB_SERIAL
-	default n
 	help
 	  Say Y here if you want to use the PL2303 USB Serial single port
 	  adapter from Prolific.
 
 config ADK_KERNEL_USB_SERIAL_VISOR
-	prompt "Support for Handspring Visor / Palm m50x / Sony Clie Driver"
-	tristate
+	tristate "Support for Handspring Visor / Palm m50x / Sony Clie Driver"
 	depends on ADK_KERNEL_USB_SERIAL
-	default n
 	help
 	  Say Y here if you want to connect to your HandSpring Visor, Palm
 	  m500 or m505 through its USB docking station. See
@@ -313,25 +284,17 @@ config ADK_KERNEL_USB_SERIAL_VISOR
 	  driver.
 
 config ADK_KERNEL_USB_ATM
-        prompt "Support for USB ATM devices"
-	tristate
-	default n
+        tristate "Support for USB ATM devices"
 
 config ADK_KERNEL_USB_ATM_SPEEDTOUCH
-        prompt "Support for USB Speedtouch ADSL modem"
-	tristate
+        tristate "Support for USB Speedtouch ADSL modem"
 	depends on ADK_KERNEL_USB_ATM
-	default n
-
-config ADK_KERNEL_USB_USBNET
-        prompt "Multi-purpose USB Networking Framework"
-	tristate
-	default n
 
 config ADK_KERNEL_USB_SISUSBVGA
-        prompt "USB 2.0 SVGA dongle support (Net2280/SiS315)"
-	tristate
-	default n
+        tristate "USB 2.0 SVGA dongle support (Net2280/SiS315)"
+
+config ADK_KERNEL_USB_USBNET
+        tristate
 	
 endmenu
 endmenu
diff --git a/target/linux/kernel.config b/target/linux/kernel.config
index b1c580da0..696820c61 100644
--- a/target/linux/kernel.config
+++ b/target/linux/kernel.config
@@ -25,7 +25,6 @@ CONFIG_TMPFS=y
 CONFIG_NLS=y
 CONFIG_EMBEDDED=y
 CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
 CONFIG_BINFMT_ELF=y
 CONFIG_BINFMT_SCRIPT=y
 CONFIG_HOTPLUG=y
author	Waldemar Brodkorb <wbx@openadk.org>	2014-12-26 15:15:43 +0100
committer	Waldemar Brodkorb <wbx@openadk.org>	2014-12-26 15:15:43 +0100
commit	f8f4789eb00ad9e7768a98bed5f598f36c6679f4 (patch)
tree	23e1e1aaa58b147f21e3ee19a25886edf7960cb9
parent	ad9e0b66c9f717f3cdcc4a265fd2a41a37b8ed1b (diff)
parent	6967ec40538c8b4f8646dfc38aa355dc70a84dab (diff)