rcar_gen3: E3 target: fix compilation issues
Target builds but has not been tested.
Signed-off-by: ldts <jorge.ramirez.ortiz@gmail.com>
diff --git a/drivers/renesas/rcar/watchdog/swdt.c b/drivers/renesas/rcar/watchdog/swdt.c
index 6df47b9..f9dbf86 100644
--- a/drivers/renesas/rcar/watchdog/swdt.c
+++ b/drivers/renesas/rcar/watchdog/swdt.c
@@ -72,9 +72,9 @@
void rcar_swdt_init(void)
{
- uint32_t rmsk, val, sr;
+ uint32_t rmsk, sr;
#if (RCAR_LSI != RCAR_E3)
- uint32_t reg, product_cut, chk_data;
+ uint32_t reg, val, product_cut, chk_data;
reg = mmio_read_32(RCAR_PRR);
product_cut = reg & (RCAR_PRODUCT_MASK | RCAR_CUT_MASK);
diff --git a/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.c b/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.c
index 800105e..716d15d 100644
--- a/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.c
+++ b/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.c
@@ -1046,7 +1046,7 @@
} else {
NOTICE("[COLD_BOOT]");
} /* ddrBackup */
- err=dram_update_boot_status(ddrBackup);
+ err=rcar_dram_update_boot_status(ddrBackup);
if(err){
NOTICE("[BOOT_STATUS_UPDATE_ERROR]");
return INITDRAM_ERR_I;
@@ -1500,7 +1500,7 @@
/*******************************************************************************
* DDR Initialize entry for IPL
******************************************************************************/
-int32_t InitDram(void)
+int32_t rcar_dram_init(void)
{
uint32_t dataL;
uint32_t failcount;
@@ -1516,7 +1516,7 @@
NOTICE("BL2: DDR1856(%s)", RCAR_E3_DDR_VERSION);
} /* ddr */
- dram_get_boot_status(&ddrBackup);
+ rcar_dram_get_boot_status(&ddrBackup);
if(ddrBackup==DRAM_BOOT_STATUS_WARM){
dataL=recovery_from_backup_mode(); /* WARM boot */
diff --git a/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.h b/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.h
index b202b02..115765b 100644
--- a/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.h
+++ b/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.h
@@ -24,7 +24,7 @@
#endif
#endif
-extern int32_t InitDram(void);
+extern int32_t rcar_dram_init(void);
#define INITDRAM_OK (0)
#define INITDRAM_NG (0xffffffff)
#define INITDRAM_ERR_I (0xffffffff)
diff --git a/plat/renesas/rcar/bl2_cpg_init.c b/plat/renesas/rcar/bl2_cpg_init.c
index eb533ce..880ad36 100644
--- a/plat/renesas/rcar/bl2_cpg_init.c
+++ b/plat/renesas/rcar/bl2_cpg_init.c
@@ -42,7 +42,8 @@
uint32_t stop_cr2, reset_cr2;
#if (RCAR_LSI == RCAR_E3)
- reset_cr2 = 0x10000000U stop_cr2 = 0xEFFFFFFFU;
+ reset_cr2 = 0x10000000U;
+ stop_cr2 = 0xEFFFFFFFU;
#else
reset_cr2 = 0x14000000U;
stop_cr2 = 0xEBFFFFFFU;