3.11.0-0.rc7.git4.1.fc21.gnu

1 files changed, 33 insertions, 29 deletions

diff --git a/freed-ora/current/master/config-armv7-generic b/freed-ora/current/master/config-armv7-generic
index 897a7e3ee..663f86b82 100644
--- a/freed-ora/current/master/config-armv7-generic
+++ b/freed-ora/current/master/config-armv7-generic
@@ -46,6 +46,25 @@ CONFIG_ALWAYS_USE_PERSISTENT_CLOCK=y
 # CONFIG_XIP_KERNEL is not set
 # CONFIG_ARM_VIRT_EXT is not set
 
+# Platforms enabled/disabled globally on ARMv7
+CONFIG_ARCH_HIGHBANK=y
+CONFIG_ARCH_VEXPRESS_CA9X4=y
+CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y
+# CONFIG_ARCH_BCM is not set
+# CONFIG_PLAT_SPEAR is not set
+# CONFIG_ARCH_STI is not set
+# CONFIG_ARCH_SIRF is not set
+# CONFIG_ARCH_U8500 is not set
+# CONFIG_ARCH_WM8850 is not set
+
+# highbank
+# 2013/04/19 - stability issues
+# CONFIG_CPU_IDLE_CALXEDA is not set
+CONFIG_EDAC_HIGHBANK_MC=m
+CONFIG_EDAC_HIGHBANK_L2=m
+CONFIG_SATA_HIGHBANK=m
+CONFIG_ARM_HIGHBANK_CPUFREQ=m
+
 # errata
 # v5/v6
 # CONFIG_ARM_ERRATA_326103 is not set
@@ -76,8 +95,6 @@ CONFIG_PJ4B_ERRATA_4742=y
 # CONFIG_ARM_ERRATA_798181 is not set
 
 # generic that deviates from or should be merged into config-generic
-CONFIG_SMP=y
-CONFIG_NR_CPUS=8
 CONFIG_SMP_ON_UP=y
 CONFIG_HIGHMEM=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
@@ -98,15 +115,8 @@ CONFIG_RCU_FANOUT=32
 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
 CONFIG_LSM_MMAP_MIN_ADDR=32768
 
-CONFIG_SECCOMP=y
-CONFIG_STRICT_DEVMEM=y
-
 CONFIG_XZ_DEC_ARM=y
-CONFIG_OC_ETM=y
 
-CONFIG_PM=y
-CONFIG_PM_STD_PARTITION=""
-CONFIG_SUSPEND=y
 CONFIG_ARM_CPU_SUSPEND=y
 
 CONFIG_LOCAL_TIMERS=y
@@ -119,7 +129,6 @@ CONFIG_IP_PNP_BOOTP=y
 
 # Root as NFS, different from mainline
 CONFIG_ROOT_NFS=y
-CONFIG_NLS_CODEPAGE_437=y
 
 CONFIG_LBDAF=y
 
@@ -127,15 +136,7 @@ CONFIG_LBDAF=y
 CONFIG_USE_OF=y
 CONFIG_ARM_ATAG_DTB_COMPAT=y
 CONFIG_ARM_APPENDED_DTB=y
-CONFIG_PROC_DEVICETREE=y
-CONFIG_SERIAL_OF_PLATFORM=y
-CONFIG_OF_PCI=y
-CONFIG_OF_PCI_IRQ=y
 CONFIG_I2C_MUX_PINCTRL=m
-CONFIG_OF_MDIO=m
-
-CONFIG_OF_DISPLAY_TIMING=y
-CONFIG_OF_VIDEOMODE=y
 
 # General vexpress ARM drivers
 CONFIG_ARM_TIMER_SP804=y
@@ -152,11 +153,8 @@ CONFIG_RTC_DRV_PL031=y
 CONFIG_PL330_DMA=m
 CONFIG_AMBA_PL08X=y
 CONFIG_ARM_SP805_WATCHDOG=m
-CONFIG_I2C_VERSATILE=m
 CONFIG_GPIO_PL061=y
-CONFIG_SENSORS_VEXPRESS=m
 CONFIG_FB_ARMCLCD=m
-CONFIG_REGULATOR_VEXPRESS=m
 
 # usb
 CONFIG_USB_OTG=y
@@ -165,9 +163,6 @@ CONFIG_USB_OTG=y
 CONFIG_USB_ULPI=y
 CONFIG_AX88796=m
 CONFIG_AX88796_93CX6=y
