main/linux-rpi: update config

disable the bootup logo, and make fbcon a module

2 files changed, 11 insertions, 13 deletions

diff --git a/main/linux-rpi/APKBUILD b/main/linux-rpi/APKBUILD
index 3d44e2c7b1..b795d55d6d 100644
--- a/main/linux-rpi/APKBUILD
+++ b/main/linux-rpi/APKBUILD
@@ -7,7 +7,7 @@ case $pkgver in
         *.*.*)  _kernver=${pkgver%.*};;
         *.*) _kernver=$pkgver;;
 esac
-pkgrel=0
+pkgrel=1
 pkgdesc="Linux kernel with Raspberry Pi patches"
 url=https://github.com/raspberrypi/linux
 depends="mkinitfs linux-firmware"
@@ -148,15 +148,15 @@ dev() {
 md5sums="b621207b3f6ecbb67db18b13258f8ea8  linux-3.14.tar.xz
 e0ba3d497c3476973e9702af8974145a  linux-3.14.y-rpi-20140923.patch
 f901100a661ec62aac12000872d0276c  aslr-pie.patch
-e501874c52236b9f99ec47ef80ad230b  kernelconfig.armhf
+f4a7b1481ae53c5da4d071be1c880cea  kernelconfig.armhf
 651a92fc1d45c02fa02358bb07e80697  patch-3.14.24.xz"
 sha256sums="61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa  linux-3.14.tar.xz
 20af8de40d5d59f0ba8e4c0ecd69070854e3fc2c42dce52aa4b9897d2f79b86d  linux-3.14.y-rpi-20140923.patch
 07e9b089c0d5d57e91256ff6e8fe373519c8bd4ae4cba4eb4a2edad3e2cc9a8e  aslr-pie.patch
-b8dc837958a9d2052f8dfb104a35f14c5b57091ed5773451ccbf9c7b9ffa83bc  kernelconfig.armhf
+28ead5cbc2475e5ba76c841fdc24ad5258665ff1e5a98dfee8e147c6b7303659  kernelconfig.armhf
 80013321b6891216fcff6d0746cb977bd7e8438b02ca13ff261659f3dfa76d51  patch-3.14.24.xz"
 sha512sums="5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e  linux-3.14.tar.xz
 effa64ce5592f62d3cff5b13936fb8997ae320dd7bb975919d72db725a744f9c760197e405883be09b3aa2251ef10b67e5869294692cf8518a6aa3393fb42634  linux-3.14.y-rpi-20140923.patch
 35055eea7fce660a200cf6f56490a88f1601b4ea95d2364191ad0d890633e8811f2753b5816dad9640384a764b147a4a80b95f39e3bd7a66a15fd5b3ec0c794a  aslr-pie.patch
-7ff20c908cf005840b042e50aeaece9807df13a6be20e547e25f6bf9922c554914c18a2a377130dd8ead5b1955e98f4971db0cf8aeabdec28e319d7d23634c2f  kernelconfig.armhf
+847b0daeba852e3d280ad4deb51b95cef375f04ab1033a1bc9a95febba7bf3a893f8752cf7b9286d37030ee8bf0baf3852343a428739934024a9b48505e2c4a0  kernelconfig.armhf
 7f45dfd7340a41c360c7521b573adbb8569825aa078f7ef067a27f19be5c749e42965badde7cdf9c413374953e776e4cce43cd1856f9e08870793a50ba6ad0fb  patch-3.14.24.xz"
diff --git a/main/linux-rpi/kernelconfig.armhf b/main/linux-rpi/kernelconfig.armhf
index af481edd90..cff8540179 100644
--- a/main/linux-rpi/kernelconfig.armhf
+++ b/main/linux-rpi/kernelconfig.armhf
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.14.4 Kernel Configuration
+# Linux/arm 3.14.24 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -177,6 +177,7 @@ CONFIG_SLUB_DEBUG=y
 # CONFIG_SLAB is not set
 CONFIG_SLUB=y
 # CONFIG_SLOB is not set
+# CONFIG_SYSTEM_TRUSTED_KEYRING is not set
 CONFIG_PROFILING=y
 CONFIG_OPROFILE=m
 CONFIG_HAVE_OPROFILE=y
@@ -225,7 +226,6 @@ CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
-# CONFIG_SYSTEM_TRUSTED_KEYRING is not set
 CONFIG_MODULES=y
 # CONFIG_MODULE_FORCE_LOAD is not set
 CONFIG_MODULE_UNLOAD=y
@@ -277,6 +277,7 @@ CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
 CONFIG_UNINLINE_SPIN_UNLOCK=y
+CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
 CONFIG_FREEZER=y
 
 #
@@ -1189,8 +1190,8 @@ CONFIG_CMA_AREAS=7
 # CONFIG_ARM_CCI is not set
 CONFIG_CONNECTOR=m
 # CONFIG_MTD is not set
-# CONFIG_PARPORT is not set
 CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
+# CONFIG_PARPORT is not set
 CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_NULL_BLK is not set
 # CONFIG_BLK_DEV_COW_COMMON is not set
@@ -2592,13 +2593,10 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=m
 # Console display driver support
 #
 CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=m
 # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
 # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_LOGO_LINUX_CLUT224=y
+# CONFIG_LOGO is not set
 CONFIG_SOUND=y
 CONFIG_SOUND_OSS_CORE=y
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
@@ -3849,7 +3847,7 @@ CONFIG_AVERAGE=y
 # CONFIG_CORDIC is not set
 # CONFIG_DDR is not set
 CONFIG_OID_REGISTRY=y
-CONFIG_FONT_SUPPORT=y
+CONFIG_FONT_SUPPORT=m
 # CONFIG_FONTS is not set
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y