summaryrefslogtreecommitdiff
path: root/src/mainboard/tyan
diff options
context:
space:
mode:
authorYinghai Lu <yinghailu@gmail.com>2004-11-05 22:03:37 +0000
committerYinghai Lu <yinghailu@gmail.com>2004-11-05 22:03:37 +0000
commit44b34e31a54519fe00658cf9e0ebb6a5b01a3702 (patch)
tree3f254b55398ccaaf81c91095bf2fe20685c13478 /src/mainboard/tyan
parent7a9c836f93de8373c122d483894599b3eaf4b151 (diff)
CONFIG_CHIP_NAME to control config chip.h without .name
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1764 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/mainboard/tyan')
-rw-r--r--src/mainboard/tyan/s2735/Config.lb130
-rw-r--r--src/mainboard/tyan/s2735/Options.lb2
-rw-r--r--src/mainboard/tyan/s2735/mainboard.c2
-rw-r--r--src/mainboard/tyan/s2850/Config.lb4
-rw-r--r--src/mainboard/tyan/s2850/mainboard.c2
-rw-r--r--src/mainboard/tyan/s2875/Config.lb4
-rw-r--r--src/mainboard/tyan/s2875/mainboard.c2
-rw-r--r--src/mainboard/tyan/s2880/Config.lb4
-rw-r--r--src/mainboard/tyan/s2880/mainboard.c2
-rw-r--r--src/mainboard/tyan/s2881/Config.lb4
-rw-r--r--src/mainboard/tyan/s2881/mainboard.c2
-rw-r--r--src/mainboard/tyan/s2882/Config.lb4
-rw-r--r--src/mainboard/tyan/s2882/mainboard.c2
-rw-r--r--src/mainboard/tyan/s2885/Config.lb5
-rw-r--r--src/mainboard/tyan/s2885/mainboard.c2
-rw-r--r--src/mainboard/tyan/s4880/Config.lb4
-rw-r--r--src/mainboard/tyan/s4880/mainboard.c2
-rw-r--r--src/mainboard/tyan/s4882/Config.lb4
-rw-r--r--src/mainboard/tyan/s4882/mainboard.c2
19 files changed, 112 insertions, 71 deletions
diff --git a/src/mainboard/tyan/s2735/Config.lb b/src/mainboard/tyan/s2735/Config.lb
index 52c1ccde4f..3e602fb0d8 100644
--- a/src/mainboard/tyan/s2735/Config.lb
+++ b/src/mainboard/tyan/s2735/Config.lb
@@ -122,73 +122,77 @@ mainboardinit cpu/x86/mmx/disable_mmx.inc
## Include the secondary Configuration files
##
dir /pc80
-config chip.h
+
+if CONFIG_CHIP_NAME
+ config chip.h
+end
# sample config for tyan/s2735
-chip northbridge/intel/e7501
+chip northbridge/intel/e7501/root_complex
device pci_domain 0 on
- device pci 0.0 on end
- device pci 0.1 on end
- device pci 2.0 on
- chip southbridge/intel/i82870
- device pci 1c.0 on end
- device pci 1d.0 on end
- device pci 1e.0 on end
- device pci 1f.0 on end
- end
- end
- device pci 6.0 on end
- chip southbridge/intel/i82801er
- device pci 1d.0 on end
- device pci 1d.1 on end
- device pci 1d.2 on end
- device pci 1d.3 on end
- device pci 1d.7 on end
- device pci 1e.0 on end
- device pci 1f.0 on
+ chip northbridge/intel/e7501
+ device pci 0.0 on end
+ device pci 0.1 on end
+ device pci 2.0 on
+ chip southbridge/intel/i82870
+ device pci 1c.0 on end
+ device pci 1d.0 on end
+ device pci 1e.0 on end
+ device pci 1f.0 on end
+ end
+ end
+ device pci 6.0 on end
+ chip southbridge/intel/i82801er
+ device pci 1d.0 on end
+ device pci 1d.1 on end
+ device pci 1d.2 on end
+ device pci 1d.3 on end
+ device pci 1d.7 on end
+ device pci 1e.0 on end
+ device pci 1f.0 on
# device pci 8.0 end
- chip superio/winbond/w83627hf
- device pnp 2e.0 on # Floppy
- io 0x60 = 0x3f0
- irq 0x70 = 6
- drq 0x74 = 2
- end
- device pnp 2e.1 off # Parallel Port
- io 0x60 = 0x378
- irq 0x70 = 7
- end
- device pnp 2e.2 on # Com1
- io 0x60 = 0x3f8
- irq 0x70 = 4
- end
- device pnp 2e.3 off # Com2
- io 0x60 = 0x2f8
- irq 0x70 = 3
- end
- device pnp 2e.5 on # Keyboard
- io 0x60 = 0x60
- io 0x62 = 0x64
- irq 0x70 = 1
- irq 0x72 = 12
- end
- device pnp 2e.6 off end # CIR
- device pnp 2e.7 off end # GAME_MIDI_GIPO1
- device pnp 2e.8 off end # GPIO2
- device pnp 2e.9 off end # GPIO3
- device pnp 2e.a off end # ACPI
- device pnp 2e.b on # HW Monitor
- io 0x60 = 0x290
- end
- end
- end
- device pci 1f.1 off end
- device pci 1f.2 on end
- device pci 1f.3 on end
- device pci 1f.5 off end
- device pci 1f.6 off end
-
- end
- end
+ chip superio/winbond/w83627hf
+ device pnp 2e.0 on # Floppy
+ io 0x60 = 0x3f0
+ irq 0x70 = 6
+ drq 0x74 = 2
+ end
+ device pnp 2e.1 off # Parallel Port
+ io 0x60 = 0x378
+ irq 0x70 = 7
+ end
+ device pnp 2e.2 on # Com1
+ io 0x60 = 0x3f8
+ irq 0x70 = 4
+ end
+ device pnp 2e.3 off # Com2
+ io 0x60 = 0x2f8
+ irq 0x70 = 3
+ end
+ device pnp 2e.5 on # Keyboard
+ io 0x60 = 0x60
+ io 0x62 = 0x64
+ irq 0x70 = 1
+ irq 0x72 = 12
+ end
+ device pnp 2e.6 off end # CIR
+ device pnp 2e.7 off end # GAME_MIDI_GIPO1
+ device pnp 2e.8 off end # GPIO2
+ device pnp 2e.9 off end # GPIO3
+ device pnp 2e.a off end # ACPI
+ device pnp 2e.b on # HW Monitor
+ io 0x60 = 0x290
+ end
+ end
+ end
+ device pci 1f.1 off end
+ device pci 1f.2 on end
+ device pci 1f.3 on end
+ device pci 1f.5 off end
+ device pci 1f.6 off end
+ end # SB
+ end #NB
+ end # PCI_DOMAIN
device apic_cluster 0 on
chip cpu/intel/socket_mPGA604_533Mhz
device apic 0 on end
diff --git a/src/mainboard/tyan/s2735/Options.lb b/src/mainboard/tyan/s2735/Options.lb
index 617dfa8650..98c7e50f4f 100644
--- a/src/mainboard/tyan/s2735/Options.lb
+++ b/src/mainboard/tyan/s2735/Options.lb
@@ -44,11 +44,13 @@ uses MAINBOARD_POWER_ON_AFTER_POWER_FAIL
uses CONFIG_CONSOLE_SERIAL8250
uses CONFIG_UDELAY_TSC
uses CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
+uses HAVE_INIT_TIMER
uses CONFIG_GDB_STUB
uses CROSS_COMPILE
uses CC
uses HOSTCC
uses OBJCOPY
+uses CONFIG_CHIP_NAME
###
### Build options
diff --git a/src/mainboard/tyan/s2735/mainboard.c b/src/mainboard/tyan/s2735/mainboard.c
index c2a68f341d..61ddd8242a 100644
--- a/src/mainboard/tyan/s2735/mainboard.c
+++ b/src/mainboard/tyan/s2735/mainboard.c
@@ -5,6 +5,8 @@
#include <device/pci_ops.h>
#include "chip.h"
+#if CONFIG_CHIP_NAME == 1
struct chip_operations mainboard_tyan_s2735_ops = {
CHIP_NAME("Tyan s2735 mainboard")
};
+#endif
diff --git a/src/mainboard/tyan/s2850/Config.lb b/src/mainboard/tyan/s2850/Config.lb
index 761a55477c..ca890c8ded 100644
--- a/src/mainboard/tyan/s2850/Config.lb
+++ b/src/mainboard/tyan/s2850/Config.lb
@@ -121,7 +121,9 @@ mainboardinit cpu/x86/mmx/disable_mmx.inc
## Include the secondary Configuration files
##
dir /pc80
-config chip.h
+if CONFIG_CHIP_NAME
+ config chip.h
+end
# sample config for tyan/s2850
chip northbridge/amd/amdk8/root_complex
diff --git a/src/mainboard/tyan/s2850/mainboard.c b/src/mainboard/tyan/s2850/mainboard.c
index 6ddd3e9727..8b96c5f0a6 100644
--- a/src/mainboard/tyan/s2850/mainboard.c
+++ b/src/mainboard/tyan/s2850/mainboard.c
@@ -5,6 +5,8 @@
#include <device/pci_ops.h>
#include "chip.h"
+#if CONFIG_CHIP_NAME == 1
struct chip_operations mainboard_tyan_s2850_ops = {
CHIP_NAME("Tyan s2850 mainboard")
};
+#endif
diff --git a/src/mainboard/tyan/s2875/Config.lb b/src/mainboard/tyan/s2875/Config.lb
index ffc90a4d6c..7a27d7da7e 100644
--- a/src/mainboard/tyan/s2875/Config.lb
+++ b/src/mainboard/tyan/s2875/Config.lb
@@ -122,7 +122,9 @@ mainboardinit cpu/x86/mmx/disable_mmx.inc
## Include the secondary Configuration files
##
dir /pc80
-config chip.h
+if CONFIG_CHIP_NAME
+ config chip.h
+end
# sample config for tyan/s2875
chip northbridge/amd/amdk8/root_complex
diff --git a/src/mainboard/tyan/s2875/mainboard.c b/src/mainboard/tyan/s2875/mainboard.c
index 81ce181e15..737178a492 100644
--- a/src/mainboard/tyan/s2875/mainboard.c
+++ b/src/mainboard/tyan/s2875/mainboard.c
@@ -5,6 +5,8 @@
#include <device/pci_ops.h>
#include "chip.h"
+#if CONFIG_CHIP_NAME == 1
struct chip_operations mainboard_tyan_s2875_ops = {
CHIP_NAME("Tyan s2875 mainboard")
};
+#endif
diff --git a/src/mainboard/tyan/s2880/Config.lb b/src/mainboard/tyan/s2880/Config.lb
index 315e3b5e16..241e9d9968 100644
--- a/src/mainboard/tyan/s2880/Config.lb
+++ b/src/mainboard/tyan/s2880/Config.lb
@@ -122,7 +122,9 @@ mainboardinit cpu/x86/mmx/disable_mmx.inc
## Include the secondary Configuration files
##
dir /pc80
-config chip.h
+if CONFIG_CHIP_NAME
+ config chip.h
+end
# sample config for tyan/s2880
chip northbridge/amd/amdk8/root_complex
diff --git a/src/mainboard/tyan/s2880/mainboard.c b/src/mainboard/tyan/s2880/mainboard.c
index b00bdfaa4a..535ccdc530 100644
--- a/src/mainboard/tyan/s2880/mainboard.c
+++ b/src/mainboard/tyan/s2880/mainboard.c
@@ -5,6 +5,8 @@
#include <device/pci_ops.h>
#include "chip.h"
+#if CONFIG_CHIP_NAME == 1
struct chip_operations mainboard_tyan_s2880_ops = {
CHIP_NAME("Tyan s2880 mainboard")
};
+#endif
diff --git a/src/mainboard/tyan/s2881/Config.lb b/src/mainboard/tyan/s2881/Config.lb
index 17dcc90fa4..552324bc67 100644
--- a/src/mainboard/tyan/s2881/Config.lb
+++ b/src/mainboard/tyan/s2881/Config.lb
@@ -122,7 +122,9 @@ mainboardinit cpu/x86/mmx/disable_mmx.inc
## Include the secondary Configuration files
##
dir /pc80
-config chip.h
+if CONFIG_CHIP_NAME
+ config chip.h
+end
# sample config for tyan/s2881
chip northbridge/amd/amdk8/root_complex
diff --git a/src/mainboard/tyan/s2881/mainboard.c b/src/mainboard/tyan/s2881/mainboard.c
index fb9b9c8b8a..e96bd39051 100644
--- a/src/mainboard/tyan/s2881/mainboard.c
+++ b/src/mainboard/tyan/s2881/mainboard.c
@@ -5,6 +5,8 @@
#include <device/pci_ops.h>
#include "chip.h"
+#if CONFIG_CHIP_NAME == 1
struct chip_operations mainboard_tyan_s2881_ops = {
CHIP_NAME("Tyan s2881 mainboard")
};
+#endif
diff --git a/src/mainboard/tyan/s2882/Config.lb b/src/mainboard/tyan/s2882/Config.lb
index 7db07ad5e4..955432b05e 100644
--- a/src/mainboard/tyan/s2882/Config.lb
+++ b/src/mainboard/tyan/s2882/Config.lb
@@ -121,7 +121,9 @@ mainboardinit cpu/x86/mmx/disable_mmx.inc
## Include the secondary Configuration files
##
dir /pc80
-config chip.h
+if CONFIG_CHIP_NAME
+ config chip.h
+end
# sample config for tyan/s2882
chip northbridge/amd/amdk8/root_complex
diff --git a/src/mainboard/tyan/s2882/mainboard.c b/src/mainboard/tyan/s2882/mainboard.c
index a910114263..8ad4bec92c 100644
--- a/src/mainboard/tyan/s2882/mainboard.c
+++ b/src/mainboard/tyan/s2882/mainboard.c
@@ -5,6 +5,8 @@
#include <device/pci_ops.h>
#include "chip.h"
+#if CONFIG_CHIP_NAME == 1
struct chip_operations mainboard_tyan_s2882_ops = {
CHIP_NAME("Tyan s2882 mainboard")
};
+#endif
diff --git a/src/mainboard/tyan/s2885/Config.lb b/src/mainboard/tyan/s2885/Config.lb
index a07e068af5..3e8dd3beb9 100644
--- a/src/mainboard/tyan/s2885/Config.lb
+++ b/src/mainboard/tyan/s2885/Config.lb
@@ -125,7 +125,10 @@ mainboardinit cpu/x86/mmx/disable_mmx.inc
## Include the secondary Configuration files
##
dir /pc80
-config chip.h
+
+if CONFIG_CHIP_NAME
+ config chip.h
+end
# sample config for tyan/s2885
chip northbridge/amd/amdk8/root_complex
diff --git a/src/mainboard/tyan/s2885/mainboard.c b/src/mainboard/tyan/s2885/mainboard.c
index 3c7583dca9..1f652c2cca 100644
--- a/src/mainboard/tyan/s2885/mainboard.c
+++ b/src/mainboard/tyan/s2885/mainboard.c
@@ -5,6 +5,8 @@
#include <device/pci_ops.h>
#include "chip.h"
+#if CONFIG_CHIP_NAME == 1
struct chip_operations mainboard_tyan_s2885_ops = {
CHIP_NAME("Tyan s2885 mainboard")
};
+#endif
diff --git a/src/mainboard/tyan/s4880/Config.lb b/src/mainboard/tyan/s4880/Config.lb
index d867537cf5..b9387cb700 100644
--- a/src/mainboard/tyan/s4880/Config.lb
+++ b/src/mainboard/tyan/s4880/Config.lb
@@ -121,7 +121,9 @@ mainboardinit cpu/x86/mmx/disable_mmx.inc
## Include the secondary Configuration files
##
dir /pc80
-config chip.h
+if CONFIG_CHIP_NAME
+ config chip.h
+end
# sample config for tyan/s4880
chip northbridge/amd/amdk8/root_complex
diff --git a/src/mainboard/tyan/s4880/mainboard.c b/src/mainboard/tyan/s4880/mainboard.c
index fac83b534f..b13dd9f702 100644
--- a/src/mainboard/tyan/s4880/mainboard.c
+++ b/src/mainboard/tyan/s4880/mainboard.c
@@ -5,6 +5,8 @@
#include <device/pci_ops.h>
#include "chip.h"
+#if CONFIG_CHIP_NAME == 1
struct chip_operations mainboard_tyan_s4880_ops = {
CHIP_NAME("Tyan s4880 mainboard")
};
+#endif
diff --git a/src/mainboard/tyan/s4882/Config.lb b/src/mainboard/tyan/s4882/Config.lb
index 0c17843628..27e14df397 100644
--- a/src/mainboard/tyan/s4882/Config.lb
+++ b/src/mainboard/tyan/s4882/Config.lb
@@ -121,7 +121,9 @@ mainboardinit cpu/x86/mmx/disable_mmx.inc
## Include the secondary Configuration files
##
dir /pc80
-config chip.h
+if CONFIG_CHIP_NAME
+ config chip.h
+end
# sample config for tyan/s4882
chip northbridge/amd/amdk8/root_complex
diff --git a/src/mainboard/tyan/s4882/mainboard.c b/src/mainboard/tyan/s4882/mainboard.c
index 0277dd634f..9687ee313c 100644
--- a/src/mainboard/tyan/s4882/mainboard.c
+++ b/src/mainboard/tyan/s4882/mainboard.c
@@ -5,6 +5,8 @@
#include <device/pci_ops.h>
#include "chip.h"
+#if CONFIG_CHIP_NAME == 1
struct chip_operations mainboard_tyan_s4882_ops = {
CHIP_NAME("Tyan s4882 mainboard")
};
+#endif