From: Marek Vasut <marek.vasut+renesas@gmail.com>
Date: Sat, 25 Nov 2017 21:43:57 +0000 (+0100)
Subject: ARM: rmobile: Stop using rcar-common/common.c on Gen3
X-Git-Tag: v2018.01-rc1~26^2~18
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e23eb942ad103f6d3dd15d9346bb1ea132899963;p=oweals%2Fu-boot.git

ARM: rmobile: Stop using rcar-common/common.c on Gen3

Since the Gen3 clock driver now has a .remove callback, it is no
longer necessary to shut the clock down before booting Linux in the
arch_preboot_os hook. Stop using it and while doing so, remove all
the ad-hoc config options which this hook used.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
---

diff --git a/board/renesas/salvator-x/Makefile b/board/renesas/salvator-x/Makefile
index 61b0d063e5..5b4dea91c1 100644
--- a/board/renesas/salvator-x/Makefile
+++ b/board/renesas/salvator-x/Makefile
@@ -6,4 +6,4 @@
 # SPDX-License-Identifier: GPL-2.0+
 #
 
-obj-y	:= salvator-x.o ../rcar-common/common.o
+obj-y	:= salvator-x.o
diff --git a/board/renesas/ulcb/Makefile b/board/renesas/ulcb/Makefile
index 6fe0b480f7..406fdc8fa4 100644
--- a/board/renesas/ulcb/Makefile
+++ b/board/renesas/ulcb/Makefile
@@ -6,4 +6,4 @@
 # SPDX-License-Identifier: GPL-2.0+
 #
 
-obj-y	:= ulcb.o cpld.o ../rcar-common/common.o
+obj-y	:= ulcb.o cpld.o
diff --git a/include/configs/salvator-x.h b/include/configs/salvator-x.h
index 5004fa31b6..605c9c64b8 100644
--- a/include/configs/salvator-x.h
+++ b/include/configs/salvator-x.h
@@ -62,12 +62,4 @@
 #define CONFIG_SYS_MMC_ENV_DEV		1
 #define CONFIG_SYS_MMC_ENV_PART		2
 
-/* Module stop status bits */
-/* MFIS, SCIF1 */
-#define CONFIG_SMSTP2_ENA	0x00002040
-/* SCIF2 */
-#define CONFIG_SMSTP3_ENA	0x00000400
-/* INTC-AP, IRQC */
-#define CONFIG_SMSTP4_ENA	0x00000180
-
 #endif /* __SALVATOR_X_H */
diff --git a/include/configs/ulcb.h b/include/configs/ulcb.h
index 41ba5972a6..8f989bbce5 100644
--- a/include/configs/ulcb.h
+++ b/include/configs/ulcb.h
@@ -83,12 +83,4 @@ unsigned char ulcb_softspi_read(void);
 #define CONFIG_SYS_MMC_ENV_DEV		1
 #define CONFIG_SYS_MMC_ENV_PART		2
 
-/* Module stop status bits */
-/* MFIS, SCIF1 */
-#define CONFIG_SMSTP2_ENA	0x00002040
-/* SCIF2 */
-#define CONFIG_SMSTP3_ENA	0x00000400
-/* INTC-AP, IRQC */
-#define CONFIG_SMSTP4_ENA	0x00000180
-
 #endif /* __ULCB_H */