Add detection and dump support for NSC PC87309.
[coreboot.git] / util / flashrom / board_enable.c
index ac8de9f40e3c2d31c0401a8339d1d6727167acbe..2610a53532d890e990e3cbe7187abab968e83e6f 100644 (file)
@@ -1,14 +1,23 @@
 /*
- *   flash rom utility: enable flash writes (board specific)
+ * This file is part of the flashrom project.
  *
- *   Copyright (C) 2005-2007 coresystems GmbH <stepan@coresystems.de>
- *   Copyright (C) 2006 Uwe Hermann <uwe@hermann-uwe.de>
- *   Copyright (C) 2007 Luc Verhaegen <libv@skynet.be>
+ * Copyright (C) 2005-2007 coresystems GmbH <stepan@coresystems.de>
+ * Copyright (C) 2006 Uwe Hermann <uwe@hermann-uwe.de>
+ * Copyright (C) 2007 Luc Verhaegen <libv@skynet.be>
+ * Copyright (C) 2007 Carl-Daniel Hailfinger
  *
- *   This program is free software; you can redistribute it and/or
- *   modify it under the terms of the GNU General Public License
- *   version 2
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
  *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 /*
 #include <pci/pci.h>
 #include <stdint.h>
 #include <string.h>
-
 #include "flash.h"
-#include "debug.h"
 
 /*
- * Match on pci-ids, no report received, just data from the mainboard
- * specific code:
- *   main: 0x1022:0x746B, which is the SMBUS controller.
- *   card: 0x1022:0x36C0...
+ * Helper functions for many Winbond Super I/Os of the W836xx range.
  */
