[flashrom] [commit] r1342 - trunk
repository service
svn at flashrom.org
Sat Jun 18 20:45:42 CEST 2011
Author: stefanct
Date: Sat Jun 18 20:45:41 2011
New Revision: 1342
URL: http://flashrom.org/trac/flashrom/changeset/1342
Log:
resort chipset_enables array by pci ids
Signed-off-by: Idwer Vollering <vidwer at gmail.com>
Signed-off-by: Stefan Tauner <stefan.tauner at student.tuwien.ac.at>
Acked-by: Uwe Hermann <uwe at hermann-uwe.de>
Modified:
trunk/chipset_enable.c
Modified: trunk/chipset_enable.c
==============================================================================
--- trunk/chipset_enable.c Sat Jun 18 00:38:53 2011 (r1341)
+++ trunk/chipset_enable.c Sat Jun 18 20:45:41 2011 (r1342)
@@ -1009,80 +1009,50 @@
#endif
-/* Please keep this list alphabetically sorted by vendor/device. */
+/* Please keep this list numerically sorted by vendor/device ID. */
const struct penable chipset_enables[] = {
#if defined(__i386__) || defined(__x86_64__)
- {0x10B9, 0x1533, OK, "ALi", "M1533", enable_flash_ali_m1533},
- {0x1022, 0x7440, OK, "AMD", "AMD-768", enable_flash_amd8111},
- {0x1022, 0x7468, OK, "AMD", "AMD8111", enable_flash_amd8111},
- {0x1078, 0x0100, OK, "AMD", "CS5530(A)", enable_flash_cs5530},
- {0x1022, 0x2080, OK, "AMD", "CS5536", enable_flash_cs5536},
- {0x1022, 0x2090, OK, "AMD", "CS5536", enable_flash_cs5536},
- {0x1022, 0x3000, OK, "AMD", "Elan SC520", get_flashbase_sc520},
+ {0x1002, 0x4377, OK, "ATI", "SB400", enable_flash_sb400},
{0x1002, 0x438D, OK, "AMD", "SB600", enable_flash_sb600},
{0x1002, 0x439d, OK, "AMD", "SB700/SB710/SB750/SB850", enable_flash_sb600},
{0x100b, 0x0510, NT, "AMD", "SC1100", enable_flash_sc1100},
- {0x1002, 0x4377, OK, "ATI", "SB400", enable_flash_sb400},
- {0x1166, 0x0200, OK, "Broadcom", "OSB4", enable_flash_osb4},
- {0x1166, 0x0205, OK, "Broadcom", "HT-1000", enable_flash_ht1000},
- {0x8086, 0x3b00, NT, "Intel", "3400 Desktop", enable_flash_ich10},
- {0x8086, 0x3b01, NT, "Intel", "3400 Mobile", enable_flash_ich10},
- {0x8086, 0x3b02, NT, "Intel", "P55", enable_flash_ich10},
- {0x8086, 0x3b03, NT, "Intel", "PM55", enable_flash_ich10},
- {0x8086, 0x3b06, NT, "Intel", "H55", enable_flash_ich10},
- {0x8086, 0x3b07, OK, "Intel", "QM57", enable_flash_ich10},
- {0x8086, 0x3b08, NT, "Intel", "H57", enable_flash_ich10},
- {0x8086, 0x3b09, NT, "Intel", "HM55", enable_flash_ich10},
- {0x8086, 0x3b0a, NT, "Intel", "Q57", enable_flash_ich10},
- {0x8086, 0x3b0b, NT, "Intel", "HM57", enable_flash_ich10},
- {0x8086, 0x3b0d, NT, "Intel", "3400 Mobile SFF", enable_flash_ich10},
- {0x8086, 0x3b0e, NT, "Intel", "B55", enable_flash_ich10},
- {0x8086, 0x3b0f, OK, "Intel", "QS57", enable_flash_ich10},
- {0x8086, 0x3b12, NT, "Intel", "3400", enable_flash_ich10},
- {0x8086, 0x3b14, NT, "Intel", "3420", enable_flash_ich10},
- {0x8086, 0x3b16, NT, "Intel", "3450", enable_flash_ich10},
- {0x8086, 0x3b1e, NT, "Intel", "B55", enable_flash_ich10},
- {0x8086, 0x7198, OK, "Intel", "440MX", enable_flash_piix4},
- {0x8086, 0x25a1, OK, "Intel", "6300ESB", enable_flash_ich_4e},
- {0x8086, 0x2670, OK, "Intel", "631xESB/632xESB/3100", enable_flash_ich_dc},
- {0x8086, 0x5031, OK, "Intel", "EP80579", enable_flash_ich7},
- {0x8086, 0x2420, OK, "Intel", "ICH0", enable_flash_ich_4e},
- {0x8086, 0x3a18, OK, "Intel", "ICH10", enable_flash_ich10},
- {0x8086, 0x3a1a, OK, "Intel", "ICH10D", enable_flash_ich10},
- {0x8086, 0x3a14, OK, "Intel", "ICH10DO", enable_flash_ich10},
- {0x8086, 0x3a16, OK, "Intel", "ICH10R", enable_flash_ich10},
- {0x8086, 0x2440, OK, "Intel", "ICH2", enable_flash_ich_4e},
- {0x8086, 0x244c, OK, "Intel", "ICH2-M", enable_flash_ich_4e},
- {0x8086, 0x248c, OK, "Intel", "ICH3-M", enable_flash_ich_4e},
- {0x8086, 0x2480, OK, "Intel", "ICH3-S", enable_flash_ich_4e},
- {0x8086, 0x24c0, OK, "Intel", "ICH4/ICH4-L", enable_flash_ich_4e},
- {0x8086, 0x24cc, OK, "Intel", "ICH4-M", enable_flash_ich_4e},
- {0x8086, 0x24d0, OK, "Intel", "ICH5/ICH5R", enable_flash_ich_4e},
- {0x8086, 0x2640, OK, "Intel", "ICH6/ICH6R", enable_flash_ich_dc},
- {0x8086, 0x2641, OK, "Intel", "ICH6-M", enable_flash_ich_dc},
- {0x8086, 0x27b0, OK, "Intel", "ICH7DH", enable_flash_ich7},
- {0x8086, 0x27b8, OK, "Intel", "ICH7/ICH7R", enable_flash_ich7},
- {0x8086, 0x27b9, OK, "Intel", "ICH7M", enable_flash_ich7},
- {0x8086, 0x27bd, OK, "Intel", "ICH7MDH", enable_flash_ich7},
- {0x8086, 0x27bc, OK, "Intel", "NM10", enable_flash_ich7},
- {0x8086, 0x2410, OK, "Intel", "ICH", enable_flash_ich_4e},
- {0x8086, 0x2812, OK, "Intel", "ICH8DH", enable_flash_ich8},
- {0x8086, 0x2814, OK, "Intel", "ICH8DO", enable_flash_ich8},
- {0x8086, 0x2810, OK, "Intel", "ICH8/ICH8R", enable_flash_ich8},
- {0x8086, 0x2815, OK, "Intel", "ICH8M", enable_flash_ich8},
- {0x8086, 0x2811, OK, "Intel", "ICH8M-E", enable_flash_ich8},
- {0x8086, 0x2918, OK, "Intel", "ICH9", enable_flash_ich9},
- {0x8086, 0x2912, OK, "Intel", "ICH9DH", enable_flash_ich9},
- {0x8086, 0x2914, OK, "Intel", "ICH9DO", enable_flash_ich9},
- {0x8086, 0x2919, OK, "Intel", "ICH9M", enable_flash_ich9},
- {0x8086, 0x2917, OK, "Intel", "ICH9M-E", enable_flash_ich9},
- {0x8086, 0x2916, OK, "Intel", "ICH9R", enable_flash_ich9},
- {0x8086, 0x2910, OK, "Intel", "ICH9 Engineering Sample", enable_flash_ich9},
- {0x8086, 0x1234, NT, "Intel", "MPIIX", enable_flash_piix4},
- {0x8086, 0x7000, OK, "Intel", "PIIX3", enable_flash_piix4},
- {0x8086, 0x7110, OK, "Intel", "PIIX4/4E/4M", enable_flash_piix4},
- {0x8086, 0x122e, OK, "Intel", "PIIX", enable_flash_piix4},
- {0x8086, 0x8119, OK, "Intel", "Poulsbo", enable_flash_poulsbo},
+ {0x1022, 0x2080, OK, "AMD", "CS5536", enable_flash_cs5536},
+ {0x1022, 0x2090, OK, "AMD", "CS5536", enable_flash_cs5536},
+ {0x1022, 0x3000, OK, "AMD", "Elan SC520", get_flashbase_sc520},
+ {0x1022, 0x7440, OK, "AMD", "AMD-768", enable_flash_amd8111},
+ {0x1022, 0x7468, OK, "AMD", "AMD8111", enable_flash_amd8111},
+ {0x1039, 0x0406, NT, "SiS", "501/5101/5501", enable_flash_sis501},
+ {0x1039, 0x0496, NT, "SiS", "85C496+497", enable_flash_sis85c496},
+ {0x1039, 0x0530, NT, "SiS", "530", enable_flash_sis530},
+ {0x1039, 0x0540, NT, "SiS", "540", enable_flash_sis540},
+ {0x1039, 0x0620, NT, "SiS", "620", enable_flash_sis530},
+ {0x1039, 0x0630, NT, "SiS", "630", enable_flash_sis540},
+ {0x1039, 0x0635, NT, "SiS", "635", enable_flash_sis540},
+ {0x1039, 0x0640, NT, "SiS", "640", enable_flash_sis540},
+ {0x1039, 0x0645, NT, "SiS", "645", enable_flash_sis540},
+ {0x1039, 0x0646, NT, "SiS", "645DX", enable_flash_sis540},
+ {0x1039, 0x0648, NT, "SiS", "648", enable_flash_sis540},
+ {0x1039, 0x0650, NT, "SiS", "650", enable_flash_sis540},
+ {0x1039, 0x0651, NT, "SiS", "651", enable_flash_sis540},
+ {0x1039, 0x0655, NT, "SiS", "655", enable_flash_sis540},
+ {0x1039, 0x0661, OK, "SiS", "661", enable_flash_sis540},
+ {0x1039, 0x0730, NT, "SiS", "730", enable_flash_sis540},
+ {0x1039, 0x0733, NT, "SiS", "733", enable_flash_sis540},
+ {0x1039, 0x0735, OK, "SiS", "735", enable_flash_sis540},
+ {0x1039, 0x0740, NT, "SiS", "740", enable_flash_sis540},
+ {0x1039, 0x0741, OK, "SiS", "741", enable_flash_sis540},
+ {0x1039, 0x0745, OK, "SiS", "745", enable_flash_sis540},
+ {0x1039, 0x0746, NT, "SiS", "746", enable_flash_sis540},
+ {0x1039, 0x0748, NT, "SiS", "748", enable_flash_sis540},
+ {0x1039, 0x0755, NT, "SiS", "755", enable_flash_sis540},
+ {0x1039, 0x5511, NT, "SiS", "5511", enable_flash_sis5511},
+ {0x1039, 0x5571, NT, "SiS", "5571", enable_flash_sis530},
+ {0x1039, 0x5591, NT, "SiS", "5591/5592", enable_flash_sis530},
+ {0x1039, 0x5596, NT, "SiS", "5596", enable_flash_sis5511},
+ {0x1039, 0x5597, NT, "SiS", "5597/5598/5581/5120", enable_flash_sis530},
+ {0x1039, 0x5600, NT, "SiS", "600", enable_flash_sis530},
+ {0x1078, 0x0100, OK, "AMD", "CS5530(A)", enable_flash_cs5530},
+ {0x10B9, 0x1533, OK, "ALi", "M1533", enable_flash_ali_m1533},
{0x10de, 0x0030, OK, "NVIDIA", "nForce4/MCP4", enable_flash_nvidia_nforce2},
{0x10de, 0x0050, OK, "NVIDIA", "CK804", enable_flash_ck804}, /* LPC */
{0x10de, 0x0051, OK, "NVIDIA", "CK804", enable_flash_ck804}, /* Pro */
@@ -1126,57 +1096,87 @@
{0x10de, 0x0aad, NT, "NVIDIA", "MCP79", enable_flash_mcp6x_7x},
{0x10de, 0x0aae, NT, "NVIDIA", "MCP79", enable_flash_mcp6x_7x},
{0x10de, 0x0aaf, NT, "NVIDIA", "MCP79", enable_flash_mcp6x_7x},
- {0x1039, 0x0496, NT, "SiS", "85C496+497", enable_flash_sis85c496},
- {0x1039, 0x0406, NT, "SiS", "501/5101/5501", enable_flash_sis501},
- {0x1039, 0x5511, NT, "SiS", "5511", enable_flash_sis5511},
- {0x1039, 0x5596, NT, "SiS", "5596", enable_flash_sis5511},
- {0x1039, 0x5571, NT, "SiS", "5571", enable_flash_sis530},
- {0x1039, 0x5591, NT, "SiS", "5591/5592", enable_flash_sis530},
- {0x1039, 0x5597, NT, "SiS", "5597/5598/5581/5120", enable_flash_sis530},
- {0x1039, 0x0530, NT, "SiS", "530", enable_flash_sis530},
- {0x1039, 0x5600, NT, "SiS", "600", enable_flash_sis530},
- {0x1039, 0x0620, NT, "SiS", "620", enable_flash_sis530},
- {0x1039, 0x0540, NT, "SiS", "540", enable_flash_sis540},
- {0x1039, 0x0630, NT, "SiS", "630", enable_flash_sis540},
- {0x1039, 0x0635, NT, "SiS", "635", enable_flash_sis540},
- {0x1039, 0x0640, NT, "SiS", "640", enable_flash_sis540},
- {0x1039, 0x0645, NT, "SiS", "645", enable_flash_sis540},
- {0x1039, 0x0646, NT, "SiS", "645DX", enable_flash_sis540},
- {0x1039, 0x0648, NT, "SiS", "648", enable_flash_sis540},
- {0x1039, 0x0650, NT, "SiS", "650", enable_flash_sis540},
- {0x1039, 0x0651, NT, "SiS", "651", enable_flash_sis540},
- {0x1039, 0x0655, NT, "SiS", "655", enable_flash_sis540},
- {0x1039, 0x0661, OK, "SiS", "661", enable_flash_sis540},
- {0x1039, 0x0730, NT, "SiS", "730", enable_flash_sis540},
- {0x1039, 0x0733, NT, "SiS", "733", enable_flash_sis540},
- {0x1039, 0x0735, OK, "SiS", "735", enable_flash_sis540},
- {0x1039, 0x0740, NT, "SiS", "740", enable_flash_sis540},
- {0x1039, 0x0741, OK, "SiS", "741", enable_flash_sis540},
- {0x1039, 0x0745, OK, "SiS", "745", enable_flash_sis540},
- {0x1039, 0x0746, NT, "SiS", "746", enable_flash_sis540},
- {0x1039, 0x0748, NT, "SiS", "748", enable_flash_sis540},
- {0x1039, 0x0755, NT, "SiS", "755", enable_flash_sis540},
/* VIA northbridges */
{0x1106, 0x0585, NT, "VIA", "VT82C585VPX", via_no_byte_merge},
{0x1106, 0x0595, NT, "VIA", "VT82C595", via_no_byte_merge},
{0x1106, 0x0597, NT, "VIA", "VT82C597", via_no_byte_merge},
- {0x1106, 0x0691, NT, "VIA", "VT82C69x", via_no_byte_merge}, /* 691, 693a, 694t, 694x checked */
{0x1106, 0x0601, NT, "VIA", "VT8601/VT8601A", via_no_byte_merge},
+ {0x1106, 0x0691, NT, "VIA", "VT82C69x", via_no_byte_merge}, /* 691, 693a, 694t, 694x checked */
{0x1106, 0x8601, NT, "VIA", "VT8601T", via_no_byte_merge},
/* VIA southbridges */
- {0x1106, 0x8324, OK, "VIA", "CX700", enable_flash_vt823x},
- {0x1106, 0x8231, NT, "VIA", "VT8231", enable_flash_vt823x},
+ {0x1106, 0x0586, OK, "VIA", "VT82C586A/B", enable_flash_amd8111},
+ {0x1106, 0x0596, OK, "VIA", "VT82C596", enable_flash_amd8111},
+ {0x1106, 0x0686, NT, "VIA", "VT82C686A/B", enable_flash_amd8111},
{0x1106, 0x3074, NT, "VIA", "VT8233", enable_flash_vt823x},
{0x1106, 0x3147, OK, "VIA", "VT8233A", enable_flash_vt823x},
{0x1106, 0x3177, OK, "VIA", "VT8235", enable_flash_vt823x},
{0x1106, 0x3227, OK, "VIA", "VT8237", enable_flash_vt823x},
{0x1106, 0x3337, OK, "VIA", "VT8237A", enable_flash_vt823x},
{0x1106, 0x3372, OK, "VIA", "VT8237S", enable_flash_vt8237s_spi},
+ {0x1106, 0x8231, NT, "VIA", "VT8231", enable_flash_vt823x},
+ {0x1106, 0x8324, OK, "VIA", "CX700", enable_flash_vt823x},
{0x1106, 0x8353, OK, "VIA", "VX800", enable_flash_vt8237s_spi},
{0x1106, 0x8409, OK, "VIA", "VX855", enable_flash_vt823x},
- {0x1106, 0x0596, OK, "VIA", "VT82C596", enable_flash_amd8111},
- {0x1106, 0x0586, OK, "VIA", "VT82C586A/B", enable_flash_amd8111},
- {0x1106, 0x0686, NT, "VIA", "VT82C686A/B", enable_flash_amd8111},
+ {0x1166, 0x0200, OK, "Broadcom", "OSB4", enable_flash_osb4},
+ {0x1166, 0x0205, OK, "Broadcom", "HT-1000", enable_flash_ht1000},
+ {0x8086, 0x122e, OK, "Intel", "PIIX", enable_flash_piix4},
+ {0x8086, 0x1234, NT, "Intel", "MPIIX", enable_flash_piix4},
+ {0x8086, 0x2410, OK, "Intel", "ICH", enable_flash_ich_4e},
+ {0x8086, 0x2420, OK, "Intel", "ICH0", enable_flash_ich_4e},
+ {0x8086, 0x2440, OK, "Intel", "ICH2", enable_flash_ich_4e},
+ {0x8086, 0x244c, OK, "Intel", "ICH2-M", enable_flash_ich_4e},
+ {0x8086, 0x2480, OK, "Intel", "ICH3-S", enable_flash_ich_4e},
+ {0x8086, 0x248c, OK, "Intel", "ICH3-M", enable_flash_ich_4e},
+ {0x8086, 0x24c0, OK, "Intel", "ICH4/ICH4-L", enable_flash_ich_4e},
+ {0x8086, 0x24cc, OK, "Intel", "ICH4-M", enable_flash_ich_4e},
+ {0x8086, 0x24d0, OK, "Intel", "ICH5/ICH5R", enable_flash_ich_4e},
+ {0x8086, 0x25a1, OK, "Intel", "6300ESB", enable_flash_ich_4e},
+ {0x8086, 0x2640, OK, "Intel", "ICH6/ICH6R", enable_flash_ich_dc},
+ {0x8086, 0x2641, OK, "Intel", "ICH6-M", enable_flash_ich_dc},
+ {0x8086, 0x2670, OK, "Intel", "631xESB/632xESB/3100", enable_flash_ich_dc},
+ {0x8086, 0x27b0, OK, "Intel", "ICH7DH", enable_flash_ich7},
+ {0x8086, 0x27b8, OK, "Intel", "ICH7/ICH7R", enable_flash_ich7},
+ {0x8086, 0x27b9, OK, "Intel", "ICH7M", enable_flash_ich7},
+ {0x8086, 0x27bc, OK, "Intel", "NM10", enable_flash_ich7},
+ {0x8086, 0x27bd, OK, "Intel", "ICH7MDH", enable_flash_ich7},
+ {0x8086, 0x2810, OK, "Intel", "ICH8/ICH8R", enable_flash_ich8},
+ {0x8086, 0x2811, OK, "Intel", "ICH8M-E", enable_flash_ich8},
+ {0x8086, 0x2812, OK, "Intel", "ICH8DH", enable_flash_ich8},
+ {0x8086, 0x2814, OK, "Intel", "ICH8DO", enable_flash_ich8},
+ {0x8086, 0x2815, OK, "Intel", "ICH8M", enable_flash_ich8},
+ {0x8086, 0x2910, OK, "Intel", "ICH9 Engineering Sample", enable_flash_ich9},
+ {0x8086, 0x2912, OK, "Intel", "ICH9DH", enable_flash_ich9},
+ {0x8086, 0x2914, OK, "Intel", "ICH9DO", enable_flash_ich9},
+ {0x8086, 0x2916, OK, "Intel", "ICH9R", enable_flash_ich9},
+ {0x8086, 0x2917, OK, "Intel", "ICH9M-E", enable_flash_ich9},
+ {0x8086, 0x2918, OK, "Intel", "ICH9", enable_flash_ich9},
+ {0x8086, 0x2919, OK, "Intel", "ICH9M", enable_flash_ich9},
+ {0x8086, 0x3a14, OK, "Intel", "ICH10DO", enable_flash_ich10},
+ {0x8086, 0x3a16, OK, "Intel", "ICH10R", enable_flash_ich10},
+ {0x8086, 0x3a18, OK, "Intel", "ICH10", enable_flash_ich10},
+ {0x8086, 0x3a1a, OK, "Intel", "ICH10D", enable_flash_ich10},
+ {0x8086, 0x3b00, NT, "Intel", "3400 Desktop", enable_flash_ich10},
+ {0x8086, 0x3b01, NT, "Intel", "3400 Mobile", enable_flash_ich10},
+ {0x8086, 0x3b02, NT, "Intel", "P55", enable_flash_ich10},
+ {0x8086, 0x3b03, NT, "Intel", "PM55", enable_flash_ich10},
+ {0x8086, 0x3b06, NT, "Intel", "H55", enable_flash_ich10},
+ {0x8086, 0x3b07, OK, "Intel", "QM57", enable_flash_ich10},
+ {0x8086, 0x3b08, NT, "Intel", "H57", enable_flash_ich10},
+ {0x8086, 0x3b09, NT, "Intel", "HM55", enable_flash_ich10},
+ {0x8086, 0x3b0a, NT, "Intel", "Q57", enable_flash_ich10},
+ {0x8086, 0x3b0b, NT, "Intel", "HM57", enable_flash_ich10},
+ {0x8086, 0x3b0d, NT, "Intel", "3400 Mobile SFF", enable_flash_ich10},
+ {0x8086, 0x3b0e, NT, "Intel", "B55", enable_flash_ich10},
+ {0x8086, 0x3b0f, OK, "Intel", "QS57", enable_flash_ich10},
+ {0x8086, 0x3b12, NT, "Intel", "3400", enable_flash_ich10},
+ {0x8086, 0x3b14, NT, "Intel", "3420", enable_flash_ich10},
+ {0x8086, 0x3b16, NT, "Intel", "3450", enable_flash_ich10},
+ {0x8086, 0x3b1e, NT, "Intel", "B55", enable_flash_ich10},
+ {0x8086, 0x5031, OK, "Intel", "EP80579", enable_flash_ich7},
+ {0x8086, 0x7000, OK, "Intel", "PIIX3", enable_flash_piix4},
+ {0x8086, 0x7110, OK, "Intel", "PIIX4/4E/4M", enable_flash_piix4},
+ {0x8086, 0x7198, OK, "Intel", "440MX", enable_flash_piix4},
+ {0x8086, 0x8119, OK, "Intel", "Poulsbo", enable_flash_poulsbo},
#endif
{},
};
More information about the flashrom
mailing list