From: Florent Kermarrec <florent@enjoy-digital.fr>
Date: Mon, 23 Nov 2015 10:08:04 +0000 (+0100)
Subject: soc/software/boot: add #ifndef on LOCALIP and REMOTEIP to allow definition in the... 
X-Git-Tag: 24jan2021_ls180~2046
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6f4dd14ffa79acadf65875ae4a9c23ef6be9ffaf;p=litex.git

soc/software/boot: add #ifndef on LOCALIP and REMOTEIP to allow definition in the SoC with add_constant
---

diff --git a/litex/soc/software/bios/boot.c b/litex/soc/software/bios/boot.c
index 635bd649..e9257b1a 100644
--- a/litex/soc/software/bios/boot.c
+++ b/litex/soc/software/bios/boot.c
@@ -178,14 +178,19 @@ void serialboot(void)
 
 #ifdef CSR_ETHMAC_BASE
 
+#ifndef LOCALIP1
 #define LOCALIP1 192
 #define LOCALIP2 168
 #define LOCALIP3 0
 #define LOCALIP4 42
+#endif
+
+#ifndef REMOTEIP1
 #define REMOTEIP1 192
 #define REMOTEIP2 168
 #define REMOTEIP3 0
 #define REMOTEIP4 14
+#endif
 
 static int tftp_get_v(unsigned int ip, const char *filename, char *buffer)
 {