URL
https://opencores.org/ocsvn/s6soc/s6soc/trunk
Subversion Repositories s6soc
Compare Revisions
- This comparison shows the changes necessary to convert path
/s6soc/trunk/sw
- from Rev 19 to Rev 15
- ↔ Reverse comparison
Rev 19 → Rev 15
/host/dumpuart.cpp
File deleted
/host/zipload.cpp
493,7 → 493,6
} |
} |
|
unsigned startaddr = RESET_ADDRESS, codelen = 0; |
for(int i=0; secpp[i]->m_len; i++) { |
secp = secpp[i]; |
if ((secp->m_start >= RAMBASE) |
503,26 → 502,14
if (secp->m_data[i] != 0) { |
fprintf(stderr, "ERR: Cannot set RAM upon bootup!\n"); |
fprintf(stderr, "(The bootloaders just not that smart ... yet)\n"); |
fprintf(stderr, "Attempting to set %08x - %08x\n", secp->m_start, secp->m_start+secp->m_len-1); |
fprintf(stderr, "%08x cannot be set to %08x\n", secp->m_start+i, secp->m_data[i]); |
exit(EXIT_FAILURE); |
} |
} |
} else { |
if (secp->m_start < startaddr) { |
codelen += (startaddr-secp->m_start); |
startaddr = secp->m_start; |
} if (secp->m_start+secp->m_len > startaddr+codelen) { |
codelen = secp->m_start+secp->m_len-startaddr; |
} memcpy(&fbuf[secp->m_start-SPIFLASH], |
secp->m_data, |
secp->m_len*sizeof(FPGA::BUSW)); |
} else if (!flash->write(secp->m_start, secp->m_len, secp->m_data, true)) { |
fprintf(stderr, "ERR: Could not write program to flash\n"); |
exit(EXIT_FAILURE); |
} |
} |
if (!flash->write(startaddr, codelen, &fbuf[startaddr-SPIFLASH], true)) { |
fprintf(stderr, "ERR: Could not write program to flash\n"); |
exit(EXIT_FAILURE); |
} |
m_fpga->readio(R_VERSION); // Check for bus errors |
|
// Now ... how shall we start this CPU? |
/host/flashdrvr.cpp
156,10 → 156,6
// If this buffer is equal to the sector value(s), go on |
// If not, erase the sector |
|
/* |
fprintf(stderr, "FLASH->write(%08x, %d, ..., %s)\n", addr, len, |
(verify)?"Verify":""); |
*/ |
// m_fpga->writeio(R_QSPI_CREG, 2); |
// m_fpga->readio(R_VERSION); // Read something innocuous |
// m_fpga->writeio(R_QSPI_SREG, 0); |
/host/Makefile
39,7 → 39,7
## |
## |
all: |
PROGRAMS := wbregs readflash zipload buildsamples dumpuart |
PROGRAMS := wbregs readflash zipload buildsamples |
all: $(PROGRAMS) |
|
CXX := g++ |
74,9 → 74,6
buildsamples: buildsamples.cpp |
$(CXX) $(CFLAGS) $^ -o $@ |
|
dumpuart: dumpuart.cpp |
$(CXX) $(CFLAGS) $^ -o $@ |
|
define build-depends |
@echo "Building dependency file(s)" |
@$(CXX) $(CFLAGS) -MM $(SOURCES) $(BUSSRCS) > $(OBJDIR)/xdepends.txt |