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

6 files changed, 24 insertions, 13 deletions

diff --git a/target/linux/config/Config.in.addons b/target/linux/config/Config.in.addons
index bdc2f4e78..1ea6b7315 100644
--- a/target/linux/config/Config.in.addons
+++ b/target/linux/config/Config.in.addons
@@ -15,5 +15,10 @@ config ADK_KERNEL_ADDON_MPTCP
 
 config ADK_KERNEL_ADDON_FBLOGO
 	boolean
-	depends on ADK_KERNEL_VERSION_3_15
 	depends on ADK_KERNEL_VERSION_3_14
+
+config ADK_KERNEL_ADDON_DIETNET
+	boolean
+	depends on ADK_KERNEL_VERSION_3_14
+	depends on ADK_KERNEL_VERSION_3_12
+	depends on ADK_KERNEL_VERSION_3_10
diff --git a/target/linux/config/Config.in.network b/target/linux/config/Config.in.network
index 761fce117..6e20a190e 100644
--- a/target/linux/config/Config.in.network
+++ b/target/linux/config/Config.in.network
@@ -4,8 +4,15 @@ config ADK_KERNEL_IP_FIB_HASH
 	boolean
 	default y
 
+config ADK_DISABLE_TCP_FASTOPEN
+	prompt "Disable TCP Fastopen"
+	boolean
+	select ADK_KERNEL_ADDON_DIETNET
+	default n
+
 config ADK_KERNEL_SYN_COOKIES
-	boolean "IP: TCP syncookie support"
+	prompt "IP: TCP syncookie support"
+	boolean
 	default n
 
 config ADK_KERNEL_IP_PNP_BOOTP
@@ -40,12 +47,6 @@ config ADK_KERNEL_LLC
 	tristate
 	default n
 
-config ADK_KERNEL_TCP_FASTOPEN
-	prompt "Enable TCP Fastopen"
-	select ADK_KERNEL_CRYPTO
-	select ADK_KERNEL_CRYPTO_AES
-	boolean
-	default n
 
 config ADK_KERNEL_IP_MULTICAST
 	prompt "Enable IP Multicasting"
diff --git a/target/linux/patches/3.10.53/tcp-fastopen.patch b/target/linux/patches/3.10.53/patch-dietnet
index c0bddbc4f..c0bddbc4f 100644
--- a/target/linux/patches/3.10.53/tcp-fastopen.patch
+++ b/target/linux/patches/3.10.53/patch-dietnet
diff --git a/target/linux/patches/3.12.33/tcp-fastopen.patch b/target/linux/patches/3.12.33/patch-dietnet
index c1ff7209c..c1ff7209c 100644
--- a/target/linux/patches/3.12.33/tcp-fastopen.patch
+++ b/target/linux/patches/3.12.33/patch-dietnet
diff --git a/target/linux/patches/3.14.26/tcp-fastopen.patch b/target/linux/patches/3.14.26/patch-dietnet
index 43e685972..43e685972 100644
--- a/target/linux/patches/3.14.26/tcp-fastopen.patch
+++ b/target/linux/patches/3.14.26/patch-dietnet
diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index d13822b6e..6abecf52a 100644
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -3,10 +3,10 @@
 
 include $(ADK_TOPDIR)/rules.mk
 include ../rules.mk
-include ${ADK_TOPDIR}/mk/kernel-ver.mk
+include $(ADK_TOPDIR)/mk/kernel-ver.mk
 include $(ADK_TOPDIR)/mk/linux.mk
-include ${ADK_TOPDIR}/mk/kernel-vars.mk
-include ${ADK_TOPDIR}/mk/buildhlp.mk
+include $(ADK_TOPDIR)/mk/kernel-vars.mk
+include $(ADK_TOPDIR)/mk/buildhlp.mk
 
 $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION)/.patched:
 ifeq ($(ADK_TARGET_SYSTEM_PCENGINES_APU),y)
@@ -50,11 +50,16 @@ ifeq ($(ADK_KERNEL_ADDON_MPTCP),y)
 	$(PATCH) $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION) \
 		$(ADK_TOPDIR)/target/linux/patches/$(KERNEL_VERSION) patch-mptcp $(MAKE_TRACE)
 endif
+ifeq ($(ADK_KERNEL_ADDON_DIETNET),y)
+	$(TRACE) dietnet-kernel-patch
+	$(PATCH) $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION) \
+		$(ADK_TOPDIR)/target/linux/patches/$(KERNEL_VERSION) patch-dietnet $(MAKE_TRACE)
+endif
 	touch $@
 
 $(WRKBUILD)/.headers: $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION)/.patched
-	${KERNEL_MAKE_ENV} $(MAKE) -C $(WRKBUILD) ${KERNEL_MAKE_OPTS} headers_check
-	${KERNEL_MAKE_ENV} $(MAKE) -C $(WRKBUILD) ${KERNEL_MAKE_OPTS} \
+	$(KERNEL_MAKE_ENV) $(MAKE) -C $(WRKBUILD) $(KERNEL_MAKE_OPTS) headers_check
+	$(KERNEL_MAKE_ENV) $(MAKE) -C $(WRKBUILD) $(KERNEL_MAKE_OPTS) \
 		INSTALL_HDR_PATH=$(STAGING_TARGET_DIR)/usr \
 		headers_install
 ifeq ($(ADK_TARGET_ARCH),cris)