summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorNobuhiro Iwamatsu <iwamatsu@nigauri.org>2015-10-10 05:58:28 +0900
committerNobuhiro Iwamatsu <iwamatsu@nigauri.org>2016-08-17 10:25:34 +0900
commit1cc95f6e1b38e96dfbb5ffb9aec211b1d0a88135 (patch)
tree4fa7d9cc14f29f62aca55de96fc06157e2b24ba3 /arch/arm
parent7a7d246d97bc66e01bf030b0503b14f78f08629d (diff)
ARM: Rmobile: Rename CONFIG_RMOBILE to CONFIG_ARCH_RMOBILE
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/Kconfig4
-rw-r--r--arch/arm/Makefile2
-rw-r--r--arch/arm/mach-rmobile/Kconfig2
-rw-r--r--arch/arm/mach-rmobile/include/mach/rmobile.h4
4 files changed, 7 insertions, 5 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index e6940e6206..413d269d26 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -575,9 +575,11 @@ config AM43XX
protocols, dual camera support, optional 3D graphics
and an optional customer programmable secure boot.
-config RMOBILE
+config ARCH_RMOBILE
bool "Renesas ARM SoCs"
select CPU_V7
+ select DM
+ select DM_SERIAL
config TARGET_S32V234EVB
bool "Support s32v234evb"
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 43ae79a6ef..5000d87fd0 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -59,7 +59,7 @@ machine-$(CONFIG_ARCH_S5PC1XX) += s5pc1xx
machine-$(CONFIG_ARCH_SUNXI) += sunxi
machine-$(CONFIG_ARCH_SNAPDRAGON) += snapdragon
machine-$(CONFIG_ARCH_SOCFPGA) += socfpga
-machine-$(CONFIG_RMOBILE) += rmobile
+machine-$(CONFIG_ARCH_RMOBILE) += rmobile
machine-$(CONFIG_ARCH_ROCKCHIP) += rockchip
machine-$(CONFIG_STM32) += stm32
machine-$(CONFIG_TEGRA) += tegra
diff --git a/arch/arm/mach-rmobile/Kconfig b/arch/arm/mach-rmobile/Kconfig
index 85c06eb45f..5915768928 100644
--- a/arch/arm/mach-rmobile/Kconfig
+++ b/arch/arm/mach-rmobile/Kconfig
@@ -1,4 +1,4 @@
-if RMOBILE
+if ARCH_RMOBILE
choice
prompt "Renesus ARM SoCs board select"
diff --git a/arch/arm/mach-rmobile/include/mach/rmobile.h b/arch/arm/mach-rmobile/include/mach/rmobile.h
index 65ee9eb547..46e821d263 100644
--- a/arch/arm/mach-rmobile/include/mach/rmobile.h
+++ b/arch/arm/mach-rmobile/include/mach/rmobile.h
@@ -1,7 +1,7 @@
#ifndef __ASM_ARCH_RMOBILE_H
#define __ASM_ARCH_RMOBILE_H
-#if defined(CONFIG_RMOBILE)
+#if defined(CONFIG_ARCH_RMOBILE)
#if defined(CONFIG_SH73A0)
#include <asm/arch/sh73a0.h>
#elif defined(CONFIG_R8A7740)
@@ -17,7 +17,7 @@
#else
#error "SOC Name not defined"
#endif
-#endif /* CONFIG_RMOBILE */
+#endif /* CONFIG_ARCH_RMOBILE */
#ifndef __ASSEMBLY__
u32 rmobile_get_cpu_type(void);