From 9e2e618269782f11df3b210eb152f028fd482d06 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 11 Jul 2013 06:54:59 +0100 Subject: ARM config cleanups and changes for 3.11 --- config-armv7-lpae | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) (limited to 'config-armv7-lpae') diff --git a/config-armv7-lpae b/config-armv7-lpae index 0798e2d33..ce10b5384 100644 --- a/config-armv7-lpae +++ b/config-armv7-lpae @@ -45,12 +45,6 @@ CONFIG_MACH_EXYNOS5_DT=y CONFIG_SERIAL_SAMSUNG=y CONFIG_SERIAL_SAMSUNG_CONSOLE=y CONFIG_SERIAL_OF_PLATFORM=y -CONFIG_S3C_BOOT_ERROR_RESET=y -CONFIG_S3C_BOOT_UART_FORCE_FIFO=y -CONFIG_S3C_LOWLEVEL_UART_PORT=0 -CONFIG_S3C_GPIO_SPACE=8 -CONFIG_S3C_ADC=y -CONFIG_S3C24XX_PWM=y # CONFIG_SAMSUNG_PM_DEBUG is not set # CONFIG_SAMSUNG_PM_CHECK is not set CONFIG_SOC_EXYNOS5250=y @@ -63,10 +57,8 @@ CONFIG_PCI_EXYNOS=y CONFIG_ARM_CCI=y CONFIG_TCG_TIS_I2C_INFINEON=m -CONFIG_I2C_S3C2410=m CONFIG_PINCTRL_EXYNOS=y CONFIG_PINCTRL_EXYNOS5440=y -CONFIG_S3C2410_WATCHDOG=m CONFIG_VIDEO_SAMSUNG_S5P_G2D=m CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m CONFIG_VIDEO_SAMSUNG_S5P_MFC=m @@ -91,24 +83,16 @@ CONFIG_SND_SOC_SAMSUNG=m CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_S5P=m CONFIG_USB_OHCI_EXYNOS=y -CONFIG_S3C_DEV_HSMMC=y -CONFIG_MMC_SDHCI_S3C=m -CONFIG_MMC_SDHCI_S3C_DMA=y -CONFIG_RTC_DRV_S3C=m CONFIG_PWM_SAMSUNG=m -CONFIG_S3C_BOOT_WATCHDOG=y CONFIG_SAMSUNG_GPIO_EXTRA=8 CONFIG_SERIAL_SAMSUNG_CONSOLE=y -CONFIG_BATTERY_S3C_ADC=m -CONFIG_SENSORS_S3C=m -CONFIG_SENSORS_S3C_RAW=y -CONFIG_FB_S3C_DEBUG_REGWRITE=y CONFIG_SND_SOC_SAMSUNG_SMDK_SPDIF=m CONFIG_USB_EHCI_S5P=y CONFIG_SAMSUNG_USBPHY=m CONFIG_SAMSUNG_USB2PHY=m CONFIG_SAMSUNG_USB3PHY=m CONFIG_MMC_DW_EXYNOS=m +CONFIG_RTC_DRV_S3C=m # Chromebook CONFIG_MFD_CROS_EC=m @@ -123,7 +107,14 @@ CONFIG_REGULATOR_MAX8997=m CONFIG_REGULATOR_S5M8767=m CONFIG_COMMON_CLK_MAX77686=m +CONFIG_S3C_LOWLEVEL_UART_PORT=1 # CONFIG_EXYNOS4_SDHCI_CH0_8BIT is not set # CONFIG_EXYNOS4_SDHCI_CH2_8BIT is not set # CONFIG_SGI_IOC4 is not set +# +# CONFIG_S3C_BOOT_ERROR_RESET is not set +# CONFIG_S3C_BOOT_UART_FORCE_FIFO is not set +# CONFIG_I2C_S3C2410 is not set +# CONFIG_S3C2410_WATCHDOG is not set +# CONFIG_MMC_SDHCI_S3C is not set -- cgit