add support for pcengines-alix

Readd Alix2d support, tested via NFS boot.
Fix IPSec kernel module loading.

7 files changed, 27 insertions, 37 deletions

diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block
index 519f6284a..e8f17f55c 100644
--- a/target/linux/config/Config.in.block
+++ b/target/linux/config/Config.in.block
@@ -119,13 +119,9 @@ config ADK_KERNEL_PATA_AMD
 	select ADK_KERNEL_ATA_BMDMA
 	select ADK_KERNEL_BLK_DEV
 	select ADK_KERNEL_BLK_DEV_SD
-	depends on ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 || \
-		   ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 || \
-		   ADK_TARGET_SYSTEM_PCENGINES_ALIX1C || \
-		   ADK_TARGET_SYSTEM_LEMOTE_YEELONG
-	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
-	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
-	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
+	depends on ADK_TARGET_SYSTEM_PCENGINES_ALIX \
+		 || ADK_TARGET_SYSTEM_LEMOTE_YEELONG
+	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default n
 
diff --git a/target/linux/config/Config.in.crypto b/target/linux/config/Config.in.crypto
index 8b1ceb056..8af4bde0f 100644
--- a/target/linux/config/Config.in.crypto
+++ b/target/linux/config/Config.in.crypto
@@ -547,6 +547,7 @@ config ADK_KERNEL_CRYPTO_DEFLATE
 	tristate
 	select ADK_KERNEL_CRYPTO_ALGAPI
 	select ADK_KERNEL_ZLIB_DEFLATE
+	select ADK_KERNEL_ZLIB_INFLATE
 	default n
 	help
 	  This is the Deflate algorithm (RFC1951), specified for use in
diff --git a/target/linux/config/Config.in.ethernet b/target/linux/config/Config.in.ethernet
index e74c30123..23dbebf58 100644
--- a/target/linux/config/Config.in.ethernet
+++ b/target/linux/config/Config.in.ethernet
@@ -110,8 +110,10 @@ config ADK_KERNEL_VIA_RHINE
 	tristate "VIA Rhine ethernet driver"
 	select ADK_KERNEL_NET_VENDOR_VIA
 	select ADK_KERNEL_VIA_RHINE_MMIO
-	depends on ADK_TARGET_SYSTEM_MIKROTIK_RB532
+	depends on ADK_TARGET_SYSTEM_MIKROTIK_RB532 \
+		|| ADK_TARGET_SYSTEM_PCENGINES_ALIX
 	default y if ADK_TARGET_SYSTEM_MIKROTIK_RB532
+	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX
 	default n
 	help
 	  VIA Rhine ethernet driver
diff --git a/target/linux/config/Config.in.ipsec b/target/linux/config/Config.in.ipsec
index da638c40c..60a7a392b 100644
--- a/target/linux/config/Config.in.ipsec
+++ b/target/linux/config/Config.in.ipsec
@@ -1,37 +1,35 @@
 menu "IPSec support"
 
-config ADK_KERNEL_NET_KEY
-	prompt "PF_KEYv2 socket family"
+config ADK_KERNEL_XFRM_ALGO
 	tristate
+
+config ADK_KERNEL_NET_KEY
+	tristate "PF_KEYv2 socket family"
 	default n
 	help
 	  PF_KEYv2 socket family, compatible to KAME ones.
 
 config ADK_KERNEL_XFRM_USER
-	prompt "IPsec usertools support"
-	tristate
+	tristate "IPsec usertools support"
+	select ADK_KERNEL_XFRM_ALGO
 	default n
-	help
 
 config ADK_KERNEL_INET_AH
-	prompt "IPsec AH support"
-	tristate
+	tristate "IPsec AH support"
 	select ADK_KERNEL_CRYPTO_HASH
 	default n
 	help
 	  Support for IPsec AH.
 
 config ADK_KERNEL_INET_ESP
