From fbdf56b2ff212dacbb371cd5fee3c2877a799b57 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Tue, 1 Sep 2015 18:21:20 -0300
Subject: linux-libre: add our deblobbed RCN patch for armv7h

---
 libre/linux-libre/config.armv7h | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

(limited to 'libre/linux-libre/config.armv7h')

diff --git a/libre/linux-libre/config.armv7h b/libre/linux-libre/config.armv7h
index fd2e670ae..c22750444 100644
--- a/libre/linux-libre/config.armv7h
+++ b/libre/linux-libre/config.armv7h
@@ -10,7 +10,7 @@ CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8
 CONFIG_MIGHT_HAVE_PCI=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 CONFIG_HAVE_PROC_CPU=y
-CONFIG_ARCH_DEFCONFIG="arch/arm/configs/multi_v7_defconfig"
+CONFIG_ARCH_DEFCONFIG="arch/arm/configs/rcn-ee_defconfig"
 CONFIG_NO_IOPORT_MAP=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_LOCKDEP_SUPPORT=y
@@ -414,6 +414,7 @@ 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
 
@@ -1852,6 +1853,7 @@ 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
@@ -1913,6 +1915,9 @@ 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
 
 #
@@ -1924,7 +1929,6 @@ 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
 
 #
@@ -1950,6 +1954,12 @@ 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
@@ -2605,6 +2615,8 @@ 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
@@ -3249,6 +3261,7 @@ 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
 
@@ -4454,7 +4467,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=m
+# CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
 CONFIG_FB_BACKLIGHT=y
 CONFIG_FB_MODE_HELPERS=y
@@ -4571,7 +4584,7 @@ CONFIG_BACKLIGHT_PWM=y
 CONFIG_BACKLIGHT_GPIO=m
 # CONFIG_BACKLIGHT_LV5207LP is not set
 # CONFIG_BACKLIGHT_BD6107 is not set
-CONFIG_VGASTATE=m
+# CONFIG_VGASTATE is not set
 CONFIG_VIDEOMODE_HELPERS=y
 CONFIG_HDMI=y
 
@@ -5625,6 +5638,7 @@ 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
@@ -5910,6 +5924,7 @@ 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
@@ -6238,6 +6253,8 @@ 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
-- 
cgit v1.2.3-54-g00ecf