From 84b4e2ca8f91085932b2a8d6d0d38526abbe339c Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sat, 20 Aug 2016 20:59:36 +0000 Subject: [PATCH] core/linux-veyron to 3.14.0-21 --- core/linux-veyron/PKGBUILD | 12 +++++++----- core/linux-veyron/config | 24 ++++++++++++------------ core/linux-veyron/kernel.its | 28 ++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+), 17 deletions(-) diff --git a/core/linux-veyron/PKGBUILD b/core/linux-veyron/PKGBUILD index 1f40262be..aaab1eee7 100644 --- a/core/linux-veyron/PKGBUILD +++ b/core/linux-veyron/PKGBUILD @@ -7,8 +7,8 @@ pkgbase=linux-veyron _kernelname=${pkgbase#linux} _desc="Veyron Chromebooks" pkgver=3.14.0 -pkgrel=20 -_commit=714d37c6d25231f465288693b5f11fdfd93e826f +pkgrel=21 +_commit=8099d2b5a8a51915e6c4ab314b427c04c5dc6073 arch=('armv7h') url="https://chromium.googlesource.com/chromiumos/third_party/kernel/+/chromeos-3.14" license=('GPL2') @@ -28,7 +28,7 @@ source=("https://chromium.googlesource.com/chromiumos/third_party/kernel/+archiv 'cmdline' 'brcmfmac4354-sdio.txt' '99-veyron-brcm.rules') -md5sums=('ebf40c490f68e60efc8074e015db7fd8' +md5sums=('ee600c695416c2c30c95836d660c8c68' 'bda543cb5943eac34e16d12911f3ee99' '5e2d7cd74de07d13052de99411c13a2f' '1534c1dbfe5df35a5634072f7b912840' @@ -37,8 +37,8 @@ md5sums=('ebf40c490f68e60efc8074e015db7fd8' '29ac9b84b8f84fbeb78ed32e049fcea5' '0a923f72b30570ceae127cb82a0ea432' '22ad496bbbece67f9a825a2d60d8dc25' - 'c31e7e99a65e49e2fcfef91e9d0452da' - '9656e787504396f2cbac29c78f921bd0' + '2e57d5a525a9ec3ad0eb87178f0c4e9f' + '761d2e8cef38584b9e2f478e8096e458' '61c5ff73c136ed07a7aadbf58db3d96a' '584777ae88bce2c5659960151b64c7d8' 'e3bdf63d5d936fb982c4cd62da1433ad' @@ -60,6 +60,8 @@ prepare() { sed -i '2iexit 0' scripts/depmod.sh export WIFIVERSION=-3.8 + + cp include/linux/compiler-gcc5.h include/linux/compiler-gcc6.h } build() { diff --git a/core/linux-veyron/config b/core/linux-veyron/config index 79d810c0e..62e3ed95d 100644 --- a/core/linux-veyron/config +++ b/core/linux-veyron/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.14.0-20 Kernel Configuration +# Linux/arm 3.14.0-21 Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y @@ -430,6 +430,7 @@ CONFIG_MULTI_IRQ_HANDLER=y CONFIG_ARM_ERRATA_818325_852422=y CONFIG_ARM_ERRATA_821420=y CONFIG_ARM_ERRATA_825619=y +# CONFIG_ARM_ERRATA_FOOBAR is not set # CONFIG_ARM_ERRATA_852421 is not set # CONFIG_ARM_ERRATA_852423 is not set @@ -492,8 +493,7 @@ CONFIG_NO_BOOTMEM=y # CONFIG_HAVE_BOOTMEM_INFO_NODE is not set CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 -CONFIG_COMPACTION=y -CONFIG_MIGRATION=y +# CONFIG_COMPACTION is not set # CONFIG_PHYS_ADDR_T_64BIT is not set CONFIG_ZONE_DMA_FLAG=0 CONFIG_BOUNCE=y @@ -726,7 +726,6 @@ CONFIG_IPV6_MROUTE=y CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y CONFIG_IPV6_PIMSM_V2=y # CONFIG_NETLABEL is not set -# CONFIG_ANDROID_PARANOID_NETWORK is not set # CONFIG_NET_ACTIVITY_STATS is not set CONFIG_NETWORK_SECMARK=y # CONFIG_NETWORK_PHY_TIMESTAMPING is not set @@ -2780,13 +2779,12 @@ CONFIG_DRM_PANEL_SIMPLE=y # ARM GPU Configuration # CONFIG_MALI_MIDGARD=y -CONFIG_MALI_TIMELINE_DISABLED=y # CONFIG_MALI_GATOR_SUPPORT is not set -# CONFIG_MALI_MIPE_ENABLED is not set CONFIG_MALI_MIDGARD_DVFS=y # CONFIG_MALI_MIDGARD_ENABLE_TRACE is not set # CONFIG_MALI_DEVFREQ is not set CONFIG_MALI_EXPERT=y +# CONFIG_MALI_PRFCNT_SET_SECONDARY is not set # CONFIG_MALI_DEBUG_SHADER_SPLIT_FS is not set CONFIG_MALI_PLATFORM_FAKE=y # CONFIG_MALI_PLATFORM_DEVICETREE is not set @@ -2796,7 +2794,6 @@ CONFIG_MALI_PLATFORM_THIRDPARTY_NAME="rk" # CONFIG_MALI_NO_MALI is not set # CONFIG_MALI_TRACE_TIMELINE is not set # CONFIG_MALI_SYSTEM_TRACE is not set -# CONFIG_MALI_GPU_TRACEPOINTS is not set # CONFIG_VGASTATE is not set CONFIG_VIDEO_OUTPUT_CONTROL=y CONFIG_VIDEOMODE_HELPERS=y @@ -3890,8 +3887,9 @@ CONFIG_DCACHE_WORD_ACCESS=y # CONFIG_EXT3_FS is not set CONFIG_EXT4_FS=y CONFIG_EXT4_USE_FOR_EXT23=y -CONFIG_EXT4_FS_POSIX_ACL=y +# CONFIG_EXT4_FS_POSIX_ACL is not set CONFIG_EXT4_FS_SECURITY=y +# CONFIG_EXT4_ENCRYPTION is not set # CONFIG_EXT4_DEBUG is not set CONFIG_JBD2=y # CONFIG_JBD2_DEBUG is not set @@ -3958,6 +3956,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" CONFIG_PROC_FS=y CONFIG_PROC_SYSCTL=y CONFIG_PROC_PAGE_MONITOR=y +CONFIG_KERNFS=y CONFIG_SYSFS=y CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y @@ -4226,6 +4225,7 @@ CONFIG_HAVE_C_RECORDMCOUNT=y CONFIG_TRACE_CLOCK=y CONFIG_RING_BUFFER=y CONFIG_EVENT_TRACING=y +CONFIG_GPU_TRACEPOINTS=y CONFIG_CONTEXT_SWITCH_TRACER=y CONFIG_TRACING=y CONFIG_GENERIC_TRACER=y @@ -4293,7 +4293,7 @@ CONFIG_KEYS=y # CONFIG_PERSISTENT_KEYRINGS is not set # CONFIG_BIG_KEYS is not set # CONFIG_TRUSTED_KEYS is not set -# CONFIG_ENCRYPTED_KEYS is not set +CONFIG_ENCRYPTED_KEYS=y CONFIG_KEYS_DEBUG_PROC_KEYS=y # CONFIG_SECURITY_DMESG_RESTRICT is not set CONFIG_SECURITY=y @@ -4331,7 +4331,7 @@ CONFIG_CRYPTO_BLKCIPHER=y CONFIG_CRYPTO_BLKCIPHER2=y CONFIG_CRYPTO_HASH=y CONFIG_CRYPTO_HASH2=y -CONFIG_CRYPTO_RNG=m +CONFIG_CRYPTO_RNG=y CONFIG_CRYPTO_RNG2=y CONFIG_CRYPTO_PCOMP2=y CONFIG_CRYPTO_MANAGER=y @@ -4352,13 +4352,13 @@ CONFIG_CRYPTO_ABLK_HELPER=y # CONFIG_CRYPTO_CCM=m # CONFIG_CRYPTO_GCM is not set -CONFIG_CRYPTO_SEQIV=m +CONFIG_CRYPTO_SEQIV=y # # Block modes # CONFIG_CRYPTO_CBC=y -CONFIG_CRYPTO_CTR=m +CONFIG_CRYPTO_CTR=y CONFIG_CRYPTO_CTS=y CONFIG_CRYPTO_ECB=y # CONFIG_CRYPTO_LRW is not set diff --git a/core/linux-veyron/kernel.its b/core/linux-veyron/kernel.its index f1a3afeec..ed1f7ea90 100644 --- a/core/linux-veyron/kernel.its +++ b/core/linux-veyron/kernel.its @@ -203,6 +203,26 @@ algo = "sha1"; }; }; + fdt@20{ + description = "rk3288-fievel-rev0.dtb"; + data = /incbin/("arch/arm/boot/dts/rk3288-fievel-rev0.dtb"); + type = "flat_dt"; + arch = "arm"; + compression = "none"; + hash@1{ + algo = "sha1"; + }; + }; + fdt@21{ + description = "rk3288-tiger-rev0.dtb"; + data = /incbin/("arch/arm/boot/dts/rk3288-tiger-rev0.dtb"); + type = "flat_dt"; + arch = "arm"; + compression = "none"; + hash@1{ + algo = "sha1"; + }; + }; }; configurations { default = "conf@1"; @@ -282,5 +302,13 @@ kernel = "kernel@1"; fdt = "fdt@19"; }; + conf@20{ + kernel = "kernel@1"; + fdt = "fdt@20"; + }; + conf@21{ + kernel = "kernel@1"; + fdt = "fdt@21"; + }; }; };