Commit 8e8bffffdaf6b75fb1380bfbb80481d3073086c5
Committed by
Simon Horman
1 parent
0b52b2508b
ARM: shmobile: sh73a0: Add Multiplatform support
Enable sh73a0 Multiplatform support for the generic sh73a0 machine vector. No board support is enabled, and the board code for KZM9G DT Reference is left by itself. Signed-off-by: Magnus Damm <damm+renesas@opensource.se> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Showing 3 changed files with 8 additions and 3 deletions Side-by-side Diff
arch/arm/mach-shmobile/Kconfig
arch/arm/mach-shmobile/Makefile
... | ... | @@ -7,7 +7,7 @@ |
7 | 7 | |
8 | 8 | # CPU objects |
9 | 9 | obj-$(CONFIG_ARCH_SH7372) += setup-sh7372.o intc-sh7372.o pm-sh7372.o |
10 | -obj-$(CONFIG_ARCH_SH73A0) += setup-sh73a0.o intc-sh73a0.o pm-sh73a0.o | |
10 | +obj-$(CONFIG_ARCH_SH73A0) += setup-sh73a0.o pm-sh73a0.o | |
11 | 11 | obj-$(CONFIG_ARCH_R8A73A4) += setup-r8a73a4.o |
12 | 12 | obj-$(CONFIG_ARCH_R8A7740) += setup-r8a7740.o pm-r8a7740.o |
13 | 13 | obj-$(CONFIG_ARCH_R8A7778) += setup-r8a7778.o |
... | ... | @@ -65,7 +65,7 @@ |
65 | 65 | obj-$(CONFIG_MACH_BOCKW_REFERENCE) += board-bockw-reference.o |
66 | 66 | obj-$(CONFIG_MACH_MARZEN) += board-marzen.o |
67 | 67 | obj-$(CONFIG_MACH_ARMADILLO800EVA) += board-armadillo800eva.o |
68 | -obj-$(CONFIG_MACH_KZM9G) += board-kzm9g.o | |
68 | +obj-$(CONFIG_MACH_KZM9G) += board-kzm9g.o intc-sh73a0.o | |
69 | 69 | obj-$(CONFIG_MACH_KZM9G_REFERENCE) += board-kzm9g-reference.o |
70 | 70 | endif |
71 | 71 |
arch/arm/mach-shmobile/smp-sh73a0.c
... | ... | @@ -33,7 +33,7 @@ |
33 | 33 | |
34 | 34 | #define SH73A0_SCU_BASE 0xf0000000 |
35 | 35 | |
36 | -#ifdef CONFIG_HAVE_ARM_TWD | |
36 | +#if defined(CONFIG_HAVE_ARM_TWD) && !defined(CONFIG_ARCH_MULTIPLATFORM) | |
37 | 37 | static DEFINE_TWD_LOCAL_TIMER(twd_local_timer, SH73A0_SCU_BASE + 0x600, 29); |
38 | 38 | void __init sh73a0_register_twd(void) |
39 | 39 | { |