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 61b0d06..5b4dea9 100644 (file)
--- 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 6fe0b48..406fdc8 100644 (file)
--- 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 5004fa3..605c9c6 100644 (file)
--- 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 41ba597..8f989bb 100644 (file)
--- 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 */