diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2013-02-27 23:32:41 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-03-07 02:48:03 +0100 |
| commit | 1187ed87723899816128ec9f75edf4fad9c07dc6 (patch) | |
| tree | c6df0ae7afb190b7577a6d13e15f1ea2415f9596 /arch/arm/mach-nomadik | |
| parent | 266c347924f59b642d0f016e7f9891fdd7463108 (diff) | |
| download | linux-1187ed87723899816128ec9f75edf4fad9c07dc6.tar.gz | |
ARM: nomadik: convert to multiplatform
This converts the Nomadik to run in multiplatform mode, including the defconfig change. After this the "uImage" target in the kernel tree will no longer work, but we do not care about this. Instead we generate the uImage from the zImage using mkimage or update the bootloader to accept bootz. Some minor updates to the defconfig are done as part of this. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-nomadik')
| -rw-r--r-- | arch/arm/mach-nomadik/Kconfig | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/arch/arm/mach-nomadik/Kconfig b/arch/arm/mach-nomadik/Kconfig index 82226a5d60ef..954f0e30f3a0 100644 --- a/arch/arm/mach-nomadik/Kconfig +++ b/arch/arm/mach-nomadik/Kconfig @@ -1,4 +1,21 @@ -if ARCH_NOMADIK +config ARCH_NOMADIK + bool "ST-Ericsson Nomadik" + depends on ARCH_MULTI_V5 + select ARCH_REQUIRE_GPIOLIB + select ARM_AMBA + select ARM_VIC + select CLKSRC_NOMADIK_MTU + select COMMON_CLK + select CPU_ARM926T + select GENERIC_CLOCKEVENTS + select MIGHT_HAVE_CACHE_L2X0 + select PINCTRL + select PINCTRL_NOMADIK + select PINCTRL_STN8815 + select SPARSE_IRQ + select USE_OF + help + Support for the Nomadik platform by ST-Ericsson menu "Nomadik boards" @@ -11,6 +28,5 @@ config MACH_NOMADIK_8815NHK endmenu config NOMADIK_8815 + depends on ARCH_NOMADIK bool - -endif |