]> git.sur5r.net Git - u-boot/commitdiff
ARM: rmobile: Stop using rcar-common/common.c on Gen3
authorMarek Vasut <marek.vasut+renesas@gmail.com>
Sat, 25 Nov 2017 21:43:57 +0000 (22:43 +0100)
committerMarek Vasut <marek.vasut+renesas@gmail.com>
Thu, 30 Nov 2017 01:34:20 +0000 (02:34 +0100)
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>
board/renesas/salvator-x/Makefile
board/renesas/ulcb/Makefile
include/configs/salvator-x.h
include/configs/ulcb.h

index 61b0d063e592289d0c26399a8c75a205c4a53847..5b4dea91c1410e10249418eb65c2cc1dac79d0e7 100644 (file)
@@ -6,4 +6,4 @@
 # SPDX-License-Identifier: GPL-2.0+
 #
 
-obj-y  := salvator-x.o ../rcar-common/common.o
+obj-y  := salvator-x.o
index 6fe0b480f77ebca50402a3a91067dbb139cb55fb..406fdc8fa404d62a0326c16a3b770dea98bf9b6d 100644 (file)
@@ -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
index 5004fa31b6d4dfb6e6a1ce8fd32fed16e053f83f..605c9c64b82f55b1e0b82c3b9b1a1f491f6e4d38 100644 (file)
 #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 */
index 41ba5972a6ee218fd1c99cf98d1779654c48f2b2..8f989bbce5ecbd62718684065083429101be18c3 100644 (file)
@@ -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 */