+/* Enter extended functions */
+static void w836xx_ext_enter(uint16_t port)
+{
+       outb(0x87, port);
+       outb(0x87, port);
+}
+
+/* Leave extended functions */
+static void w836xx_ext_leave(uint16_t port)
+{
+       outb(0xAA, port);
+}
+
+/* General functions for reading/writing Winbond Super I/Os. */
+static unsigned char wbsio_read(uint16_t index, uint8_t reg)
+{
+       outb(reg, index);
+       return inb(index + 1);
+}
+
+static void wbsio_write(uint16_t index, uint8_t reg, uint8_t data)
+{
+       outb(reg, index);
+       outb(data, index + 1);
+}
+
+static void wbsio_mask(uint16_t index, uint8_t reg, uint8_t data, uint8_t mask)
+{
+       uint8_t tmp;
 
-static int board_agami_aruma(char *name)
+       outb(reg, index);
+       tmp = inb(index + 1) & ~mask;
+       outb(tmp | (data & mask), index + 1);
+}
+
+/**
+ * Winbond W83627HF: Raise GPIO24.
+ *
+ * Suited for:
+ *  - Agami Aruma
+ *  - IWILL DK8-HTX
+ */
+static int w83627hf_gpio24_raise(uint16_t index, const char *name)
 {
-       /* Extended function index register, either 0x2e or 0x4e    */
-#define EFIR 0x2e
-       /* Extended function data register, one plus the index reg. */
-#define EFDR EFIR + 1
-       char b;
-
-        /*  Disable the flash write protect.  The flash write protect is
-         *  connected to the WinBond w83627hf GPIO 24.
-         */
-       outb(0x87, EFIR); /* sequence to unlock extended functions */
-       outb(0x87, EFIR);
-
-       outb(0x20, EFIR); /* SIO device ID register */
-       b = inb(EFDR);
-       printf_debug("\nW83627HF device ID = 0x%x\n",b);
-
-       if (b != 0x52) {
-               fprintf(stderr, "\nIncorrect device ID, aborting write protect disable\n");
+       w836xx_ext_enter(index);
+
+       /* Is this the W83627HF? */
+       if (wbsio_read(index, 0x20) != 0x52) {  /* Super I/O device ID reg. */
+               fprintf(stderr, "\nERROR: %s: W83627HF: Wrong ID: 0x%02X.\n",
+                       name, wbsio_read(index, 0x20));
+               w836xx_ext_leave(index);
                return -1;
        }
 
-       outb(0x2b, EFIR); /* GPIO multiplexed pin reg. */
-       b = inb(EFDR) | 0x10;
-       outb(0x2b, EFIR);
-       outb(b, EFDR); /* select GPIO 24 instead of WDTO */
+       /* PIN89S: WDTO/GP24 multiplex -> GPIO24 */
+       wbsio_mask(index, 0x2B, 0x10, 0x10);
 
-       outb(0x7, EFIR); /* logical device select */
-        outb(0x8, EFDR); /* point to device 8, GPIO port 2 */
+       /* Select logical device 8: GPIO port 2 */
+       wbsio_write(index, 0x07, 0x08);
 
-       outb(0x30, EFIR); /* logic device activation control */
-       outb(0x1, EFDR); /* activate */
+       wbsio_mask(index, 0x30, 0x01, 0x01);    /* Activate logical device. */
+       wbsio_mask(index, 0xF0, 0x00, 0x10);    /* GPIO24 -> output */
+       wbsio_mask(index, 0xF2, 0x00, 0x10);    /* Clear GPIO24 inversion */
+       wbsio_mask(index, 0xF1, 0x10, 0x10);    /* Raise GPIO24 */
 
-       outb(0xf0, EFIR); /* GPIO 20-27 I/O selection register */
-       b = inb(EFDR) & ~0x10;
-       outb(0xf0, EFIR);
-       outb(b, EFDR); /* set GPIO 24 as an output */
+       w836xx_ext_leave(index);
 
-       outb(0xf1, EFIR); /* GPIO 20-27 data register */
-       b = inb(EFDR) | 0x10;
-       outb(0xf1, EFIR);
-       outb(b, EFDR); /* set GPIO 24 */
+       return 0;
+}
 
-       outb(0xaa, EFIR); /* command to exit extended functions */
+static int w83627hf_gpio24_raise_2e(const char *name)
+{
+       /* TODO: Typo? Shouldn't this be 0x2e? */
+       return w83627hf_gpio24_raise(0x2d, name);
+}
+
+/**
+ * Winbond W83627THF: GPIO 4, bit 4
+ *
+ * Suited for:
+ *  - MSI K8N-NEO3
+ */
+static int w83627thf_gpio4_4_raise(uint16_t index, const char *name)
+{
+       w836xx_ext_enter(index);
+
+       /* Is this the W83627THF? */
+       if (wbsio_read(index, 0x20) != 0x82) {  /* Super I/O device ID reg. */
+               fprintf(stderr, "\nERROR: %s: W83627THF: Wrong ID: 0x%02X.\n",
+                       name, wbsio_read(index, 0x20));
+               w836xx_ext_leave(index);
+               return -1;
+       }
+
+       /* PINxxxxS: GPIO4/bit 4 multiplex -> GPIOXXX */
+
+       wbsio_write(index, 0x07, 0x09);      /* Select LDN 9: GPIO port 4 */
+       wbsio_mask(index, 0x30, 0x02, 0x02); /* Activate logical device. */
+       wbsio_mask(index, 0xF4, 0x00, 0x10); /* GPIO4 bit 4 -> output */
+       wbsio_mask(index, 0xF6, 0x00, 0x10); /* Clear GPIO4 bit 4 inversion */
+       wbsio_mask(index, 0xF5, 0x10, 0x10); /* Raise GPIO4 bit 4 */
+
+       w836xx_ext_leave(index);
 
        return 0;
 }
 
-/*
+static int w83627thf_gpio4_4_raise_4e(const char *name)
+{
+       return w83627thf_gpio4_4_raise(0x4e, name);
+}
+
+/**
  * Suited for VIAs EPIA M and MII, and maybe other CLE266 based EPIAs.
  *
- * We don't need to do this when using linuxbios, GPIO15 is never lowered there.
+ * We don't need to do this when using LinuxBIOS, GPIO15 is never lowered there.
  */
+static int board_via_epia_m(const char *name)
+{
+       struct pci_dev *dev;
+       uint16_t base;
+       uint8_t val;
+
+       dev = pci_dev_find(0x1106, 0x3177);     /* VT8235 ISA bridge */
+       if (!dev) {
+               fprintf(stderr, "\nERROR: VT8235 ISA bridge not found.\n");
+               return -1;
+       }
+
+       /* GPIO12-15 -> output */
+       val = pci_read_byte(dev, 0xE4);
+       val |= 0x10;
+       pci_write_byte(dev, 0xE4, val);
+
+       /* Get Power Management IO address. */
+       base = pci_read_word(dev, 0x88) & 0xFF80;
+
+       /* Enable GPIO15 which is connected to write protect. */
+       val = inb(base + 0x4D);
+       val |= 0x80;
+       outb(val, base + 0x4D);
 
-static int board_via_epia_m(char *name)
+       return 0;
+}
+
+/**
+ * Suited for:
+ *   - ASUS A7V8X-MX SE and A7V400-MX: AMD K7 + VIA KM400A + VT8235
+ *   - Tyan Tomcat K7M: AMD Geode NX + VIA KM400 + VT8237.
+ */
+static int board_asus_a7v8x_mx(const char *name)
 {
-        struct pci_dev *dev;
-        unsigned int base;
-        uint8_t val;
-
-        dev = pci_dev_find(0x1106, 0x3177); /* VT8235 ISA bridge */
-        if (!dev) {
-                fprintf(stderr, "\nERROR: VT8235 ISA Bridge not found.\n");
-                return -1;
-        }
-
-        /* GPIO12-15 -> output */
-        val = pci_read_byte(dev, 0xE4);
-        val |= 0x10;
-        pci_write_byte(dev, 0xE4, val);
-
-        /* Get Power Management IO address. */
-        base = pci_read_word(dev, 0x88) & 0xFF80;
-
-        /* enable GPIO15 which is connected to write protect. */
-        val = inb(base + 0x4D);
-        val |= 0x80;
-        outb(val, base + 0x4D);
-
-        return 0;
+       struct pci_dev *dev;
+       uint8_t val;
+
+       dev = pci_dev_find(0x1106, 0x3177);     /* VT8235 ISA bridge */
+       if (!dev)
+               dev = pci_dev_find(0x1106, 0x3227);     /* VT8237 ISA bridge */
+       if (!dev) {
+               fprintf(stderr, "\nERROR: VT823x ISA bridge not found.\n");
+               return -1;
+       }
+
+       /* This bit is marked reserved actually. */
+       val = pci_read_byte(dev, 0x59);
+       val &= 0x7F;
+       pci_write_byte(dev, 0x59, val);
+
+       /* Raise ROM MEMW# line on Winbond W83697 Super I/O. */
+       w836xx_ext_enter(0x2E);
+
+       if (!(wbsio_read(0x2E, 0x24) & 0x02))   /* Flash ROM enabled? */
+               wbsio_mask(0x2E, 0x24, 0x08, 0x08);     /* Enable MEMW#. */
+
+       w836xx_ext_leave(0x2E);
+
+       return 0;
 }
 
-/*
- * Winbond LPC super IO.
+/**
+ * Suited for ASUS P5A.
  *
- * Raises the ROM MEMW# line.
+ * This is rather nasty code, but there's no way to do this cleanly.
+ * We're basically talking to some unknown device on SMBus, my guess
+ * is that it is the Winbond W83781D that lives near the DIP BIOS.
  */
-
-static void w83697_rom_memw_enable(void)
+static int board_asus_p5a(const char *name)
 {
-        uint8_t val;
+       uint8_t tmp;
+       int i;
 
-        outb(0x87, 0x2E); /* enable extended functions */
-        outb(0x87, 0x2E);
+#define ASUSP5A_LOOP 5000
 
-        outb(0x24, 0x2E); /* rom bits live here */
+       outb(0x00, 0xE807);
+       outb(0xEF, 0xE803);
 
-        val = inb(0x2F);
-        if (!(val & 0x02)) /* flash rom enabled? */
-                outb(val | 0x08, 0x2F); /* enable MEMW# */
+       outb(0xFF, 0xE800);
 
-        outb(0xAA, 0x2E); /* disable extended functions */
+       for (i = 0; i < ASUSP5A_LOOP; i++) {
+               outb(0xE1, 0xFF);
+               if (inb(0xE800) & 0x04)
+                       break;
+       }
+
+       if (i == ASUSP5A_LOOP) {
+               printf("%s: Unable to contact device.\n", name);
+               return -1;
+       }
+
+       outb(0x20, 0xE801);
+       outb(0x20, 0xE1);
+
+       outb(0xFF, 0xE802);
+
+       for (i = 0; i < ASUSP5A_LOOP; i++) {
+               tmp = inb(0xE800);
+               if (tmp & 0x70)
+                       break;
+       }
+
+       if ((i == ASUSP5A_LOOP) || !(tmp & 0x10)) {
+               printf("%s: failed to read device.\n", name);
+               return -1;
+       }
+
+       tmp = inb(0xE804);
+       tmp &= ~0x02;
+
+       outb(0x00, 0xE807);
+       outb(0xEE, 0xE803);
+
+       outb(tmp, 0xE804);
+
+       outb(0xFF, 0xE800);
+       outb(0xE1, 0xFF);
+
+       outb(0x20, 0xE801);
+       outb(0x20, 0xE1);
+
+       outb(0xFF, 0xE802);
+
+       for (i = 0; i < ASUSP5A_LOOP; i++) {
+               tmp = inb(0xE800);
+               if (tmp & 0x70)
+                       break;
+       }
+
+       if ((i == ASUSP5A_LOOP) || !(tmp & 0x10)) {
+               printf("%s: failed to write to device.\n", name);
+               return -1;
+       }
+
+       return 0;
 }
 
-/*
- * Suited for Asus A7V8X-MX SE and A7V400-MX.
- *
+static int board_ibm_x3455(const char *name)
+{
+       uint8_t byte;
+
+       /* Set GPIO lines in the Broadcom HT-1000 southbridge. */
+       outb(0x45, 0xcd6);
+       byte = inb(0xcd7);
+       outb(byte | 0x20, 0xcd7);
+
+       return 0;
+}
+
+/**
+ * Suited for EPoX EP-BX3, and maybe some other Intel 440BX based boards.
  */
