software/bios: rename CONFIG_SIM_DISABLE_DELAY to CONFIG_DISABLE_DELAYS and disable timeout on serialboot's check_ack when CONFIG_DISABLE_DELAYS is set.

This is useful in simulation to skip serialboot ack check.
This commit is contained in:
Florent Kermarrec 2021-01-20 09:27:39 +01:00
parent 41964f945c
commit acb6741b8a
3 changed files with 7 additions and 3 deletions

View file

@ -108,7 +108,11 @@ static int check_ack(void)
timer0_en_write(0); timer0_en_write(0);
timer0_reload_write(0); timer0_reload_write(0);
#ifndef CONFIG_DISABLE_DELAYS
timer0_load_write(CONFIG_CLOCK_FREQUENCY/4); timer0_load_write(CONFIG_CLOCK_FREQUENCY/4);
#else
timer0_load_write(0);
#endif
timer0_en_write(1); timer0_en_write(1);
timer0_update_value_write(1); timer0_update_value_write(1);
recognized = 0; recognized = 0;

View file

@ -23,7 +23,7 @@ uint32_t rd_errors;
__attribute__((unused)) static void cdelay(int i) __attribute__((unused)) static void cdelay(int i)
{ {
#ifndef CONFIG_SIM_DISABLE_DELAYS #ifndef CONFIG_DISABLE_DELAYS
while(i > 0) { while(i > 0) {
__asm__ volatile(CONFIG_CPU_NOP); __asm__ volatile(CONFIG_CPU_NOP);
i--; i--;

View file

@ -37,7 +37,7 @@
__attribute__((unused)) static void cdelay(int i) __attribute__((unused)) static void cdelay(int i)
{ {
#ifndef CONFIG_SIM_DISABLE_DELAYS #ifndef CONFIG_DISABLE_DELAYS
while(i > 0) { while(i > 0) {
__asm__ volatile(CONFIG_CPU_NOP); __asm__ volatile(CONFIG_CPU_NOP);
i--; i--;
@ -348,7 +348,7 @@ static void sdram_write_leveling_rst_delay(int module) {
for(i=0; i<ddrphy_half_sys8x_taps_read(); i++) { for(i=0; i<ddrphy_half_sys8x_taps_read(); i++) {
ddrphy_wdly_dqs_inc_write(1); ddrphy_wdly_dqs_inc_write(1);
cdelay(100); cdelay(100);
} }
#endif #endif
/* Un-select module */ /* Un-select module */