diff --git a/core/linux-armv7/PKGBUILD b/core/linux-armv7/PKGBUILD index 9d082662a..635bfdb1c 100644 --- a/core/linux-armv7/PKGBUILD +++ b/core/linux-armv7/PKGBUILD @@ -7,16 +7,16 @@ pkgbase=linux-armv7 _srcname=linux-4.12 _kernelname=${pkgbase#linux} _desc="ARMv7 multi-platform" -pkgver=4.12.0 +pkgver=4.12.1 pkgrel=1 -rcnrel=armv7-x1 +rcnrel=armv7-x2 arch=('armv7h') url="http://www.kernel.org/" license=('GPL2') makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'git' 'uboot-tools' 'vboot-utils' 'dtc') options=('!strip') source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz" - #"http://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz" + "http://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz" "http://rcn-ee.com/deb/sid-armhf/v${pkgver}-${rcnrel}/patch-${pkgver%.0}-${rcnrel}.diff.gz" '0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch' '0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch' @@ -34,7 +34,8 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz" 'linux.preset' '99-linux.hook') md5sums=('fc454157e2d024d401a60905d6481c6b' - '9ad4709c961ce6c495fc87a04982fe05' + 'fab3dcd3b5a99d959bde7cde2e5cedb8' + '70c9d91e63162430c2f5bd49e78f50fb' '722bc867ef5285e2719ce3e526425a65' 'c2e8438c4e7a93bb8fbf1576f23773f7' 'def3e95ff11cffe49d4624f4e00b59a2' @@ -44,7 +45,7 @@ md5sums=('fc454157e2d024d401a60905d6481c6b' 'ff5f4ca7f97b8ebfbb09ec76363e71ec' 'f9282ee13ad2c393c462ef20b143ae22' '9fb6cef04dd98e38094803c56e9c453b' - '4e637fa73658afeb65e4390ef3e6a524' + 'd03240bcc2861eefd63f34796297fca0' '4f2379ed84258050edb858ee8d281678' '61c5ff73c136ed07a7aadbf58db3d96a' '584777ae88bce2c5659960151b64c7d8' @@ -55,7 +56,7 @@ prepare() { cd "${srcdir}/${_srcname}" # add upstream patch - #git apply --whitespace=nowarn ../patch-${pkgver} + git apply --whitespace=nowarn ../patch-${pkgver} # RCN patch git apply ../patch-${pkgver%.0}-${rcnrel}.diff diff --git a/core/linux-armv7/config b/core/linux-armv7/config index 24683b226..1af029dfa 100644 --- a/core/linux-armv7/config +++ b/core/linux-armv7/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.12.0-rc5-1 Kernel Configuration +# Linux/arm 4.12.1-1 Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y @@ -3669,7 +3669,7 @@ CONFIG_I2C_MUX=y # Multiplexer I2C Chip support # CONFIG_I2C_ARB_GPIO_CHALLENGE=y -# CONFIG_I2C_MUX_GPIO is not set +CONFIG_I2C_MUX_GPIO=m # CONFIG_I2C_MUX_LTC4306 is not set # CONFIG_I2C_MUX_PCA9541 is not set CONFIG_I2C_MUX_PCA954x=y @@ -6990,8 +6990,6 @@ CONFIG_LIRC_ZILOG=m # # Android # -CONFIG_ASHMEM=y -# CONFIG_ION is not set # CONFIG_STAGING_BOARD is not set CONFIG_LTE_GDM724X=m # CONFIG_MTD_SPINAND_MT29F is not set @@ -7779,10 +7777,7 @@ CONFIG_RAS=y # # Android # -CONFIG_ANDROID=y -CONFIG_ANDROID_BINDER_IPC=y -CONFIG_ANDROID_BINDER_DEVICES="binder" -CONFIG_ANDROID_BINDER_IPC_32BIT=y +# CONFIG_ANDROID is not set CONFIG_DAX=y CONFIG_NVMEM=y CONFIG_NVMEM_IMX_IIM=y