+static int board_epox_ep_bx3(const char *name)
+{
+       uint8_t tmp;
+
+       /* Raise GPIO22. */
+       tmp = inb(0x4036);
+       outb(tmp, 0xEB);
 
-static int board_asus_a7v8x_mx(char *name)
+       tmp |= 0x40;
+
+       outb(tmp, 0x4036);
+       outb(tmp, 0xEB);
+
+       return 0;
+}
+
+/**
+ * Suited for Acorp 6A815EPD.
+ */
+static int board_acorp_6a815epd(const char *name)
 {
-        struct pci_dev *dev;
-        uint8_t val;
+       struct pci_dev *dev;
+       uint16_t port;
+       uint8_t val;
 
-        dev = pci_dev_find(0x1106, 0x3177); /* VT8235 ISA bridge */
-        if (!dev) {
-                fprintf(stderr, "\nERROR: VT8235 ISA Bridge not found.\n");
-                return -1;
-        }
+       dev = pci_dev_find(0x8086, 0x2440);     /* Intel ICH2 LPC */
+       if (!dev) {
+               fprintf(stderr, "\nERROR: ICH2 LPC bridge not found.\n");
+               return -1;
+       }
 
-        /* This bit is marked reserved actually */
-        val = pci_read_byte(dev, 0x59);
-        val &= 0x7F;
-        pci_write_byte(dev, 0x59, val);
+       /* Use GPIOBASE register to find where the GPIO is mapped. */
+       port = (pci_read_word(dev, 0x58) & 0xFFC0) + 0xE;
 
-        w83697_rom_memw_enable();
+       val = inb(port);
+       val |= 0x80; /* Top Block Lock -- pin 8 of PLCC32 */
+       val |= 0x40; /* Lower Blocks Lock -- pin 7 of PLCC32 */
+       outb(val, port);
 
-        return 0;
+       return 0;
 }
 
