diff options
| author | Jon Medhurst <tixy@linaro.org> | 2014-01-20 09:07:56 +0000 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2014-01-20 09:07:56 +0000 |
| commit | 617ca7007a669ca7479f4f33471dcef901ae8cd4 (patch) | |
| tree | a3e5944e4d092fcd9c7e0e8cf62a6f7493b19a9b | |
| parent | bb67b10d560679d341bb1dafaa2ab5e981351774 (diff) | |
| parent | 9b80643dcdad05ab2c1ecd60f8e3165238cb1934 (diff) | |
Merge branch 'tracking-armlt-config64' into integration-linaro-vexpresstracking-integration-linaro-vexpress-ll-20140204.0tracking-integration-linaro-vexpress-ll-20140124.0tracking-integration-linaro-vexpress-ll-20140120.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 |