From e8b3bd988d91394bef4d1d674333ee150f636a3e Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Oct 21 2012 23:11:42 +0000 Subject: ARM: Update config files: Exynos: Enable gfx and highmem --- diff --git a/config/armv7hl/exynos b/config/armv7hl/exynos index d56f3d2..dff8328 100644 --- a/config/armv7hl/exynos +++ b/config/armv7hl/exynos @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.6.2 Kernel Configuration +# Linux/arm 3.6.3 Kernel Configuration # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -349,6 +349,7 @@ CONFIG_SAMSUNG_CLKSRC=y CONFIG_S5P_CLOCK=y CONFIG_SAMSUNG_IRQ_VIC_TIMER=y CONFIG_S5P_IRQ=y +CONFIG_S5P_GPIO_INT=y CONFIG_SAMSUNG_GPIOLIB_4BIT=y CONFIG_S5P_GPIO_DRVSTR=y CONFIG_SAMSUNG_GPIO_EXTRA=0 @@ -361,13 +362,17 @@ CONFIG_S3C_DEV_HSMMC2=y CONFIG_S3C_DEV_HSMMC3=y CONFIG_S3C_DEV_I2C1=y CONFIG_S3C_DEV_I2C3=y +CONFIG_S3C_DEV_I2C5=y +CONFIG_S3C_DEV_I2C6=y CONFIG_S3C_DEV_I2C7=y CONFIG_S3C_DEV_USB_HSOTG=y CONFIG_S3C_DEV_WDT=y CONFIG_S3C_DEV_RTC=y +CONFIG_SAMSUNG_DEV_ADC=y CONFIG_SAMSUNG_DEV_KEYPAD=y CONFIG_SAMSUNG_DEV_PWM=y CONFIG_SAMSUNG_DEV_BACKLIGHT=y +CONFIG_S5P_DEV_CSIS0=y CONFIG_S5P_DEV_FIMC0=y CONFIG_S5P_DEV_FIMC1=y CONFIG_S5P_DEV_FIMC2=y @@ -380,6 +385,7 @@ CONFIG_S5P_DEV_MFC=y CONFIG_S5P_DEV_TV=y CONFIG_S5P_DEV_USB_EHCI=y # CONFIG_S3C24XX_PWM is not set +CONFIG_S5P_SETUP_MIPIPHY=y CONFIG_SAMSUNG_DMADEV=y # @@ -413,10 +419,13 @@ CONFIG_EXYNOS_DEV_SYSMMU=y CONFIG_EXYNOS4_DEV_USB_OHCI=y CONFIG_EXYNOS4_SETUP_I2C1=y CONFIG_EXYNOS4_SETUP_I2C3=y +CONFIG_EXYNOS4_SETUP_I2C5=y +CONFIG_EXYNOS4_SETUP_I2C6=y CONFIG_EXYNOS4_SETUP_I2C7=y CONFIG_EXYNOS4_SETUP_KEYPAD=y CONFIG_EXYNOS4_SETUP_SDHCI=y CONFIG_EXYNOS4_SETUP_SDHCI_GPIO=y +CONFIG_EXYNOS4_SETUP_FIMC=y CONFIG_EXYNOS4_SETUP_USB_PHY=y # @@ -426,7 +435,7 @@ CONFIG_MACH_SMDKC210=y CONFIG_MACH_SMDKV310=y CONFIG_MACH_ARMLEX4210=y # CONFIG_MACH_UNIVERSAL_C210 is not set -# CONFIG_MACH_NURI is not set +CONFIG_MACH_NURI=y CONFIG_MACH_ORIGEN=y # @@ -442,14 +451,14 @@ CONFIG_MACH_SMDK4412=y # # Flattened Device Tree based board for EXYNOS SoCs # -# CONFIG_MACH_EXYNOS4_DT is not set -# CONFIG_MACH_EXYNOS5_DT is not set +CONFIG_MACH_EXYNOS4_DT=y +CONFIG_MACH_EXYNOS5_DT=y # # Configuration for HSMMC 8-bit bus width # -# CONFIG_EXYNOS4_SDHCI_CH0_8BIT is not set -# CONFIG_EXYNOS4_SDHCI_CH2_8BIT is not set +CONFIG_EXYNOS4_SDHCI_CH0_8BIT=y +CONFIG_EXYNOS4_SDHCI_CH2_8BIT=y # # Processor Type @@ -504,6 +513,7 @@ CONFIG_MULTI_IRQ_HANDLER=y # CONFIG_ARM_ERRATA_754327 is not set # CONFIG_ARM_ERRATA_764369 is not set # CONFIG_PL310_ERRATA_769419 is not set +# CONFIG_ARM_ERRATA_775420 is not set CONFIG_ARM_GIC=y CONFIG_GIC_NON_BANKED=y @@ -542,23 +552,24 @@ CONFIG_HZ=200 CONFIG_AEABI=y # CONFIG_OABI_COMPAT is not set CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y -CONFIG_ARCH_SPARSEMEM_ENABLE=y -CONFIG_ARCH_SPARSEMEM_DEFAULT=y -CONFIG_ARCH_SELECT_MEMORY_MODEL=y +# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set +# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set CONFIG_HAVE_ARCH_PFN_VALID=y -# CONFIG_HIGHMEM is not set +CONFIG_HIGHMEM=y +# CONFIG_HIGHPTE is not set CONFIG_HW_PERF_EVENTS=y CONFIG_SELECT_MEMORY_MODEL=y -CONFIG_SPARSEMEM_MANUAL=y -CONFIG_SPARSEMEM=y -CONFIG_HAVE_MEMORY_PRESENT=y -CONFIG_SPARSEMEM_EXTREME=y +CONFIG_FLATMEM_MANUAL=y +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y CONFIG_HAVE_MEMBLOCK=y +CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_COMPACTION=y CONFIG_MIGRATION=y # CONFIG_PHYS_ADDR_T_64BIT is not set CONFIG_ZONE_DMA_FLAG=0 +CONFIG_BOUNCE=y CONFIG_VIRT_TO_BUS=y # CONFIG_KSM is not set CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 @@ -2906,12 +2917,22 @@ CONFIG_SOC_CAMERA_OV9640=m CONFIG_SOC_CAMERA_OV9740=m CONFIG_VIDEO_SH_MOBILE_CSI2=m CONFIG_VIDEO_SH_MOBILE_CEU=m -# CONFIG_VIDEO_SAMSUNG_S5P_FIMC is not set -# CONFIG_VIDEO_SAMSUNG_S5P_TV is not set +CONFIG_VIDEO_SAMSUNG_S5P_FIMC=y +CONFIG_VIDEO_S5P_FIMC=m +CONFIG_VIDEO_S5P_MIPI_CSIS=m +CONFIG_VIDEO_EXYNOS_FIMC_LITE=m +CONFIG_VIDEO_SAMSUNG_S5P_TV=y +CONFIG_VIDEO_SAMSUNG_S5P_HDMI=m +# CONFIG_VIDEO_SAMSUNG_S5P_HDMI_DEBUG is not set +CONFIG_VIDEO_SAMSUNG_S5P_HDMIPHY=m +CONFIG_VIDEO_SAMSUNG_S5P_SII9234=m +CONFIG_VIDEO_SAMSUNG_S5P_SDO=m +CONFIG_VIDEO_SAMSUNG_S5P_MIXER=m +# CONFIG_VIDEO_SAMSUNG_S5P_MIXER_DEBUG is not set CONFIG_V4L_MEM2MEM_DRIVERS=y # CONFIG_VIDEO_MEM2MEM_TESTDEV is not set CONFIG_VIDEO_SAMSUNG_S5P_G2D=m -# CONFIG_VIDEO_SAMSUNG_S5P_JPEG is not set +CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m CONFIG_VIDEO_SAMSUNG_S5P_MFC=m CONFIG_RADIO_ADAPTERS=y CONFIG_RADIO_SI470X=y @@ -3120,7 +3141,6 @@ CONFIG_DRM_I2C_SIL164=m CONFIG_DRM_EXYNOS=m CONFIG_DRM_EXYNOS_DMABUF=y CONFIG_DRM_EXYNOS_FIMD=y -CONFIG_DRM_EXYNOS_HDMI=y CONFIG_DRM_EXYNOS_VIDI=y CONFIG_DRM_EXYNOS_G2D=y CONFIG_DRM_UDL=m @@ -3163,7 +3183,10 @@ CONFIG_FB_VIRTUAL=m CONFIG_FB_METRONOME=m CONFIG_FB_BROADSHEET=m # CONFIG_FB_AUO_K190X is not set -# CONFIG_EXYNOS_VIDEO is not set +CONFIG_EXYNOS_VIDEO=y +CONFIG_EXYNOS_MIPI_DSI=y +CONFIG_EXYNOS_LCD_S6E8AX0=y +CONFIG_EXYNOS_DP=y CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_LCD_CLASS_DEVICE=m # CONFIG_LCD_L4F00242T03 is not set @@ -3365,14 +3388,14 @@ CONFIG_USB_C67X00_HCD=m CONFIG_USB_EHCI_HCD=m CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_EHCI_TT_NEWSCHED=y -# CONFIG_USB_EHCI_S5P is not set +CONFIG_USB_EHCI_S5P=y CONFIG_USB_OXU210HP_HCD=m CONFIG_USB_ISP116X_HCD=m CONFIG_USB_ISP1760_HCD=m CONFIG_USB_ISP1362_HCD=m CONFIG_USB_OHCI_HCD=m CONFIG_USB_OHCI_HCD_SSB=y -# CONFIG_USB_OHCI_EXYNOS is not set +CONFIG_USB_OHCI_EXYNOS=y CONFIG_USB_OHCI_HCD_PLATFORM=y CONFIG_USB_EHCI_HCD_PLATFORM=y # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set @@ -3593,7 +3616,6 @@ CONFIG_MMC_SDHCI_PLTFM=m # CONFIG_MMC_SDHCI_S3C is not set CONFIG_MMC_SDHCI_PXAV3=m CONFIG_MMC_SDHCI_PXAV2=m -CONFIG_MMC_SPI=m CONFIG_MMC_TMIO_CORE=m CONFIG_MMC_TMIO=m # CONFIG_MMC_DW is not set @@ -4206,6 +4228,7 @@ CONFIG_TIMER_STATS=y CONFIG_STACKTRACE=y # CONFIG_DEBUG_STACK_USAGE is not set # CONFIG_DEBUG_KOBJECT is not set +# CONFIG_DEBUG_HIGHMEM is not set CONFIG_DEBUG_BUGVERBOSE=y CONFIG_DEBUG_INFO=y # CONFIG_DEBUG_INFO_REDUCED is not set