diff options
| author | Jon Medhurst <tixy@linaro.org> | 2013-05-03 14:23:53 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2013-05-03 14:23:53 +0100 |
| commit | 37221470fd83a722c48ce94d80b18acf135e5cd5 (patch) | |
| tree | 30885019548cee4e1f577451913b95bf47e1aa95 | |
| parent | d619c729b3c4d29b4e6915acfa0a7455a25227d3 (diff) | |
| parent | a0fdbdbb309906bb3004d3ef8914adf9366b57e4 (diff) | |
Merge branch 'tracking-armlt-config' into integration-linux-vexpress
Conflicts:
linaro/configs/vexpress.conf
| -rw-r--r-- | linaro/configs/vexpress-tuning.conf | 1 | ||||
| -rw-r--r-- | linaro/configs/vexpress.conf | 14 |
2 files changed, 15 insertions, 0 deletions
diff --git a/linaro/configs/vexpress-tuning.conf b/linaro/configs/vexpress-tuning.conf new file mode 100644 index 00000000000..adea6cc66de --- /dev/null +++ b/linaro/configs/vexpress-tuning.conf @@ -0,0 +1 @@ +# CONFIG_PROVE_LOCKING is not set diff --git a/linaro/configs/vexpress.conf b/linaro/configs/vexpress.conf index 6576492b153..94ed8d8729b 100644 --- a/linaro/configs/vexpress.conf +++ b/linaro/configs/vexpress.conf @@ -1,6 +1,19 @@ CONFIG_ARCH_VEXPRESS=y CONFIG_ARCH_VEXPRESS_CA9X4=y +CONFIG_BIG_LITTLE=y +CONFIG_ARCH_VEXPRESS_TC2=y +CONFIG_ARCH_VEXPRESS_DCSCB=y +CONFIG_ARM_VEXPRESS_BL_CPUFREQ=y +CONFIG_ARM_PSCI=y +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_INTERACTIVE=y +CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y CONFIG_HAVE_ARM_ARCH_TIMER=y +CONFIG_NR_CPUS=8 +CONFIG_HIGHMEM=y +CONFIG_HIGHPTE=y CONFIG_CMDLINE="console=ttyAMA0,38400n8 root=/dev/mmcblk0p2 rootwait mmci.fmax=4000000" CONFIG_VFP=y CONFIG_NEON=y @@ -15,6 +28,7 @@ CONFIG_SERIAL_AMBA_PL011_CONSOLE=y CONFIG_FB=y CONFIG_FB_ARMCLCD=y CONFIG_FB_ARMHDLCD=y +CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_LOGO=y # CONFIG_LOGO_LINUX_MONO is not set # CONFIG_LOGO_LINUX_VGA16 is not set |