riscv/freedom
1
0
Fork 0
Code Issues Releases Activity

Compare commits

base: riscv:291a765b8dea2a7a780874816561fe7a340db22f
Branches Tags
riscv:ml507 riscv:boot-test riscv:master
..
compare: riscv:ml507
Branches Tags
riscv:ml507 riscv:boot-test riscv:master

9 Commits
291a765b8d ... ml507

Author SHA1 Message Date
Klemens Schölhorn
552553e526 Load 32 MiB bootimage from a 2048 sector offset (first partiton) 2018-06-13 00:34:19 +02:00
Klemens Schölhorn
ee888b8c7b Rebuild when changing the bootloader 2018-06-13 00:33:46 +02:00
Klemens Schölhorn
c812a8878f Properly set clock frequencies 2018-06-06 01:05:36 +02:00
Klemens Schölhorn
2c74ef7f03 Use correct frequency for the sd-spi interface 2018-05-19 19:04:56 +02:00
Klemens Schölhorn
c27ee2215c Print everything send over serial to the terminal 2018-05-19 19:04:11 +02:00
Klemens Schölhorn
ec4e3ec36d Use rocket config with fpu and mmu for booting linux 2018-05-19 19:00:57 +02:00
Klemens Schölhorn
87bb3a5f24 Use correct clock period and memory size in config 2018-05-14 20:10:08 +02:00
Klemens Schölhorn
a3f166d5a2 Pull in memory and terminal improvements 2018-05-14 20:09:55 +02:00
Klemens Schölhorn
175ed051d3 Pull in the new XilinxML507MIGToTL implementation 2018-05-10 21:43:51 +02:00
7 changed files with 17 additions and 10 deletions
Expand all files Collapse all files

3
bootrom/sdboot/kprintf.h
View File

@ -33,6 +33,9 @@ static inline void kputc(char c)
while ((int32_t)(*tx) < 0); while ((int32_t)(*tx) < 0);
*tx = c; *tx = c;
#endif #endif
volatile uint32_t *term = (void *) 0x64003000; // Terminal (32 bit)
while ((int32_t)(*term) < 0);
*term = c;
} }
extern void kputs(const char *); extern void kputs(const char *);

10
bootrom/sdboot/sd.c
View File

@ -10,9 +10,13 @@
#define MAX_CORES 8 #define MAX_CORES 8
#define PAYLOAD_SIZE (16 << 11) //#define PAYLOAD_START 0
//#define PAYLOAD_CRC7 0xE1
#define PAYLOAD_START 2048
#define PAYLOAD_CRC7 0x51
#define PAYLOAD_SIZE (16 << 12)
#define F_CLK 50000000UL #define F_CLK 60000000UL
static volatile uint32_t * const spi = (void *)(SPI_CTRL_ADDR); static volatile uint32_t * const spi = (void *)(SPI_CTRL_ADDR);
@ -163,7 +167,7 @@ static int copy(void)
kprintf("LOADING "); kprintf("LOADING ");
REG32(spi, SPI_REG_SCKDIV) = (F_CLK / 20000000UL); REG32(spi, SPI_REG_SCKDIV) = (F_CLK / 20000000UL);
if (sd_cmd(0x52, 0, 0xE1) != 0x00) { if (sd_cmd(0x52, PAYLOAD_START, PAYLOAD_CRC7) != 0x00) {
sd_cmd_end(); sd_cmd_end();
return 1; return 1;
} }

2
common.mk
View File

@ -63,7 +63,7 @@ endif
verilog: $(verilog) verilog: $(verilog)
romgen := $(BUILD_DIR)/$(CONFIG_PROJECT).$(CONFIG).rom.v romgen := $(BUILD_DIR)/$(CONFIG_PROJECT).$(CONFIG).rom.v
$(romgen): $(verilog) $(romgen): $(verilog) $(BOOTROM_DIR)
ifneq ($(BOOTROM_DIR),"") ifneq ($(BOOTROM_DIR),"")
$(MAKE) -C $(BOOTROM_DIR) romgen $(MAKE) -C $(BOOTROM_DIR) romgen
mv $(BUILD_DIR)/rom.v $@ mv $(BUILD_DIR)/rom.v $@

2
fpga-shells

Submodule fpga-shells updated: 589e9960c0...b49f5cfa78

2
rocket-chip

Submodule rocket-chip updated: 6df42fc360...8710fe9561

2
sifive-blocks

Submodule sifive-blocks updated: 48d8524c4a...88f1cbe420

6
src/main/scala/unleashed/u500ml507devkit/Config.scala
View File

@ -20,8 +20,9 @@ import sifive.fpgashells.devices.xilinx.xilinxml507mig._
class FreedomUML507Config extends Config( class FreedomUML507Config extends Config(
new WithoutTLMonitors ++ new WithoutTLMonitors ++
new WithJtagDTM ++ new WithJtagDTM ++
new WithClockFrequency(60000000) ++ // 60 MHz
new WithNMemoryChannels(1) ++ new WithNMemoryChannels(1) ++
new WithNBigCores(1) ++ new WithNSmallLinuxCores(1) ++
new BaseConfig new BaseConfig
) )
@ -45,10 +46,9 @@ class U500ML507DevKitConfig extends Config(
new U500ML507DevKitPeripherals ++ new U500ML507DevKitPeripherals ++
new FreedomUML507Config().alter((site,here,up) => { new FreedomUML507Config().alter((site,here,up) => {
case ErrorParams => ErrorParams(Seq(AddressSet(0x3000, 0xfff)), maxAtomic=site(XLen)/8, maxTransfer=128) case ErrorParams => ErrorParams(Seq(AddressSet(0x3000, 0xfff)), maxAtomic=site(XLen)/8, maxTransfer=128)
case PeripheryBusKey => up(PeripheryBusKey, site).copy(frequency = 50000000) // 50 MHz hperiphery
case MemoryML507Key => XilinxML507MIGParams(address = Seq(AddressSet(0x80000000L,0x10000000L-1))) // 256 MiB case MemoryML507Key => XilinxML507MIGParams(address = Seq(AddressSet(0x80000000L,0x10000000L-1))) // 256 MiB
case DTSTimebase => BigInt(1000000) case DTSTimebase => BigInt(1000000)
case ExtMem => up(ExtMem).copy(size = 0x40000000L) case ExtMem => up(ExtMem).copy(size = 0x10000000L)
case JtagDTMKey => new JtagDTMConfig ( case JtagDTMKey => new JtagDTMConfig (
idcodeVersion = 2, // 1 was legacy (FE310-G000, Acai). idcodeVersion = 2, // 1 was legacy (FE310-G000, Acai).
idcodePartNum = 0x000, // Decided to simplify. idcodePartNum = 0x000, // Decided to simplify.