3 files changed, 5 insertions, 53 deletions
diff --git a/board/renesas/rcar-common/common.c b/board/renesas/rcar-common/common.c
index 1129f4bf0c..1ce6e2eac1 100644
--- a/board/renesas/rcar-common/common.c
+++ b/board/renesas/rcar-common/common.c
@@ -8,57 +8,4 @@
  */
 
 #include <common.h>
-#include <asm/io.h>
-#include <asm/arch/sys_proto.h>
 #include <asm/arch/rmobile.h>
-#include <asm/arch/rcar-mstp.h>
-
-#define TSTR0		0x04
-#define TSTR0_STR0	0x01
-
-static struct mstp_ctl mstptbl[] = {
-	{ SMSTPCR0, MSTP0_BITS, CONFIG_SMSTP0_ENA,
-		RMSTPCR0, MSTP0_BITS, CONFIG_RMSTP0_ENA },
-	{ SMSTPCR1, MSTP1_BITS, CONFIG_SMSTP1_ENA,
-		RMSTPCR1, MSTP1_BITS, CONFIG_RMSTP1_ENA },
-	{ SMSTPCR2, MSTP2_BITS, CONFIG_SMSTP2_ENA,
-		RMSTPCR2, MSTP2_BITS, CONFIG_RMSTP2_ENA },
-	{ SMSTPCR3, MSTP3_BITS, CONFIG_SMSTP3_ENA,
-		RMSTPCR3, MSTP3_BITS, CONFIG_RMSTP3_ENA },
-	{ SMSTPCR4, MSTP4_BITS, CONFIG_SMSTP4_ENA,
-		RMSTPCR4, MSTP4_BITS, CONFIG_RMSTP4_ENA },
-	{ SMSTPCR5, MSTP5_BITS, CONFIG_SMSTP5_ENA,
-		RMSTPCR5, MSTP5_BITS, CONFIG_RMSTP5_ENA },
-#ifdef CONFIG_RCAR_GEN3
-	{ SMSTPCR6, MSTP6_BITS, CONFIG_SMSTP6_ENA,
-		RMSTPCR6, MSTP6_BITS, CONFIG_RMSTP6_ENA },
-#endif
-	{ SMSTPCR7, MSTP7_BITS, CONFIG_SMSTP7_ENA,
-		RMSTPCR7, MSTP7_BITS, CONFIG_RMSTP7_ENA },
-	{ SMSTPCR8, MSTP8_BITS, CONFIG_SMSTP8_ENA,
-		RMSTPCR8, MSTP8_BITS, CONFIG_RMSTP8_ENA },
-	{ SMSTPCR9, MSTP9_BITS, CONFIG_SMSTP9_ENA,
-		RMSTPCR9, MSTP9_BITS, CONFIG_RMSTP9_ENA },
-	{ SMSTPCR10, MSTP10_BITS, CONFIG_SMSTP10_ENA,
-		 RMSTPCR10, MSTP10_BITS, CONFIG_RMSTP10_ENA },
-	{ SMSTPCR11, MSTP11_BITS, CONFIG_SMSTP1_ENA,
-		 RMSTPCR11, MSTP11_BITS, CONFIG_RMSTP11_ENA },
-};
-
-void arch_preboot_os(void)
-{
-	int i;
-
-	/* stop TMU0 */
-	mstp_clrbits_le32(TMU_BASE + TSTR0, TMU_BASE + TSTR0, TSTR0_STR0);
-
-	/* Stop module clock */
-	for (i = 0; i < ARRAY_SIZE(mstptbl); i++) {
-		mstp_setclrbits_le32((uintptr_t)mstptbl[i].s_addr,
-				     mstptbl[i].s_dis,
-				     mstptbl[i].s_ena);
-		mstp_setclrbits_le32((uintptr_t)mstptbl[i].r_addr,
-				     mstptbl[i].r_dis,
-				     mstptbl[i].r_ena);
-	}
-}
diff --git a/board/renesas/ulcb/MAINTAINERS b/board/renesas/ulcb/MAINTAINERS
index e7cdc5217f..8549f543f4 100644
--- a/board/renesas/ulcb/MAINTAINERS
+++ b/board/renesas/ulcb/MAINTAINERS
@@ -5,3 +5,4 @@ F:	board/renesas/ulcb/
 F:	include/configs/ulcb.h
 F:	configs/r8a7795_ulcb_defconfig
 F:	configs/r8a7796_ulcb_defconfig
+F:	configs/r8a77965_ulcb_defconfig
diff --git a/board/renesas/ulcb/ulcb.c b/board/renesas/ulcb/ulcb.c
index 81d6f8f6f2..9785107e56 100644
--- a/board/renesas/ulcb/ulcb.c
+++ b/board/renesas/ulcb/ulcb.c
@@ -97,6 +97,10 @@ int board_fit_config_name_match(const char *name)
 	    !strcmp(name, "r8a7796-m3ulcb-u-boot"))
 		return 0;
 
+	if ((cpu_type == RMOBILE_CPU_TYPE_R8A77965) &&
+	    !strcmp(name, "r8a77965-m3nulcb-u-boot"))
+		return 0;
+
 	return -1;
 }
 #endif