diff --git a/litex/soc/software/bios/boot.c b/litex/soc/software/bios/boot.c
index 7516c0dd6..e5a28f780 100644
--- a/litex/soc/software/bios/boot.c
+++ b/litex/soc/software/bios/boot.c
@@ -108,7 +108,11 @@ static int check_ack(void)
 
 	timer0_en_write(0);
 	timer0_reload_write(0);
+#ifndef CONFIG_DISABLE_DELAYS
 	timer0_load_write(CONFIG_CLOCK_FREQUENCY/4);
+#else
+	timer0_load_write(0);
+#endif
 	timer0_en_write(1);
 	timer0_update_value_write(1);
 	recognized = 0;
diff --git a/litex/soc/software/liblitedram/bist.c b/litex/soc/software/liblitedram/bist.c
index 65e2dcf4c..e3dc0028a 100644
--- a/litex/soc/software/liblitedram/bist.c
+++ b/litex/soc/software/liblitedram/bist.c
@@ -23,7 +23,7 @@ uint32_t rd_errors;
 
 __attribute__((unused)) static void cdelay(int i)
 {
-#ifndef CONFIG_SIM_DISABLE_DELAYS
+#ifndef CONFIG_DISABLE_DELAYS
 	while(i > 0) {
 		__asm__ volatile(CONFIG_CPU_NOP);
 		i--;
diff --git a/litex/soc/software/liblitedram/sdram.c b/litex/soc/software/liblitedram/sdram.c
index e42462173..97d58a566 100644
--- a/litex/soc/software/liblitedram/sdram.c
+++ b/litex/soc/software/liblitedram/sdram.c
@@ -37,7 +37,7 @@
 
 __attribute__((unused)) static void cdelay(int i)
 {
-#ifndef CONFIG_SIM_DISABLE_DELAYS
+#ifndef CONFIG_DISABLE_DELAYS
 	while(i > 0) {
 		__asm__ volatile(CONFIG_CPU_NOP);
 		i--;
@@ -348,7 +348,7 @@ static void sdram_write_leveling_rst_delay(int module) {
 	for(i=0; i<ddrphy_half_sys8x_taps_read(); i++) {
 		ddrphy_wdly_dqs_inc_write(1);
 		cdelay(100);
-    }
+	}
 #endif
 
 	/* Un-select module */