* Helper functions for many Winbond Super I/Os of the W836xx range.
*/
/* Enter extended functions */
-static void w836xx_ext_enter(uint16_t port)
+void w836xx_ext_enter(uint16_t port)
{
OUTB(0x87, port);
OUTB(0x87, port);
}
/* Leave extended functions */
-static void w836xx_ext_leave(uint16_t port)
+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)
+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)
+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)
+void wbsio_mask(uint16_t index, uint8_t reg, uint8_t data, uint8_t mask)
{
uint8_t tmp;
* Winbond W83627THF: GPIO 4, bit 4
*
* Suited for:
+ * - MSI K8T Neo2-F
* - MSI K8N-NEO3
*/
static int w83627thf_gpio4_4_raise(uint16_t index, const char *name)
return 0;
}
+static int w83627thf_gpio4_4_raise_2e(const char *name)
+{
+ return w83627thf_gpio4_4_raise(0x2e, name);
+}
+
static int w83627thf_gpio4_4_raise_4e(const char *name)
{
return w83627thf_gpio4_4_raise(0x4e, name);
uint16_t port;
uint8_t val;
- dev = pci_dev_find(0x8086, 0x2440); /* Intel ICH2 LPC */
+ dev = pci_dev_find(0x8086, 0x2440); /* Intel ICH2 LPC */
if (!dev) {
fprintf(stderr, "\nERROR: ICH2 LPC bridge not found.\n");
return -1;
port = (pci_read_word(dev, 0x58) & 0xFFC0) + 0xE;
val = INB(port);
- val |= 0x80; /* Top Block Lock -- pin 8 of PLCC32 */
- val |= 0x40; /* Lower Blocks Lock -- pin 7 of PLCC32 */
+ val |= 0x80; /* Top Block Lock -- pin 8 of PLCC32 */
+ val |= 0x40; /* Lower Blocks Lock -- pin 7 of PLCC32 */
OUTB(val, port);
return 0;
return -1;
}
- if (read(msr_fd, (void*) msr, 8) != 8) {
+ if (read(msr_fd, (void *)msr, 8) != 8) {
perror("read");
close(msr_fd);
return -1;
msr[0] &= ~(DBE6x_PRI_BOOT_LOC | DBE6x_SEC_BOOT_LOC);
msr[0] |= ((boot_loc << DBE6x_PRI_BOOT_LOC_SHIFT) |
- (boot_loc << DBE6x_SEC_BOOT_LOC_SHIFT));
+ (boot_loc << DBE6x_SEC_BOOT_LOC_SHIFT));
if (lseek(msr_fd, DBE6x_MSR_DIVIL_BALL_OPTS, SEEK_SET) == -1) {
perror("lseek");
return -1;
}
- if (write(msr_fd, (void*) msr, 8) != 8) {
+ if (write(msr_fd, (void *)msr, 8) != 8) {
perror("write");
close(msr_fd);
return -1;
uint16_t gpiobar;
uint32_t reg32;
- dev = pci_dev_find(ich_vendor, ich_device); /* Intel ICHx LPC */
+ dev = pci_dev_find(ich_vendor, ich_device); /* Intel ICHx LPC */
if (!dev) {
fprintf(stderr, "\nERROR: ICHx LPC dev %4x:%4x not found.\n",
ich_vendor, ich_device);
return ich_gpio_raise(name, 0x8086, 0x2440, 0x58, 0x0c, 0xffc0, 22);
}
+/**
+ * Suited for MSI MS-7046.
+ */
+static int ich6_gpio19_raise(const char *name)
+{
+ return ich_gpio_raise(name, 0x8086, 0x2640, 0x48, 0x0c, 0xffc0, 19);
+}
+
static int board_kontron_986lcd_m(const char *name)
{
struct pci_dev *dev;
#define ICH7_GPIO_LVL2 0x38
- dev = pci_dev_find(0x8086, 0x27b8); /* Intel ICH7 LPC */
+ dev = pci_dev_find(0x8086, 0x27b8); /* Intel ICH7 LPC */
if (!dev) {
// This will never happen on this board
fprintf(stderr, "\nERROR: ICH7 LPC bridge not found.\n");
return 0;
}
+/**
+ * Winbond W83697HF Super I/O + VIA VT8235 southbridge
+ *
+ * Suited for:
+ * - MSI KT4V and KT4V-L: AMD K7 + VIA KT400 + VT8235
+ * - MSI KT3 Ultra2: AMD K7 + VIA KT333 + VT8235
+ */
+static int board_msi_kt4v(const char *name)
+{
+ struct pci_dev *dev;
+ uint8_t val;
+ uint32_t val2;
+ uint16_t port;
+
+ dev = pci_dev_find(0x1106, 0x3177); /* VT8235 ISA bridge */
+ if (!dev) {
+ fprintf(stderr, "\nERROR: VT823x ISA bridge not found.\n");
+ return -1;
+ }
+
+ val = pci_read_byte(dev, 0x59);
+ val &= 0x0c;
+ pci_write_byte(dev, 0x59, val);
+
+ /* We need the I/O Base Address for this board's flash enable. */
+ port = pci_read_word(dev, 0x88) & 0xff80;
+
+ /* Starting at 'I/O Base + 0x4c' is the GPO Port Output Value.
+ * We must assert GPO12 for our enable, which is in 0x4d.
+ */
+ val2 = INB(port + 0x4d);
+ val2 |= 0x10;
+ OUTB(val2, port + 0x4d);
+
+ /* Raise ROM MEMW# line on Winbond W83697 Super I/O. */
+ w836xx_ext_enter(0x2e);
+ if (!(wbsio_read(0x2e, 0x24) & 0x02)) { /* Flash ROM enabled? */
+ /* Enable MEMW# and set ROM size select to max. (4M). */
+ wbsio_mask(0x2e, 0x24, 0x28, 0x28);
+ }
+ w836xx_ext_leave(0x2e);
+
+ return 0;
+}
+
/**
* 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
};
struct board_pciid_enable board_pciid_enables[] = {
- {0x8086, 0x1a30, 0x1043, 0x8070, 0x8086, 0x244b, 0x1043, 0x8028,
- NULL, NULL, "ASUS P4B266", ich2_gpio22_raise},
- {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},
- {0x1039, 0x0761, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
- "gigabyte", "2761gxdk", "GIGABYTE GA-2761GXDK", 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},
- {0x1106, 0x3227, 0x1106, 0xAA01, 0x1106, 0x0259, 0x1106, 0xAA01,
- NULL, NULL, "VIA EPIA SP", board_via_epia_sp},
- {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},
- {0x1022, 0x2090, 0x0000, 0x0000, 0x1022, 0x2080, 0x0000, 0x0000,
- "artecgroup", "dbe61", "Artec Group DBE61", board_artecgroup_dbe6x},
- {0x1022, 0x2090, 0x0000, 0x0000, 0x1022, 0x2080, 0x0000, 0x0000,
- "artecgroup", "dbe62", "Artec Group DBE62", board_artecgroup_dbe6x},
- {0x8086, 0x27b8, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
- "kontron", "986lcd-m", "Kontron 986LCD-M", board_kontron_986lcd_m},
- {0x1106, 0x3149, 0x1565, 0x3206, 0x1106, 0x3344, 0x1565, 0x1202,
- NULL, NULL, "BioStar P4M80-M4", board_biostar_p4m80_m4},
- {0x1106, 0x3227, 0x1458, 0x5001, 0x10ec, 0x8139, 0x1458, 0xe000,
- NULL, NULL, "GIGABYTE GA-7VT600", board_biostar_p4m80_m4},
- {0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL} /* Keep this */
+ {
+ .first_vendor = 0x1106,
+ .first_device = 0x0571,
+ .first_card_vendor = 0x1462,
+ .first_card_device = 0x7120,
+ .second_vendor = 0x0000,
+ .second_device = 0x0000,
+ .second_card_vendor = 0x0000,
+ .second_card_device = 0x0000,
+ .lb_vendor = "msi",
+ .lb_part = "kt4v",
+ .name = "MSI KT4V",
+ .enable = board_msi_kt4v,
+ },
+ {
+ .first_vendor = 0x8086,
+ .first_device = 0x1a30,
+ .first_card_vendor = 0x1043,
+ .first_card_device = 0x8070,
+ .second_vendor = 0x8086,
+ .second_device = 0x244b,
+ .second_card_vendor = 0x1043,
+ .second_card_device = 0x8028,
+ .lb_vendor = NULL,
+ .lb_part = NULL,
+ .name = "ASUS P4B266",
+ .enable = ich2_gpio22_raise,
+ },
+ {
+ .first_vendor = 0x10de,
+ .first_device = 0x0360,
+ .first_card_vendor = 0x0000,
+ .first_card_device = 0x0000,
+ .second_vendor = 0x0000,
+ .second_device = 0x0000,
+ .second_card_vendor = 0x0000,
+ .second_card_device = 0x0000,
+ .lb_vendor = "gigabyte",
+ .lb_part = "m57sli",
+ .name = "GIGABYTE GA-M57SLI-S4",
+ .enable = it87xx_probe_spi_flash,
+ },
+ {
+ .first_vendor = 0x10de,
+ .first_device = 0x03e0,
+ .first_card_vendor = 0x0000,
+ .first_card_device = 0x0000,
+ .second_vendor = 0x0000,
+ .second_device = 0x0000,
+ .second_card_vendor = 0x0000,
+ .second_card_device = 0x0000,
+ .lb_vendor = "gigabyte",
+ .lb_part = "m61p",
+ .name = "GIGABYTE GA-M61P-S3",
+ .enable = it87xx_probe_spi_flash,
+ },
+ {
+ .first_vendor = 0x1002,
+ .first_device = 0x4398,
+ .first_card_vendor = 0x1458,
+ .first_card_device = 0x5004,
+ .second_vendor = 0x1002,
+ .second_device = 0x4385,
+ .second_card_vendor = 0x1458,
+ .second_card_device = 0x4385,
+ .lb_vendor = NULL,
+ .lb_part = NULL,
+ .name = "GIGABYTE GA-MA78G-DS3H",
+ .enable = it87xx_probe_spi_flash,
+ },
+ {
+ .first_vendor = 0x1039,
+ .first_device = 0x0761,
+ .first_card_vendor = 0x0000,
+ .first_card_device = 0x0000,
+ .second_vendor = 0x0000,
+ .second_device = 0x0000,
+ .second_card_vendor = 0x0000,
+ .second_card_device = 0x0000,
+ .lb_vendor = "gigabyte",
+ .lb_part = "2761gxdk",
+ .name = "GIGABYTE GA-2761GXDK",
+ .enable = it87xx_probe_spi_flash,
+ },
+ {
+ .first_vendor = 0x1022,
+ .first_device = 0x7468,
+ .first_card_vendor = 0x0000,
+ .first_card_device = 0x0000,
+ .second_vendor = 0x0000,
+ .second_device = 0x0000,
+ .second_card_vendor = 0x0000,
+ .second_card_device = 0x0000,
+ .lb_vendor = "iwill",
+ .lb_part = "dk8_htx",
+ .name = "IWILL DK8-HTX",
+ .enable = w83627hf_gpio24_raise_2e,
+ },
+ {
+ .first_vendor = 0x10de,
+ .first_device = 0x005e,
+ .first_card_vendor = 0x0000,
+ .first_card_device = 0x0000,
+ .second_vendor = 0x0000,
+ .second_device = 0x0000,
+ .second_card_vendor = 0x0000,
+ .second_card_device = 0x0000,
+ .lb_vendor = "msi",
+ .lb_part = "k8n-neo3",
+ .name = "MSI K8N Neo3",
+ .enable = w83627thf_gpio4_4_raise_4e,
+ },
+ {
+ .first_vendor = 0x1022,
+ .first_device = 0x746B,
+ .first_card_vendor = 0x1022,
+ .first_card_device = 0x36C0,
+ .second_vendor = 0x0000,
+ .second_device = 0x0000,
+ .second_card_vendor = 0x0000,
+ .second_card_device = 0x0000,
+ .lb_vendor = "AGAMI",
+ .lb_part = "ARUMA",
+ .name = "agami Aruma",
+ .enable = w83627hf_gpio24_raise_2e,
+ },
+ {
+ .first_vendor = 0x1106,
+ .first_device = 0x3177,
+ .first_card_vendor = 0x1106,
+ .first_card_device = 0xAA01,
+ .second_vendor = 0x1106,
+ .second_device = 0x3123,
+ .second_card_vendor = 0x1106,
+ .second_card_device = 0xAA01,
+ .lb_vendor = NULL,
+ .lb_part = NULL,
+ .name = "VIA EPIA M/MII/...",
+ .enable = board_via_epia_m,
+ },
+ {
+ .first_vendor = 0x1106,
+ .first_device = 0x3177,
+ .first_card_vendor = 0x1043,
+ .first_card_device = 0x80A1,
+ .second_vendor = 0x1106,
+ .second_device = 0x3205,
+ .second_card_vendor = 0x1043,
+ .second_card_device = 0x8118,
+ .lb_vendor = NULL,
+ .lb_part = NULL,
+ .name = "ASUS A7V8-MX SE",
+ .enable = board_asus_a7v8x_mx,
+ },
+ {
+ .first_vendor = 0x1106,
+ .first_device = 0x3227,
+ .first_card_vendor = 0x1106,
+ .first_card_device = 0xAA01,
+ .second_vendor = 0x1106,
+ .second_device = 0x0259,
+ .second_card_vendor = 0x1106,
+ .second_card_device = 0xAA01,
+ .lb_vendor = NULL,
+ .lb_part = NULL,
+ .name = "VIA EPIA SP",
+ .enable = board_via_epia_sp,
+ },
+ {
+ .first_vendor = 0x1106,
+ .first_device = 0x0314,
+ .first_card_vendor = 0x1106,
+ .first_card_device = 0xaa08,
+ .second_vendor = 0x1106,
+ .second_device = 0x3227,
+ .second_card_vendor = 0x1106,
+ .second_card_device = 0xAA08,
+ .lb_vendor = NULL,
+ .lb_part = NULL,
+ .name = "VIA EPIA-CN",
+ .enable = board_via_epia_sp,
+ },
+ {
+ .first_vendor = 0x8086,
+ .first_device = 0x1076,
+ .first_card_vendor = 0x8086,
+ .first_card_device = 0x1176,
+ .second_vendor = 0x1106,
+ .second_device = 0x3059,
+ .second_card_vendor = 0x10f1,
+ .second_card_device = 0x2498,
+ .lb_vendor = NULL,
+ .lb_part = NULL,
+ .name = "Tyan Tomcat K7M",
+ .enable = board_asus_a7v8x_mx,
+ },
+ {
+ .first_vendor = 0x10B9,
+ .first_device = 0x1541,
+ .first_card_vendor = 0x0000,
+ .first_card_device = 0x0000,
+ .second_vendor = 0x10B9,
+ .second_device = 0x1533,
+ .second_card_vendor = 0x0000,
+ .second_card_device = 0x0000,
+ .lb_vendor = "asus",
+ .lb_part = "p5a",
+ .name = "ASUS P5A",
+ .enable = board_asus_p5a,
+ },
+ {
+ .first_vendor = 0x1166,
+ .first_device = 0x0205,
+ .first_card_vendor = 0x1014,
+ .first_card_device = 0x0347,
+ .second_vendor = 0x0000,
+ .second_device = 0x0000,
+ .second_card_vendor = 0x0000,
+ .second_card_device = 0x0000,
+ .lb_vendor = "ibm",
+ .lb_part = "x3455",
+ .name = "IBM x3455",
+ .enable = board_ibm_x3455,
+ },
+ {
+ .first_vendor = 0x8086,
+ .first_device = 0x7110,
+ .first_card_vendor = 0x0000,
+ .first_card_device = 0x0000,
+ .second_vendor = 0x8086,
+ .second_device = 0x7190,
+ .second_card_vendor = 0x0000,
+ .second_card_device = 0x0000,
+ .lb_vendor = "epox",
+ .lb_part = "ep-bx3",
+ .name = "EPoX EP-BX3",
+ .enable = board_epox_ep_bx3,
+ },
+ {
+ .first_vendor = 0x8086,
+ .first_device = 0x1130,
+ .first_card_vendor = 0x0000,
+ .first_card_device = 0x0000,
+ .second_vendor = 0x105a,
+ .second_device = 0x0d30,
+ .second_card_vendor = 0x105a,
+ .second_card_device = 0x4d33,
+ .lb_vendor = "acorp",
+ .lb_part = "6a815epd",
+ .name = "Acorp 6A815EPD",
+ .enable = board_acorp_6a815epd,
+ },
+ {
+ .first_vendor = 0x1022,
+ .first_device = 0x2090,
+ .first_card_vendor = 0x0000,
+ .first_card_device = 0x0000,
+ .second_vendor = 0x1022,
+ .second_device = 0x2080,
+ .second_card_vendor = 0x0000,
+ .second_card_device = 0x0000,
+ .lb_vendor = "artecgroup",
+ .lb_part = "dbe61",
+ .name = "Artec Group DBE61",
+ .enable = board_artecgroup_dbe6x,
+ },
+ {
+ .first_vendor = 0x1022,
+ .first_device = 0x2090,
+ .first_card_vendor = 0x0000,
+ .first_card_device = 0x0000,
+ .second_vendor = 0x1022,
+ .second_device = 0x2080,
+ .second_card_vendor = 0x0000,
+ .second_card_device = 0x0000,
+ .lb_vendor = "artecgroup",
+ .lb_part = "dbe62",
+ .name = "Artec Group DBE62",
+ .enable = board_artecgroup_dbe6x,
+ },
+ /* Note: There are >= 2 version of the Kontron 986LCD-M/mITX! */
+ {
+ .first_vendor = 0x8086,
+ .first_device = 0x27b8,
+ .first_card_vendor = 0x0000,
+ .first_card_device = 0x0000,
+ .second_vendor = 0x0000,
+ .second_device = 0x0000,
+ .second_card_vendor = 0x0000,
+ .second_card_device = 0x0000,
+ .lb_vendor = "kontron",
+ .lb_part = "986lcd-m",
+ .name = "Kontron 986LCD-M",
+ .enable = board_kontron_986lcd_m,
+ },
+ {
+ .first_vendor = 0x10ec,
+ .first_device = 0x8168,
+ .first_card_vendor = 0x10ec,
+ .first_card_device = 0x8168,
+ .second_vendor = 0x104c,
+ .second_device = 0x8023,
+ .second_card_vendor = 0x104c,
+ .second_card_device = 0x8019,
+ .lb_vendor = "kontron",
+ .lb_part = "986lcd-m",
+ .name = "Kontron 986LCD-M",
+ .enable = board_kontron_986lcd_m,
+ },
+ {
+ .first_vendor = 0x1106,
+ .first_device = 0x3149,
+ .first_card_vendor = 0x1565,
+ .first_card_device = 0x3206,
+ .second_vendor = 0x1106,
+ .second_device = 0x3344,
+ .second_card_vendor = 0x1565,
+ .second_card_device = 0x1202,
+ .lb_vendor = NULL,
+ .lb_part = NULL,
+ .name = "BioStar P4M80-M4",
+ .enable = board_biostar_p4m80_m4,
+ },
+ {
+ .first_vendor = 0x1106,
+ .first_device = 0x3227,
+ .first_card_vendor = 0x1458,
+ .first_card_device = 0x5001,
+ .second_vendor = 0x10ec,
+ .second_device = 0x8139,
+ .second_card_vendor = 0x1458,
+ .second_card_device = 0xe000,
+ .lb_vendor = NULL,
+ .lb_part = NULL,
+ .name = "GIGABYTE GA-7VT600",
+ .enable = board_biostar_p4m80_m4,
+ },
+ {
+ .first_vendor = 0x1106,
+ .first_device = 0x3149,
+ .first_card_vendor = 0x1462,
+ .first_card_device = 0x7094,
+ .second_vendor = 0x10ec,
+ .second_device = 0x8167,
+ .second_card_vendor = 0x1462,
+ .second_card_device = 0x094c,
+ .lb_vendor = NULL,
+ .lb_part = NULL,
+ .name = "MSI K8T Neo2",
+ .enable = w83627thf_gpio4_4_raise_2e,
+ },
+ {
+ .first_vendor = 0x1039,
+ .first_device = 0x5513,
+ .first_card_vendor = 0x8086,
+ .first_card_device = 0xd61f,
+ .second_vendor = 0x1039,
+ .second_device = 0x6330,
+ .second_card_vendor = 0x8086,
+ .second_card_device = 0xd61f,
+ .lb_vendor = NULL,
+ .lb_part = NULL,
+ .name = "Intel Desktop Board D201GLY",
+ .enable = wbsio_check_for_spi,
+ },
+ {
+ .first_vendor = 0x8086,
+ .first_device = 0x2658,
+ .first_card_vendor = 0x1462,
+ .first_card_device = 0x7046,
+ .second_vendor = 0x1106,
+ .second_device = 0x3044,
+ .second_card_vendor = 0x1462,
+ .second_card_device = 0x046d,
+ .lb_vendor = NULL,
+ .lb_part = NULL,
+ .name = "MSI MS-7046",
+ .enable = ich6_gpio19_raise,
+ },
+ {
+ .first_vendor = 0,
+ .first_device = 0,
+ .first_card_vendor = 0,
+ .first_card_device = 0,
+ .second_vendor = 0,
+ .second_device = 0,
+ .second_card_vendor = 0,
+ .second_card_device = 0,
+ .lb_vendor = NULL,
+ .lb_part = NULL,
+ } /* Keep this */
};
void print_supported_boards(void)
* Match boards on coreboot table gathered vendor and part name.
* Require main PCI IDs to match too as extra safety.
*/
-static struct board_pciid_enable *board_match_coreboot_name(const char *vendor, const char *part)
+static struct board_pciid_enable *board_match_coreboot_name(const char *vendor,
+ const char *part)
{
struct board_pciid_enable *board = board_pciid_enables;
struct board_pciid_enable *partmatch = NULL;
for (; board->name; board++) {
- if (vendor && (!board->lb_vendor || strcmp(board->lb_vendor, vendor)))
+ if (vendor && (!board->lb_vendor
+ || strcasecmp(board->lb_vendor, vendor)))
continue;
- if (!board->lb_part || strcmp(board->lb_part, part))
+ if (!board->lb_part || strcasecmp(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))
+ !pci_dev_find(board->second_vendor, board->second_device))
continue;
if (vendor)
/* a second entry has a matching part name */
printf("AMBIGUOUS BOARD NAME: %s\n", part);
printf("At least vendors '%s' and '%s' match.\n",
- partmatch->lb_vendor, board->lb_vendor);
+ partmatch->lb_vendor, board->lb_vendor);
printf("Please use the full -m vendor:part syntax.\n");
return NULL;
}
if (partmatch)
return partmatch;
- printf("NOT FOUND %s:%s\n", vendor, part);
-
+ printf("\nUnknown vendor:board from coreboot table or -m option: %s:%s\n\n", vendor, part);
return NULL;
}
continue;
if (!pci_card_find(board->first_vendor, board->first_device,
- board->first_card_vendor,
- board->first_card_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))
+ board->second_device,
+ board->second_card_vendor,
+ board->second_card_device))
continue;
} else {
if (!pci_dev_find(board->second_vendor,
- board->second_device))
+ board->second_device))
continue;
}
}
if (board) {
printf("Found board \"%s\", enabling flash write... ",
- board->name);
+ board->name);
ret = board->enable(board->name);
if (ret)
projects / coreboot.git / blobdiff