-CONFIG_SMC91X=m
-CONFIG_SMC911X=m
-CONFIG_SMSC911X=m
 CONFIG_USB_ISP1760_HCD=m
 # CONFIG_USB_EHCI_HCD_ORION is not set
 
@@ -183,7 +178,7 @@ CONFIG_MFD_TPS65912_SPI=y
 CONFIG_PINMUX=y
 CONFIG_PINCONF=y
 CONFIG_PINCTRL=y
-CONFIG_PINCTRL_SINGLE=m
+CONFIG_PINCTRL_SINGLE=y
 # CONFIG_PINCTRL_SAMSUNG is not set
 # CONFIG_PINCTRL_EXYNOS4 is not set
 
@@ -194,7 +189,6 @@ CONFIG_EXTCON_GPIO=m
 CONFIG_GPIO_ADNP=m
 CONFIG_GPIO_MCP23S08=m
 CONFIG_POWER_RESET_GPIO=y
-CONFIG_RFKILL_GPIO=m
 CONFIG_SERIAL_8250_EM=m
 CONFIG_INPUT_GPIO_TILT_POLLED=m
 CONFIG_MDIO_BUS_MUX_GPIO=m
@@ -226,6 +220,8 @@ CONFIG_SPI_DESIGNWARE=m
 CONFIG_SPI_TLE62X0=m
 # CONFIG_SPI_FSL_SPI is not set
 
+CONFIG_NFC_NCI_SPI=y
+
 # HW crypto and rng
 CONFIG_CRYPTO_SHA1_ARM=m
 CONFIG_CRYPTO_AES_ARM=m
@@ -244,7 +240,6 @@ CONFIG_POWER_RESET_RESTART=y
 CONFIG_ARM_PSCI=y
 
 # MTD
-CONFIG_MTD_OF_PARTS=y
 # CONFIG_MG_DISK is not set
 CONFIG_MTD_DATAFLASH=m
 CONFIG_MTD_DATAFLASH_WRITE_VERIFY=y
@@ -256,13 +251,20 @@ CONFIG_EEPROM_93XX46=m
 
 # MMC/SD
 CONFIG_MMC_SPI=m
+
+# Designware (used by numerous devices)
 CONFIG_MMC_DW=m
 CONFIG_MMC_DW_PLTFM=m
 CONFIG_MMC_DW_PCI=m
 CONFIG_SPI_DW_MMIO=m
 CONFIG_SPI_DW_PCI=m
+CONFIG_MMC_DW_SOCFPGA=m
 # CONFIG_MMC_DW_EXYNOS is not set
 # CONFIG_MMC_DW_IDMAC is not set
+CONFIG_USB_DWC2=m
+CONFIG_USB_DWC3=m
+# CONFIG_USB_DWC3_DEBUG is not set
+CONFIG_DW_WATCHDOG=m
 
 # Sound
 CONFIG_SND_ARM=y
@@ -401,7 +403,6 @@ CONFIG_UBIFS_FS_ZLIB=y
 
 # Should be in generic
 CONFIG_BPF_JIT=y
-# CONFIG_NET_VENDOR_BROADCOM is not set
 # CONFIG_NET_VENDOR_CIRRUS is not set
 # CONFIG_NET_VENDOR_MICROCHIP is not set
 
@@ -410,6 +411,7 @@ CONFIG_BPF_JIT=y
 # CONFIG_DRM_EXYNOS is not set
 # CONFIG_DRM_TILCDC is not set
 # CONFIG_DRM_IMX is not set
+# CONFIG_AHCI_IMX is not set
 # CONFIG_CS89x0 is not set
 # CONFIG_DM9000 is not set
 # CONFIG_HW_RANDOM_ATMEL is not set
@@ -429,7 +431,6 @@ CONFIG_BPF_JIT=y
 # CONFIG_SERIAL_MAX3100 is not set
 # CONFIG_SERIAL_MAX310X is not set
 # CONFIG_SERIAL_IFX6X60 is not set
-# CONFIG_COMMON_CLK_SI5351 is not set
 # CONFIG_COMMON_CLK_AXI_CLKGEN is not set
 # CONFIG_SPI_TOPCLIFF_PCH is not set
 # CONFIG_SPI_PXA2XX is not set
@@ -455,3 +456,6 @@ CONFIG_BPF_JIT=y
 # CONFIG_DEBUG_LL is not set
 # CONFIG_DEBUG_PINCTRL is not set
 # CONFIG_ARM_DT_BL_CPUFREQ is not set
+
+# FIX ME
+# CONFIG_FB_XILINX is not set