diff options
| author | Jon Medhurst <tixy@linaro.org> | 2013-10-31 14:26:22 -0700 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2013-10-31 14:26:22 -0700 |
| commit | dcb61bbb4896d74056e1c170da2b1053436fb06e (patch) | |
| tree | 6b257725d8181d6821b6b1136eff2cce697e695d | |
| parent | 3e3d8676869e61e60c62a325d07a551bd1baebff (diff) | |
| parent | f838a418a3e4c842f90658e004828411a02b2b6f (diff) | |
Merge branch 'tracking-armlt-config64' into integration-linaro-vexpresstracking-integration-linaro-vexpress-ll-20131031.1
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 |