linux-libre: update config.armv7h without RNC support and fix ALARM patching

2 files changed, 13 insertions, 30 deletions

diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 32b3931b5..d0ca8958a 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -64,7 +64,7 @@ sha256sums=('48b2e5ea077d0a0bdcb205e67178e8eb5b2867db3b2364b701dbc801d9755324'
             'SKIP'
             '7ec6927f4a4bc8e1aa50adfcce868f04b07b0de19a54554a8ad27ee0341b4b45'
             'ac457bf24c83a4af82251a67cb3de06f0b73e66bd08c2fb1eb936caa3b555c6f'
-            '455971ce7690c15a7983a2cc75271c4095df6dda5bfee41cc052b0706422fa3b'
+            '91b8ca9c4e2593fe9d8d037847975e8a365ebdbbf1bf1a1758e00f268cd3aaa8'
             'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
             '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
             '38cf6bdf70dc070ff0b785937d99347bb91f8531ea2bcca50283c8923a184c6d'
@@ -104,14 +104,14 @@ prepare() {
   if [ "${CARCH}" == "armv7h" ]; then
 
     # ALARM patches
-    patch -p1 -i "${srcdir}/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch
-    patch -p1 -i "${srcdir}/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
-    patch -p1 -i "${srcdir}/0003-SMILE-Plug-device-tree-file.patch
-    patch -p1 -i "${srcdir}/0004-fix-mvsdio-eMMC-timing.patch
-    patch -p1 -i "${srcdir}/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
-    patch -p1 -i "${srcdir}/0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch
-    patch -p1 -i "${srcdir}/0007-set-default-cubietruck-led-triggers.patch
-    patch -p1 -i "${srcdir}/0008-USB-armory-support.patch
+    patch -p1 -i "${srcdir}/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch"
+    patch -p1 -i "${srcdir}/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch"
+    patch -p1 -i "${srcdir}/0003-SMILE-Plug-device-tree-file.patch"
+    patch -p1 -i "${srcdir}/0004-fix-mvsdio-eMMC-timing.patch"
+    patch -p1 -i "${srcdir}/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch"
+    patch -p1 -i "${srcdir}/0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch"
+    patch -p1 -i "${srcdir}/0007-set-default-cubietruck-led-triggers.patch"
+    patch -p1 -i "${srcdir}/0008-USB-armory-support.patch"
   fi
 
   # add freedo as boot logo
diff --git a/libre/linux-libre/config.armv7h b/libre/linux-libre/config.armv7h
index 0b69dd2fe..fd2e670ae 100644
--- a/libre/linux-libre/config.armv7h
+++ b/libre/linux-libre/config.armv7h
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.1.3-gnu-1 Kernel Configuration
+# Linux/arm 4.1.6-gnu-1 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -414,7 +414,6 @@ CONFIG_SOC_VF610=y
 CONFIG_VF_USE_ARM_GLOBAL_TIMER=y
 # CONFIG_VF_USE_PIT_TIMER is not set
 CONFIG_SOC_LS1021A=y
-CONFIG_WAND_RFKILL=m
 # CONFIG_ARCH_MEDIATEK is not set
 CONFIG_ARCH_OMAP=y
 
@@ -1853,7 +1852,6 @@ CONFIG_OF_MTD=y
 CONFIG_OF_RESERVED_MEM=y
 CONFIG_OF_RESOLVE=y
 CONFIG_OF_OVERLAY=y
-CONFIG_OF_CONFIGFS=y
 CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
 # CONFIG_PARPORT is not set
 CONFIG_BLK_DEV=y
@@ -1915,9 +1913,6 @@ CONFIG_TI_DAC7512=m
 # CONFIG_USB_SWITCH_FSA9480 is not set
 # CONFIG_LATTICE_ECP3_CONFIG is not set
 CONFIG_SRAM=y
-CONFIG_BONE_CAPEMGR=y
-# CONFIG_DEV_OVERLAYMGR is not set
-CONFIG_TIEQEP=m
 CONFIG_C2PORT=m
 
 #
@@ -1929,6 +1924,7 @@ CONFIG_EEPROM_LEGACY=m
 CONFIG_EEPROM_MAX6875=m
 CONFIG_EEPROM_93CX6=m
 CONFIG_EEPROM_93XX46=m
+# CONFIG_EEPROM_SUNXI_SID is not set
 # CONFIG_CB710_CORE is not set
 
 #
@@ -1954,12 +1950,6 @@ CONFIG_ALTERA_STAPL=m
 #
 # Intel MIC Card Driver
 #
-
-#
-# Argus cape driver for beaglebone black
-#
-CONFIG_CAPE_BONE_ARGUS=y
-# CONFIG_BEAGLEBONE_PINMUX_HELPER is not set
 # CONFIG_ECHO is not set
 # CONFIG_CXL_BASE is not set
 CONFIG_HAVE_IDE=y
@@ -2615,8 +2605,6 @@ CONFIG_RT2X00_LIB_FIRMWARE=y
 CONFIG_RT2X00_LIB_CRYPTO=y
 CONFIG_RT2X00_LIB_LEDS=y
 # CONFIG_RT2X00_DEBUG is not set
-CONFIG_WL_MEDIATEK=y
-CONFIG_MT7601U=m
 CONFIG_RTL_CARDS=m
 CONFIG_RTL8192CE=m
 CONFIG_RTL8192SE=m
@@ -3261,7 +3249,6 @@ CONFIG_OF_GPIO=y
 CONFIG_GPIOLIB_IRQCHIP=y
 # CONFIG_DEBUG_GPIO is not set
 CONFIG_GPIO_SYSFS=y
-# CONFIG_GPIO_OF_HELPER is not set
 CONFIG_GPIO_GENERIC=y
 CONFIG_GPIO_MAX730X=m
 
@@ -4467,7 +4454,7 @@ CONFIG_FB_SYS_IMAGEBLIT=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 CONFIG_FB_SYS_FOPS=y
 CONFIG_FB_DEFERRED_IO=y
-# CONFIG_FB_SVGALIB is not set
+CONFIG_FB_SVGALIB=m
 # CONFIG_FB_MACMODES is not set
 CONFIG_FB_BACKLIGHT=y
 CONFIG_FB_MODE_HELPERS=y
@@ -4584,7 +4571,7 @@ CONFIG_BACKLIGHT_PWM=y
 CONFIG_BACKLIGHT_GPIO=m
 # CONFIG_BACKLIGHT_LV5207LP is not set
 # CONFIG_BACKLIGHT_BD6107 is not set
-# CONFIG_VGASTATE is not set
+CONFIG_VGASTATE=m
 CONFIG_VIDEOMODE_HELPERS=y
 CONFIG_HDMI=y
 
@@ -5638,7 +5625,6 @@ CONFIG_UIO_DMEM_GENIRQ=m
 # CONFIG_UIO_SERCOS3 is not set
 # CONFIG_UIO_PCI_GENERIC is not set
 # CONFIG_UIO_NETX is not set
-# CONFIG_UIO_PRUSS is not set
 # CONFIG_UIO_MF624 is not set
 # CONFIG_VFIO is not set
 # CONFIG_VIRT_DRIVERS is not set
@@ -5924,7 +5910,6 @@ CONFIG_ARM_SMMU=y
 CONFIG_REMOTEPROC=y
 CONFIG_OMAP_REMOTEPROC=y
 # CONFIG_STE_MODEM_RPROC is not set
-CONFIG_WKUP_M3_RPROC=y
 
 #
 # Rpmsg drivers
@@ -6253,8 +6238,6 @@ CONFIG_RAS=y
 CONFIG_ANDROID=y
 CONFIG_ANDROID_BINDER_IPC=y
 CONFIG_ANDROID_BINDER_IPC_32BIT=y
-CONFIG_NVMEM=y
-CONFIG_NVMEM_SUNXI_SID=y
 
 #
 # Firmware Drivers