luke
/
openFPGALoader
mirror of https://github.com/trabucayre/openFPGALoader.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

lattice: add mcs support for extFlash

This commit is contained in:
Gwenhael Goavec-Merou 2020-05-19 07:59:19 +02:00
parent 4b3166e8df
commit 9f9528599e
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/lattice.cpp
View File

@ -26,6 +26,8 @@
#include "jtag.hpp" #include "jtag.hpp"
#include "lattice.hpp" #include "lattice.hpp"
#include "latticeBitParser.hpp"
#include "mcsParser.hpp"
#include "progressBar.hpp" #include "progressBar.hpp"
#include "display.hpp" #include "display.hpp"
#include "spiFlash.hpp" #include "spiFlash.hpp"
@ -68,7 +70,7 @@ Lattice::Lattice(Jtag *jtag, const string filename,
Device(jtag, filename, verbose) Device(jtag, filename, verbose)
{ {
if (_filename != "") { if (_filename != "") {
if (_file_extension == "jed") { if (_file_extension == "jed" || _file_extension == "mcs") {
_mode = Device::FLASH_MODE; _mode = Device::FLASH_MODE;
} else if (_file_extension == "bit") { } else if (_file_extension == "bit") {
if (flash_wr) if (flash_wr)
@ -384,12 +386,16 @@ bool Lattice::program_intFlash()
bool Lattice::program_extFlash(unsigned int offset) bool Lattice::program_extFlash(unsigned int offset)
{ {
LatticeBitParser _bit(_filename, _verbose); ConfigBitstreamParser *_bit;
if (_file_extension == "mcs")
_bit = new McsParser(_filename, true, _verbose);
else
_bit = new LatticeBitParser(_filename, _verbose);
printInfo("Open file " + _filename + " ", false); printInfo("Open file " + _filename + " ", false);
printSuccess("DONE"); printSuccess("DONE");
int err = _bit.parse(); int err = _bit->parse();
printInfo("Parse file ", false); printInfo("Parse file ", false);
if (err == EXIT_FAILURE) { if (err == EXIT_FAILURE) {
@ -407,8 +413,8 @@ bool Lattice::program_extFlash(unsigned int offset)
uint8_t tmp[2] = {0xFE, 0x68}; uint8_t tmp[2] = {0xFE, 0x68};
_jtag->shiftDR(tmp, NULL, 16); _jtag->shiftDR(tmp, NULL, 16);
uint8_t *data = _bit.getData(); uint8_t *data = _bit->getData();
int length = _bit.getLength()/8; int length = _bit->getLength()/8;
/* test SPI */ /* test SPI */
SPIFlash flash(this, _verbose); SPIFlash flash(this, _verbose);
@ -416,6 +422,8 @@ bool Lattice::program_extFlash(unsigned int offset)
flash.read_id(); flash.read_id();
flash.read_status_reg(); flash.read_status_reg();
flash.erase_and_prog(offset, data, length); flash.erase_and_prog(offset, data, length);
delete _bit;
return true; return true;
} }