diff options
| author | Jon Medhurst <tixy@linaro.org> | 2013-12-19 11:08:28 +0000 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2013-12-19 11:08:28 +0000 |
| commit | 1db19e817b9fe949616d5c40a979d343b21554a1 (patch) | |
| tree | 7749ad899aa4fb1a8cc71cf762755dc81555aaa7 | |
| parent | a66e4a9768793d67d2e97f0847062a108b6f7b49 (diff) | |
| parent | 8af1b5b5e71d1d964be82299d7604efa362790ba (diff) | |
Merge branch 'tracking-armlt-config64' into integration-linaro-vexpresstracking-integration-linaro-vexpress-ll-20131230.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 |