-/*
- * We use 2 sets of ids here, you're free to choose which is which. This
- * to provide a very high degree of certainty when matching a board on
- * the basis of Subsystem/card ids. As not every vendor handles
- * subsystem/card ids in a sane manner.
- *
- * Keep the second set nulled if it should be ignored.
+/**
+ * We use 2 sets of IDs here, you're free to choose which is which. This
+ * is to provide a very high degree of certainty when matching a board on
+ * the basis of subsystem/card IDs. As not every vendor handles
+ * subsystem/card IDs in a sane manner.
  *
+ * Keep the second set NULLed if it should be ignored.
  */
-
 struct board_pciid_enable {
-        /* Any device, but make it sensible, like the isa bridge. */
-        uint16_t  first_vendor;
-        uint16_t  first_device;
-        uint16_t  first_card_vendor;
-        uint16_t  first_card_device;
-
-        /* Any device, but make it sensible, like 
-        * the host bridge. May be NULL
+       /* Any device, but make it sensible, like the ISA bridge. */
+       uint16_t first_vendor;
+       uint16_t first_device;
+       uint16_t first_card_vendor;
+       uint16_t first_card_device;
+
+       /* Any device, but make it sensible, like 
+        * the host bridge. May be NULL.
         */
-        uint16_t  second_vendor;
-        uint16_t  second_device;
-        uint16_t  second_card_vendor;
-        uint16_t  second_card_device;
+       uint16_t second_vendor;
+       uint16_t second_device;
+       uint16_t second_card_vendor;
+       uint16_t second_card_device;
 
-        /* From linuxbios table */
-        char  *lb_vendor;
-        char  *lb_part;
+       /* The vendor / part name from the LinuxBIOS table. */
+       const char *lb_vendor;
+       const char *lb_part;
 
-        char  *name;
-        int  (*enable)(char *name);
+       const char *name;
+       int (*enable) (const char *name);
 };
 
 struct board_pciid_enable board_pciid_enables[] = {
-        { 0x1022, 0x746B, 0x1022, 0x36C0,  0x0000, 0x0000, 0x0000, 0x0000,
-               "AGAMI", "ARUMA", "Agami Aruma", board_agami_aruma },
-        { 0x1106, 0x3177, 0x1106, 0xAA01,  0x1106, 0x3123, 0x1106, 0xAA01, 
-               NULL, NULL, "VIA EPIA M/MII/...", board_via_epia_m },
-        { 0x1106, 0x3177, 0x1043, 0x80A1,  0x1106, 0x3205, 0x1043, 0x8118, 
-               NULL, NULL, "Asus A7V8-MX SE", board_asus_a7v8x_mx },
-        { 0, 0, 0, 0,  0, 0, 0, 0, NULL, NULL } /* Keep this */
-
+       {0x10de, 0x0360, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+        "gigabyte", "m57sli", "GIGABYTE GA-M57SLI-S4", it87xx_probe_spi_flash},
+       {0x10de, 0x03e0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+        "gigabyte", "m61p", "GIGABYTE GA-M61P-S3", it87xx_probe_spi_flash},
+       {0x1022, 0x7468, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+        "iwill", "dk8_htx", "IWILL DK8-HTX", w83627hf_gpio24_raise_2e},
+       {0x10de, 0x005e, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+        "msi", "k8n-neo3", "MSI K8N Neo3", w83627thf_gpio4_4_raise_4e},
+       {0x1022, 0x746B, 0x1022, 0x36C0, 0x0000, 0x0000, 0x0000, 0x0000,
+        "AGAMI", "ARUMA", "agami Aruma", w83627hf_gpio24_raise_2e},
+       {0x1106, 0x3177, 0x1106, 0xAA01, 0x1106, 0x3123, 0x1106, 0xAA01,
+        NULL, NULL, "VIA EPIA M/MII/...", board_via_epia_m},
+       {0x1106, 0x3177, 0x1043, 0x80A1, 0x1106, 0x3205, 0x1043, 0x8118,
+        NULL, NULL, "ASUS A7V8-MX SE", board_asus_a7v8x_mx},
+       {0x8086, 0x1076, 0x8086, 0x1176, 0x1106, 0x3059, 0x10f1, 0x2498,
+        NULL, NULL, "Tyan Tomcat K7M", board_asus_a7v8x_mx},
+       {0x10B9, 0x1541, 0x0000, 0x0000, 0x10B9, 0x1533, 0x0000, 0x0000,
+        "asus", "p5a", "ASUS P5A", board_asus_p5a},
+       {0x1166, 0x0205, 0x1014, 0x0347, 0x0000, 0x0000, 0x0000, 0x0000,
+        "ibm", "x3455", "IBM x3455", board_ibm_x3455},
+       {0x8086, 0x7110, 0x0000, 0x0000, 0x8086, 0x7190, 0x0000, 0x0000,
+        "epox", "ep-bx3", "EPoX EP-BX3", board_epox_ep_bx3},
+       {0x8086, 0x1130, 0x0000, 0x0000, 0x105a, 0x0d30, 0x105a, 0x4d33,
+        "acorp", "6a815epd", "Acorp 6A815EPD", board_acorp_6a815epd},
+       {0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL}    /* Keep this */
 };
 
