From 0d1f9ab32fcef16e31678f6cfabce924e55357a0 Mon Sep 17 00:00:00 2001 From: Peter Wallace Date: Wed, 19 Jul 2023 07:09:52 -0700 Subject: [PATCH] Fix recover option for 6I24/6I25 (broken by name munging) --- anyio.c | 1 + mesaflash.c | 4 ++-- pci_boards.c | 10 +++++----- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/anyio.c b/anyio.c index 2549793..65b95c2 100644 --- a/anyio.c +++ b/anyio.c @@ -53,6 +53,7 @@ supported_board_entry_t supported_boards[] = { {"6I24", BOARD_PCI}, {"6I25", BOARD_PCI}, {"5I20", BOARD_PCI}, + {"RECOVER", BOARD_PCI}, {"4I65", BOARD_PCI}, {"4I68", BOARD_PCI}, {"5I21", BOARD_PCI}, diff --git a/mesaflash.c b/mesaflash.c index 0033eff..402a19f 100644 --- a/mesaflash.c +++ b/mesaflash.c @@ -32,7 +32,7 @@ #endif #ifndef VERSION -#define VERSION "3.4.7" +#define VERSION "3.4.8" #endif static int device_flag; @@ -161,7 +161,7 @@ void print_usage() { printf(" --fallback Use the fallback area of the FLASH memory while executing\n"); printf(" commands.\n"); printf(" --recover Access board using PCI bridge GPIO (currently\n"); - printf(" only 6I24/6I25).\n"); + printf(" only 6I24/6I25). Use --recover --device recover --write.\n"); printf(" --xml Format output from 'readhmid' command into XML.\n"); printf(" --dbname# Set daughter board name to for FPGA connector \n"); printf(" Allows readhmid to include daughterboard terminal names,\n"); diff --git a/pci_boards.c b/pci_boards.c index 87bbcb4..38e8686 100644 --- a/pci_boards.c +++ b/pci_boards.c @@ -930,16 +930,16 @@ void pci_boards_scan(board_access_t *access) { board_init_struct(board); if ((dev->vendor_id == VENDORID_XIO2001) && (dev->device_id == DEVICEID_XIO2001)) { board->type = BOARD_PCI; - strcpy(board->llio.board_name, "6I25 (RECOVER)"); + strcpy(board->llio.board_name, "RECOVER"); board->llio.num_ioport_connectors = 2; board->llio.pins_per_connector = 17; - board->llio.ioport_connector_name[0] = "P3"; - board->llio.ioport_connector_name[1] = "P2"; - board->llio.fpga_part_number = "6slx9tqg144"; + board->llio.ioport_connector_name[0] = "Unknown"; + board->llio.ioport_connector_name[1] = "Unknown"; + board->llio.ioport_connector_name[2] = "Unknown"; + board->llio.fpga_part_number = "Unknown"; board->llio.num_leds = 2; board->llio.write_flash = &local_write_flash; board->llio.verify_flash = &local_verify_flash; - board->open = &pci_board_open; board->close = &pci_board_close; board->print_info = &pci_print_info;