stdin

stdin

diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk
index 0acc730..748a30f 100644
--- a/package/kernel/linux/modules/crypto.mk
+++ b/package/kernel/linux/modules/crypto.mk
@@ -712,13 +712,15 @@ endef
 $(eval $(call KernelPackage,crypto-xts))
 
 
-define KernelPackage/crypto-mv-cesa
+define KernelPackage/crypto-marvell-cesa
   TITLE:=Marvell crypto engine
-  DEPENDS:=+kmod-crypto-manager @TARGET_kirkwood||TARGET_orion||TARGET_mvebu
-  KCONFIG:=CONFIG_CRYPTO_DEV_MV_CESA
-  FILES:=$(LINUX_DIR)/drivers/crypto/mv_cesa.ko
-  AUTOLOAD:=$(call AutoLoad,09,mv_cesa)
+  DEPENDS:=+kmod-crypto-des +kmod-crypto-manager @TARGET_kirkwood||@TARGET_orion||TARGET_mvebu
+  KCONFIG:= \
+	CONFIG_CRYPTO_DEV_MARVELL_CESA \
+	CONFIG_CRYPTO_HW=y
+  FILES:=$(LINUX_DIR)/drivers/crypto/marvell/marvell-cesa.ko
+  AUTOLOAD:=$(call AutoLoad,09,marvell-cesa)
   $(call AddDepends/crypto)
 endef
 
-$(eval $(call KernelPackage,crypto-mv-cesa))
+$(eval $(call KernelPackage,crypto-marvell-cesa))
diff --git a/target/linux/mvebu/patches-4.4/915-armada-38x-sram-crypto-interface-add-bm.patch b/target/linux/mvebu/patches-4.4/915-armada-38x-sram-crypto-interface-add-bm.patch
new file mode 100644
index 0000000..55c312e
--- /dev/null
+++ b/target/linux/mvebu/patches-4.4/915-armada-38x-sram-crypto-interface-add-bm.patch
@@ -0,0 +1,36 @@
+--- a/arch/arm/boot/dts/armada-385-linksys.dtsi
++++ b/arch/arm/boot/dts/armada-385-linksys.dtsi
+@@ -58,8 +58,9 @@
+ 	soc {
+ 		ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000
+ 			  MBUS_ID(0x01, 0x1d) 0 0xfff00000 0x100000
+-			  MBUS_ID(0x09, 0x09) 0 0xf1100000 0x10000
+-			  MBUS_ID(0x09, 0x05) 0 0xf1110000 0x10000>;
++			  MBUS_ID(0x09, 0x19) 0 0xf1100000 0x10000
++			  MBUS_ID(0x09, 0x15) 0 0xf1110000 0x10000
++			  MBUS_ID(0x0c, 0x04) 0 0xf1200000 0x100000>;
+ 
+ 		internal-regs {
+ 
+@@ -121,6 +122,10 @@
+ 				status = "okay";
+ 			};
+ 
++			bm@c8000 {
++				status = "okay";
++			};
++
+ 			usb3@f8000 {
+ 				status = "okay";
+ 				usb-phy = <&usb3_phy>;
+@@ -198,6 +203,10 @@
+ 			};
+ 		};
+ 
++		bm-bppi {
++			status = "okay";
++		};
++
+ 		pcie-controller {
+ 			status = "okay";
+ 
diff --git a/target/linux/mvebu/patches-4.4/916-mvebu-coherency.patch b/target/linux/mvebu/patches-4.4/916-mvebu-coherency.patch
new file mode 100644
index 0000000..8f86afe
--- /dev/null
+++ b/target/linux/mvebu/patches-4.4/916-mvebu-coherency.patch
@@ -0,0 +1,17 @@
+--- a/arch/arm/mach-mvebu/coherency.c
++++ b/arch/arm/mach-mvebu/coherency.c
+@@ -171,13 +171,7 @@ static void __iomem *
+ armada_pcie_wa_ioremap_caller(phys_addr_t phys_addr, size_t size,
+ 			      unsigned int mtype, void *caller)
+ {
+-	struct resource pcie_mem;
+-
+-	mvebu_mbus_get_pcie_mem_aperture(&pcie_mem);
+-
+-	if (pcie_mem.start <= phys_addr && (phys_addr + size) <= pcie_mem.end)
+-		mtype = MT_UNCACHED;
+-
++	mtype = MT_UNCACHED;
+ 	return __arm_ioremap_caller(phys_addr, size, mtype, caller);
+ }
+ 
diff --git a/wrt1900acs.config b/wrt1900acs.config
index e9dfc35..1f7c809 100644
--- a/wrt1900acs.config
+++ b/wrt1900acs.config
@@ -61,6 +61,13 @@ CONFIG_KERNEL_PROC_PAGE_MONITOR=y
 CONFIG_PACKAGE_kmod-ledtrig-sata-disk=y
 CONFIG_PACKAGE_kmod-socket-diag=y
 ###############################################################################
+# Hardware crypto (CESA)
+###############################################################################
+CONFIG_PACKAGE_kmod-crypto-marvell-cesa=y
+CONFIG_PACKAGE_kmod-cryptodev=y
+CONFIG_OPENSSL_ENGINE_CRYPTO=y
+CONFIG_OPENSSL_ENGINE_DIGEST=y
+###############################################################################
 # filesystems
 ###############################################################################
 CONFIG_PACKAGE_kmod-fs-btrfs=y