From b318282db3e297266010f85824a17c0783bbe376 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Mon, 26 Mar 2018 10:54:57 +0000
Subject: main/linux-vanilla: update aarch64 config

- enable thunder2
- set ARM64_VA_BITS to 48
- increase NR_CPUS to 256

fixes #8717
---
 main/linux-vanilla/APKBUILD               |  4 ++--
 main/linux-vanilla/config-vanilla.aarch64 | 19 +++++++++++--------
 2 files changed, 13 insertions(+), 10 deletions(-)

(limited to 'main')

diff --git a/main/linux-vanilla/APKBUILD b/main/linux-vanilla/APKBUILD
index b2953a1025..7dca2f3cc7 100644
--- a/main/linux-vanilla/APKBUILD
+++ b/main/linux-vanilla/APKBUILD
@@ -7,7 +7,7 @@ case $pkgver in
 	*.*.*)	_kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
 esac
-pkgrel=0
+pkgrel=1
 pkgdesc="Linux vanilla kernel"
 url="http://kernel.org"
 depends="mkinitfs"
@@ -222,7 +222,7 @@ _dev() {
 
 sha512sums="77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8  linux-4.14.tar.xz
 5373728be2b507c3db5e042e1d768740df7965078868afdc46418b1adc4cae3d8f9f1aedb59975a0f2acf8754340499354fcf97c503397a5d9886ccc9689b782  0001-HID-apple-fix-Fn-key-Magic-Keyboard-on-bluetooth.patch
-19f9ba6dea142b531e21b79389c498e8c07e8bf617c3fff09830a37e7a16c01baa050c8740400eb00539a8f17f9b210e8bc8e4c43051fd8e19dca16d9b82152e  config-vanilla.aarch64
+591176582d7ed3451f9404407439f34af5a39ccca4777993064b05cfcf1f0da57e5289c27b888a178d814d77a774406dd7292eaceb356017760338ea596030f2  config-vanilla.aarch64
 282834173b1429cc8ff725978da5cb4eb595d8c31fc773ef2e5002de792591bd4aa0ae188b6f2a6f537b69a6d94e2e52776d6bf591fdabab4c80613d8d859c1c  config-vanilla.armhf
 34198a6830d64b5ec685452a5880e3c7090da18857b1ce600c8c07932b5ee43b3ca68d0bdfeb6b080fef865a6eaa08bb48bfa8c6430a84b975d3e1282269fbd3  config-vanilla.x86
 0c3266989eefc8ea919f7ad7746c3d1c9ae3eb7397a82f4f867f4ef572830fe5f1eac32653e5c9081823c3ec707829e0e3836ff5f5040831d055d810ae30083d  config-vanilla.x86_64
diff --git a/main/linux-vanilla/config-vanilla.aarch64 b/main/linux-vanilla/config-vanilla.aarch64
index 81e48f668f..b0d891151a 100644
--- a/main/linux-vanilla/config-vanilla.aarch64
+++ b/main/linux-vanilla/config-vanilla.aarch64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.14.20 Kernel Configuration
+# Linux/arm64 4.14.28 Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
@@ -9,7 +9,7 @@ CONFIG_MMU=y
 CONFIG_ARM64_PAGE_SHIFT=12
 CONFIG_ARM64_CONT_SHIFT=4
 CONFIG_ARCH_MMAP_RND_BITS_MIN=18
-CONFIG_ARCH_MMAP_RND_BITS_MAX=24
+CONFIG_ARCH_MMAP_RND_BITS_MAX=33
 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11
 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
 CONFIG_STACKTRACE_SUPPORT=y
@@ -32,7 +32,7 @@ CONFIG_SWIOTLB=y
 CONFIG_IOMMU_HELPER=y
 CONFIG_KERNEL_MODE_NEON=y
 CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_PGTABLE_LEVELS=3
+CONFIG_PGTABLE_LEVELS=4
 CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_ARCH_PROC_KCORE_TEXT=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -411,7 +411,7 @@ CONFIG_ARCH_STRATIX10=y
 CONFIG_ARCH_TEGRA=y
 CONFIG_ARCH_SPRD=y
 CONFIG_ARCH_THUNDER=y
-# CONFIG_ARCH_THUNDER2 is not set
+CONFIG_ARCH_THUNDER2=y
 # CONFIG_ARCH_UNIPHIER is not set
 CONFIG_ARCH_VEXPRESS=y
 # CONFIG_ARCH_VULCAN is not set
@@ -520,13 +520,13 @@ CONFIG_QCOM_FALKOR_ERRATUM_E1041=y
 CONFIG_ARM64_4K_PAGES=y
 # CONFIG_ARM64_16K_PAGES is not set
 # CONFIG_ARM64_64K_PAGES is not set
-CONFIG_ARM64_VA_BITS_39=y
-# CONFIG_ARM64_VA_BITS_48 is not set
-CONFIG_ARM64_VA_BITS=39
+# CONFIG_ARM64_VA_BITS_39 is not set
+CONFIG_ARM64_VA_BITS_48=y
+CONFIG_ARM64_VA_BITS=48
 # CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_SCHED_MC=y
 CONFIG_SCHED_SMT=y
-CONFIG_NR_CPUS=32
+CONFIG_NR_CPUS=256
 CONFIG_HOTPLUG_CPU=y
 CONFIG_NUMA=y
 CONFIG_NODES_SHIFT=9
@@ -3478,6 +3478,7 @@ CONFIG_I2C_TEGRA=m
 CONFIG_I2C_VERSATILE=m
 CONFIG_I2C_THUNDERX=m
 CONFIG_I2C_XILINX=m
+CONFIG_I2C_XLP9XX=m
 
 #
 # External I2C/SMBus adapter drivers
@@ -3538,6 +3539,7 @@ CONFIG_SPI_SUN6I=m
 CONFIG_SPI_THUNDERX=m
 CONFIG_SPI_XCOMM=m
 # CONFIG_SPI_XILINX is not set
+CONFIG_SPI_XLP=m
 # CONFIG_SPI_ZYNQMP_GQSPI is not set
 
 #
@@ -3666,6 +3668,7 @@ CONFIG_GPIO_THUNDERX=y
 CONFIG_GPIO_XGENE=y
 CONFIG_GPIO_XGENE_SB=m
 # CONFIG_GPIO_XILINX is not set
+CONFIG_GPIO_XLP=m
 # CONFIG_GPIO_ZYNQ is not set
 
 #
-- 
cgit v1.2.3