diff options
| -rw-r--r-- | src/mainboard/hp/dl145_g3/Config.lb | 11 | ||||
| -rw-r--r-- | src/mainboard/hp/dl145_g3/Options.lb | 2 | ||||
| -rw-r--r-- | targets/hp/dl145_g3/Config-abuild.lb | 10 | ||||
| -rw-r--r-- | targets/hp/dl145_g3/Config.lb | 19 |
4 files changed, 12 insertions, 30 deletions
diff --git a/src/mainboard/hp/dl145_g3/Config.lb b/src/mainboard/hp/dl145_g3/Config.lb index 1095cde182..3e602e2ed2 100644 --- a/src/mainboard/hp/dl145_g3/Config.lb +++ b/src/mainboard/hp/dl145_g3/Config.lb @@ -192,15 +192,8 @@ chip northbridge/amd/amdk8/root_complex 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 diff --git a/src/mainboard/hp/dl145_g3/Options.lb b/src/mainboard/hp/dl145_g3/Options.lb index 2d7b9d959d..5fda0e5f8b 100644 --- a/src/mainboard/hp/dl145_g3/Options.lb +++ b/src/mainboard/hp/dl145_g3/Options.lb @@ -194,7 +194,7 @@ default K8_HT_FREQ_1G_SUPPORT=1 #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 diff --git a/targets/hp/dl145_g3/Config-abuild.lb b/targets/hp/dl145_g3/Config-abuild.lb index ecccc6bbc2..95639ecb61 100644 --- a/targets/hp/dl145_g3/Config-abuild.lb +++ b/targets/hp/dl145_g3/Config-abuild.lb @@ -13,13 +13,7 @@ __LOGLEVEL__ 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 @@ romimage "fallback" payload __PAYLOAD__ end -buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" +buildrom ./coreboot.rom ROM_SIZE "fallback" diff --git a/targets/hp/dl145_g3/Config.lb b/targets/hp/dl145_g3/Config.lb index d347a9441d..1ca40cb666 100644 --- a/targets/hp/dl145_g3/Config.lb +++ b/targets/hp/dl145_g3/Config.lb @@ -24,23 +24,18 @@ target dl145_g3 mainboard hp/dl145_g3 -# Leave 32K for VGA ROM -option ROM_SIZE= 1024*1024 - 32*1024 - -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 +option ROM_SIZE= 1024*1024 +option CONFIG_CBFS = 1 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 + |