diff options
author | Jon Medhurst <tixy@linaro.org> | 2013-10-08 12:31:54 +0100 |
---|---|---|
committer | Jon Medhurst <tixy@linaro.org> | 2013-10-08 12:31:54 +0100 |
commit | afcf3c82136d1d20644a709d054c75c078b318ae (patch) | |
tree | ed1a909255731f9ddb584a7fb0b6c3c36fe8208e | |
parent | a56b8df0bcadbb3eb293af338cbb0e14b4f4981d (diff) | |
parent | 8a5033d16dacfd864ce78581f76ad669624bfeef (diff) |
Merge branch 'tracking-armlt-config64' into integration-linaro-vexpresstracking-integration-linaro-vexpress-ll-20131009.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 |