diff options
| author | Jon Medhurst <tixy@linaro.org> | 2013-10-14 12:58:05 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2013-10-14 12:58:05 +0100 |
| commit | 16d199890e25f74af14a2028adf05f88bd1fee8c (patch) | |
| tree | 326122e4cfd95c9f77e6fca0f1e2eb879d6577ff | |
| parent | a390ef0824d38143e68780f3053d0ccd0d8d044a (diff) | |
| parent | 8a5033d16dacfd864ce78581f76ad669624bfeef (diff) | |
Merge branch 'tracking-armlt-config64' into integration-linaro-vexpresstracking-integration-linaro-vexpress-ll-20131015.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 |