From f28ef93cfc09bc0a1783872486d9fb899fe03c1f 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 Rebase-Id: Rd79d12af57b64237c66d3556cef58bf5c50e666d --- chromeos/config/armel/config.common.armel | 11 ++++++++++- chromeos/config/armel/config.flavour.chromeos-tegra3 | 3 +-- chromeos/config/armel/config.flavour.chromiumos-arm | 3 +-- chromeos/config/config.common.chromeos | 5 ++++- chromeos/config/i386/config.common.i386 | 5 ++++- chromeos/config/x86_64/config.common.x86_64 | 5 ++++- 6 files changed, 24 insertions(+), 8 deletions(-) (limited to 'chromeos') 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 diff --git a/chromeos/config/armel/config.flavour.chromeos-tegra3 b/chromeos/config/armel/config.flavour.chromeos-tegra3 index 3d2488ffab63..1b6f87579921 100644 --- a/chromeos/config/armel/config.flavour.chromeos-tegra3 +++ b/chromeos/config/armel/config.flavour.chromeos-tegra3 @@ -37,6 +37,7 @@ CONFIG_IP_PNP_RARP=y CONFIG_LOCKD=y CONFIG_LOCKD_V4=y CONFIG_LZO_COMPRESS=y +CONFIG_MAC80211_MESH=y # CONFIG_MACH_ARUBA is not set CONFIG_MACH_CARDHU=y CONFIG_MACH_HAS_SND_SOC_TEGRA_MAX98095=y @@ -111,13 +112,11 @@ CONFIG_TEGRA_PLLM_RESTRICTED=y CONFIG_TEGRA_PREINIT_CLOCKS=y CONFIG_TEGRA_PREPOWER_WIFI=y CONFIG_TEGRA_SLOW_CSITE=y -CONFIG_TEGRA_THERMAL_SYSFS=y CONFIG_USB_HOTPLUG=y CONFIG_USB_NET_AX8817X=y CONFIG_USB_NET_CDCETHER=y CONFIG_USB_NET_CDC_NCM=y CONFIG_USB_NET_MCS7830=y -CONFIG_USB_NET_RNDIS_HOST=m CONFIG_USB_NET_SMSC95XX=y CONFIG_USB_USBNET=y CONFIG_VMSPLIT_2G=y diff --git a/chromeos/config/armel/config.flavour.chromiumos-arm b/chromeos/config/armel/config.flavour.chromiumos-arm index 3c5ee02c17c1..3cfc11bfffc9 100644 --- a/chromeos/config/armel/config.flavour.chromiumos-arm +++ b/chromeos/config/armel/config.flavour.chromiumos-arm @@ -25,6 +25,7 @@ CONFIG_FRAMEBUFFER_CONSOLE=y # CONFIG_GIC_SET_MULTIPLE_CPUS is not set CONFIG_IPV6=m # CONFIG_IP_PNP is not set +# CONFIG_MAC80211_MESH is not set CONFIG_MACH_HARMONY=y CONFIG_MACH_KAEN=y # CONFIG_MACH_P852 is not set @@ -71,13 +72,11 @@ CONFIG_TEGRA_IOVMM_GART=y # CONFIG_TEGRA_PREPOWER_WIFI is not set # CONFIG_TEGRA_SLOW_CSITE is not set # CONFIG_TEGRA_STAT_MON is not set -# CONFIG_TEGRA_THERMAL_SYSFS is not set # CONFIG_USB_HOTPLUG is not set CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_CDCETHER=m CONFIG_USB_NET_CDC_NCM=m CONFIG_USB_NET_MCS7830=m -CONFIG_USB_NET_RNDIS_HOST=m CONFIG_USB_NET_SMSC95XX=m CONFIG_USB_USBNET=m # CONFIG_VIDEO_VIVI is not set diff --git a/chromeos/config/config.common.chromeos b/chromeos/config/config.common.chromeos index eaea95f28fe6..6c5db0fc665d 100644 --- a/chromeos/config/config.common.chromeos +++ b/chromeos/config/config.common.chromeos @@ -106,6 +106,9 @@ CONFIG_BASE_SMALL=0 # CONFIG_BCM4329_RFKILL is not set # CONFIG_BCMA is not set CONFIG_BCMA_POSSIBLE=y +# CONFIG_BCMDHD_CFG80211 is not set +# CONFIG_BCMDHD_NOAPI is not set +# CONFIG_BCMDHD_WEXT is not set # CONFIG_BCM_WIMAX is not set # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set @@ -926,7 +929,6 @@ CONFIG_MAC80211_DEBUGFS=y CONFIG_MAC80211_HAS_RC=y CONFIG_MAC80211_HWSIM=m CONFIG_MAC80211_LEDS=y -# CONFIG_MAC80211_MESH is not set CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y CONFIG_MAC80211_RC_MINSTREL=y @@ -1810,6 +1812,7 @@ CONFIG_USB_MON=y # CONFIG_USB_NET_KALMIA is not set # CONFIG_USB_NET_PLUSB is not set # CONFIG_USB_NET_RAW_IP is not set +CONFIG_USB_NET_RNDIS_HOST=m CONFIG_USB_NET_RNDIS_WLAN=m # CONFIG_USB_NET_SMSC75XX is not set # CONFIG_USB_NET_ZAURUS is not set diff --git a/chromeos/config/i386/config.common.i386 b/chromeos/config/i386/config.common.i386 index 8eb8362d12f4..a5a85733af59 100644 --- a/chromeos/config/i386/config.common.i386 +++ b/chromeos/config/i386/config.common.i386 @@ -362,6 +362,7 @@ CONFIG_LPC_SCH=m # CONFIG_M586MMX is not set # CONFIG_M586TSC is not set CONFIG_M686=y +# CONFIG_MAC80211_MESH is not set # CONFIG_MACINTOSH_DRIVERS is not set # CONFIG_MATH_EMULATION is not set # CONFIG_MATOM is not set @@ -481,6 +482,9 @@ CONFIG_PCIEAER=y # CONFIG_PCIEAER_INJECT is not set CONFIG_PCIEASPM=y # CONFIG_PCIEASPM_DEBUG is not set +CONFIG_PCIEASPM_DEFAULT=y +# CONFIG_PCIEASPM_PERFORMANCE is not set +# CONFIG_PCIEASPM_POWERSAVE is not set CONFIG_PCIEPORTBUS=y # CONFIG_PCIE_ECRC is not set CONFIG_PCIE_PME=y @@ -643,7 +647,6 @@ CONFIG_USB_NET_CDC_NCM=m CONFIG_USB_NET_DM9601=m CONFIG_USB_NET_MCS7830=m CONFIG_USB_NET_NET1080=m -CONFIG_USB_NET_RNDIS_HOST=m CONFIG_USB_NET_SMSC95XX=m # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set diff --git a/chromeos/config/x86_64/config.common.x86_64 b/chromeos/config/x86_64/config.common.x86_64 index ab17b2e1864c..eab255dbd9e2 100644 --- a/chromeos/config/x86_64/config.common.x86_64 +++ b/chromeos/config/x86_64/config.common.x86_64 @@ -385,6 +385,7 @@ CONFIG_LIBERTAS_THINFIRM_USB=m CONFIG_LIRC=m # CONFIG_LIRC_STAGING is not set CONFIG_LPC_SCH=m +# CONFIG_MAC80211_MESH is not set # CONFIG_MACINTOSH_DRIVERS is not set # CONFIG_MATOM is not set # CONFIG_MAXSMP is not set @@ -487,6 +488,9 @@ CONFIG_PCIEAER=y # CONFIG_PCIEAER_INJECT is not set CONFIG_PCIEASPM=y # CONFIG_PCIEASPM_DEBUG is not set +CONFIG_PCIEASPM_DEFAULT=y +# CONFIG_PCIEASPM_PERFORMANCE is not set +# CONFIG_PCIEASPM_POWERSAVE is not set CONFIG_PCIEPORTBUS=y # CONFIG_PCIE_ECRC is not set CONFIG_PCIE_PME=y @@ -653,7 +657,6 @@ CONFIG_USB_NET_CDC_NCM=m CONFIG_USB_NET_DM9601=m CONFIG_USB_NET_MCS7830=m CONFIG_USB_NET_NET1080=m -CONFIG_USB_NET_RNDIS_HOST=m CONFIG_USB_NET_SMSC95XX=m # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set -- cgit v1.2.3