diff options
| author | Magnus Damm <damm+renesas@opensource.se> | 2014-08-24 23:45:41 -0400 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2014-09-01 20:32:07 -0400 |
| commit | 0ed82bc9895daad86966d53e561330929774f92d (patch) | |
| tree | 27e3784b37e74d589e7e94be4df4f6c5557b929d | |
| parent | 46bff9db49d7995f824add28122e2a694d54d6de (diff) | |
ARM: shmobile: Consolidate Legacy CPU_V7 Kconfig
Consolidate CPU_V7 under ARCH_SHMOBILE_LEGACY so it can
be shared by the legacy ARM mach-shmobile support code.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
| -rw-r--r-- | arch/arm/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-shmobile/Kconfig | 8 |
2 files changed, 1 insertions, 8 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index c49a775937db..93efc9adb002 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -650,6 +650,7 @@ config ARCH_SHMOBILE_LEGACY | |||
| 650 | select ARCH_SHMOBILE | 650 | select ARCH_SHMOBILE |
| 651 | select ARM_PATCH_PHYS_VIRT if MMU | 651 | select ARM_PATCH_PHYS_VIRT if MMU |
| 652 | select CLKDEV_LOOKUP | 652 | select CLKDEV_LOOKUP |
| 653 | select CPU_V7 | ||
| 653 | select GENERIC_CLOCKEVENTS | 654 | select GENERIC_CLOCKEVENTS |
| 654 | select HAVE_ARM_SCU if SMP | 655 | select HAVE_ARM_SCU if SMP |
| 655 | select HAVE_ARM_TWD if SMP | 656 | select HAVE_ARM_TWD if SMP |
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index 42d9de0b471b..d4cf8bfb47bf 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig | |||
| @@ -95,7 +95,6 @@ config ARCH_SH7372 | |||
| 95 | select ARCH_RMOBILE | 95 | select ARCH_RMOBILE |
| 96 | select ARCH_WANT_OPTIONAL_GPIOLIB | 96 | select ARCH_WANT_OPTIONAL_GPIOLIB |
| 97 | select ARM_CPU_SUSPEND if PM || CPU_IDLE | 97 | select ARM_CPU_SUSPEND if PM || CPU_IDLE |
| 98 | select CPU_V7 | ||
| 99 | select SH_CLK_CPG | 98 | select SH_CLK_CPG |
| 100 | select SH_INTC | 99 | select SH_INTC |
| 101 | 100 | ||
| @@ -104,7 +103,6 @@ config ARCH_SH73A0 | |||
| 104 | select ARCH_RMOBILE | 103 | select ARCH_RMOBILE |
| 105 | select ARCH_WANT_OPTIONAL_GPIOLIB | 104 | select ARCH_WANT_OPTIONAL_GPIOLIB |
| 106 | select ARM_GIC | 105 | select ARM_GIC |
| 107 | select CPU_V7 | ||
| 108 | select I2C | 106 | select I2C |
| 109 | select SH_CLK_CPG | 107 | select SH_CLK_CPG |
| 110 | select SH_INTC | 108 | select SH_INTC |
| @@ -115,7 +113,6 @@ config ARCH_R8A73A4 | |||
| 115 | select ARCH_RMOBILE | 113 | select ARCH_RMOBILE |
| 116 | select ARCH_WANT_OPTIONAL_GPIOLIB | 114 | select ARCH_WANT_OPTIONAL_GPIOLIB |
| 117 | select ARM_GIC | 115 | select ARM_GIC |
| 118 | select CPU_V7 | ||
| 119 | select SH_CLK_CPG | 116 | select SH_CLK_CPG |
| 120 | select RENESAS_IRQC | 117 | select RENESAS_IRQC |
| 121 | 118 | ||
| @@ -124,7 +121,6 @@ config ARCH_R8A7740 | |||
| 124 | select ARCH_RMOBILE | 121 | select ARCH_RMOBILE |
| 125 | select ARCH_WANT_OPTIONAL_GPIOLIB | 122 | select ARCH_WANT_OPTIONAL_GPIOLIB |
| 126 | select ARM_GIC | 123 | select ARM_GIC |
| 127 | select CPU_V7 | ||
| 128 | select SH_CLK_CPG | 124 | select SH_CLK_CPG |
| 129 | select RENESAS_INTC_IRQPIN | 125 | select RENESAS_INTC_IRQPIN |
| 130 | 126 | ||
| @@ -132,7 +128,6 @@ config ARCH_R8A7778 | |||
| 132 | bool "R-Car M1A (R8A77781)" | 128 | bool "R-Car M1A (R8A77781)" |
| 133 | select ARCH_RCAR_GEN1 | 129 | select ARCH_RCAR_GEN1 |
| 134 | select ARCH_WANT_OPTIONAL_GPIOLIB | 130 | select ARCH_WANT_OPTIONAL_GPIOLIB |
| 135 | select CPU_V7 | ||
| 136 | select SH_CLK_CPG | 131 | select SH_CLK_CPG |
| 137 | select ARM_GIC | 132 | select ARM_GIC |
| 138 | 133 | ||
| @@ -141,7 +136,6 @@ config ARCH_R8A7779 | |||
| 141 | select ARCH_RCAR_GEN1 | 136 | select ARCH_RCAR_GEN1 |
| 142 | select ARCH_WANT_OPTIONAL_GPIOLIB | 137 | select ARCH_WANT_OPTIONAL_GPIOLIB |
| 143 | select ARM_GIC | 138 | select ARM_GIC |
| 144 | select CPU_V7 | ||
| 145 | select SH_CLK_CPG | 139 | select SH_CLK_CPG |
| 146 | 140 | ||
| 147 | config ARCH_R8A7790 | 141 | config ARCH_R8A7790 |
| @@ -149,7 +143,6 @@ config ARCH_R8A7790 | |||
| 149 | select ARCH_RCAR_GEN2 | 143 | select ARCH_RCAR_GEN2 |
| 150 | select ARCH_WANT_OPTIONAL_GPIOLIB | 144 | select ARCH_WANT_OPTIONAL_GPIOLIB |
| 151 | select ARM_GIC | 145 | select ARM_GIC |
| 152 | select CPU_V7 | ||
| 153 | select MIGHT_HAVE_PCI | 146 | select MIGHT_HAVE_PCI |
| 154 | select SH_CLK_CPG | 147 | select SH_CLK_CPG |
| 155 | select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE | 148 | select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE |
| @@ -159,7 +152,6 @@ config ARCH_R8A7791 | |||
| 159 | select ARCH_RCAR_GEN2 | 152 | select ARCH_RCAR_GEN2 |
| 160 | select ARCH_WANT_OPTIONAL_GPIOLIB | 153 | select ARCH_WANT_OPTIONAL_GPIOLIB |
| 161 | select ARM_GIC | 154 | select ARM_GIC |
| 162 | select CPU_V7 | ||
| 163 | select MIGHT_HAVE_PCI | 155 | select MIGHT_HAVE_PCI |
| 164 | select SH_CLK_CPG | 156 | select SH_CLK_CPG |
| 165 | select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE | 157 | select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE |