Patchworkβ [05/11] Rebased Board Enable Patch: A8JM board_enable patch (was Re: A8JM flashrom unable to erase)

login
register
about
Submitter Sean Nelson
Date 2010-08-09 00:25:24
Message ID <4C5F4AF4.6040000@gmail.com>
Download mbox | patch
Permalink /patch/1731/
State New
Headers show

Comments

Sean Nelson - 2010-08-09 00:25:24
On 08/08/2010 02:14 PM, Uwe Hermann wrote:
> Hi,
>
> On Fri, Mar 19, 2010 at 03:27:08PM -0700, Sean Nelson wrote:
>> This patch replaces the earlier one sent, and adds A8JM (and possibly
>> all A8J series) support, and additionally adds DMI detection of A8J,
>> after the r896 fix to dmi detection.
>>
>> Signed-off-by: James Lancaster<deathstalker@gmail.com>
>>
>> The DMI identification triggers on either the 2nd or 5th dmi strings,
>> which are both "A8J" followed by different numbers of spaces. Combined
>> with the PCI IDs, it might work on any of the A8J series seeing that
>> the main difference in all but the A8JS is the video card/screen
>> (possibly that too, while there they did add sata in place of IDE). I
>> believe (based on having a video card that was supposed to only be on
>> the A8JS, that it has a different device number (1232), that the A8JS
>> will not be picked up.)
>>
>> I've tested this on my own computer, it picks it up and appears to
>> flash just fine. I think I probably should have added Acked by as it
>> works, but I'll be conservative on the issue.
>
>> +	{0x8086, 0x27A0, 0x1043, 0x1287,  0x8086, 0x27DF, 0x1043, 0x1287, "^A8J",        NULL,         NULL,          "ASUS",        "A8JM",                  0,   NT, intel_ich_gpio34_raise},
>> -	{0x8086, 0x27A0,      0,      0,  0x8086, 0x27b8,      0,      0, NULL,          "kontron",    "986lcd-m",    "Kontron",     "986LCD-M",              0,   OK, board_kontron_986lcd_m},
>> +	{0x8086, 0x27A0, 0x8086, 0x27a0,  0x8086, 0x27b8, 0x8086, 0x27b8, NULL,          "kontron",    "986lcd-m",    "Kontron",     "986LCD-M",              0,   OK, board_kontron_986lcd_m},
> Not sure what happened here. The patch description only talks about the
> A8JM, but the patch also changes Kontron 986LCD-M matching. Was this
> intentional? I CC'ed Stefan Reinauer as he might still have access to
> the Kontron board?
>
> Note that there are at least two different versions of that board with
> different IDs, I had access to one at some point which was different
> from Stefan's (not sure which IDs differed how, I'll try to find out if
> I saved some lspci of the board).
>
>
> Uwe.
Not intentional.. fix attached.
Signed-off-by: Sean Nelson <audiohacked@gmail.com>

Patch

diff --git a/board_enable.c b/board_enable.c
index 307feeb..83d16a2 100644
--- a/board_enable.c
+++ b/board_enable.c
@@ -1791,7 +1791,7 @@  const struct board_pciid_enable board_pciid_enables[] = {
 	{0x1039, 0x5513, 0x8086, 0xd61f,  0x1039, 0x6330, 0x8086, 0xd61f, NULL,          NULL,         NULL,          "Intel",       "D201GLY",               0,   OK, wbsio_check_for_spi},
 	{0x8086, 0x7190,      0,      0,  0x8086, 0x7110,      0,      0, "^SE440BX-2$", NULL,         NULL,          "Intel",       "SE440BX-2",             0,   NT, intel_piix4_gpo27_lower},
 	{0x1022, 0x7468,      0,      0,       0,      0,      0,      0, NULL,          "iwill",      "dk8_htx",     "IWILL",       "DK8-HTX",               0,   OK, w83627hf_gpio24_raise_2e},
-	{0x8086, 0x27A0, 0x8086, 0x27a0,  0x8086, 0x27b8, 0x8086, 0x27b8, NULL,          "kontron",    "986lcd-m",    "Kontron",     "986LCD-M",              0,   OK, board_kontron_986lcd_m},
+	{0x8086, 0x27A0,      0,      0,  0x8086, 0x27b8,      0,      0, NULL,          "kontron",    "986lcd-m",    "Kontron",     "986LCD-M",              0,   OK, board_kontron_986lcd_m},
 	{0x8086, 0x2411, 0x8086, 0x2411,  0x8086, 0x7125, 0x0e11, 0xb165, NULL,          NULL,         NULL,          "Mitac",       "6513WU",                0,   OK, board_mitac_6513wu},
 	{0x10DE, 0x005E, 0x1462, 0x7125,  0x10DE, 0x0052, 0x1462, 0x7125, NULL,          NULL,         NULL,          "MSI",         "K8N Neo4-F",            0,   OK, nvidia_mcp_gpio2_raise},
 	{0x8086, 0x2560, 0x1462, 0x5770,  0x8086, 0x2562, 0x1462, 0x5778, NULL,          NULL,         NULL,          "MSI",         "MS-6577",               0,   OK, w83627hf_gpio25_raise_2e},