Index: sys/arm/conf/GENERIC
===================================================================
--- sys/arm/conf/GENERIC
+++ sys/arm/conf/GENERIC
@@ -21,6 +21,7 @@
 ident		GENERIC
 
 cpu		CPU_CORTEXA
+cpu	        CPU_MV_PJ4B	
 options 	SMP_ON_UP
 machine 	arm armv7
 makeoptions	CONF_CFLAGS="-march=armv7a"
@@ -38,6 +39,7 @@
 files		"../broadcom/bcm2835/files.bcm2836"
 files		"../broadcom/bcm2835/files.bcm283x"
 files		"../freescale/imx/files.imx6"
+files           "../mv/files.arm7"
 files		"../nvidia/tegra124/files.tegra124"
 files		"../qemu/files.qemu"
 files		"../ti/files.ti"
@@ -57,6 +59,8 @@
 options 	SOC_BCM2836
 options		SOC_TI_AM335X
 options		SOC_OMAP4
+options         SOC_MV_ARMADA38X
+options         SOC_MV_ARMADAXP
 
 options 	SCHED_ULE		# ULE scheduler
 options 	SMP			# Enable multiple cores
@@ -185,9 +189,10 @@
 # USB support
 options 	USB_HOST_ALIGN=64	# Align usb buffers to cache line size.
 device		usb
-#device		uhci
+device		uhci
 device		ohci
 device		ehci
+device		xhci
 device		dwcotg			# DWC OTG controller
 device		musb
 
@@ -196,6 +201,8 @@
 device		uhid			# "Human Interface Devices"
 device		ukbd			# Allow keyboard like HIDs to control console
 
+device 		firmware
+
 # Device mode support
 device		usb_template    	# Control of the gadget
 
@@ -204,6 +211,11 @@
 device		ether
 device		vlan			# 802.1Q VLAN support
 device		bpf
+device		mii
+device		neta
+device		mdio
+device		etherswitch
+device		e6000sw
 
 # Ethernet NICs that use the common MII bus controller code.
 # NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
@@ -244,6 +256,11 @@
 # Extensible Firmware Interface
 options 	EFI
 
+# Marvell Cryptographic Engine and Security Accelerator
+device		cesa
+device		crypto
+device		cryptodev
+
 # Flattened Device Tree
 options 	FDT			# Configure using FDT/DTB data
 makeoptions	MODULES_EXTRA="dtb/allwinner dtb/am335x dtb/imx6 dtb/nvidia dtb/rpi dtb/zynq dtb/omap4"
Index: sys/arm/mv/armada38x/armada38x.c
===================================================================
--- sys/arm/mv/armada38x/armada38x.c
+++ sys/arm/mv/armada38x/armada38x.c
@@ -39,6 +39,12 @@
 #include <arm/mv/mvreg.h>
 #include <arm/mv/mvvar.h>
 
+#if __ARM_ARCH >= 6
+struct resource_spec mv_gpio_res[] = {
+	{-1, 0},
+};
+#endif
+
 int armada38x_open_bootrom_win(void);
 int armada38x_scu_enable(void);
 int armada38x_win_set_iosync_barrier(void);