From: Giammarco Zacheo <g.zacheo@gmail.com>
Date: Mon, 30 Dec 2019 06:56:42 +0000 (-0800)
Subject: moving RAM offsets outside of CSR_ETHMAC define
X-Git-Tag: 24jan2021_ls180~786^2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=39ae230b83dd8c2760135c31cc874e5b234992c5;p=litex.git

moving RAM offsets outside of CSR_ETHMAC define
---

diff --git a/litex/soc/software/bios/boot.c b/litex/soc/software/bios/boot.c
index 0eabf6d5..dd1ab2c8 100644
--- a/litex/soc/software/bios/boot.c
+++ b/litex/soc/software/bios/boot.c
@@ -232,6 +232,19 @@ int serialboot(void)
 	return 1;
 }
 
+#if defined(CONFIG_CPU_TYPE_VEXRISCV) && defined(CONFIG_CPU_VARIANT_LINUX)
+
+#define KERNEL_IMAGE_RAM_OFFSET      0x00000000
+#define ROOTFS_IMAGE_RAM_OFFSET      0x00800000
+#define DEVICE_TREE_IMAGE_RAM_OFFSET 0x01000000
+
+#ifndef EMULATOR_RAM_BASE
+#define EMULATOR_RAM_BASE 0x20000000
+#endif
+#define EMULATOR_IMAGE_RAM_OFFSET    0x00000000
+
+#endif
+
 #ifdef CSR_ETHMAC_BASE
 
 #ifndef LOCALIP1
@@ -268,14 +281,6 @@ const char *filename, char *buffer)
 
 static const unsigned char macadr[6] = {0x10, 0xe2, 0xd5, 0x00, 0x00, 0x00};
 
-#define KERNEL_IMAGE_RAM_OFFSET      0x00000000
-#define ROOTFS_IMAGE_RAM_OFFSET      0x00800000
-#define DEVICE_TREE_IMAGE_RAM_OFFSET 0x01000000
-
-#ifndef EMULATOR_RAM_BASE
-#define EMULATOR_RAM_BASE 0x20000000
-#endif
-#define EMULATOR_IMAGE_RAM_OFFSET    0x00000000
 
 #if defined(CONFIG_CPU_TYPE_VEXRISCV) && defined(CONFIG_CPU_VARIANT_LINUX)
 static int try_get_kernel_rootfs_dtb_emulator(unsigned int ip, unsigned short tftp_port)