On Thu, Apr 08, 2010 at 11:33:08PM +0200, Michael Karcher wrote:
This one should really work now, after fixing both the IDs and the GPIO number. Note to myself: Never ever do a board enable, as trivially as it might look, when in a hurry!
Signed-off-by: Michael Karcher flashrom@mkarcher.dialup.fu-berlin.de
Assuming this is tested by someone or you are sure it works ok:
Acked-by: Uwe Hermann uwe@hermann-uwe.de
- Suited for ABit NF7-S V2.0: NVIDIA CK804.
"Abit" for consistency, please. Though "abit" might actually be the more correct spelling as per vendor website, maybe we should change that.
Also, is the "V2.0" really a different board (PCB) than the "NF7-S"?
Finally, feel free to also add the board URL in the same commit.
Uwe.
V2.0 has been killed from the strings. The V2.0 and V1.0 differences are unknown. It's the same mainboard page, but different BIOS downloads. Both BIOSses have the same board enable, though, so I don't care if this also matches V1.0. If it does not match V1.0 and we encounter that board, we just have to add another line.
Signed-off-by: Michael Karcher flashrom@mkarcher.dialup.fu-berlin.de Acked-by: Tom Brand worntreads@sbcglobal.net
--- board_enable.c | 9 +++++++++ print_wiki.c | 1 + 2 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/board_enable.c b/board_enable.c index 9b05f76..f1f7953 100644 --- a/board_enable.c +++ b/board_enable.c @@ -578,6 +578,14 @@ static int nvidia_mcp_gpio2_raise(const char *name) }
/** + * Suited for Abit NF7-S: NVIDIA CK804. + */ +static int nvidia_mcp_gpio8_raise(const char *name) +{ + return nvidia_mcp_gpio_set(0x08, 1); +} + +/** * Suited for ASUS P5ND2-SLI Deluxe: LGA775 + nForce4 SLI + MCP04. */ static int nvidia_mcp_gpio10_raise(const char *name) @@ -1346,6 +1354,7 @@ struct board_pciid_enable board_pciid_enables[] = { {0x8086, 0x2926, 0x147b, 0x1084, 0x11ab, 0x4364, 0x147b, 0x1084, NULL, NULL, NULL, "Abit", "IP35", 0, OK, intel_ich_gpio16_raise}, {0x8086, 0x2930, 0x147b, 0x1083, 0x10ec, 0x8167, 0x147b, 0x1083, NULL, NULL, NULL, "Abit", "IP35 Pro", 0, OK, intel_ich_gpio16_raise}, {0x10de, 0x0050, 0x147b, 0x1c1a, 0, 0, 0, 0, NULL, NULL, NULL, "Abit", "KN8 Ultra", 0, NT, nvidia_mcp_gpio2_lower}, + {0x10de, 0x01e0, 0x147b, 0x1c00, 0x10de, 0x0060, 0x147B, 0x1c00, NULL, NULL, NULL, "Abit", "NF7-S", 0, OK, nvidia_mcp_gpio8_raise}, {0x1106, 0x0691, 0, 0, 0x1106, 0x3057, 0, 0, NULL, "abit", "vt6x4", "Abit", "VT6X4", 0, OK, via_apollo_gpo4_lower}, {0x105a, 0x0d30, 0x105a, 0x4d33, 0x8086, 0x1130, 0x8086, 0, NULL, NULL, NULL, "Acorp", "6A815EPD", 0, OK, board_acorp_6a815epd}, {0x8086, 0x24D4, 0x1849, 0x24D0, 0x8086, 0x24D5, 0x1849, 0x9739, NULL, NULL, NULL, "ASRock", "P4i65GV", 0, OK, intel_ich_gpio23_raise}, diff --git a/print_wiki.c b/print_wiki.c index 9c0143c..87adf4d 100644 --- a/print_wiki.c +++ b/print_wiki.c @@ -215,6 +215,7 @@ const struct board_info_url boards_url[] = { { "Abit", "VT6X4", "http://www.abit.com.tw/page/en/motherboard/motherboard_detail.php?fMTYPE=Slo..." }, { "Abit", "IP35", "http://www.abit.com.tw/page/en/motherboard/motherboard_detail.php?fMTYPE=LGA..." }, { "Abit", "IP35 Pro", "http://www.abit.com.tw/page/de/motherboard/motherboard_detail.php?fMTYPE=LGA..." }, + { "Abit", "NF7-S", "http://www.abit.com.tw/page/en/motherboard/motherboard_detail.php?fMTYPE=Soc..., { "Acorp", "6A815EPD", "http://web.archive.org/web/20021206163652/www.acorp.com.tw/English/default.a..." }, { "agami", "Aruma", "http://web.archive.org/web/20080212111524/http://www.agami.com/site/ais-6000..." }, { "Albatron", "PM266A Pro", "http://www.albatron.com.tw/English/Product/MB/pro_detail.asp?rlink=Overview&..." }, /* FIXME */
-
Michael Karcher -
Uwe Hermann