main/linux-grsec: enable rtsx pci and efifb

fixes #5191
fixes #6486

4 files changed, 51 insertions, 32 deletions

diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index d535f2036f..9e7297d212 100644
--- a/main/linux-grsec/APKBUILD
+++ b/main/linux-grsec/APKBUILD
@@ -7,7 +7,7 @@ case $pkgver in
 *.*.*)	_kernver=${pkgver%.*};;
 *.*)	_kernver=${pkgver};;
 esac
-pkgrel=0
+pkgrel=1
 pkgdesc="Linux kernel with grsecurity"
 url=http://grsecurity.net
 depends="mkinitfs"
@@ -219,9 +219,9 @@ d25353e079ebcd14549ae56a4064a125  grsecurity-3.1-4.4.34-201604252206-alpine.patc
 c32f1d7517a095a2645fc1c7dec5db8f  fix-spi-nor-namespace-clash.patch
 b11c29ee88f7f537973191036d48bee7  imx6q-no-unclocked-sleep.patch
 90e0fca6cb7bca277394b0db7f605098  gcc6.patch
-85d2836493bfea74b851d65d605d8050  config-grsec.x86
-f48724915a112f3fda894dd09b44fcb7  config-grsec.x86_64
-49b78c9cd95a16fa3592615efa1099b3  config-grsec.armhf
+6e423679bf1b0cbbe7ba31bc86b0f4da  config-grsec.x86
+5caf44f1505b39e83206b8feeb4c45a7  config-grsec.x86_64
+35d10d9444978dc8009e9da5e33b0f43  config-grsec.armhf
 b8ee8bcd0b53d0d661bf9aac06150dd2  config-virtgrsec.x86
 a2e1de5edbc62606a6642b83c61b4d7b  config-virtgrsec.x86_64"
 sha256sums="401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2  linux-4.4.tar.xz
@@ -230,9 +230,9 @@ c74069661985a1e053705d3817436617da6dd79a6738b2c7861b73bdee4a876d  grsecurity-3.1
 b8ce28c61663dbd92f7e1c862c042c88c4d0459ce15f6e6ea121e20705b66212  fix-spi-nor-namespace-clash.patch
 7e8a954750139a421a76e414e19a3b57645c9ec70e6c14a6b7708a3fa0cfd5e4  imx6q-no-unclocked-sleep.patch
 21640b417cb9a389bf7be6a11dc71a481ec76fcfcc758992a9be158ab6a643e8  gcc6.patch
-aad2c2d373954e7f5f447aa59508f5f7c2b855e34956a4a51b5974a0560d6432  config-grsec.x86
-b834e7ea50252e11419ab83715a4808c4f7a0b332d62977ba4a6a4349f228e0b  config-grsec.x86_64
-1a7b3e4e11c1bd28dae47eae32662191371fd94a453e7b29264c5201d804aeb6  config-grsec.armhf
+2dcd3db2342d1a9600563ed52c4371668dd885d2ffb9a723be42cccfb0c88baf  config-grsec.x86
+fb3d8067be53c3fa056a0c260997715e4902a2d3c96d6d459052fd221b7d96f2  config-grsec.x86_64
+d975df937d5a82b48bba790bd50bf7ed04782d92755a6eeacedc9e2796633e7a  config-grsec.armhf
 4f31314b11df0a3881aa44f29ac87dddd36974303a0ccf919e50e1ffa971edd3  config-virtgrsec.x86
 7cc143f2061b65c835683f19fddaef4ef046f39bb17e4ba3bd8bc7b8245fae60  config-virtgrsec.x86_64"
 sha512sums="13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e  linux-4.4.tar.xz
@@ -241,8 +241,8 @@ df146ad827b2a65189f692a2105e40ce8f3d7fb7da9bef8ec55012312deb1a9a319c43df64b49e0b
 410fe7dae27cb4998d17a441a5b2a19dd350636ead2de97d4ef5317501d9e82e2550bfca0f022c9be6296907c076c381e1e13060d1900ff26ee7d47f234fb104  fix-spi-nor-namespace-clash.patch
 9980eb10f529bc5ce482ab0a0037febbc982b528c3e4d02fc4547e6dd45dc529a7b1711d0c89f942b1ae27842c3794b68a6b8959ef80f6fd00183d3a591cea07  imx6q-no-unclocked-sleep.patch
 edcebc229956a05621ec1c89039b56aa61b468c74b54420ff72bd08658b65d29d6af385a7d78d1ce4b39889b407106b99efe7309f8a82974a74eb9edb9e89b64  gcc6.patch
