diff options
| author | Jon Medhurst <tixy@linaro.org> | 2014-01-13 12:45:57 +0000 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2014-01-13 12:45:57 +0000 |
| commit | 48d82835f243a23fdc1483eaeae87cc554b16461 (patch) | |
| tree | 9cd44012d078f4757a7895bb751896bfd9b07e67 | |
| parent | 542983371219b3cb1a8b6395171cdd17cbcbb7fb (diff) | |
| parent | 90405c6cc5e39d47de81cf8bc53fe082422351a3 (diff) | |
Merge branch 'tracking-armlt-config64' into integration-linaro-vexpresstracking-integration-linaro-vexpress-ll-20140114.1tracking-integration-linaro-vexpress-ll-20140114.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 |