-/*
- * Match boards on linuxbios table gathered vendor and part name.
- * Require main pci-ids to match too as extra safety.
- *
+/**
+ * Match boards on LinuxBIOS table gathered vendor and part name.
+ * Require main PCI IDs to match too as extra safety.
  */
-static struct board_pciid_enable *
-board_match_linuxbios_name(char *vendor, char *part)
+static struct board_pciid_enable *board_match_linuxbios_name(const char *vendor, const char *part)
 {
-        struct board_pciid_enable *board = board_pciid_enables;
+       struct board_pciid_enable *board = board_pciid_enables;
 
-        for (; board->name; board++) {
-                if (!board->lb_vendor || strcmp(board->lb_vendor, vendor))
-                        continue;
+       for (; board->name; board++) {
+               if (!board->lb_vendor || strcmp(board->lb_vendor, vendor))
+                       continue;
 
-                if (!board->lb_part || strcmp(board->lb_part, part))
-                        continue;
+               if (!board->lb_part || strcmp(board->lb_part, part))
+                       continue;
+
+               if (!pci_dev_find(board->first_vendor, board->first_device))
+                       continue;
+
+               if (board->second_vendor &&
+                       !pci_dev_find(board->second_vendor, board->second_device))
+                       continue;
+               return board;
+       }
 
-                if (!pci_dev_find(board->first_vendor, board->first_device))
-                        continue;
+       printf("NOT FOUND %s:%s\n", vendor, part);
 
-                if (board->second_vendor &&
-                    !pci_dev_find(board->second_vendor, board->second_device))
-                        continue;
-                return board;
-        }
-        return NULL;
+       return NULL;
 }
 