-	prompt "IPsec ESP support"
-	tristate
+	tristate "IPsec ESP support"
 	select ADK_KERNEL_CRYPTO_AEAD
 	default n
 	help
 	  Support for IPsec ESP.
 
 config ADK_KERNEL_INET_IPCOMP
-	prompt "IP Payload Compression"
-	tristate
+	tristate "IP Payload Compression"
 	select ADK_KERNEL_CRYPTO_DEFLATE
 	select ADK_KERNEL_INET_TUNNEL
 	default n
@@ -40,22 +38,19 @@ config ADK_KERNEL_INET_IPCOMP
 	  typically needed for IPsec.
 
 config ADK_KERNEL_INET_XFRM_MODE_TRANSPORT
-	prompt "IPsec transport mode"
-	tristate
+	tristate "IPsec transport mode"
 	default n
 	help
 	  Support for IPsec transport mode.
 
 config ADK_KERNEL_INET_XFRM_MODE_TUNNEL
-	prompt "IPsec tunnel mode"
-	tristate
+	tristate "IPsec tunnel mode"
 	default n
 	help
 	  Support for IPsec tunnel mode.
 
 config ADK_KERNEL_INET_XFRM_MODE_BEET
-	prompt "IPsec BEET mode"
-	tristate
+	tristate "IPsec BEET mode"
 	default n
 	help
 	  Support for IPsec BEET mode.
diff --git a/target/linux/config/Config.in.lib b/target/linux/config/Config.in.lib
index 9c34f917d..29f3899c6 100644
--- a/target/linux/config/Config.in.lib
+++ b/target/linux/config/Config.in.lib
@@ -44,6 +44,10 @@ config ADK_KERNEL_ZLIB_DEFLATE
 	tristate
 	default n
 
+config ADK_KERNEL_ZLIB_INFLATE
+	tristate
+	default n
+
 config ADK_KERNEL_LZO_COMPRESS
 	tristate
 	default n
diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb
index d4e3b7a8b..de1466a9c 100644
--- a/target/linux/config/Config.in.usb
+++ b/target/linux/config/Config.in.usb
@@ -33,9 +33,7 @@ config ADK_KERNEL_USB
 	tristate "USB support"
 	select ADK_KERNEL_NLS
 	select ADK_KERNEL_USB_SUPPORT
-	default m if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
-	default m if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
-	default m if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
+	default m if ADK_TARGET_SYSTEM_PCENGINES_ALIX
 	default m if ADK_TARGET_SYSTEM_IBM_X40
 	default m if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default m if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
@@ -80,9 +78,7 @@ config ADK_KERNEL_USB_EHCI_HCD
 	depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
 	depends on !ADK_TARGET_BOARD_BCM28XX
 	depends on ADK_KERNEL_USB
-	default m if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
-	default m if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
-	default m if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
+	default m if ADK_TARGET_SYSTEM_PCENGINES_ALIX
 	default m if ADK_TARGET_SYSTEM_IBM_X40
 	default m if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default m if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
@@ -129,9 +125,7 @@ config ADK_KERNEL_USB_OHCI_HCD
 	tristate "Support for OHCI controllers"
 	depends on ADK_KERNEL_USB
 	depends on !ADK_TARGET_BOARD_BCM28XX
-	default m if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
-	default m if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
-	default m if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
+	default m if ADK_TARGET_SYSTEM_PCENGINES_ALIX
 	default m if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
 	default m if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default n
diff --git a/target/linux/config/Config.in.watchdog b/target/linux/config/Config.in.watchdog
index 9f1673a53..70fafbc60 100644
--- a/target/linux/config/Config.in.watchdog
+++ b/target/linux/config/Config.in.watchdog
@@ -68,9 +68,7 @@ config ADK_KERNEL_GEODE_WDT
 	select ADK_KERNEL_MISC_DEVICES
 	select ADK_KERNEL_CS5535_MFGPT
 	select ADK_KERNEL_CS5535_CLOCK_EVENT_SRC
-	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
-	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
-	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
+	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX
 	default n
 	help
 	 Geode watchdog.