diff options
| author | Jon Medhurst <tixy@linaro.org> | 2014-01-06 10:16:17 +0000 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2014-01-06 10:16:17 +0000 |
| commit | 24a2a0e93671d78187726737aa84ef1081b10c11 (patch) | |
| tree | 6f84bad798e4e0c16265733f23aa550f3d6c1ac1 | |
| parent | a1e8447850eedca22d959c8214a71ee766e6252e (diff) | |
| parent | 3ea4a7f1b5be60d624055b694feb0804a22a13ee (diff) | |
Merge branch 'tracking-armlt-config64' into integration-linaro-vexpresstracking-integration-linaro-vexpress-ll-20140113.0tracking-integration-linaro-vexpress-ll-20140110.0tracking-integration-linaro-vexpress-ll-20140109.0
Conflicts:
linaro/configs/vexpress64.conf
| -rw-r--r-- | linaro/configs/vexpress64.conf | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linaro/configs/vexpress64.conf b/linaro/configs/vexpress64.conf index 7895612e1ed3..2d0f201c444d 100644 --- a/linaro/configs/vexpress64.conf +++ b/linaro/configs/vexpress64.conf @@ -1,5 +1,7 @@ CONFIG_ARCH_VEXPRESS=y CONFIG_SMP=y +CONFIG_NR_CPUS=8 +CONFIG_HOTPLUG_CPU=y CONFIG_CMDLINE="console=ttyAMA0" CONFIG_COMPAT=y CONFIG_SMC91X=y |