summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorarch import user (historical) <svn@openbios.org>2005-07-06 16:49:52 +0000
committerarch import user (historical) <svn@openbios.org>2005-07-06 16:49:52 +0000
commit72c3b053d86c68a9e5454a79f0808c898170e21e (patch)
tree80fd2f9bfd9b0d22d1cc23685a65897c95ab62c3 /src
parentfd6067425858d136418986fa77927a6ea76b79ee (diff)
downloadcoreboot-72c3b053d86c68a9e5454a79f0808c898170e21e.tar.xz
Revision: linuxbios@linuxbios.org--devel/freebios--devel--2.0--patch-7
Creator: Yinghai Lu <yhlu@tyan.com> ide_enable in MB Config and jmp_auto ( it will make start in the 64k boundary) git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1926 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src')
-rw-r--r--src/arch/i386/lib/jmp_auto.inc3
-rw-r--r--src/arch/i386/lib/jmp_auto_out.inc5
-rw-r--r--src/cpu/x86/fpu/enable_fpu.inc1
-rw-r--r--src/mainboard/tyan/s2850/Config.lb31
-rw-r--r--src/mainboard/tyan/s2875/Config.lb32
-rw-r--r--src/mainboard/tyan/s2880/Config.lb47
-rw-r--r--src/mainboard/tyan/s2881/Config.lb85
-rw-r--r--src/mainboard/tyan/s2882/Config.lb82
-rw-r--r--src/mainboard/tyan/s2885/Config.lb45
-rw-r--r--src/mainboard/tyan/s4880/Config.lb92
-rw-r--r--src/mainboard/tyan/s4882/Config.lb292
11 files changed, 397 insertions, 318 deletions
diff --git a/src/arch/i386/lib/jmp_auto.inc b/src/arch/i386/lib/jmp_auto.inc
new file mode 100644
index 0000000000..5701922bae
--- /dev/null
+++ b/src/arch/i386/lib/jmp_auto.inc
@@ -0,0 +1,3 @@
+/* -*- asm -*- */
+
+ jmp __fpu_start
diff --git a/src/arch/i386/lib/jmp_auto_out.inc b/src/arch/i386/lib/jmp_auto_out.inc
new file mode 100644
index 0000000000..88b1728aab
--- /dev/null
+++ b/src/arch/i386/lib/jmp_auto_out.inc
@@ -0,0 +1,5 @@
+/* -*- asm -*- */
+
+ /* clear boot_complete flag */
+ xorl %ebp, %ebp
+ jmp __main
diff --git a/src/cpu/x86/fpu/enable_fpu.inc b/src/cpu/x86/fpu/enable_fpu.inc
index e663e365ac..bd7a7ff630 100644
--- a/src/cpu/x86/fpu/enable_fpu.inc
+++ b/src/cpu/x86/fpu/enable_fpu.inc
@@ -1,4 +1,5 @@
/* preserve BIST in %eax */
+__fpu_start:
movl %eax, %ebp
/* Disable floating point emulation */
diff --git a/src/mainboard/tyan/s2850/Config.lb b/src/mainboard/tyan/s2850/Config.lb
index ea41e2fb29..89de7dba33 100644
--- a/src/mainboard/tyan/s2850/Config.lb
+++ b/src/mainboard/tyan/s2850/Config.lb
@@ -126,11 +126,11 @@ end
# sample config for tyan/s2850
chip northbridge/amd/amdk8/root_complex
- device apic_cluster 0 on
- chip cpu/amd/socket_940
- device apic 0 on end
- end
- end
+ device apic_cluster 0 on
+ chip cpu/amd/socket_940
+ device apic 0 on end
+ end
+ end
device pci_domain 0 on
chip northbridge/amd/amdk8
device pci 18.0 on # LDT0
@@ -178,8 +178,8 @@ chip northbridge/amd/amdk8/root_complex
io 0x60 = 0x100
end
device pnp 2e.7 off # GAME_MIDI_GIPO1
- io 0x60 = 0x201
- io 0x62 = 0x330
+ io 0x60 = 0x220
+ io 0x62 = 0x300
irq 0x70 = 9
end
device pnp 2e.8 off end # GPIO2
@@ -193,9 +193,24 @@ chip northbridge/amd/amdk8/root_complex
end
device pci 1.1 on end
device pci 1.2 on end
- device pci 1.3 on end
+ device pci 1.3 on
+ chip drivers/generic/generic #dimm 0-0-0
+ device i2c 50 on end
+ end
+ chip drivers/generic/generic #dimm 0-0-1
+ device i2c 51 on end
+ end
+ chip drivers/generic/generic #dimm 0-1-0
+ device i2c 52 on end
+ end
+ chip drivers/generic/generic #dimm 0-1-1
+ device i2c 53 on end
+ end
+ end
device pci 1.5 on end
device pci 1.6 off end
+ register "ide0_enable" = "1"
+ register "ide1_enable" = "1"
end
end # device pci 18.0
device pci 18.0 on end
diff --git a/src/mainboard/tyan/s2875/Config.lb b/src/mainboard/tyan/s2875/Config.lb
index 7a27d7da7e..f042467f5c 100644
--- a/src/mainboard/tyan/s2875/Config.lb
+++ b/src/mainboard/tyan/s2875/Config.lb
@@ -121,13 +121,17 @@ mainboardinit cpu/x86/mmx/disable_mmx.inc
##
## Include the secondary Configuration files
##
-dir /pc80
if CONFIG_CHIP_NAME
config chip.h
end
# sample config for tyan/s2875
chip northbridge/amd/amdk8/root_complex
+ device apic_cluster 0 on
+ chip cpu/amd/socket_940
+ device apic 0 on end
+ end
+ end
device pci_domain 0 on
chip northbridge/amd/amdk8
device pci 18.0 on # northbridge
@@ -145,6 +149,10 @@ chip northbridge/amd/amdk8/root_complex
device pci 0.1 on end
device pci 0.2 off end
device pci 1.0 off end
+ chip drivers/pci/onboard
+ device pci 5.0 on end
+ register "rom_address" = "0xfff80000"
+ end
end
device pci 1.0 on
chip superio/winbond/w83627hf
@@ -175,8 +183,8 @@ chip northbridge/amd/amdk8/root_complex
io 0x60 = 0x100
end
device pnp 2e.7 off # GAME_MIDI_GIPO1
- io 0x60 = 0x201
- io 0x62 = 0x330
+ io 0x60 = 0x220
+ io 0x62 = 0x300
irq 0x70 = 9
end
device pnp 2e.8 off end # GPIO2
@@ -193,6 +201,8 @@ chip northbridge/amd/amdk8/root_complex
device pci 1.3 on end
device pci 1.5 on end
device pci 1.6 off end
+ register "ide0_enable" = "1"
+ register "ide1_enable" = "1"
end
end # device pci 18.0
@@ -203,22 +213,6 @@ chip northbridge/amd/amdk8/root_complex
device pci 18.2 on end
device pci 18.3 on end
end
- chip northbridge/amd/amdk8
- device pci 19.0 on end
- device pci 19.0 on end
- device pci 19.0 on end
- device pci 19.1 on end
- 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/tyan/s2880/Config.lb b/src/mainboard/tyan/s2880/Config.lb
index 241e9d9968..f82bd23b44 100644
--- a/src/mainboard/tyan/s2880/Config.lb
+++ b/src/mainboard/tyan/s2880/Config.lb
@@ -121,20 +121,34 @@ mainboardinit cpu/x86/mmx/disable_mmx.inc
##
## Include the secondary Configuration files
##
-dir /pc80
if CONFIG_CHIP_NAME
config chip.h
end
# sample config for tyan/s2880
chip northbridge/amd/amdk8/root_complex
+ device apic_cluster 0 on
+ chip cpu/amd/socket_940
+ device apic 0 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.0 on
+ chip drivers/pci/onboard
+ device pci 9.0 on end #broadcom
+ device pci 9.1 on end
+ end
+ chip drivers/lsi/53c1030
+ device pci a.0 on end
+ device pci a.1 on end
+ register "fw_address" = "0xfff8c000"
+ end
+ end
device pci 0.1 on end
device pci 1.0 on end
device pci 1.1 on end
@@ -147,6 +161,13 @@ chip northbridge/amd/amdk8/root_complex
device pci 0.1 on end
device pci 0.2 off end
device pci 1.0 off end
+ chip drivers/pci/onboard
+ device pci 5.0 on end #some sata
+ end
+ chip drivers/pci/onboard
+ device pci 6.0 on end #adti
+ register "rom_address" = "0xfff80000"
+ end
end
device pci 1.0 on
chip superio/winbond/w83627hf
@@ -177,8 +198,8 @@ chip northbridge/amd/amdk8/root_complex
io 0x60 = 0x100
end
device pnp 2e.7 off # GAME_MIDI_GIPO1
- io 0x60 = 0x201
- io 0x62 = 0x330
+ io 0x60 = 0x220
+ io 0x62 = 0x300
irq 0x70 = 9
end
device pnp 2e.8 off end # GPIO2
@@ -195,6 +216,8 @@ chip northbridge/amd/amdk8/root_complex
device pci 1.3 on end
device pci 1.5 off end
device pci 1.6 off end
+ register "ide0_enable" = "1"
+ register "ide1_enable" = "1"
end
end # device pci 18.0
@@ -205,22 +228,6 @@ chip northbridge/amd/amdk8/root_complex
device pci 18.2 on end
device pci 18.3 on end
end
- chip northbridge/amd/amdk8
- device pci 19.0 on end
- device pci 19.0 on end
- device pci 19.0 on end
- device pci 19.1 on end
- 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/tyan/s2881/Config.lb b/src/mainboard/tyan/s2881/Config.lb
index 552324bc67..ba28422aac 100644
--- a/src/mainboard/tyan/s2881/Config.lb
+++ b/src/mainboard/tyan/s2881/Config.lb
@@ -121,13 +121,17 @@ mainboardinit cpu/x86/mmx/disable_mmx.inc
##
## Include the secondary Configuration files
##
-dir /pc80
if CONFIG_CHIP_NAME
config chip.h
end
# sample config for tyan/s2881
chip northbridge/amd/amdk8/root_complex
+ device apic_cluster 0 on
+ chip cpu/amd/socket_940
+ device apic 0 on end
+ end
+ end
device pci_domain 0 on
chip northbridge/amd/amdk8
device pci 18.0 on end # LDT0
@@ -136,7 +140,16 @@ chip northbridge/amd/amdk8/root_complex
# devices on link 2, link 2 == LDT 2
chip southbridge/amd/amd8131
# the on/off keyword is mandatory
- device pci 0.0 on end
+ device pci 0.0 on
+ chip drivers/pci/onboard
+ device pci 9.0 on end # Broadcom 5704
+ device pci 9.1 on end
+ end
+ chip drivers/pci/onboard
+ device pci a.0 on end # Adaptic
+ device pci a.1 on end
+ end
+ end
device pci 0.1 on end
device pci 1.0 on end
device pci 1.1 on end
@@ -149,6 +162,13 @@ chip northbridge/amd/amdk8/root_complex
device pci 0.1 on end
device pci 0.2 off end
device pci 1.0 off end
+ chip drivers/pci/onboard
+ device pci 5.0 on end # SiI
+ end
+ chip drivers/pci/onboard
+ device pci 6.0 on end
+ register "rom_address" = "0xfff80000"
+ end
end
device pci 1.0 on
chip superio/winbond/w83627hf
@@ -179,8 +199,8 @@ chip northbridge/amd/amdk8/root_complex
io 0x60 = 0x100
end
device pnp 2e.7 off # GAME_MIDI_GIPO1
- io 0x60 = 0x201
- io 0x62 = 0x330
+ io 0x60 = 0x220
+ io 0x62 = 0x300
irq 0x70 = 9
end
device pnp 2e.8 off end # GPIO2
@@ -194,9 +214,48 @@ chip northbridge/amd/amdk8/root_complex
end
device pci 1.1 on end
device pci 1.2 on end
- device pci 1.3 on end
+ device pci 1.3 on
+# chip drivers/generic/generic #dimm 0-0-0
+# device i2c 50 on end
+# end
+# chip drivers/generic/generic #dimm 0-0-1
+# device i2c 51 on end
+# end
+# chip drivers/generic/generic #dimm 0-1-0
+# device i2c 52 on end
+# end
+# chip drivers/generic/generic #dimm 0-1-1
+# device i2c 53 on end
+# end
+# chip drivers/generic/generic #dimm 1-0-0
+# device i2c 54 on end
+# end
+# chip drivers/generic/generic #dimm 1-0-1
+# device i2c 55 on end
+# end
+# chip drivers/generic/generic #dimm 1-1-0
+# device i2c 56 on end
+# end
+# chip drivers/generic/generic #dimm 1-1-1
+# device i2c 57 on end
+# end
+# chip drivers/i2c/adm1027 # ADT7463A CPU0/1 temp, CPU1 vid, SYS FAN 1/2/3
+# device i2c 2d on end
+# end
+# chip drivers/generic/generic # Winbond HWM 0x54 CPU0/1 VRM temp, SYSFAN 4,CPU0 vid, CPU0/1 FAN
+# device i2c 2a on end
+# end
+# chip drivers/generic/generic # Winbond HWM 0x92
+# device i2c 49 on end
+# end
+# chip drivers/generic/generic # Winbond HWM 0x94
+# device i2c 4a on end
+# end
+ end # acpi
device pci 1.5 off end
device pci 1.6 off end
+ register "ide0_enable" = "1"
+ register "ide1_enable" = "1"
end
end # device pci 18.0
@@ -204,22 +263,6 @@ chip northbridge/amd/amdk8/root_complex
device pci 18.2 on end
device pci 18.3 on end
end
- chip northbridge/amd/amdk8
- device pci 19.0 on end
- device pci 19.0 on end
- device pci 19.0 on end
- device pci 19.1 on end
- 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/tyan/s2882/Config.lb b/src/mainboard/tyan/s2882/Config.lb
index 955432b05e..e708936f46 100644
--- a/src/mainboard/tyan/s2882/Config.lb
+++ b/src/mainboard/tyan/s2882/Config.lb
@@ -120,20 +120,34 @@ mainboardinit cpu/x86/mmx/disable_mmx.inc
##
## Include the secondary Configuration files
##
-dir /pc80
if CONFIG_CHIP_NAME
config chip.h
end
# sample config for tyan/s2882
chip northbridge/amd/amdk8/root_complex
+ device apic_cluster 0 on
+ chip cpu/amd/socket_940
+ device apic 0 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.0 on
+ chip drivers/pci/onboard
+ device pci 6.0 on end # adaptec
+ device pci 6.1 on end
+ end
+ chip drivers/pci/onboard
+ device pci 9.0 on end # broadcom 5704
+ device pci 9.1 on end
+ end
+ end
device pci 0.1 on end
device pci 1.0 on end
device pci 1.1 on end
@@ -146,6 +160,17 @@ chip northbridge/amd/amdk8/root_complex
device pci 0.1 on end
device pci 0.2 off end
device pci 1.0 off end
+ chip drivers/pci/onboard
+ device pci 5.0 on end
+ end
+ # chip drivers/ati/ragexl
+ chip drivers/pci/onboard
+ device pci 6.0 on end
+ register "rom_address" = "0xfff80000"
+ end
+ chip drivers/pci/onboard
+ device pci 8.0 on end #intel 10/100
+ end
end
device pci 1.0 on
chip superio/winbond/w83627hf
@@ -176,8 +201,8 @@ chip northbridge/amd/amdk8/root_complex
io 0x60 = 0x100
end
device pnp 2e.7 off # GAME_MIDI_GIPO1
- io 0x60 = 0x201
- io 0x62 = 0x330
+ io 0x60 = 0x220
+ io 0x62 = 0x300
irq 0x70 = 9
end
device pnp 2e.8 off end # GPIO2
@@ -191,9 +216,36 @@ chip northbridge/amd/amdk8/root_complex
end
device pci 1.1 on end
device pci 1.2 on end
- device pci 1.3 on end
+ device pci 1.3 on
+# chip drivers/generic/generic #dimm 0-0-0
+# device i2c 50 on end
+# end
+# chip drivers/generic/generic #dimm 0-0-1
+# device i2c 51 on end
+# end
+# chip drivers/generic/generic #dimm 0-1-0
+# device i2c 52 on end
+# end
+# chip drivers/generic/generic #dimm 0-1-1
+# device i2c 53 on end
+# end
+# chip drivers/generic/generic #dimm 1-0-0
+# device i2c 54 on end
+# end
+# chip drivers/generic/generic #dimm 1-0-1
+# device i2c 55 on end
+# end
+# chip drivers/generic/generic #dimm 1-1-0
+# device i2c 56 on end
+# end
+# chip drivers/generic/generic #dimm 1-1-1
+# device i2c 57 on end
+# end
+ end # acpi
device pci 1.5 off end
device pci 1.6 off end
+ register "ide0_enable" = "1"
+ register "ide1_enable" = "1"
end
end # device pci 18.0
@@ -203,23 +255,7 @@ chip northbridge/amd/amdk8/root_complex
device pci 18.1 on end
device pci 18.2 on end
device pci 18.3 on end
- end
- chip northbridge/amd/amdk8
- device pci 19.0 on end
- device pci 19.0 on end
- device pci 19.0 on end
- device pci 19.1 on end
- 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 # NB
+ end #pci_domain
end
diff --git a/src/mainboard/tyan/s2885/Config.lb b/src/mainboard/tyan/s2885/Config.lb
index a974cb5644..f7374c24a7 100644
--- a/src/mainboard/tyan/s2885/Config.lb
+++ b/src/mainboard/tyan/s2885/Config.lb
@@ -40,8 +40,12 @@ arch i386 end
driver mainboard.o
+#dir /drivers/si/3114
+
if HAVE_MP_TABLE object mptable.o end
if HAVE_PIRQ_TABLE object irq_tables.o end
+#object reset.o
+
##
## Romcc output
@@ -120,21 +124,17 @@ mainboardinit cpu/x86/mmx/disable_mmx.inc
##
## Include the secondary Configuration files
##
-
if CONFIG_CHIP_NAME
config chip.h
end
# sample config for tyan/s2885
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 apic_cluster 0 on
+ chip cpu/amd/socket_940
+ device apic 0 on end
+ end
+ end
device pci_domain 0 on
chip northbridge/amd/amdk8
device pci 18.0 on # LDT0
@@ -149,7 +149,11 @@ chip northbridge/amd/amdk8/root_complex
# devices on link 2, link 2 == LDT 2
chip southbridge/amd/amd8131
# the on/off keyword is mandatory
- device pci 0.0 on end
+ device pci 0.0 on
+ chip drivers/pci/onboard
+ device pci 9.0 on end # broadcom 5703
+ end
+ end
device pci 0.1 on end
device pci 1.0 on end
device pci 1.1 on end
@@ -162,6 +166,9 @@ chip northbridge/amd/amdk8/root_complex
device pci 0.1 on end
device pci 0.2 off end
device pci 1.0 off end
+ chip drivers/pci/onboard
+ device pci b.0 on end # SiI 3114
+ end
end
device pci 1.0 on
chip superio/winbond/w83627hf
@@ -195,7 +202,7 @@ chip northbridge/amd/amdk8/root_complex
io 0x60 = 0x220
io 0x62 = 0x300
irq 0x70 = 9
- end
+ end
device pnp 2e.8 off end # GPIO2
device pnp 2e.9 off end # GPIO3
device pnp 2e.a off end # ACPI
@@ -245,21 +252,15 @@ chip northbridge/amd/amdk8/root_complex
device pci 18.3 on end
end
-# chip northbridge/amd/amdk8
-# device pci 19.0 on end
-# device pci 19.0 on end
-# device pci 19.0 on end
-# device pci 19.1 on end
-# device pci 19.2 on end
-# device pci 19.3 on end
-# end
- end
+ end #pci_domain
# chip drivers/generic/debug
-# device pnp 0.0 on end
+# device pnp 0.0 off end
# device pnp 0.1 off end
# device pnp 0.2 off end
-# device pnp 0.3 on end
+# device pnp 0.3 off end
+# device pnp 0.4 off end
+# device pnp 0.5 on end
# end
end
diff --git a/src/mainboard/tyan/s4880/Config.lb b/src/mainboard/tyan/s4880/Config.lb
index b9387cb700..d053c663f6 100644
--- a/src/mainboard/tyan/s4880/Config.lb
+++ b/src/mainboard/tyan/s4880/Config.lb
@@ -66,6 +66,17 @@ makerule ./auto.inc
end
##
+## Setup RAM
+##
+mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/mmx/enable_mmx.inc
+mainboardinit cpu/x86/sse/enable_sse.inc
+mainboardinit ./auto.inc
+mainboardinit cpu/x86/sse/disable_sse.inc
+mainboardinit cpu/x86/mmx/disable_mmx.inc
+mainboardinit arch/i386/lib/jmp_auto_out.inc
+
+##
## Build our 16 bit and 32 bit linuxBIOS entry code
##
mainboardinit cpu/x86/16bit/entry16.inc
@@ -107,26 +118,23 @@ end
### O.k. We aren't just an intermediary anymore!
###
-##
-## Setup RAM
-##
-mainboardinit cpu/x86/fpu/enable_fpu.inc
-mainboardinit cpu/x86/mmx/enable_mmx.inc
-mainboardinit cpu/x86/sse/enable_sse.inc
-mainboardinit ./auto.inc
-mainboardinit cpu/x86/sse/disable_sse.inc
-mainboardinit cpu/x86/mmx/disable_mmx.inc
+mainboardinit arch/i386/lib/jmp_auto.inc
##
## Include the secondary Configuration files
##
-dir /pc80
if CONFIG_CHIP_NAME
config chip.h
end
# sample config for tyan/s4880
chip northbridge/amd/amdk8/root_complex
+ device apic_cluster 0 on
+ chip cpu/amd/socket_940
+ device apic 0 on end
+ end
+ end
+
device pci_domain 0 on
chip northbridge/amd/amdk8
device pci 18.0 on end # LDT0
@@ -135,7 +143,17 @@ chip northbridge/amd/amdk8/root_complex
# devices on link 2, link 2 == LDT 2
chip southbridge/amd/amd8131
# the on/off keyword is mandatory
- device pci 0.0 on end
+ device pci 0.0 on
+ chip drivers/lsi/53c1030
+ device pci 4.0 on end
+ device pci 4.1 on end
+ register "fw_address" = "0xfff8c000"
+ end
+ chip drivers/pci/onboard
+ device pci 9.0 on end
+ device pci 9.1 on end
+ end
+ end
device pci 0.1 on end
device pci 1.0 on end
device pci 1.1 on end
@@ -148,6 +166,10 @@ chip northbridge/amd/amdk8/root_complex
device pci 0.1 on end
device pci 0.2 off end
device pci 1.0 off end
+ chip drivers/pci/onboard
+ device pci 6.0 on end
+ register "rom_address" = "0xfff80000"
+ end
end
device pci 1.0 on
chip superio/winbond/w83627hf
@@ -178,8 +200,8 @@ chip northbridge/amd/amdk8/root_complex
io 0x60 = 0x100
end
device pnp 2e.7 off # GAME_MIDI_GIPO1
- io 0x60 = 0x201
- io 0x62 = 0x330
+ io 0x60 = 0x220
+ io 0x62 = 0x300
irq 0x70 = 9
end
device pnp 2e.8 off end # GPIO2
@@ -196,6 +218,8 @@ chip northbridge/amd/amdk8/root_complex
device pci 1.3 on end
device pci 1.5 off end
device pci 1.6 off end
+ register "ide0_enable" = "1"
+ register "ide1_enable" = "1"
end
end # device pci 18.0
@@ -204,46 +228,6 @@ chip northbridge/amd/amdk8/root_complex
device pci 18.3 on end
end
- chip northbridge/amd/amdk8
- device pci 19.0 on end
- device pci 19.0 on end
- device pci 19.0 on end
- device pci 19.1 on end
- device pci 19.2 on end
- device pci 19.3 on end
- end
-
- chip northbridge/amd/amdk8
- device pci 1a.0 on end
- device pci 1a.0 on end
- device pci 1a.0 on end
- device pci 1a.1 on end
- device pci 1a.2 on end
- device pci 1a.3 on end
- end
-
- chip northbridge/amd/amdk8
- device pci 1b.0 on end
- device pci 1b.0 on end
- device pci 1b.0 on end
- device pci 1b.1 on end
- device pci 1b.2 on end
- device pci 1b.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
- chip cpu/amd/socket_940
- device apic 2 on end
- end
- chip cpu/amd/socket_940
- device apic 3 on end
- end
- end
+ end #pci_domain
end
diff --git a/src/mainboard/tyan/s4882/Config.lb b/src/mainboard/tyan/s4882/Config.lb
index e13f8c57f8..78d5b60016 100644
--- a/src/mainboard/tyan/s4882/Config.lb
+++ b/src/mainboard/tyan/s4882/Config.lb
@@ -66,6 +66,17 @@ makerule ./auto.inc
end
##
+## Setup RAM
+##
+mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/mmx/enable_mmx.inc
+mainboardinit cpu/x86/sse/enable_sse.inc
+mainboardinit ./auto.inc
+mainboardinit cpu/x86/sse/disable_sse.inc
+mainboardinit cpu/x86/mmx/disable_mmx.inc
+mainboardinit arch/i386/lib/jmp_auto_out.inc
+
+##
## Build our 16 bit and 32 bit linuxBIOS entry code
##
mainboardinit cpu/x86/16bit/entry16.inc
@@ -107,26 +118,22 @@ end
### O.k. We aren't just an intermediary anymore!
###
-##
-## Setup RAM
-##
-mainboardinit cpu/x86/fpu/enable_fpu.inc
-mainboardinit cpu/x86/mmx/enable_mmx.inc
-mainboardinit cpu/x86/sse/enable_sse.inc
-mainboardinit ./auto.inc
-mainboardinit cpu/x86/sse/disable_sse.inc
-mainboardinit cpu/x86/mmx/disable_mmx.inc
+mainboardinit arch/i386/lib/jmp_auto.inc
##
## Include the secondary Configuration files
##
-dir /pc80
if CONFIG_CHIP_NAME
config chip.h
end
# sample config for tyan/s4882
chip northbridge/amd/amdk8/root_complex
+ device apic_cluster 0 on
+ chip cpu/amd/socket_940
+ device apic 0 on end
+ end
+ end
device pci_domain 0 on
chip northbridge/amd/amdk8
device pci 18.0 on end # LDT0
@@ -134,7 +141,17 @@ chip northbridge/amd/amdk8/root_complex
# devices on link 1, link 1 == LDT 1
chip southbridge/amd/amd8131
# the on/off keyword is mandatory
- device pci 0.0 on end
+ device pci 0.0 on
+ chip drivers/lsi/53c1030
+ device pci 4.0 on end
+ device pci 4.1 on end
+ register "fw_address" = "0xfff8c000"
+ end
+ chip drivers/pci/onboard
+ device pci 9.0 on end #Broadcom
+ device pci 9.1 on end
+ end
+ end
device pci 0.1 on end
device pci 1.0 on end
device pci 1.1 on end
@@ -147,6 +164,14 @@ chip northbridge/amd/amdk8/root_complex
device pci 0.1 on end
device pci 0.2 off end
device pci 1.0 off end
+ #chip drivers/ati/ragexl
+ chip drivers/pci/onboard
+ device pci 6.0 on end
+ register "rom_address" = "0xfff80000"
+ end
+ chip drivers/pci/onboard
+ device pci 5.0 on end #SiI
+ end
end
device pci 1.0 on
chip superio/winbond/w83627hf
@@ -193,102 +218,104 @@ chip northbridge/amd/amdk8/root_complex
device pci 1.1 on end
device pci 1.2 on end
device pci 1.3 on
- chip drivers/i2c/i2cmux # pca9556 smbus mux
- device i2c 18 on #0 pca9516 2, 1
- chip drivers/i2c/lm63 #cpu0 temp
- device i2c 4c on end
- end
- end
- device i2c 18 on #1 pca9516 1, 1
- chip drivers/generic/generic #dimm 0-0-0
- device i2c 50 on end
- end
- chip drivers/generic/generic #dimm 0-0-1
- device i2c 51 on end
- end
- chip drivers/generic/generic #dimm 0-1-0
- device i2c 52 on end
- end
- chip drivers/generic/generic #dimm 0-1-1
- device i2c 53 on end
- end
- end
- device i2c 18 on #2 pca9516 1, 2
- chip drivers/generic/generic #dimm 1-0-0
- device i2c 50 on end
- end
- chip drivers/generic/generic #dimm 1-0-1
- device i2c 51 on end
- end
- chip drivers/generic/generic #dimm 1-1-0
- device i2c 52 on end
- end
- chip drivers/generic/generic #dimm 1-1-1
- device i2c 53 on end
- end
- end
- device i2c 18 on #3 pca9516 1, 3
- chip drivers/generic/generic #dimm 2-0-0
- device i2c 50 on end
- end
- chip drivers/generic/generic #dimm 2-0-1
- device i2c 51 on end
- end
- chip drivers/generic/generic #dimm 2-1-0
- device i2c 52 on end
- end
- chip drivers/generic/generic #dimm 2-1-1
- device i2c 53 on end
- end
- end
- device i2c 18 on #4 pca9516 1, 4
- chip drivers/generic/generic #dimm 3-0-0
- device i2c 50 on end
- end
- chip drivers/generic/generic #dimm 3-0-1
- device i2c 51 on end
- end
- chip drivers/generic/generic #dimm 3-1-0
- device i2c 52 on end
- end
- chip drivers/generic/generic #dimm 3-1-1
- device i2c 53 on end
- end
- end
- device i2c 18 on #5 pca9516 2, 2
- chip drivers/i2c/lm63 #cpu1 temp
- device i2c 4c on end
- end
- end
- device i2c 18 on #6 pca9516 2, 3
- chip drivers/i2c/lm63 #cpu2 temp
- device i2c 4c on end
- end
- end
- device i2c 18 on #7 pca9516 2, 4
- chip drivers/i2c/lm63 #cpu3 temp
- device i2c 4c on end
- end
- end
- end # i2cmux
- chip drivers/i2c/adm1027 # ADM1027 CPU1 vid and System FAN...
- device i2c 2e on end
- end
- chip drivers/generic/generic # Winbond HWM 0x54 CPU0 vid
- device i2c 2a on end
- end
- chip drivers/generic/generic # Winbond HWM 0x92
- device i2c 49 on end
- end
- chip drivers/generic/generic # Winbond HWM 0x94
- device i2c 4a on end
- end
- chip drivers/generic/generic # ??
- device i2c 69 on end
- end
+# chip drivers/i2c/i2cmux # pca9556 smbus mux
+# device i2c 18 on #0 pca9516 2, 1
+# chip drivers/i2c/lm63 #cpu0 temp
+# device i2c 4c on end
+# end
+# end
+# device i2c 18 on #1 pca9516 1, 1
+# chip drivers/generic/generic #dimm 1-0-0
+# device i2c 50 on end
+# end
+# chip drivers/generic/generic #dimm 1-0-1
+# device i2c 51 on end
+# end
+# chip drivers/generic/generic #dimm 1-1-0
+# device i2c 52 on end
+# end
+# chip drivers/generic/generic #dimm 1-1-1
+# device i2c 53 on end
+# end
+# end
+# device i2c 18 on #2 pca9516 1, 2
+# chip drivers/generic/generic #dimm 0-0-0
+# device i2c 50 on end
+# end
+# chip drivers/generic/generic #dimm 0-0-1
+# device i2c 51 on end
+# end
+# chip drivers/generic/generic #dimm 0-1-0
+# device i2c 52 on end
+# end
+# chip drivers/generic/generic #dimm 0-1-1
+# device i2c 53 on end
+# end
+# end
+# device i2c 18 on #3 pca9516 1, 3
+# chip drivers/generic/generic #dimm 3-0-0
+# device i2c 50 on end
+# end
+# chip drivers/generic/generic #dimm 3-0-1
+# device i2c 51 on end
+# end
+# chip drivers/generic/generic #dimm 3-1-0
+# device i2c 52 on end
+# end
+# chip drivers/generic/generic #dimm 3-1-1
+# device i2c 53 on end
+# end
+# end
+# device i2c 18 on #4 pca9516 1, 4
+# chip drivers/generic/generic #dimm 2-0-0
+# device i2c 50 on end
+# end
+# chip drivers/generic/generic #dimm 2-0-1
+# device i2c 51 on end
+# end
+# chip drivers/generic/generic #dimm 2-1-0
+# device i2c 52 on end
+# end
+# chip drivers/generic/generic #dimm 2-1-1
+# device i2c 53 on end
+# end
+# end
+# device i2c 18 on #5 pca9516 2, 2
+# chip drivers/i2c/lm63 #cpu1 temp
+# device i2c 4c on end
+# end
+# end
+# device i2c 18 on #6 pca9516 2, 3
+# chip drivers/i2c/lm63 #cpu2 temp
+# device i2c 4c on end
+# end
+# end
+# device i2c 18 on #7 pca9516 2, 4
+# chip drivers/i2c/lm63 #cpu3 temp
+# device i2c 4c on end
+# end
+# end
+# end # i2cmux
+# chip drivers/i2c/adm1027 # ADM1027 CPU1 vid and System FAN...
+# device i2c 2e on end
+# end
+# chip drivers/generic/generic # Winbond HWM 0x54 CPU0 vid
+# device i2c 2a on end
+# end
+# chip drivers/generic/generic # Winbond HWM 0x92
+# device i2c 49 on end
+# end
+# chip drivers/generic/generic # Winbond HWM 0x94
+# device i2c 4a on end
+# end
+# chip drivers/generic/generic # ??
+# device i2c 69 on end
+# end
end # acpi
device pci 1.5 off end
device pci 1.6 off end
+ register "ide0_enable" = "1"
+ register "ide1_enable" = "1"
end
end # device pci 18.0
@@ -299,53 +326,16 @@ chip northbridge/amd/amdk8/root_complex
device pci 18.3 on end
end
- chip northbridge/amd/amdk8
- device pci 19.0 on end
- device pci 19.0 on end
- device pci 19.0 on end
- device pci 19.1 on end
- device pci 19.2 on end
- device pci 19.3 on end
- end
-
- chip northbridge/amd/amdk8
- device pci 1a.0 on end
- device pci 1a.0 on end
- device pci 1a.0 on end
- device pci 1a.1 on end
- device pci 1a.2 on end
- device pci 1a.3 on end
- end
-
- chip northbridge/amd/amdk8
- device pci 1b.0 on end
- device pci 1b.0 on end
- device pci 1b.0 on end
- device pci 1b.1 on end
- device pci 1b.2 on end
- device pci 1b.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
- chip cpu/amd/socket_940
- device apic 2 on end
- end
- chip cpu/amd/socket_940
- device apic 3 on end
- end
- end
- chip drivers/generic/debug
- device pnp 0.0 off end
- device pnp 0.1 off end
- device pnp 0.2 off end
- device pnp 0.3 off end
- device pnp 0.4 on end
- end
+# chip drivers/generic/debug
+# device pnp 0.0 off end # chip name
+# device pnp 0.1 off end # pci_regs_all
+# device pnp 0.2 off end # mem
+# device pnp 0.3 on end # cpuid
+# device pnp 0.4 off end # smbus_regs_all
+# device pnp 0.5 on end # dual core msr
+# device pnp 0.6 on end # cache size
+# device pnp 0.7 on end # tsc
+# end
end