From 1cc95f6e1b38e96dfbb5ffb9aec211b1d0a88135 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Sat, 10 Oct 2015 05:58:28 +0900 Subject: ARM: Rmobile: Rename CONFIG_RMOBILE to CONFIG_ARCH_RMOBILE Signed-off-by: Nobuhiro Iwamatsu --- board/renesas/lager/lager.c | 2 +- board/renesas/lager/qos.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'board/renesas/lager') diff --git a/board/renesas/lager/lager.c b/board/renesas/lager/lager.c index 83260a1..6fed2f9 100644 --- a/board/renesas/lager/lager.c +++ b/board/renesas/lager/lager.c @@ -235,7 +235,7 @@ int dram_init(void) } const struct rmobile_sysinfo sysinfo = { - CONFIG_RMOBILE_BOARD_STRING + CONFIG_ARCH_RMOBILE_BOARD_STRING }; void reset_cpu(ulong addr) diff --git a/board/renesas/lager/qos.c b/board/renesas/lager/qos.c index ae15551..25b8d09 100644 --- a/board/renesas/lager/qos.c +++ b/board/renesas/lager/qos.c @@ -13,7 +13,7 @@ #include /* QoS version 0.955 for ES1 and version 0.973 for ES2 */ -#if defined(CONFIG_RMOBILE_EXTRAM_BOOT) +#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT) enum { DBSC3_00, DBSC3_01, DBSC3_02, DBSC3_03, DBSC3_04, DBSC3_05, DBSC3_06, DBSC3_07, DBSC3_08, DBSC3_09, @@ -2426,8 +2426,8 @@ void qos_init(void) else qos_init_es1(); } -#else /* CONFIG_RMOBILE_EXTRAM_BOOT */ +#else /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */ void qos_init(void) { } -#endif /* CONFIG_RMOBILE_EXTRAM_BOOT */ +#endif /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */ -- cgit v1.1 From 0f2765e84e85f1a11b4651895d9284ba352f5eae Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Fri, 22 Jul 2016 07:15:57 +0900 Subject: ARM: rmobile: lager: Move rcar-gen2-common to rcar-common To common use of rcar-gen2-common directory in the R-Car SoCs, and change from rcar-gen2-common to rcar-common. Signed-off-by: Nobuhiro Iwamatsu --- board/renesas/lager/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'board/renesas/lager') diff --git a/board/renesas/lager/Makefile b/board/renesas/lager/Makefile index 8d03461..0e44c69 100644 --- a/board/renesas/lager/Makefile +++ b/board/renesas/lager/Makefile @@ -6,4 +6,4 @@ # SPDX-License-Identifier: GPL-2.0 # -obj-y := lager.o qos.o ../rcar-gen2-common/common.o +obj-y := lager.o qos.o ../rcar-common/common.o -- cgit v1.1