diff options
| author | Nico Huber <nico.h@gmx.de> | 2017-07-29 01:46:23 +0200 |
|---|---|---|
| committer | Nico Huber <nico.h@gmx.de> | 2017-07-30 00:07:01 +0000 |
| commit | 23b93dd7d806e6f8ca899adb0449b5d6accba3ba (patch) | |
| tree | c7ac6b2492c17b4f1ccca0a84b790f7886157ed3 | |
| parent | 2b5c02143152cee95fc189f05cca2243089ab45d (diff) | |
intel/sandybridge: Clean VGA BIOS ids up a little
Sync map_oprom_vendev() and autoport with the list of PCI ids in the
`gma.c` driver, remove one obsolete Kconfig default override.
Change-Id: I12f24f415b695c516fbb947114e09c873af2e439
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/20814
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Rudolph <siro@das-labor.org>
| -rw-r--r-- | src/mainboard/lenovo/t530/Kconfig | 4 | ||||
| -rw-r--r-- | src/northbridge/intel/sandybridge/gma.c | 22 | ||||
| -rw-r--r-- | util/autoport/sandybridge.go | 6 |
3 files changed, 15 insertions, 17 deletions
diff --git a/src/mainboard/lenovo/t530/Kconfig b/src/mainboard/lenovo/t530/Kconfig index 84ebe86f98..065fd3c952 100644 --- a/src/mainboard/lenovo/t530/Kconfig +++ b/src/mainboard/lenovo/t530/Kconfig @@ -52,10 +52,6 @@ config DRAM_RESET_GATE_GPIO int default 10 -config VGA_BIOS_ID - string - default "8086,0106" - config VGA_BIOS_FILE string default "pci8086,0106.rom" diff --git a/src/northbridge/intel/sandybridge/gma.c b/src/northbridge/intel/sandybridge/gma.c index 6d1044c77a..db24ddac5f 100644 --- a/src/northbridge/intel/sandybridge/gma.c +++ b/src/northbridge/intel/sandybridge/gma.c @@ -258,18 +258,20 @@ static const struct gt_powermeter ivb_pm_gt2_35w[] = { u32 map_oprom_vendev(u32 vendev) { - u32 new_vendev=vendev; + u32 new_vendev = vendev; switch (vendev) { - case 0x80860102: /* GT1 Desktop */ - case 0x8086010a: /* GT1 Server */ - case 0x80860112: /* GT2 Desktop */ - case 0x80860116: /* GT2 Mobile */ - case 0x80860122: /* GT2 Desktop >=1.3GHz */ - case 0x80860126: /* GT2 Mobile >=1.3GHz */ - case 0x80860156: /* IVB */ - case 0x80860166: /* IVB */ - new_vendev=0x80860106; /* GT1 Mobile */ + case 0x80860102: /* SNB GT1 Desktop */ + case 0x8086010a: /* SNB GT1 Server */ + case 0x80860112: /* SNB GT2 Desktop */ + case 0x80860116: /* SNB GT2 Mobile */ + case 0x80860122: /* SNB GT2 Desktop >=1.3GHz */ + case 0x80860126: /* SNB GT2 Mobile >=1.3GHz */ + case 0x80860152: /* IVB GT1 Desktop */ + case 0x80860156: /* IVB GT1 Mobile */ + case 0x80860162: /* IVB GT2 Desktop */ + case 0x80860166: /* IVB GT2 Mobile */ + new_vendev = 0x80860106;/* SNB GT1 Mobile */ break; } diff --git a/util/autoport/sandybridge.go b/util/autoport/sandybridge.go index 45d4b0ced4..e54e6a6087 100644 --- a/util/autoport/sandybridge.go +++ b/util/autoport/sandybridge.go @@ -141,9 +141,9 @@ func init() { RegisterPCI(0x8086, 0x0150, sandybridgemc{variant: "IVY"}) RegisterPCI(0x8086, 0x0154, sandybridgemc{variant: "IVY"}) for _, id := range []uint16{ - 0x0102, 0x0106, 0x010a, 0x0112, - 0x0116, 0x0122, 0x0126, 0x0156, - 0x0162, 0x0166, + 0x0102, 0x0106, 0x010a, + 0x0112, 0x0116, 0x0122, 0x0126, + 0x0152, 0x0156, 0x0162, 0x0166, } { RegisterPCI(0x8086, id, GenericVGA{GenericPCI{Comment: "VGA controller"}}) } |