diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-01-31 18:51:18 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-29 21:56:57 +0200 |
| commit | 883a106b0866ca8d75b5520bdb3ca1cf8e3730ba (patch) | |
| tree | 7145ae6e3d0ced8e04f544535d1bfc63600df252 /arch/arm/Kconfig | |
| parent | ARM: dts: exynops4210: really add universal_c210 dts (diff) | |
| download | linux-883a106b0866ca8d75b5520bdb3ca1cf8e3730ba.tar.xz linux-883a106b0866ca8d75b5520bdb3ca1cf8e3730ba.zip | |
ARM: default machine descriptor for multiplatform
Since we now have default implementations for init_time and init_irq,
the init_machine callback is the only one that is not yet optional,
but since simple DT based platforms all have the same
of_platform_populate function call in there, we can consolidate them
as well, and then actually boot with a completely empty machine_desc.
Unofortunately we cannot just default to an empty init_machine: We
cannot call of_platform_populate before init_machine because that
does not work in case of auxdata, and we cannot call it after
init_machine either because the machine might need to run code
after adding the devices.
To take the final step, this adds support for booting without defining
any machine_desc whatsoever.
For the case that CONFIG_MULTIPLATFORM is enabled, it adds a
global machine descriptor that never matches any machine but is
used as a fallback if nothing else matches. We assume that without
CONFIG_MULTIPLATFORM, we only want to boot on the systems that the kernel
is built for, so we still retain the build-time warning for missing
machine descriptors and the run-time warning when the platform does not
match in that case.
In the case that we run on a multiplatform kernel and the machine
provides a fully populated device tree, we attempt to keep booting,
hoping that no machine specific callbacks are necessary.
Finally, this also removes the misguided "select ARCH_VEXPRESS" that
was only added to avoid a build error for allnoconfig kernels.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Nicolas Pitre <nico@linaro.org>
Acked-by: Olof Johansson <olof@lixom.net>
Cc: "Russell King - ARM Linux" <linux@arm.linux.org.uk>
Cc: Rob Herring <robherring2@gmail.com>
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 5bfd584929c8..f0f90f06f84b 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1014,7 +1014,6 @@ config ARCH_MULTI_V7 bool "ARMv7 based platforms (Cortex-A, PJ4, Krait)" default y select ARCH_MULTI_V6_V7 - select ARCH_VEXPRESS select CPU_V7 config ARCH_MULTI_V6_V7 |