diff --git a/core/linux-armv7-rc/PKGBUILD b/core/linux-armv7-rc/PKGBUILD
index a2bc3e221..adafde66d 100644
--- a/core/linux-armv7-rc/PKGBUILD
+++ b/core/linux-armv7-rc/PKGBUILD
@@ -4,7 +4,7 @@
 buildarch=4
 
 _rcver=4.0
-_rcrel=3
+_rcrel=4
 _rcnrel=armv7-x0
 
 pkgbase=linux-armv7-rc
@@ -30,15 +30,15 @@ source=("http://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz"
         '0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch'
         'config')
 md5sums=('d3fc8316d4d4d04b65cbc2d70799e763'
-         '8e1711d234cd969d20fd51c5a9698f0e'
-         '53130266d466d772f0cbb19ef66a3283'
+         '5282c9ea279dc5fdf3865b001cc0d6a8'
+         'd8d8f47b2f808e943ce9af688270dc4c'
          'SKIP'
          '98931609e0e5c0beb3dbaabfb669b872'
          'b7aa41223a0eff197ab905d9791e4ec4'
          'd71cd90ee737afc07708fae7e449d651'
          '950087add736d74afacd54bcfe8908d9'
          'd6ef79617d7e59e841f4f3d65501a6d8'
-         '7cdaba92013563849d6253808376dc45')
+         '94ade3158dad220f93f8e7dc7c4ad580')
 
 prepare() {
   cd "${srcdir}/${_srcname}"
diff --git a/core/linux-armv7-rc/config b/core/linux-armv7-rc/config
index 442ca46fe..f94d49856 100644
--- a/core/linux-armv7-rc/config
+++ b/core/linux-armv7-rc/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.0.0-rc2-1 Kernel Configuration
+# Linux/arm 4.0.0-rc4-1 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -1825,6 +1825,7 @@ CONFIG_OF=y
 # CONFIG_OF_UNITTEST is not set
 CONFIG_OF_FLATTREE=y
 CONFIG_OF_EARLY_FLATTREE=y
+CONFIG_OF_DYNAMIC=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_ADDRESS_PCI=y
 CONFIG_OF_IRQ=y
@@ -1834,6 +1835,8 @@ CONFIG_OF_PCI=y
 CONFIG_OF_PCI_IRQ=y
 CONFIG_OF_MTD=y
 CONFIG_OF_RESERVED_MEM=y
+CONFIG_OF_RESOLVE=y
+CONFIG_OF_OVERLAY=y
 CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
 # CONFIG_PARPORT is not set
 CONFIG_BLK_DEV=y
@@ -2930,8 +2933,8 @@ CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y
 CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_DMA=y
 CONFIG_SERIAL_8250_PCI=y
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+CONFIG_SERIAL_8250_NR_UARTS=6
+CONFIG_SERIAL_8250_RUNTIME_UARTS=6
 # CONFIG_SERIAL_8250_EXTENDED is not set
 CONFIG_SERIAL_8250_DW=y
 # CONFIG_SERIAL_8250_EM is not set
@@ -5093,12 +5096,14 @@ CONFIG_USB_MUSB_DUAL_ROLE=y
 #
 # Platform Glue Layer
 #
-# CONFIG_USB_MUSB_TUSB6010 is not set
+CONFIG_USB_MUSB_TUSB6010=y
 CONFIG_USB_MUSB_OMAP2PLUS=y
-# CONFIG_USB_MUSB_AM35X is not set
-# CONFIG_USB_MUSB_DSPS is not set
+CONFIG_USB_MUSB_AM35X=y
+CONFIG_USB_MUSB_DSPS=y
+CONFIG_USB_MUSB_AM335X_CHILD=y
 # CONFIG_USB_INVENTRA_DMA is not set
 # CONFIG_USB_TI_CPPI41_DMA is not set
+# CONFIG_USB_TUSB_OMAP_DMA is not set
 CONFIG_MUSB_PIO_ONLY=y
 CONFIG_USB_DWC3=y
 # CONFIG_USB_DWC3_HOST is not set
@@ -5234,8 +5239,8 @@ CONFIG_USB_XUSBATM=m
 CONFIG_USB_PHY=y
 CONFIG_KEYSTONE_USB_PHY=y
 CONFIG_NOP_USB_XCEIV=y
-CONFIG_AM335X_CONTROL_USB=m
-CONFIG_AM335X_PHY_USB=m
+CONFIG_AM335X_CONTROL_USB=y
+CONFIG_AM335X_PHY_USB=y
 CONFIG_TWL6030_USB=y
 CONFIG_USB_GPIO_VBUS=y
 # CONFIG_USB_ISP1301 is not set