-2a496976cb8f2b791ba9a206985ef42f15baef84101dafd0036e5686dae64acec6725b3efd8b5692db33bc0851ef16fadb9f10e44cd9eccb6b194329ed749452  config-grsec.x86
-9b30b640fd7548b16ece153b0e9f449fd0332069ec015953246d50b1407cf24eeb85ed1b0897441438a9940dd6a048d6ff69dac9fc56c4b6c76a7e88c1de4c8e  config-grsec.x86_64
-3e899b536d3377179f26c826d21c03e3b6792fdc1ca8576cd7a10da638f1189b1dffca4a4bf9e711fbba3b2ffe79e755b8d64d3be2511428faadd77b1fbfa8eb  config-grsec.armhf
+04c978fa501987176486d1ac7a16a01468c060ce134e779ce7fa3145d2e994bc8ab431d51c154f717897dd8c989954a66076dded8d628c633832bcd42cce172a  config-grsec.x86
+3fbbe5f0bb599dd7418b545dcce29115e71b16b8d2ef60c1e27161392e2ebe73ed62570d28a7c65fb8c1ab7368ccb56fb9b536c8074a90f96a9593053e884c4c  config-grsec.x86_64
+a19b8179cce90e5cfe0ee30c85c0e9fd67274290d7556a5f2cb530ba9ee5f6e941ff96f20cebbd0223f3febfe8b0e3f30c7c2696dd9184c1d3ca9dcb0eca6f4a  config-grsec.armhf
 c07523775446c6cac6e2c8bd740d2647cf099a4b11aae0787259ccdf667571832185781257534657039773d68a21079b25f8e32bd32797bbbffe26d82f634bcb  config-virtgrsec.x86
 b8c285676251c47e3ca69c5d7075585cc0199408a9567c6da132f8a3b34ec948821a5759e7e7b9a67666df08bf4ef0587f32433dc93387217ceeb832a6c1566a  config-virtgrsec.x86_64"
diff --git a/main/linux-grsec/config-grsec.armhf b/main/linux-grsec/config-grsec.armhf
index 36f753a3df..2e165dec74 100644
--- a/main/linux-grsec/config-grsec.armhf
+++ b/main/linux-grsec/config-grsec.armhf
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.4.6 Kernel Configuration
+# Linux/arm 4.4.34 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -4220,7 +4220,7 @@ CONFIG_DRM_BRIDGE=y
 #
 # Frame buffer Devices
 #
-CONFIG_FB=m
+CONFIG_FB=y
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FB_CMDLINE=y
 # CONFIG_FB_DDC is not set
@@ -4247,8 +4247,11 @@ CONFIG_FB_TILEBLITTING=y
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_PM2 is not set
 CONFIG_FB_ARMCLCD=m
+CONFIG_PLAT_VERSATILE_CLCD=y
 CONFIG_FB_IMX=m
 # CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
 CONFIG_FB_UVESA=m
 # CONFIG_FB_OPENCORES is not set
 CONFIG_FB_S1D13XXX=m
@@ -4284,6 +4287,7 @@ CONFIG_FB_MX3=m
 CONFIG_FB_BROADSHEET=m
 # CONFIG_FB_AUO_K190X is not set
 CONFIG_FB_MXS=m
+# CONFIG_FB_SIMPLE is not set
 CONFIG_OMAP2_DSS_INIT=y
 CONFIG_OMAP2_DSS=m
 # CONFIG_OMAP2_DSS_DEBUG is not set
@@ -4333,7 +4337,7 @@ CONFIG_LCD_S6E63M0=m
 CONFIG_LCD_AMS369FG06=m
 CONFIG_LCD_LMS501KF03=m
 CONFIG_LCD_HX8357=m
-CONFIG_BACKLIGHT_CLASS_DEVICE=m
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_GENERIC=m
 CONFIG_BACKLIGHT_PWM=m
 # CONFIG_BACKLIGHT_PM8941_WLED is not set
@@ -6213,6 +6217,7 @@ CONFIG_CRYPTO_RNG_DEFAULT=m
 CONFIG_CRYPTO_PCOMP=m
 CONFIG_CRYPTO_PCOMP2=y
 CONFIG_CRYPTO_AKCIPHER2=y
+CONFIG_CRYPTO_AKCIPHER=m
 # CONFIG_CRYPTO_RSA is not set
 CONFIG_CRYPTO_MANAGER=m
 CONFIG_CRYPTO_MANAGER2=y
