From 455cb3ebe35a1e291eef25e2026372b205cf3550 Mon Sep 17 00:00:00 2001
From: Florent Kermarrec <florent@enjoy-digital.fr>
Date: Tue, 17 Jan 2017 04:36:15 +0100
Subject: [PATCH] soc/software/main: fix double serialboot (merge issue)

---
 litex/soc/software/bios/main.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/litex/soc/software/bios/main.c b/litex/soc/software/bios/main.c
index 0bdffdf1..b389024b 100644
--- a/litex/soc/software/bios/main.c
+++ b/litex/soc/software/bios/main.c
@@ -467,7 +467,6 @@ static void boot_sequence(void)
 #ifdef ROM_BOOT_ADDRESS
 		romboot();
 #endif
-		serialboot();
 #ifdef CSR_ETHMAC_BASE
 #ifdef CSR_ETHPHY_MODE_DETECTION_MODE_ADDR
 		eth_mode();
-- 
2.30.2