Marshall Dawson would like Martin Roth and Furquan Shaikh to review this change.
soc/amd/picasso: Update for vbios
Add Picasso's Device ID and default filename.
Only a single Device ID is documented for Picasso so remove the oprom
remapper function.
Signed-off-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Change-Id: Iaf43d7c8da41beb05b58c494f0a6814f8f571b18
---
M src/soc/amd/picasso/Kconfig
M src/soc/amd/picasso/include/soc/pci_devs.h
M src/soc/amd/picasso/northbridge.c
3 files changed, 3 insertions(+), 19 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/22/34422/1
diff --git a/src/soc/amd/picasso/Kconfig b/src/soc/amd/picasso/Kconfig
index 10e1930..840de12 100644
--- a/src/soc/amd/picasso/Kconfig
+++ b/src/soc/amd/picasso/Kconfig
@@ -93,14 +93,14 @@
config VGA_BIOS_ID
string
- default "1002,98e4"
+ default "1002,15d8"
help
The default VGA BIOS PCI vendor/device ID should be set to the
result of the map_oprom_vendev() function in northbridge.c.
config VGA_BIOS_FILE
string
- default "3rdparty/blobs/soc/amd/picasso/VBIOS.bin"
+ default "3rdparty/blobs/soc/amd/picasso/PicassoGenericVbios.bin"
config S3_VGA_ROM_RUN
bool
diff --git a/src/soc/amd/picasso/include/soc/pci_devs.h b/src/soc/amd/picasso/include/soc/pci_devs.h
index d6887f9..acde455 100644
--- a/src/soc/amd/picasso/include/soc/pci_devs.h
+++ b/src/soc/amd/picasso/include/soc/pci_devs.h
@@ -42,7 +42,7 @@
/* Internal Graphics */
#define GFX_DEV 0x1
#define GFX_FUNC 0
-#define GFX_DEVID 0x98e4 /* subject to SKU/OPN variation */
+#define GFX_DEVID 0x15d8
#define GFX_DEVFN PCI_DEVFN(GFX_DEV, GFX_FUNC)
#define SOC_GFX_DEV _SOC_DEV(GFX_DEV, GFX_FUNC)
diff --git a/src/soc/amd/picasso/northbridge.c b/src/soc/amd/picasso/northbridge.c
index 627ce03..a39e79a 100644
--- a/src/soc/amd/picasso/northbridge.c
+++ b/src/soc/amd/picasso/northbridge.c
@@ -329,19 +329,3 @@
assign_resources(dev->link_list);
}
-/*********************************************************************
- * Change the vendor / device IDs to match the generic VBIOS header. *
- *********************************************************************/
-u32 map_oprom_vendev(u32 vendev)
-{
- u32 new_vendev;
- new_vendev =
- ((vendev >= 0x100298e0) && (vendev <= 0x100298ef)) ?
- 0x100298e0 : vendev;
-
- if (vendev != new_vendev)
- printk(BIOS_NOTICE, "Mapping PCI device %8x to %8x\n",
- vendev, new_vendev);
-
- return new_vendev;
-}
To view, visit change 34422. To unsubscribe, or for help writing mail filters, visit settings.