diff options
| author | Jon Medhurst <tixy@linaro.org> | 2013-12-10 08:23:26 +0000 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2013-12-10 08:23:26 +0000 |
| commit | d82800c68ebfe8a6114064716a06c2b1558ec478 (patch) | |
| tree | 418053947bfaa20317a556dbecda51611fd58045 | |
| parent | 26ee5528b3373f9e1f199d8fa7fd3134edc17613 (diff) | |
| parent | a2e0cfcd066321c451a9b5b98c9614ace20a46e0 (diff) | |
Merge branch 'tracking-armlt-config64' into integration-linaro-vexpresstracking-integration-linaro-vexpress-ll-20131213.0tracking-integration-linaro-vexpress-ll-20131212.0tracking-integration-linaro-vexpress-ll-20131210.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 |