Merge ee8c35fd4d into 676f59416a
This commit is contained in:
commit
96036dfdfb
|
|
@ -213,6 +213,10 @@ static std::map <std::string, target_board_t> board_list = {
|
|||
JTAG_BOARD("mlk-s200-eg4d20", "", "anlogicCable", SPI_FLASH, 0, 0, CABLE_DEFAULT),
|
||||
JTAG_BOARD("mimas_a7", "xc7a50tfgg484", "numato", SPI_FLASH, 0, 0, CABLE_MHZ(30)),
|
||||
JTAG_BOARD("neso_a7", "xc7a100tcsg324", "numato-neso", SPI_FLASH, 0, 0, CABLE_MHZ(30)),
|
||||
JTAG_BITBANG_BOARD("netv2", "xc7a35tfgg484", "", SPI_FLASH, 0, 0,
|
||||
17, 4, 27, 22, CABLE_DEFAULT),
|
||||
JTAG_BITBANG_BOARD("netv2_100", "xc7a100tfgg484", "", SPI_FLASH, 0, 0,
|
||||
17, 4, 27, 22, CABLE_DEFAULT),
|
||||
JTAG_BOARD("minispartan6", "", "ft2232", SPI_FLASH, 0, 0, CABLE_DEFAULT),
|
||||
JTAG_BOARD("nexys_a7_50", "xc7a50tcsg324", "digilent", SPI_FLASH, 0, 0, CABLE_DEFAULT),
|
||||
JTAG_BOARD("nexys_a7_100", "xc7a100tcsg324", "digilent", SPI_FLASH, 0, 0, CABLE_DEFAULT),
|
||||
|
|
|
|||
15
src/main.cpp
15
src/main.cpp
|
|
@ -218,6 +218,21 @@ int main(int argc, char **argv)
|
|||
}
|
||||
}
|
||||
|
||||
/* Auto-detect GPIO cable for boards with bitbang pins but no
|
||||
* default cable (e.g. netv2): use libgpiod on Raspberry Pi.
|
||||
*/
|
||||
if (args.cable[0] == '-' && board->cable_name.empty() &&
|
||||
board->jtag_pins_config.tck_pin != 0) {
|
||||
#ifdef ENABLE_LIBGPIOD
|
||||
args.cable = "libgpiod";
|
||||
#else
|
||||
printError("No GPIO cable available: "
|
||||
"build with ENABLE_LIBGPIOD");
|
||||
return EXIT_FAILURE;
|
||||
#endif
|
||||
printInfo("Auto-detected cable: " + args.cable);
|
||||
}
|
||||
|
||||
/* Xilinx only: to write flash exact fpga model must be provided */
|
||||
if (!board->fpga_part.empty() && !args.fpga_part.empty())
|
||||
printInfo("Board default fpga part overridden with " + args.fpga_part);
|
||||
|
|
|
|||
Loading…
Reference in New Issue