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

9 files changed, 20 insertions, 15 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.debug b/target/linux/config/Config.in.debug
index e3965123c..a2287f5f5 100644
--- a/target/linux/config/Config.in.debug
+++ b/target/linux/config/Config.in.debug
@@ -122,7 +122,7 @@ config ADK_KERNEL_OPROFILE
 	prompt "Oprofile support"
 	tristate
 	select ADK_KERNEL_PROFILING
-	depends on !ADK_LINUX_M68K
+	depends on !ADK_TARGET_ARCH_M68K
 	default m if ADK_PACKAGE_OPROFILE
 	default n
 	help
diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel
index b1a6d30f6..dcc7b5ed1 100644
--- a/target/linux/config/Config.in.kernel
+++ b/target/linux/config/Config.in.kernel
@@ -110,7 +110,7 @@ config ADK_KERNEL_CPU_MIPS64_R2
 # ARM specific
 config ADK_KERNEL_AEABI
 	boolean
-	default y if ADK_LINUX_ARM
+	default y if ADK_TARGET_ARCH_ARM
 
 config ADK_KERNEL_THUMB2_KERNEL
 	boolean
@@ -142,7 +142,7 @@ config ADK_KERNEL_COMP_LZ4
 	select ADK_KERNEL_RD_LZ4
 	select ADK_KERNEL_KERNEL_LZ4
 	select ADK_KERNEL_INITRAMFS_COMPRESSION_LZ4
-	depends on ADK_LINUX_X86 || ADK_LINUX_ARM
+	depends on ADK_TARGET_ARCH_X86 || ADK_TARGET_ARCH_ARM
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
 
 config ADK_KERNEL_COMP_LZMA
@@ -205,12 +205,12 @@ config ADK_KERNEL_CC_OPTIMIZE_FOR_SIZE
 	prompt "Optimize for size"
 	boolean
 	# does not boot in qemu
-	depends on !ADK_LINUX_MICROBLAZE
+	depends on !ADK_TARGET_ARCH_MICROBLAZE
 	default y
 
 choice
 prompt "Page size"
-depends on ADK_LINUX_MIPS64
+depends on ADK_TARGET_ARCH_MIPS64
 default ADK_KERNEL_PAGE_SIZE_16KB if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 default ADK_KERNEL_PAGE_SIZE_4KB
 
diff --git a/target/linux/config/Config.in.kvm b/target/linux/config/Config.in.kvm
index 5bba30871..4dfd93b12 100644
--- a/target/linux/config/Config.in.kvm
+++ b/target/linux/config/Config.in.kvm
@@ -1,5 +1,5 @@
 menu "Virtualization"
-depends on (ADK_LINUX_X86_64 || ADK_LINUX_X86) && ADK_TARGET_CPU_WITH_VT
+depends on (ADK_TARGET_ARCH_X86_64 || ADK_TARGET_ARCH_X86) && ADK_TARGET_CPU_WITH_VT
 
 config ADK_KERNEL_VIRTUALIZATION
 	bool
diff --git a/target/linux/config/Config.in.leds b/target/linux/config/Config.in.leds
index f0001fc41..db855dccf 100644
--- a/target/linux/config/Config.in.leds
+++ b/target/linux/config/Config.in.leds
@@ -11,7 +11,6 @@ config ADK_KERNEL_LEDS_TRIGGERS
 
 config ADK_KERNEL_LEDS_CLASS
 	boolean
-	depends on !ADK_KERNEL_LEDS_CLASS
 
 menu "LEDS driver support"
 depends on ADK_TARGET_WITH_LEDS
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