diff --git a/main/linux-grsec/config-grsec.x86 b/main/linux-grsec/config-grsec.x86
index 321cfafdeb..8dc0537464 100644
--- a/main/linux-grsec/config-grsec.x86
+++ b/main/linux-grsec/config-grsec.x86
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 4.4.14 Kernel Configuration
+# Linux/x86 4.4.34 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -3842,7 +3842,7 @@ CONFIG_PCF50633_ADC=m
 CONFIG_PCF50633_GPIO=m
 CONFIG_UCB1400_CORE=m
 CONFIG_MFD_RDC321X=m
-# CONFIG_MFD_RTSX_PCI is not set
+CONFIG_MFD_RTSX_PCI=m
 CONFIG_MFD_RTSX_USB=m
 # CONFIG_MFD_RN5T618 is not set
 # CONFIG_MFD_SI476X_CORE is not set
@@ -4505,14 +4505,14 @@ CONFIG_DRM_BRIDGE=y
 #
 # Frame buffer Devices
 #
-CONFIG_FB=m
+CONFIG_FB=y
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FB_CMDLINE=y
 CONFIG_FB_DDC=m
 # CONFIG_FB_BOOT_VESA_SUPPORT is not set
-CONFIG_FB_CFB_FILLRECT=m
-CONFIG_FB_CFB_COPYAREA=m
-CONFIG_FB_CFB_IMAGEBLIT=m
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
 CONFIG_FB_SYS_FILLRECT=m
 CONFIG_FB_SYS_COPYAREA=m
@@ -4536,8 +4536,12 @@ CONFIG_FB_PM2_FIFO_DISCONNECT=y
 CONFIG_FB_CYBER2000=m
 CONFIG_FB_CYBER2000_DDC=y
 CONFIG_FB_ARC=m
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
 CONFIG_FB_VGA16=m
 CONFIG_FB_UVESA=m
+# CONFIG_FB_VESA is not set
+CONFIG_FB_EFI=y
 CONFIG_FB_N411=m
 CONFIG_FB_HGA=m
 # CONFIG_FB_OPENCORES is not set
@@ -4603,8 +4607,8 @@ CONFIG_FB_GEODE_LX=m
 CONFIG_FB_GEODE_GX=m
 CONFIG_FB_GEODE_GX1=m
 CONFIG_FB_SM501=m
-# CONFIG_FB_SMSCUFX is not set
-# CONFIG_FB_UDL is not set
+CONFIG_FB_SMSCUFX=m
+CONFIG_FB_UDL=m
 # CONFIG_FB_IBM_GXT4500 is not set
 # CONFIG_FB_VIRTUAL is not set
 CONFIG_FB_METRONOME=m
@@ -4614,6 +4618,7 @@ CONFIG_FB_MB862XX_I2C=y
 CONFIG_FB_BROADSHEET=m
 # CONFIG_FB_AUO_K190X is not set
 CONFIG_FB_HYPERV=m
+CONFIG_FB_SIMPLE=y
 # CONFIG_FB_SM712 is not set
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_LCD_CLASS_DEVICE=m
@@ -4630,7 +4635,7 @@ CONFIG_LCD_S6E63M0=m
 CONFIG_LCD_AMS369FG06=m
 CONFIG_LCD_LMS501KF03=m
 CONFIG_LCD_HX8357=m
-CONFIG_BACKLIGHT_CLASS_DEVICE=m
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_GENERIC=m
 CONFIG_BACKLIGHT_CARILLO_RANCH=m
 CONFIG_BACKLIGHT_PWM=m
@@ -5336,6 +5341,7 @@ CONFIG_MMC_VIA_SDMMC=m
 CONFIG_MMC_VUB300=m
 # CONFIG_MMC_USHC is not set
 # CONFIG_MMC_USDHI6ROL0 is not set
+CONFIG_MMC_REALTEK_PCI=m
 CONFIG_MMC_REALTEK_USB=m
 CONFIG_MMC_TOSHIBA_PCI=m
 CONFIG_MMC_MTK=m
@@ -5355,6 +5361,7 @@ CONFIG_MSPRO_BLOCK=m
 CONFIG_MEMSTICK_TIFM_MS=m
 CONFIG_MEMSTICK_JMICRON_38X=m
 CONFIG_MEMSTICK_R592=m
+CONFIG_MEMSTICK_REALTEK_PCI=m
 CONFIG_MEMSTICK_REALTEK_USB=m
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
@@ -5998,7 +6005,7 @@ CONFIG_TMPFS_XATTR=y
 # CONFIG_HUGETLBFS is not set
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_CONFIGFS_FS=m
-# CONFIG_EFIVAR_FS is not set
+CONFIG_EFIVAR_FS=m
 CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set
