diff options
| author | Marek Vasut <marek.vasut+renesas@gmail.com> | 2019-01-21 23:11:33 +0100 |
|---|---|---|
| committer | Marek Vasut <marek.vasut+renesas@gmail.com> | 2019-01-29 06:07:21 +0100 |
| commit | c87c8f85b1b3e72521216bbae2de42e9feca854f (patch) | |
| tree | 71e8437edeb8bd69c70848c3416aba167acd58d6 /drivers | |
| parent | 458a449cfd8bc80c4cfb11b3f8fdf5eb5ac1e11b (diff) | |
| download | platform_external_arm-trusted-firmware-c87c8f85b1b3e72521216bbae2de42e9feca854f.tar.gz platform_external_arm-trusted-firmware-c87c8f85b1b3e72521216bbae2de42e9feca854f.tar.bz2 platform_external_arm-trusted-firmware-c87c8f85b1b3e72521216bbae2de42e9feca854f.zip | |
rcar_gen3: drivers: ddr: Clean up printouts
Clean up the NOTICE() and FATAL_MSG() outputs, so that they contain
proper newlines and BL2 prefixes.
Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.c | 12 | ||||
| -rw-r--r-- | drivers/staging/renesas/rcar/ddr/ddr_b/boot_init_dram.c | 8 |
2 files changed, 9 insertions, 11 deletions
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 62997bc0d..c289c88fd 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 @@ -1137,13 +1137,13 @@ uint32_t recovery_from_backup_mode(void) /* ddr backupmode end */ if (ddrBackup) { - NOTICE("[WARM_BOOT]"); + NOTICE("BL2: [WARM_BOOT]\n"); } else { - NOTICE("[COLD_BOOT]"); + NOTICE("BL2: [COLD_BOOT]\n"); } /* ddrBackup */ err = rcar_dram_update_boot_status(ddrBackup); if (err) { - NOTICE("[BOOT_STATUS_UPDATE_ERROR]"); + NOTICE("BL2: [BOOT_STATUS_UPDATE_ERROR]\n"); return INITDRAM_ERR_I; } /* err */ @@ -1672,9 +1672,9 @@ int32_t rcar_dram_init(void) md = *((volatile uint32_t*)RST_MODEMR); ddr = (md & 0x00080000) >> 19; if (ddr == 0x0) { - NOTICE("BL2: DDR1584(%s)", RCAR_E3_DDR_VERSION); + NOTICE("BL2: DDR1584(%s)\n", RCAR_E3_DDR_VERSION); } else if(ddr == 0x1){ - NOTICE("BL2: DDR1856(%s)", RCAR_E3_DDR_VERSION); + NOTICE("BL2: DDR1856(%s)\n", RCAR_E3_DDR_VERSION); } /* ddr */ rcar_dram_get_boot_status(&ddrBackup); @@ -1691,8 +1691,6 @@ int32_t rcar_dram_init(void) failcount = 1; } /* dataL */ - NOTICE("..%d\n", failcount); /* rev.0.05 */ - if (failcount == 0) { return INITDRAM_OK; } else { diff --git a/drivers/staging/renesas/rcar/ddr/ddr_b/boot_init_dram.c b/drivers/staging/renesas/rcar/ddr/ddr_b/boot_init_dram.c index 78f0f1146..f4bfdde1c 100644 --- a/drivers/staging/renesas/rcar/ddr/ddr_b/boot_init_dram.c +++ b/drivers/staging/renesas/rcar/ddr/ddr_b/boot_init_dram.c @@ -2826,7 +2826,7 @@ static uint32_t pll3_freq(uint32_t on) set_freqchgack(0); if (timeout) { - FATAL_MSG("Time out[2]"); + FATAL_MSG("BL2: Time out[2]\n"); return (1); } return (0); @@ -3012,13 +3012,13 @@ static uint32_t init_ddr(void) ***********************************************************************/ #ifdef DDR_BACKUPMODE if (ddrBackup) { - NOTICE("[WARM_BOOT]"); + NOTICE("BL2: [WARM_BOOT]\n"); } else { - NOTICE("[COLD_BOOT]"); + NOTICE("BL2: [COLD_BOOT]\n"); } err = rcar_dram_update_boot_status(ddrBackup); if (err) { - NOTICE("[BOOT_STATUS_UPDATE_ERROR]"); + NOTICE("BL2: [BOOT_STATUS_UPDATE_ERROR]\n"); return INITDRAM_ERR_I; } #endif |