Index: src/mainboard/hp/dl145_g3/Config.lb
===================================================================
--- src/mainboard/hp/dl145_g3/Config.lb	(revision 4227)
+++ src/mainboard/hp/dl145_g3/Config.lb	(working copy)
@@ -192,15 +192,8 @@
 					device pci 2.0 on end # USB	0x0223
 					device pci 2.1 on end # USB
 					device pci 2.2 on end # USB
- 					chip drivers/pci/onboard
-						# it is in bcm5785_0 bus, but the device id can
-						# not be changed even unitid is changed, fake one
-						# to get the rom_address
-						# if HT_CHAIN_END_UNITID_BASE=0, it is 4,
-						# if HT_CHAIN_END_UNITID_BASE=1, it is 3
- 						device pci 4.0 on end
- 						register "rom_address" = "0xfff00000"
- 					end
+					device pci 3.0 on end # VGA
+					
 					#bx_a013+ start
 					#chip drivers/pci/onboard    #SATA2
 					#	device pci 5.0 on end
Index: src/mainboard/hp/dl145_g3/Options.lb
===================================================================
--- src/mainboard/hp/dl145_g3/Options.lb	(revision 4227)
+++ src/mainboard/hp/dl145_g3/Options.lb	(working copy)
@@ -194,7 +194,7 @@
 
 #VGA Console
 default CONFIG_CONSOLE_VGA=1
-default CONFIG_PCI_ROM_RUN=1
+default CONFIG_PCI_ROM_RUN=0
 
 #HT Unit ID offset, default is 1, the typical one
 default HT_CHAIN_UNITID_BASE=0x06
Index: targets/hp/dl145_g3/Config-abuild.lb
===================================================================
--- targets/hp/dl145_g3/Config-abuild.lb	(revision 4227)
+++ targets/hp/dl145_g3/Config-abuild.lb	(working copy)
@@ -13,13 +13,7 @@
 option ROM_SIZE=1024*(1024-32)
 option FALLBACK_SIZE=1024*512
 
-romimage "normal"
-	option USE_FALLBACK_IMAGE=0
-	option ROM_IMAGE_SIZE=0x20000
-	option XIP_ROM_SIZE=0x20000
-	option COREBOOT_EXTRA_VERSION=".0-normal"
-	payload __PAYLOAD__
-end
+option CONFIG_CBFS = 1
 
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
@@ -29,5 +23,5 @@
 	payload __PAYLOAD__
 end
 
-buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "fallback"
 
Index: targets/hp/dl145_g3/Config.lb
===================================================================
--- targets/hp/dl145_g3/Config.lb	(revision 4227)
+++ targets/hp/dl145_g3/Config.lb	(working copy)
@@ -25,22 +25,19 @@
 mainboard hp/dl145_g3
 
 # Leave 32K for VGA ROM
-option ROM_SIZE= 1024*1024 - 32*1024
+option ROM_SIZE= 1024*1024
+option CONFIG_CBFS = 1
 
-romimage "normal"
-	option USE_FALLBACK_IMAGE=0
-	option ROM_IMAGE_SIZE=0x20000
-	option XIP_ROM_SIZE=0x20000
-	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
-	payload ../payload.elf
-end
-
 romimage "fallback"
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE=0x20000
 	option XIP_ROM_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
-	payload ../payload.elf
+	payload ./bios.bin.elf
 end
 
-buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "fallback"
+
+pci_rom ./matrox.rom vendor_id=0x102b device_id=0x0522
+
+