diff options
| author | Jon Medhurst <tixy@linaro.org> | 2013-09-27 08:52:45 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2013-09-27 08:52:45 +0100 |
| commit | 0d59d95725af5fecbe17b01efcfadfd84bae5fe2 (patch) | |
| tree | 3c51ad5bba286fe80ef55d00bb681a9f4a158178 | |
| parent | f684be0f575e0972375d806f52dcc56aede5c7c1 (diff) | |
| parent | fcc525ff436c7df38d39c2ccef135a53460b4d1a (diff) | |
Merge branch 'tracking-armlt-config64' into integration-linaro-vexpresstracking-integration-linaro-vexpress-ll-20131008.0tracking-integration-linaro-vexpress-ll-20131003.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 |