diff options
Diffstat (limited to 'chromeos/config/armel')
-rw-r--r-- | chromeos/config/armel/config.common.armel | 11 | ||||
-rw-r--r-- | chromeos/config/armel/config.flavour.chromeos-tegra3 | 3 | ||||
-rw-r--r-- | chromeos/config/armel/config.flavour.chromiumos-arm | 3 |
3 files changed, 12 insertions, 5 deletions
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 |