Compare commits

..

3 Commits

4 changed files with 9 additions and 5 deletions

View File

@ -10,7 +10,11 @@
#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 60000000UL #define F_CLK 60000000UL
@ -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;
} }

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 $@

View File

@ -20,6 +20,7 @@ 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 WithNSmallLinuxCores(1) ++ new WithNSmallLinuxCores(1) ++
new BaseConfig new BaseConfig
@ -45,7 +46,6 @@ 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 = 60000000) // 60 MHz clock
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 = 0x10000000L) case ExtMem => up(ExtMem).copy(size = 0x10000000L)