main/linux-rpi: rpi2 config update

seems CONFIG_BCM2708_NOL2CACHE=y is required

3 files changed, 11 insertions, 11 deletions

diff --git a/main/linux-rpi/APKBUILD b/main/linux-rpi/APKBUILD
index 8ede826f19..c71626cf55 100644
--- a/main/linux-rpi/APKBUILD
+++ b/main/linux-rpi/APKBUILD
@@ -7,7 +7,7 @@ case $pkgver in
 *.*.*)	_kernver=${pkgver%.*};;
 *.*)	_kernver=${pkgver};;
 esac
-pkgrel=2
+pkgrel=3
 pkgdesc="Linux kernel with Raspberry Pi patches"
 url=https://github.com/raspberrypi/linux
 depends="mkinitfs linux-firmware"
@@ -195,17 +195,17 @@ md5sums="9e854df51ca3fef8bfe566dbd7b89241  linux-3.18.tar.xz
 ac5c93edbc9385793ccc33f4ced85950  patch-3.18.11.xz
 d046388e58921b2a21591acb86452d6a  linux-3.18.y-rpi-20150413.patch
 f901100a661ec62aac12000872d0276c  aslr-pie.patch
-c433bf16d5ee0ff6fc6e01c547af6542  config-rpi.armhf
-3077de01ea2f3da7c6440096e5b9e12b  config-rpi2.armhf"
+ad95c7987e94f789bb67c447d2c86a8e  config-rpi.armhf
+95bb00ed50492ac97860861632cf3140  config-rpi2.armhf"
 sha256sums="becc413cc9e6d7f5cc52a3ce66d65c3725bc1d1cc1001f4ce6c32b69eb188cbd  linux-3.18.tar.xz
 e4c44f887f507b2470a5c2f1c286a38fec6e84c4d433c929981abab7b83f80d5  patch-3.18.11.xz
 c2ec44791aa2c14de2c4827e69174f6ea4e10272f304895853252a021714faf9  linux-3.18.y-rpi-20150413.patch
 07e9b089c0d5d57e91256ff6e8fe373519c8bd4ae4cba4eb4a2edad3e2cc9a8e  aslr-pie.patch
-52796d07ad4e311410efcb5fd2e35cb54f4c4ba165f715b92abb5ce80b70edf4  config-rpi.armhf
-6eeeee7708bc708ce5a8b93a035d303cfceab10a0f86123eb67b15fa26cd1542  config-rpi2.armhf"
+871e627deb9e0c0c0b0cfbf44952d849b01b4a4c413b3af7371ade3b21544484  config-rpi.armhf
+0090c28a04150204c4ed4864519012b0267f4ae4ef2626250bf5c8a5a2031ca4  config-rpi2.armhf"
 sha512sums="2f0b72466e9bc538a675738aa416573d41bbbd7e3e2ffd5b5b127afde609ebc278cec5a3c37e73479607e957c13f1b4ed9782a3795e0dcc2cf8e550228594009  linux-3.18.tar.xz
 cc4ac5d341ca4e9d71ef1ba45a839b18947e3e7ffdc7f7efe2c211c95483518a1983bc3637edd607e0631f14c1cc9bfb9164926261d2cf5c2bb2eb91206f43b9  patch-3.18.11.xz
 7493bffc80921dc4a5a5472008500fd742703744d3798d0e886b64f5a67be5690ee422f188b95dcf4534249b1fedd439a5eb0a80f9572f7c3c931eb69bc36037  linux-3.18.y-rpi-20150413.patch
 35055eea7fce660a200cf6f56490a88f1601b4ea95d2364191ad0d890633e8811f2753b5816dad9640384a764b147a4a80b95f39e3bd7a66a15fd5b3ec0c794a  aslr-pie.patch
-e411b3eba56cf97182ccc56ea399782e9c760c701b296f63704322bef87db4693d6f6cfa067162b844d2c295723f4ad3351d11db9b3bc049069267ab39bdeb71  config-rpi.armhf
-2152114ea84ab2b71ec5f1203cb5747d79e83a70346cea61d85ba8c1706107919287d279be8d85b0c42d1e71d71f9b80eda9ebe580ade11ae137719c22db56d7  config-rpi2.armhf"
+b867dbe86d6b84b078821f6df039a4f241ee8e80871a1cef629f33542d5a0c722cdec5e9606d294775e83b19ec288f4b23f76ae5800ae5db71ae70bd5ec93207  config-rpi.armhf
+a96a725632cf7b1ef1800a15f7fd21379ab0b75d49d3ac6f83f0efb15a9a0542798b302fe06a0c6b6543b1ecf2ebcf3357d7a8a52f546d7dea6fddd209b85678  config-rpi2.armhf"
diff --git a/main/linux-rpi/config-rpi.armhf b/main/linux-rpi/config-rpi.armhf
index ad6f26f720..1c93083a52 100644
--- a/main/linux-rpi/config-rpi.armhf
+++ b/main/linux-rpi/config-rpi.armhf
@@ -19,7 +19,7 @@ CONFIG_VECTORS_BASE=0xffff0000
 # CONFIG_ARM_PATCH_PHYS_VIRT is not set
 CONFIG_NEED_MACH_IO_H=y
 CONFIG_NEED_MACH_MEMORY_H=y
-CONFIG_PHYS_OFFSET=0x0
+CONFIG_PHYS_OFFSET=0
 CONFIG_GENERIC_BUG=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 CONFIG_IRQ_WORK=y
diff --git a/main/linux-rpi/config-rpi2.armhf b/main/linux-rpi/config-rpi2.armhf
index a59e2c4c0d..e7fc26ed6e 100644
--- a/main/linux-rpi/config-rpi2.armhf
+++ b/main/linux-rpi/config-rpi2.armhf
@@ -18,7 +18,7 @@ CONFIG_VECTORS_BASE=0xffff0000
 # CONFIG_ARM_PATCH_PHYS_VIRT is not set
 CONFIG_NEED_MACH_IO_H=y
 CONFIG_NEED_MACH_MEMORY_H=y
-CONFIG_PHYS_OFFSET=0x0
+CONFIG_PHYS_OFFSET=0
 CONFIG_GENERIC_BUG=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 CONFIG_IRQ_WORK=y
@@ -338,7 +338,7 @@ CONFIG_MMU=y
 CONFIG_ARCH_BCM2709=y
 CONFIG_BCM2708_GPIO=y
 CONFIG_BCM2708_VCMEM=y
-# CONFIG_BCM2708_NOL2CACHE is not set
+CONFIG_BCM2708_NOL2CACHE=y
 CONFIG_BCM2708_SPIDEV=y
 
 #
@@ -369,7 +369,7 @@ CONFIG_CPU_CP15_MMU=y
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
 CONFIG_ARM_THUMB=y
-CONFIG_ARM_THUMBEE=y
+# CONFIG_ARM_THUMBEE is not set
 CONFIG_ARM_VIRT_EXT=y
 CONFIG_SWP_EMULATE=y
 # CONFIG_CPU_ICACHE_DISABLE is not set