-/*
- * Match boards on pci ids and subsystem ids.
- * Second set of ids can be main only or missing completely.
+/**
+ * Match boards on PCI IDs and subsystem IDs.
+ * Second set of IDs can be main only or missing completely.
  */
 static struct board_pciid_enable *board_match_pci_card_ids(void)
 {
-        struct board_pciid_enable *board = board_pciid_enables;
-
-        for (; board->name; board++) {
-                if (!board->first_card_vendor || !board->first_card_device)
-                        continue;
-
-                if (!pci_card_find(board->first_vendor, board->first_device,
-                                   board->first_card_vendor,
-                                   board->first_card_device))
-                        continue;
-
-                if (board->second_vendor) {
-                        if (board->second_card_vendor) {
-                                if (!pci_card_find(board->second_vendor,
-                                                   board->second_device,
-                                                   board->second_card_vendor,
-                                                   board->second_card_device))
-                                        continue;
-                        } else {
-                                if (!pci_dev_find(board->second_vendor,
-                                                  board->second_device))
-                                        continue;
-                        }
-                }
-
-                return board;
-        }
-
-        return NULL;
+       struct board_pciid_enable *board = board_pciid_enables;
+
+       for (; board->name; board++) {
+               if (!board->first_card_vendor || !board->first_card_device)
+                       continue;
+
+               if (!pci_card_find(board->first_vendor, board->first_device,
+                                       board->first_card_vendor,
+                                       board->first_card_device))
+                       continue;
+
+               if (board->second_vendor) {
+                       if (board->second_card_vendor) {
+                               if (!pci_card_find(board->second_vendor,
+                                               board->second_device,
+                                               board->second_card_vendor,
+                                               board->second_card_device))
+                                       continue;
+                       } else {
+                               if (!pci_dev_find(board->second_vendor,
+                                                       board->second_device))
+                                       continue;
+                       }
+               }
+
+               return board;
+       }
+
+       return NULL;
 }
 
-/*
- *
- */
-int board_flash_enable(char *vendor, char *part)
+int board_flash_enable(const char *vendor, const char *part)
 {
-        struct board_pciid_enable *board = NULL;
-        int ret = 0;
+       struct board_pciid_enable *board = NULL;
+       int ret = 0;
 
-        if (vendor && part)
-                board = board_match_linuxbios_name(vendor, part);
+       if (vendor && part)
+               board = board_match_linuxbios_name(vendor, part);
 
-        if (!board)
-                board = board_match_pci_card_ids();
+       if (!board)
+               board = board_match_pci_card_ids();
 
-        if (board) {
-                printf("Found board \"%s\": Enabling flash write... ",
-                       board->name);
+       if (board) {
+               printf("Found board \"%s\": enabling flash write... ",
+                       board->name);
 
-                ret = board->enable(board->name);
-                if (ret)
-                        printf("Failed!\n");
-                else
-                        printf("OK.\n");
-        }
+               ret = board->enable(board->name);
+               if (ret)
+                       printf("FAILED!\n");
+               else
+                       printf("OK.\n");
+       }
 
-        return ret;
+       return ret;
 }