Hardware
/
litex
mirror of https://github.com/enjoy-digital/litex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #327 from zakgi/master 

moving RAM offsets outside of CSR_ETHMAC define
This commit is contained in:
enjoy-digital 2019-12-31 09:49:53 +01:00 committed by GitHub
parent f0b5c67216 39ae230b83
commit 2157d0f332
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
litex/soc/software/bios/boot.c
View File

@ -232,6 +232,19 @@ int serialboot(void)
return 1; 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 #ifdef CSR_ETHMAC_BASE
#ifndef LOCALIP1 #ifndef LOCALIP1
@ -268,14 +281,6 @@ const char *filename, char *buffer)
static const unsigned char macadr[6] = {0x10, 0xe2, 0xd5, 0x00, 0x00, 0x00}; 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) #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) static int try_get_kernel_rootfs_dtb_emulator(unsigned int ip, unsigned short tftp_port)