diff --git a/core/linux-armv7/PKGBUILD b/core/linux-armv7/PKGBUILD index 0cd7f20d1..14508f02e 100644 --- a/core/linux-armv7/PKGBUILD +++ b/core/linux-armv7/PKGBUILD @@ -7,9 +7,9 @@ pkgbase=linux-armv7 _srcname=linux-3.14 _kernelname=${pkgbase#linux} _desc="ARMv7 multi-platform" -pkgver=3.14.3 +pkgver=3.14.4 pkgrel=1 -rcnrel=armv7-x5 +rcnrel=armv7-x6 arch=('armv7h') url="http://www.kernel.org/" license=('GPL2') @@ -25,11 +25,10 @@ source=("http://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz" '0004-emmc-timing-fix.patch' '0005-squelch-rt2800usb-messages.patch' '0006-Bluetooth-allocate-static-minor-for-vhci.patch' - 'mvneta.patch::https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/drivers/net/ethernet/marvell/mvneta.c?id=e3a8786c10e75903f1269474e21fe8cb49c3a670' 'config') md5sums=('b621207b3f6ecbb67db18b13258f8ea8' - '92a784cdb150c798e122ac080dc0f455' - '7a7f33365b70ecc8c20a8d14714a37de' + '116f27cf17c3522716b6678b17516067' + 'fdca4951009d7cd954fa3b0d4a3c2cfb' 'SKIP' '3ad860d0d6daedc82091ea29c9730b95' '02cce6b8f88c4392f552b14d0bf2e71c' @@ -37,8 +36,7 @@ md5sums=('b621207b3f6ecbb67db18b13258f8ea8' '911bffe9c261ca5b91dd0a083d99e81f' '8609ac79ba99320692c50481aabc6ed2' '1b276abe16d14e133f3f28d9c9e6bd68' - '1986ba8f945dbf4f9a3c94761b713336' - 'c55cdca16f3fdc8c9faa2323b080812c') + 'b28eac7b4b0e0976dea86381d5ea3177') prepare() { cd "${srcdir}/${_srcname}" @@ -46,10 +44,6 @@ prepare() { # add upstream patch patch -p1 -i ../patch-${pkgver} - # Revert commit e3a8786c10e75903f1269474e21fe8cb49c3a670 - # This fixes mvneta ethernet on Armada 370 - patch -Rp1 -i ../mvneta.patch - # RCN patch git apply ../patch-${pkgver%.0}-${rcnrel}.diff diff --git a/core/linux-armv7/config b/core/linux-armv7/config index 21c5537e9..dd054e178 100644 --- a/core/linux-armv7/config +++ b/core/linux-armv7/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.14.0-2 Kernel Configuration +# Linux/arm 3.14.4-1 Kernel Configuration # CONFIG_ARM=y CONFIG_MIGHT_HAVE_PCI=y @@ -118,8 +118,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y CONFIG_MEMCG=y CONFIG_MEMCG_SWAP=y -# CONFIG_MEMCG_SWAP_ENABLED is not set -# CONFIG_MEMCG_KMEM is not set +CONFIG_MEMCG_SWAP_ENABLED=y +CONFIG_MEMCG_KMEM=y CONFIG_CGROUP_PERF=y CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y @@ -451,7 +451,7 @@ CONFIG_MACH_OMAP3_PANDORA=y # CONFIG_MACH_TI8148EVM is not set # CONFIG_OMAP3_EMU is not set # CONFIG_OMAP3_SDRC_AC_TIMING is not set -# CONFIG_ARCH_ROCKCHIP is not set +CONFIG_ARCH_ROCKCHIP=y # CONFIG_ARCH_SOCFPGA is not set # CONFIG_PLAT_SPEAR is not set # CONFIG_ARCH_STI is not set @@ -2939,6 +2939,7 @@ CONFIG_PINCTRL_IMX6Q=y CONFIG_PINCTRL_IMX6SL=y CONFIG_PINCTRL_VF610=y # CONFIG_PINCTRL_MSM8X74 is not set +CONFIG_PINCTRL_ROCKCHIP=y CONFIG_PINCTRL_SINGLE=y CONFIG_PINCTRL_SUNXI=y CONFIG_PINCTRL_TEGRA=y @@ -3253,7 +3254,7 @@ CONFIG_DA9052_WATCHDOG=y # CONFIG_ARM_SP805_WATCHDOG is not set # CONFIG_DW_WATCHDOG is not set CONFIG_OMAP_WATCHDOG=y -# CONFIG_SUNXI_WATCHDOG is not set +CONFIG_SUNXI_WATCHDOG=y CONFIG_TWL4030_WATCHDOG=y # CONFIG_MAX63XX_WATCHDOG is not set CONFIG_IMX2_WDT=y @@ -4945,7 +4946,7 @@ CONFIG_R8712U=m CONFIG_R8188EU=m CONFIG_88EU_AP_MODE=y CONFIG_88EU_P2P=y -# CONFIG_R8821AE is not set +CONFIG_R8821AE=m CONFIG_RTS5139=m # CONFIG_RTS5139_DEBUG is not set # CONFIG_RTS5208 is not set @@ -5104,7 +5105,7 @@ CONFIG_ANDROID_INTF_ALARM_DEV=y CONFIG_SYNC=y # CONFIG_SW_SYNC is not set # CONFIG_ION is not set -# CONFIG_USB_WPAN_HCD is not set +CONFIG_USB_WPAN_HCD=m CONFIG_WIMAX_GDM72XX=m CONFIG_WIMAX_GDM72XX_QOS=y CONFIG_WIMAX_GDM72XX_K_MODE=y @@ -5156,6 +5157,8 @@ CONFIG_HWSPINLOCK=y CONFIG_HWSPINLOCK_OMAP=y CONFIG_CLKSRC_OF=y CONFIG_CLKSRC_MMIO=y +CONFIG_DW_APB_TIMER=y +CONFIG_DW_APB_TIMER_OF=y CONFIG_ARMADA_370_XP_TIMER=y CONFIG_SUN4I_TIMER=y CONFIG_SUN5I_HSTIMER=y @@ -5604,8 +5607,8 @@ CONFIG_SUNRPC_SWAP=y CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_SUNRPC_DEBUG is not set CONFIG_CEPH_FS=m -# CONFIG_CEPH_FSCACHE is not set -# CONFIG_CEPH_FS_POSIX_ACL is not set +CONFIG_CEPH_FSCACHE=y +CONFIG_CEPH_FS_POSIX_ACL=y CONFIG_CIFS=m CONFIG_CIFS_STATS=y # CONFIG_CIFS_STATS2 is not set @@ -5616,7 +5619,7 @@ CONFIG_CIFS_POSIX=y CONFIG_CIFS_ACL=y CONFIG_CIFS_DEBUG=y # CONFIG_CIFS_DEBUG2 is not set -# CONFIG_CIFS_DFS_UPCALL is not set +CONFIG_CIFS_DFS_UPCALL=y CONFIG_CIFS_SMB2=y CONFIG_CIFS_FSCACHE=y # CONFIG_NCP_FS is not set @@ -5970,8 +5973,8 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_ZLIB=m CONFIG_CRYPTO_LZO=y -# CONFIG_CRYPTO_LZ4 is not set -# CONFIG_CRYPTO_LZ4HC is not set +CONFIG_CRYPTO_LZ4=m +CONFIG_CRYPTO_LZ4HC=m # # Random Number Generation @@ -6021,6 +6024,8 @@ CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y +CONFIG_LZ4_COMPRESS=m +CONFIG_LZ4HC_COMPRESS=m CONFIG_LZ4_DECOMPRESS=y CONFIG_XZ_DEC=y # CONFIG_XZ_DEC_X86 is not set