diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-06-21 08:57:38 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-06-21 08:57:38 -0400 |
| commit | 30e544612c4c64eb992244607ac16aea79f824b7 (patch) | |
| tree | 73bca9413c09dec2ed5d61091b97d257198e3295 /arch/arm/Kconfig | |
| parent | c20e459fcc7d5d86a359b19f54362fb6fb77c6aa (diff) | |
| parent | 53332005bfde9d2e3c9a66030c0e8c2598eaa1d5 (diff) | |
Merge tag 'renesas-cleanup-boot-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc
From Simon Horman:
Renesas ARM based SoC boot cleanup for v3.11
Work by Magnus Damm and others to clean up the boot of and move
things closer to supporting multi-arch.
As a side effect of this work it was decided to remove support for
two boards, Bonito and AP4EVB. Those patches are included in this
series as they depend on earlier patches in the series.
* tag 'renesas-cleanup-boot-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: Remove Bonito board support
ARM: shmobile: Remove AP4EVB board support
ARM: shmobile: Remove mach/memory.h
ARM: shmobile: Remove MEMORY_START/SIZE
ARM: shmobile: Enable ARM_PATCH_PHYS_VIRT
ARM: shmobile: Remove old SCU boot code
ARM: shmobile: EMEV2 SMP with SCU boot fn and args
ARM: shmobile: sh73a0 SMP with SCU boot fn and args
ARM: shmobile: r8a7779 SMP with SCU boot fn and args
ARM: shmobile: Add SCU boot function using argument
ARM: shmobile: Add SMP boot function and argument
ARM: shmobile: Rework sh7372 sleep code to use virt_to_phys()
ARM: shmobile: Remove romImage CONFIG_MEMORY_START
ARM: shmobile: Let romImage rely on default ATAGS
ARM: shmobile: uImage load address rework
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index ccd78c912cbf..db5aa5f2d1de 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -636,6 +636,7 @@ config ARCH_MSM | |||
| 636 | 636 | ||
| 637 | config ARCH_SHMOBILE | 637 | config ARCH_SHMOBILE |
| 638 | bool "Renesas SH-Mobile / R-Mobile" | 638 | bool "Renesas SH-Mobile / R-Mobile" |
| 639 | select ARM_PATCH_PHYS_VIRT | ||
| 639 | select CLKDEV_LOOKUP | 640 | select CLKDEV_LOOKUP |
| 640 | select GENERIC_CLOCKEVENTS | 641 | select GENERIC_CLOCKEVENTS |
| 641 | select HAVE_ARM_SCU if SMP | 642 | select HAVE_ARM_SCU if SMP |
| @@ -645,7 +646,6 @@ config ARCH_SHMOBILE | |||
| 645 | select HAVE_SMP | 646 | select HAVE_SMP |
| 646 | select MIGHT_HAVE_CACHE_L2X0 | 647 | select MIGHT_HAVE_CACHE_L2X0 |
| 647 | select MULTI_IRQ_HANDLER | 648 | select MULTI_IRQ_HANDLER |
| 648 | select NEED_MACH_MEMORY_H | ||
| 649 | select NO_IOPORT | 649 | select NO_IOPORT |
| 650 | select PINCTRL | 650 | select PINCTRL |
| 651 | select PM_GENERIC_DOMAINS if PM | 651 | select PM_GENERIC_DOMAINS if PM |