From 6f4dd14ffa79acadf65875ae4a9c23ef6be9ffaf Mon Sep 17 00:00:00 2001 From: Florent Kermarrec Date: Mon, 23 Nov 2015 11:08:04 +0100 Subject: [PATCH] soc/software/boot: add #ifndef on LOCALIP and REMOTEIP to allow definition in the SoC with add_constant --- litex/soc/software/bios/boot.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/litex/soc/software/bios/boot.c b/litex/soc/software/bios/boot.c index 635bd6493..e9257b1a9 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) {