diff --git a/main/linux-grsec/config-grsec.x86_64 b/main/linux-grsec/config-grsec.x86_64
index bcb7d75a1f..9dba153d90 100644
--- a/main/linux-grsec/config-grsec.x86_64
+++ b/main/linux-grsec/config-grsec.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.4.14 Kernel Configuration
+# Linux/x86 4.4.34 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -3772,7 +3772,7 @@ CONFIG_PCF50633_ADC=m
 CONFIG_PCF50633_GPIO=m
 CONFIG_UCB1400_CORE=m
 CONFIG_MFD_RDC321X=m
-# CONFIG_MFD_RTSX_PCI is not set
+CONFIG_MFD_RTSX_PCI=m
 CONFIG_MFD_RTSX_USB=m
 # CONFIG_MFD_RN5T618 is not set
 # CONFIG_MFD_SI476X_CORE is not set
@@ -4400,14 +4400,14 @@ CONFIG_HSA_AMD=m
 #
 # Frame buffer Devices
 #
-CONFIG_FB=m
+CONFIG_FB=y
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FB_CMDLINE=y
 CONFIG_FB_DDC=m
 # CONFIG_FB_BOOT_VESA_SUPPORT is not set
-CONFIG_FB_CFB_FILLRECT=m
-CONFIG_FB_CFB_COPYAREA=m
-CONFIG_FB_CFB_IMAGEBLIT=m
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
 CONFIG_FB_SYS_FILLRECT=m
 CONFIG_FB_SYS_COPYAREA=m
@@ -4431,8 +4431,12 @@ CONFIG_FB_PM2_FIFO_DISCONNECT=y
 CONFIG_FB_CYBER2000=m
 CONFIG_FB_CYBER2000_DDC=y
 CONFIG_FB_ARC=m
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
 CONFIG_FB_VGA16=m
 CONFIG_FB_UVESA=m
+# CONFIG_FB_VESA is not set
+CONFIG_FB_EFI=y
 CONFIG_FB_N411=m
 CONFIG_FB_HGA=m
 # CONFIG_FB_OPENCORES is not set
@@ -4493,8 +4497,8 @@ CONFIG_FB_CARMINE=m
 CONFIG_FB_CARMINE_DRAM_EVAL=y
 # CONFIG_CARMINE_DRAM_CUSTOM is not set
 CONFIG_FB_SM501=m
-# CONFIG_FB_SMSCUFX is not set
-# CONFIG_FB_UDL is not set
+CONFIG_FB_SMSCUFX=m
+CONFIG_FB_UDL=m
 # CONFIG_FB_IBM_GXT4500 is not set
 # CONFIG_FB_VIRTUAL is not set
 CONFIG_XEN_FBDEV_FRONTEND=m
@@ -4505,6 +4509,7 @@ CONFIG_FB_MB862XX_I2C=y
 CONFIG_FB_BROADSHEET=m
 # CONFIG_FB_AUO_K190X is not set
 CONFIG_FB_HYPERV=m
+CONFIG_FB_SIMPLE=y
 # CONFIG_FB_SM712 is not set
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_LCD_CLASS_DEVICE=m
@@ -4521,7 +4526,7 @@ CONFIG_LCD_S6E63M0=m
 CONFIG_LCD_AMS369FG06=m
 CONFIG_LCD_LMS501KF03=m
 CONFIG_LCD_HX8357=m
-CONFIG_BACKLIGHT_CLASS_DEVICE=m
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_GENERIC=m
 CONFIG_BACKLIGHT_CARILLO_RANCH=m
 CONFIG_BACKLIGHT_PWM=m
@@ -5190,6 +5195,7 @@ CONFIG_MMC_VIA_SDMMC=m
 CONFIG_MMC_VUB300=m
 # CONFIG_MMC_USHC is not set
 # CONFIG_MMC_USDHI6ROL0 is not set
+CONFIG_MMC_REALTEK_PCI=m
 CONFIG_MMC_REALTEK_USB=m
 CONFIG_MMC_TOSHIBA_PCI=m
 CONFIG_MMC_MTK=m
@@ -5209,6 +5215,7 @@ CONFIG_MSPRO_BLOCK=m
 CONFIG_MEMSTICK_TIFM_MS=m
 CONFIG_MEMSTICK_JMICRON_38X=m
 CONFIG_MEMSTICK_R592=m
+CONFIG_MEMSTICK_REALTEK_PCI=m
 CONFIG_MEMSTICK_REALTEK_USB=m
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y