From 501339c55778f71876a37b697b0bd7110a706dff Mon Sep 17 00:00:00 2001 From: Rhyland Klein Date: Tue, 26 Jun 2012 17:45:26 -0400 Subject: chromeos: update chromeos tegra3 split configs Update split configs to enable the brcmfmac driver for wifi. Also renormalize the split configs. BUG=1007114 TEST=Using 6/20/2012 nightly image I was able to browse the web using wifi Signed-off-by: Rhyland Klein Change-Id: Ia810032861cf1015c3a0127cfa07f865a05e9028 Reviewed-on: http://git-master/r/111335 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Wei Ni Reviewed-by: Allen Martin --- chromeos/config/armel/config.common.armel | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'chromeos/config/armel/config.common.armel') diff --git a/chromeos/config/armel/config.common.armel b/chromeos/config/armel/config.common.armel index efc5f4e20ae0..98451e005db9 100644 --- a/chromeos/config/armel/config.common.armel +++ b/chromeos/config/armel/config.common.armel @@ -17,6 +17,7 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ARCH_GEMINI is not set # CONFIG_ARCH_H720X is not set CONFIG_ARCH_HAS_CPUFREQ=y +CONFIG_ARCH_HAS_SUSPEND_PAGETABLE=y # CONFIG_ARCH_INTEGRATOR is not set # CONFIG_ARCH_IOP13XX is not set # CONFIG_ARCH_IOP32X is not set @@ -77,7 +78,7 @@ CONFIG_ARM_ERRATA_742230=y # CONFIG_ARM_ERRATA_742231 is not set # CONFIG_ARM_ERRATA_753970 is not set # CONFIG_ARM_ERRATA_754327 is not set -# CONFIG_ARM_ERRATA_764369 is not set +CONFIG_ARM_ERRATA_764369=y # CONFIG_ARM_FLUSH_CONSOLE_ON_RESTART is not set CONFIG_ARM_GIC=y CONFIG_ARM_L1_CACHE_SHIFT=5 @@ -132,6 +133,7 @@ CONFIG_CMDLINE_FROM_BOOTLOADER=y CONFIG_COMPAT_BRK=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set CONFIG_CPA=y +# CONFIG_CPUQUIET_FRAMEWORK is not set CONFIG_CPU_32v6K=y CONFIG_CPU_32v7=y CONFIG_CPU_ABRT_EV7=y @@ -269,7 +271,9 @@ CONFIG_MMC_UNSAFE_RESUME=y # CONFIG_MOUSE_PS2 is not set CONFIG_NEED_DMA_MAP_STATE=y # CONFIG_NET_PCI is not set +# CONFIG_NON_ALIASED_COHERENT_MEM is not set CONFIG_NVMAP_ALLOW_SYSMEM=y +CONFIG_NVMAP_CACHE_MAINT_BY_SET_WAYS=y CONFIG_NVMAP_CARVEOUT_COMPACTOR=y # CONFIG_NVMAP_CARVEOUT_KILLER is not set # CONFIG_NVMAP_HIGHMEM_ONLY is not set @@ -296,6 +300,7 @@ CONFIG_OLD_MCOUNT=y CONFIG_OUTER_CACHE=y CONFIG_OUTER_CACHE_SYNC=y CONFIG_PAGEFLAGS_EXTENDED=y +# CONFIG_PCIEPORTBUS is not set CONFIG_PCI_SYSCALL=y CONFIG_PERF_USE_VMALLOC=y # CONFIG_PHYS_ADDR_T_64BIT is not set @@ -465,12 +470,15 @@ CONFIG_TEGRA_EMC_SCALING_ENABLE=y # CONFIG_TEGRA_FIQ_DEBUGGER is not set # CONFIG_TEGRA_FPGA_PLATFORM is not set CONFIG_TEGRA_GRHOST=y +CONFIG_TEGRA_GRHOST_DEFAULT_TIMEOUT=30000 +CONFIG_TEGRA_GRHOST_USE_NVMAP=y # CONFIG_TEGRA_HDMI_74MHZ_LIMIT is not set # CONFIG_TEGRA_IOMMU_SMMU is not set CONFIG_TEGRA_IOVMM=y # CONFIG_TEGRA_MC_PROFILE is not set # CONFIG_TEGRA_MEDIASERVER is not set CONFIG_TEGRA_NVAVP=y +# CONFIG_TEGRA_NVAVP_AUDIO is not set # CONFIG_TEGRA_NVHDCP is not set CONFIG_TEGRA_NVMAP=y CONFIG_TEGRA_PWM=y @@ -507,6 +515,7 @@ CONFIG_VGA_ARB=y CONFIG_VGA_ARB_MAX_GPUS=16 CONFIG_VIDEOBUF2_CORE=m CONFIG_VIDEOBUF_GEN=m +# CONFIG_VIDEO_AD5816 is not set # CONFIG_VIDEO_AD5820 is not set # CONFIG_VIDEO_AR0832 is not set # CONFIG_VIDEO_OV14810 is not set -- cgit v1.2.3