Linux v3.15-7218-g3f17ea6dea8b

- Reenable debugging options.

1 files changed, 33 insertions, 1 deletions

diff --git a/config-armv7-generic b/config-armv7-generic
index 1b6bea7ad..411480286 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -67,6 +67,7 @@ CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y
 # CONFIG_ARCH_HI3xxx is not set
 # CONFIG_ARCH_MSM_DT is not set
 # CONFIG_ARCH_QCOM is not set
+# CONFIG_ARCH_EXYNOS is not set
 
 # errata
 # v5/v6
@@ -127,6 +128,9 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 
+# CONFIG_PCI_HOST_GENERIC is not set
+# CONFIG_BRCMSTB_GISB_ARB is not set
+
 # Root as NFS, different from mainline
 CONFIG_ROOT_NFS=y
 
@@ -162,6 +166,10 @@ CONFIG_ARM_HIGHBANK_CPUFREQ=m
 # CONFIG_ARM_HIGHBANK_CPUIDLE is not set
 
 # Allwinner
+CONFIG_MACH_SUN4I=y
+CONFIG_MACH_SUN5I=y
+CONFIG_MACH_SUN6I=y
+CONFIG_MACH_SUN7I=y
 CONFIG_PINCTRL_SUNXI=y
 CONFIG_SUNXI_WATCHDOG=m
 CONFIG_MDIO_SUN4I=m
@@ -178,6 +186,7 @@ CONFIG_SPI_SUN4I=m
 CONFIG_SPI_SUN6I=m
 CONFIG_MMC_SUNXI=m
 CONFIG_GPIO_PCA953X=m
+CONFIG_POWER_RESET_SUN6I=y
 
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=m
@@ -271,6 +280,7 @@ CONFIG_MFD_TPS65912_SPI=y
 # CONFIG_MFD_WM831X_SPI is not set
 # CONFIG_MFD_MC13XXX_SPI is not set
 # CONFIG_MFD_PM8921_CORE is not set
+# CONFIG_MFD_AXP20X is not set
 
 # Pin stuff
 CONFIG_PINMUX=y
@@ -283,6 +293,8 @@ CONFIG_GENERIC_PINCONF=y
 # CONFIG_PINCTRL_CAPRI is not set
 # CONFIG_PINCTRL_MSM8X74 is not set
 # CONFIG_PINCTRL_BCM281XX is not set
+# CONFIG_PINCTRL_APQ8064 is not set
+# CONFIG_PINCTRL_IPQ8064 is not set
 
 # GPIO
 # CONFIG_GPIO_EM is not set
@@ -325,6 +337,7 @@ CONFIG_SPI_TLE62X0=m
 CONFIG_SPI_XCOMM=m
 CONFIG_SPI_XILINX=m
 # CONFIG_SPI_FSL_SPI is not set
+# CONFIG_SPI_CADENCE is not set
 
 CONFIG_NFC_NCI_SPI=y
 
@@ -332,6 +345,7 @@ CONFIG_NFC_NCI_SPI=y
 CONFIG_I2C_DESIGNWARE_CORE=m
 CONFIG_I2C_DESIGNWARE_PLATFORM=m
 CONFIG_I2C_MV64XXX=m
+# CONFIG_I2C_CROS_EC_TUNNEL is not set
 
 # HW crypto and rng
 CONFIG_CRYPTO_SHA1_ARM=m
@@ -397,7 +411,11 @@ CONFIG_SPI_DW_PCI=m
 # CONFIG_MMC_DW_EXYNOS is not set
 # CONFIG_MMC_DW_IDMAC is not set
 # CONFIG_MMC_DW_K3 is not set
-CONFIG_USB_DWC2=m
+CONFIG_USB_DWC2=y
+CONFIG_USB_DWC2_HOST=m
+CONFIG_USB_DWC2_PLATFORM=y
+CONFIG_USB_DWC2_PCI=y
+# CONFIG_USB_DWC2_PERIPHERAL is not set
 # CONFIG_USB_DWC2_DEBUG is not set
 # CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set
 CONFIG_USB_DWC3=m
@@ -460,6 +478,14 @@ CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 # CONFIG_SND_SOC_WM8903 is not set
 # CONFIG_SND_SOC_WM8962 is not set
 # CONFIG_SND_SOC_TPA6130A2 is not set
+# CONFIG_SND_SOC_FSL_SAI is not set
+# CONFIG_SND_SOC_FSL_SSI is not set
+# CONFIG_SND_SOC_FSL_SPDIF is not set
+# CONFIG_SND_SOC_FSL_ESAI is not set
+# CONFIG_SND_SOC_IMX_AUDMUX is not set
+# CONFIG_SND_SOC_ALC5623 is not set
+# CONFIG_SND_SOC_CS42L56 is not set
+# CONFIG_SND_SOC_STA350 is not set
 # CONFIG_SND_ATMEL_SOC is not set
 
 # Displays
@@ -479,6 +505,9 @@ CONFIG_RTC_DRV_RX4581=m
 CONFIG_RTC_DRV_TPS65910=m
 CONFIG_RTC_DRV_TPS80031=m
 # CONFIG_RTC_DRV_DS1347 is not set
+# CONFIG_RTC_DRV_DS1343 is not set
+# CONFIG_RTC_DRV_MCP795 is not set
+# CONFIG_RTC_DRV_XGENE  is not set
 
 # Regulators
 CONFIG_REGULATOR=y
@@ -514,6 +543,8 @@ CONFIG_REGULATOR_TPS6586X=m
 CONFIG_REGULATOR_TPS65910=m
 CONFIG_REGULATOR_TPS65912=m
 CONFIG_REGULATOR_TPS80031=m
+CONFIG_REGULATOR_LTC3589=m
+CONFIG_REGULATOR_ANATOP=m
 
 CONFIG_CHARGER_MANAGER=y
 CONFIG_CHARGER_BQ2415X=m
@@ -621,6 +652,7 @@ CONFIG_BPF_JIT=y
 # CONFIG_DRM_TILCDC is not set
 # CONFIG_DRM_IMX is not set
 # CONFIG_AHCI_IMX is not set
+# CONFIG_IMX_THERMAL is not set
 # CONFIG_CS89x0 is not set
 # CONFIG_DM9000 is not set
 # CONFIG_HW_RANDOM_ATMEL is not set