diff options
| -rw-r--r-- | src/mainboard/arima/hdama/Config.lb | 63 | ||||
| -rw-r--r-- | src/mainboard/arima/hdama/Options.lb | 6 | ||||
| -rw-r--r-- | targets/arima/hdama/Config.lb | 12 |
3 files changed, 47 insertions, 34 deletions
diff --git a/src/mainboard/arima/hdama/Config.lb b/src/mainboard/arima/hdama/Config.lb index 5d065fa4cf..a9df17bcdf 100644 --- a/src/mainboard/arima/hdama/Config.lb +++ b/src/mainboard/arima/hdama/Config.lb @@ -129,48 +129,61 @@ config chip.h # config for arima/hdama chip northbridge/amd/amdk8/root_complex + device apic_cluster 0 on + chip cpu/amd/socket_940 + device apic 0 on end + end + chip cpu/amd/socket_940 + device apic 1 on end + end + end device pci_domain 0 on chip northbridge/amd/amdk8 device pci 18.0 on # northbridge # devices on link 0, link 0 == LDT 0 chip southbridge/amd/amd8131 # the on/off keyword is mandatory - device pci 0.0 on end - device pci 0.1 on end - device pci 1.0 on end - device pci 1.1 on end + device pci 0.0 on end # PCIX bridge + device pci 0.1 on end # IOAPIC + device pci 1.0 on end # PCIX bridge + device pci 1.1 on end # IOAPIC end chip southbridge/amd/amd8111 - # this "device pci 0.0" is the parent the next one + # this "device pci 0.0" is the parent of the next one # PCI bridge device pci 0.0 on - device pci 0.0 on end - device pci 0.1 on end - device pci 0.2 off end - device pci 1.0 off end + device pci 0.0 on end # USB0 + device pci 0.1 on end # USB1 + device pci 0.2 off end # USB 2.0 + device pci 1.0 off end # LAN + chip drivers/pci/onboard + device pci 6.0 on end # ATI Rage XL + register "rom_address" = "0xfff80000" + end end + # LPC bridge device pci 1.0 on chip superio/NSC/pc87360 - device pnp 2e.0 off # Floppy + device pnp 2e.0 off # Floppy io 0x60 = 0x3f0 irq 0x70 = 6 drq 0x74 = 2 end - device pnp 2e.1 off # Parallel Port + device pnp 2e.1 off # Parallel Port io 0x60 = 0x378 irq 0x70 = 7 end - device pnp 2e.2 off # Com 2 + device pnp 2e.2 off # Com 2 io 0x60 = 0x2f8 irq 0x70 = 3 end - device pnp 2e.3 on # Com 1 + device pnp 2e.3 on # Com 1 io 0x60 = 0x3f8 irq 0x70 = 4 end device pnp 2e.4 off end # SWC device pnp 2e.5 off end # Mouse - device pnp 2e.6 on # Keyboard + device pnp 2e.6 on # Keyboard io 0x60 = 0x60 io 0x62 = 0x64 irq 0x70 = 1 @@ -181,9 +194,9 @@ chip northbridge/amd/amdk8/root_complex device pnp 2e.a off end # WDT end end - device pci 1.1 on end - device pci 1.2 on end - device pci 1.3 on + device pci 1.1 on end # IDE + device pci 1.2 on end # SMBus 2.0 + device pci 1.3 on # System Management chip drivers/generic/generic #phillips pca9545 smbus mux device i2c 70 on @@ -221,19 +234,19 @@ chip northbridge/amd/amdk8/root_complex device i2c 57 on end end end - device pci 1.5 off end - device pci 1.6 on end + device pci 1.5 off end # AC97 Audio + device pci 1.6 on end # AC97 Modem register "ide0_enable" = "1" register "ide1_enable" = "1" end - end # device pci 18.0 + end # device pci 18.0 device pci 18.0 on end # LDT1 device pci 18.0 on end # LDT2 device pci 18.1 on end device pci 18.2 on end device pci 18.3 on end - end + end # chip northbridge/amd/amdk8 chip northbridge/amd/amdk8 device pci 19.0 on end device pci 19.0 on end @@ -242,14 +255,6 @@ chip northbridge/amd/amdk8/root_complex device pci 19.2 on end device pci 19.3 on end end - end - device apic_cluster 0 on - chip cpu/amd/socket_940 - device apic 0 on end - end - chip cpu/amd/socket_940 - device apic 1 on end - end end end diff --git a/src/mainboard/arima/hdama/Options.lb b/src/mainboard/arima/hdama/Options.lb index 091f792e3b..1972c39fe4 100644 --- a/src/mainboard/arima/hdama/Options.lb +++ b/src/mainboard/arima/hdama/Options.lb @@ -50,6 +50,8 @@ uses CROSS_COMPILE uses CC uses HOSTCC uses OBJCOPY +uses CONFIG_CONSOLE_VGA +uses CONFIG_PCI_ROM_RUN ### ### Build options @@ -119,6 +121,10 @@ default CONFIG_MAX_PHYSICAL_CPUS=2 ## default CONFIG_IOAPIC=1 +#VGA +default CONFIG_CONSOLE_VGA=1 +default CONFIG_PCI_ROM_RUN=1 + ## ## Clean up the motherboard id strings ## diff --git a/targets/arima/hdama/Config.lb b/targets/arima/hdama/Config.lb index 8e5a16c02e..1dce4fdc8b 100644 --- a/targets/arima/hdama/Config.lb +++ b/targets/arima/hdama/Config.lb @@ -6,20 +6,22 @@ target hdama mainboard arima/hdama +option ROM_SIZE=487424 + # Arima hdama romimage "normal" option USE_FALLBACK_IMAGE=0 - option ROM_IMAGE_SIZE=0x10400 + option ROM_IMAGE_SIZE=0x16000 option LINUXBIOS_EXTRA_VERSION=".0Normal" - payload /usr/share/etherboot/5.2.1eb1-lnxi-lb/tg3--ide_disk.zelf + payload /home/ollie/work/filo-0.4.1/filo.elf +# payload /etc/hosts end romimage "fallback" option USE_FALLBACK_IMAGE=1 - option ROM_IMAGE_SIZE=0x10400 + option ROM_IMAGE_SIZE=0x16000 option LINUXBIOS_EXTRA_VERSION=".0Fallback" - payload /usr/share/etherboot/5.2.1eb1-lnxi-lb/tg3--ide_disk.zelf -# use this to test a build if you don't have the etherboot + payload /home/ollie/work/filo-0.4.1/filo.elf # payload /etc/hosts end |