diff options
| author | Jon Medhurst <tixy@linaro.org> | 2013-10-15 14:23:05 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2013-10-15 14:23:05 +0100 |
| commit | cc0badfcedac5b03feb111c3f5a2735d3b7bb773 (patch) | |
| tree | 034d8fee7df585e00e34d98b9df81dbd1f58d0f5 | |
| parent | f61d8a3f649bb71fa74b90badae8c1e2e90dc19c (diff) | |
| parent | 05ad39ca7f86b3987b1b0efeaf924da877a81c81 (diff) | |
Merge branch 'tracking-armlt-config64' into integration-linaro-vexpresstracking-integration-linaro-vexpress-ll-20131031.0tracking-integration-linaro-vexpress-ll-20131018.0tracking-integration-linaro-vexpress-ll-20131017.0tracking-integration-linaro-vexpress-ll-20131016.0tracking-integration-linaro-vexpress-ll-20131015.1
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 |