diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-06-22 09:40:12 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-06-22 09:40:12 -0700 |
| commit | 230304f53c54520b3b28b9e420719fe328984c17 (patch) | |
| tree | 35a3396772baf5e0c0c28c43fa46bdd72c7192dd /linaro/configs/vexpress64.conf | |
| parent | 9a004a75a3305fbd3c253f38cd0788164c4fbd56 (diff) | |
| parent | a0b6bc035e9b20c56a270bb80b3237a4997182b3 (diff) | |
Merge branch 'v3.18/topic/configs' into linux-linaro-lsk-v3.18lsk-v3.18-15.06
* v3.18/topic/configs:
configs: linaro-base: enable ZRAM features
Revert "linaro/configs: remove options already present in base defconfig"
Revert "configs: linaro-base: enable ZRAM features"
Diffstat (limited to 'linaro/configs/vexpress64.conf')
| -rw-r--r-- | linaro/configs/vexpress64.conf | 63 |
1 files changed, 50 insertions, 13 deletions
diff --git a/linaro/configs/vexpress64.conf b/linaro/configs/vexpress64.conf index de419f3fdf70..cb5d0162c0fa 100644 --- a/linaro/configs/vexpress64.conf +++ b/linaro/configs/vexpress64.conf @@ -1,19 +1,56 @@ +CONFIG_ARCH_VEXPRESS=y +CONFIG_SMP=y +CONFIG_NR_CPUS=8 +CONFIG_CMDLINE="console=ttyAMA0" +CONFIG_COMPAT=y +CONFIG_SMC91X=y +CONFIG_INPUT_EVDEV=y +CONFIG_SERIO_AMBAKMI=y +CONFIG_SERIAL_AMBA_PL011=y +CONFIG_SERIAL_AMBA_PL011_CONSOLE=y # CONFIG_SERIO_I8042 is not set +CONFIG_FB=y +CONFIG_FB_ARMCLCD=y +CONFIG_FRAMEBUFFER_CONSOLE=y # CONFIG_VGA_CONSOLE is not set -CONFIG_ARM64_CPUIDLE=y -CONFIG_ARM_BIG_LITTLE_CPUFREQ=y -CONFIG_ARM_DT_BL_CPUFREQ=y -CONFIG_ARM_MHU_MBOX=y -CONFIG_ARM_SCPI_PROTOCOL=y -CONFIG_COMMON_CLK_SCPI=y -CONFIG_GENERIC_CPUFREQ_CPU0=y -CONFIG_I2C=y +CONFIG_LOGO=y +# CONFIG_LOGO_LINUX_MONO is not set +# CONFIG_LOGO_LINUX_VGA16 is not set +CONFIG_MMC=y +CONFIG_MMC_ARMMMCI=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_PL031=y +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=y -CONFIG_NR_CPUS=8 -CONFIG_PM_OPP=y -CONFIG_RTC_DRV_PL031=y -CONFIG_USB_EHCI_HCD_SYNOPSYS=y +CONFIG_ROOT_NFS=y +CONFIG_VIRTIO=y +CONFIG_VIRTIO_BLK=y +CONFIG_VIRTIO_MMIO=y +CONFIG_REGULATOR=y +CONFIG_REGULATOR_FIXED_VOLTAGE=y +CONFIG_CMA=y +CONFIG_DMA_CMA=y +CONFIG_COMMON_CLK_SCPI=y +CONFIG_SMSC911X=y +CONFIG_I2C=y +CONFIG_ARM_MHU_MBOX=y +CONFIG_ARM_SCPI_PROTOCOL=y CONFIG_USB_HIDDEV=y -CONFIG_USB_ISP1301=y +CONFIG_SCSI=y +CONFIG_BLK_DEV_SD=y +CONFIG_USB_STORAGE=y +CONFIG_USB=y +CONFIG_USB_ULPI=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_HCD_SYNOPSYS=y +CONFIG_USB_OHCI_HCD=y CONFIG_USB_PHY=y +CONFIG_USB_ISP1301=y +CONFIG_PM_OPP=y +CONFIG_GENERIC_CPUFREQ_CPU0=y +CONFIG_ARM_BIG_LITTLE_CPUFREQ=y +CONFIG_ARM_DT_BL_CPUFREQ=y +CONFIG_ARM64_CPUIDLE=y +CONFIG_ARM64_CRYPTO=y |