git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'trace-v4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-shmobile
/
Kconfig
diff --git
a/arch/arm/mach-shmobile/Kconfig
b/arch/arm/mach-shmobile/Kconfig
index 94e9431d92b874058944faf0361cf56003154240..b100c26a858f9015b5b001c7a6c52acd227d94aa 100644
(file)
--- a/
arch/arm/mach-shmobile/Kconfig
+++ b/
arch/arm/mach-shmobile/Kconfig
@@
-1,6
+1,4
@@
-config ARCH_SHMOBILE
- bool
-
+# SPDX-License-Identifier: GPL-2.0
config PM_RMOBILE
bool
select PM
config PM_RMOBILE
bool
select PM
@@
-30,7
+28,6
@@
config ARCH_RMOBILE
menuconfig ARCH_RENESAS
bool "Renesas ARM SoCs"
depends on ARCH_MULTI_V7 && MMU
menuconfig ARCH_RENESAS
bool "Renesas ARM SoCs"
depends on ARCH_MULTI_V7 && MMU
- select ARCH_SHMOBILE
select ARM_GIC
select GPIOLIB
select HAVE_ARM_SCU if SMP
select ARM_GIC
select GPIOLIB
select HAVE_ARM_SCU if SMP
@@
-78,6
+75,11
@@
config ARCH_R8A7743
select ARCH_RCAR_GEN2
select ARM_ERRATA_798181 if SMP
select ARCH_RCAR_GEN2
select ARM_ERRATA_798181 if SMP
+config ARCH_R8A7744
+ bool "RZ/G1N (R8A77440)"
+ select ARCH_RCAR_GEN2
+ select ARM_ERRATA_798181 if SMP
+
config ARCH_R8A7745
bool "RZ/G1E (R8A77450)"
select ARCH_RCAR_GEN2
config ARCH_R8A7745
bool "RZ/G1E (R8A77450)"
select ARCH_RCAR_GEN2