diff options
| author | Jon Medhurst <tixy@linaro.org> | 2013-11-13 09:53:13 +0000 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2013-11-13 09:53:13 +0000 |
| commit | 9a164424a9a67f43f4da5890b909d021ef2ae599 (patch) | |
| tree | 0cb69e5f11ac38ff79bf7ad06acd3ea1d137dde0 | |
| parent | 5c33749bcf2db235f5ad05c8527ed0740aa9b365 (diff) | |
| parent | c3a108db02131e4e85b2815b12b543398e96e524 (diff) | |
Merge branch 'tracking-armlt-config64' into integration-linaro-vexpresstracking-integration-linaro-vexpress-ll-20131119.0tracking-integration-linaro-vexpress-ll-20131115.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 |