Merge git://git.denx.de/u-boot-socfpga

This commit is contained in:
Tom Rini 2018-01-27 14:48:41 -05:00
commit d61639e39a
14 changed files with 23 additions and 8 deletions

View file

@ -3534,7 +3534,7 @@ static void debug_mem_calibrate(int pass)
u32 debug_info;
if (pass) {
printf("%s: CALIBRATION PASSED\n", __FILE__);
debug("%s: CALIBRATION PASSED\n", __FILE__);
gbl->fom_in /= 2;
gbl->fom_out /= 2;
@ -3553,7 +3553,7 @@ static void debug_mem_calibrate(int pass)
writel(debug_info, &phy_mgr_cfg->cal_debug_info);
writel(PHY_MGR_CAL_SUCCESS, &phy_mgr_cfg->cal_status);
} else {
printf("%s: CALIBRATION FAILED\n", __FILE__);
debug("%s: CALIBRATION FAILED\n", __FILE__);
debug_info = gbl->error_stage;
debug_info |= gbl->error_substage << 8;
@ -3570,7 +3570,7 @@ static void debug_mem_calibrate(int pass)
writel(debug_info, &sdr_reg_file->failing_stage);
}
printf("%s: Calibration complete\n", __FILE__);
debug("%s: Calibration complete\n", __FILE__);
}
/**
@ -3741,7 +3741,7 @@ int sdram_calibration_full(void)
initialize_tracking();
printf("%s: Preparing to start memory calibration\n", __FILE__);
debug("%s: Preparing to start memory calibration\n", __FILE__);
debug("%s:%d\n", __func__, __LINE__);
debug_cond(DLEVEL >= 1,