summaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
authorStefan Reinauer <stepan@coresystems.de>2010-04-07 00:38:09 +0000
committerStefan Reinauer <stepan@openbios.org>2010-04-07 00:38:09 +0000
commitf8b19238481c7581cb521c4f5bde8b9e6f091ee1 (patch)
tree1e4e5fc3f8512c2a25fcb6af9a3b1c62acb394a1 /src/mainboard
parent0ff769baa58f786bdbeef23dc911e730884d803a (diff)
downloadcoreboot-f8b19238481c7581cb521c4f5bde8b9e6f091ee1.tar.xz
- unify use of SB_HT_CHAIN_UNITID_OFFSET_ONLY
- cleanup reset - some minor warning fixes. Signed-off-by: Stefan Reinauer <stepan@coresystems.de> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5361 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/mainboard')
-rw-r--r--src/mainboard/asus/a8n_e/Kconfig5
-rw-r--r--src/mainboard/asus/a8v-e_se/Kconfig5
-rw-r--r--src/mainboard/asus/m2v-mx_se/Kconfig5
-rw-r--r--src/mainboard/hp/dl145_g3/Kconfig5
-rw-r--r--src/mainboard/msi/ms7135/Kconfig5
-rw-r--r--src/mainboard/msi/ms9282/get_bus_conf.c25
-rw-r--r--src/mainboard/msi/ms9282/mptable.c8
-rw-r--r--src/mainboard/msi/ms9652_fam10/Kconfig6
-rw-r--r--src/mainboard/sunw/ultra40/Kconfig5
-rw-r--r--src/mainboard/supermicro/h8dme/Kconfig5
-rw-r--r--src/mainboard/supermicro/h8dmr/Kconfig5
-rw-r--r--src/mainboard/supermicro/h8dmr_fam10/Kconfig5
-rw-r--r--src/mainboard/supermicro/h8qme_fam10/Kconfig5
-rw-r--r--src/mainboard/tyan/s2850/Kconfig6
-rw-r--r--src/mainboard/tyan/s2875/Kconfig6
-rw-r--r--src/mainboard/tyan/s2892/Kconfig5
-rw-r--r--src/mainboard/tyan/s2895/Kconfig5
17 files changed, 7 insertions, 104 deletions
diff --git a/src/mainboard/asus/a8n_e/Kconfig b/src/mainboard/asus/a8n_e/Kconfig
index afb8658a94..19a6d86a3e 100644
--- a/src/mainboard/asus/a8n_e/Kconfig
+++ b/src/mainboard/asus/a8n_e/Kconfig
@@ -44,11 +44,6 @@ config SB_HT_CHAIN_ON_BUS0
default 2
depends on BOARD_ASUS_A8N_E
-config SB_HT_CHAIN_UNITID_OFFSET_ONLY
- bool
- default n
- depends on BOARD_ASUS_A8N_E
-
config MAINBOARD_PART_NUMBER
string
default "A8N-E"
diff --git a/src/mainboard/asus/a8v-e_se/Kconfig b/src/mainboard/asus/a8v-e_se/Kconfig
index fb76263f23..e6f2b7b9d0 100644
--- a/src/mainboard/asus/a8v-e_se/Kconfig
+++ b/src/mainboard/asus/a8v-e_se/Kconfig
@@ -44,11 +44,6 @@ config SB_HT_CHAIN_ON_BUS0
default 1
depends on BOARD_ASUS_A8V_E_SE
-config SB_HT_CHAIN_UNITID_OFFSET_ONLY
- bool
- default n
- depends on BOARD_ASUS_A8V_E_SE
-
config MAINBOARD_PART_NUMBER
string
default "A8V-E SE"
diff --git a/src/mainboard/asus/m2v-mx_se/Kconfig b/src/mainboard/asus/m2v-mx_se/Kconfig
index a1f2ce6045..55ad875df0 100644
--- a/src/mainboard/asus/m2v-mx_se/Kconfig
+++ b/src/mainboard/asus/m2v-mx_se/Kconfig
@@ -86,11 +86,6 @@ config HT_CHAIN_UNITID_BASE
default 0x0
depends on BOARD_ASUS_M2V_MX_SE
-config SB_HT_CHAIN_UNITID_OFFSET_ONLY
- bool
- default n
- depends on BOARD_ASUS_M2V_MX_SE
-
config SB_HT_CHAIN_ON_BUS0
int
default 1
diff --git a/src/mainboard/hp/dl145_g3/Kconfig b/src/mainboard/hp/dl145_g3/Kconfig
index 0bf5623ddd..3d70aac6d7 100644
--- a/src/mainboard/hp/dl145_g3/Kconfig
+++ b/src/mainboard/hp/dl145_g3/Kconfig
@@ -47,11 +47,6 @@ config SB_HT_CHAIN_ON_BUS0
default 2
depends on BOARD_HP_DL145_G3
-config SB_HT_CHAIN_UNITID_OFFSET_ONLY
- bool
- default n
- depends on BOARD_HP_DL145_G3
-
config MAINBOARD_PART_NUMBER
string
default "ProLiant DL145 G3"
diff --git a/src/mainboard/msi/ms7135/Kconfig b/src/mainboard/msi/ms7135/Kconfig
index 5d1acfc8e1..4617c9f8f9 100644
--- a/src/mainboard/msi/ms7135/Kconfig
+++ b/src/mainboard/msi/ms7135/Kconfig
@@ -79,11 +79,6 @@ config SB_HT_CHAIN_ON_BUS0
default 2
depends on BOARD_MSI_MS7135
-config SB_HT_CHAIN_UNITID_OFFSET_ONLY
- bool
- default n
- depends on BOARD_MSI_MS7135
-
config IRQ_SLOT_COUNT
int
default 13
diff --git a/src/mainboard/msi/ms9282/get_bus_conf.c b/src/mainboard/msi/ms9282/get_bus_conf.c
index f2b9f5932a..a1326b84dd 100644
--- a/src/mainboard/msi/ms9282/get_bus_conf.c
+++ b/src/mainboard/msi/ms9282/get_bus_conf.c
@@ -68,31 +68,6 @@ extern void get_sblk_pci1234(void);
static unsigned get_bus_conf_done = 0;
-static unsigned get_hcid(unsigned i)
-{
- unsigned id = 0;
-
- unsigned busn = (sysconf.pci1234[i] >> 16) & 0xff;
-
- unsigned devn = sysconf.hcdn[i] & 0xff;
-
- device_t dev;
-
- dev = dev_find_slot(busn, PCI_DEVFN(devn,0));
-
- switch (dev->device) {
- case 0x0369: //IO55
- id = 4;
- break;
- }
-
- // we may need more way to find out hcid: subsystem id? GPIO read ?
-
- // we need use id for 1. bus num, 2. mptable, 3. acpi table
-
- return id;
-}
-
void get_bus_conf(void)
{
diff --git a/src/mainboard/msi/ms9282/mptable.c b/src/mainboard/msi/ms9282/mptable.c
index 02a4ede25b..f8a3195614 100644
--- a/src/mainboard/msi/ms9282/mptable.c
+++ b/src/mainboard/msi/ms9282/mptable.c
@@ -38,12 +38,12 @@ static void *smp_write_config_table(void *v)
{
static const char sig[4] = "PCMP";
static const char oem[8] = "MSI ";
- static const char productid[12] = "MS9282 ";
+ static const char productid[12] = "MS9282 ";
struct mp_config_table *mc;
- struct mb_sysconf_t *m;
- unsigned sbdn;
+ struct mb_sysconf_t *m;
+ unsigned sbdn;
- int i,j;
+ int i,j;
mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
memset(mc, 0, sizeof(*mc));
diff --git a/src/mainboard/msi/ms9652_fam10/Kconfig b/src/mainboard/msi/ms9652_fam10/Kconfig
index aa8a6b261d..4a80544342 100644
--- a/src/mainboard/msi/ms9652_fam10/Kconfig
+++ b/src/mainboard/msi/ms9652_fam10/Kconfig
@@ -16,6 +16,7 @@ config BOARD_MSI_MS9652_FAM10
select ENABLE_APIC_EXT_ID
select AMDMCT
select TINY_BOOTBLOCK
+ select SB_HT_CHAIN_UNITID_OFFSET_ONLY
config MAINBOARD_DIR
string
@@ -189,11 +190,6 @@ config SB_HT_CHAIN_ON_BUS0
default 1
depends on BOARD_MSI_MS9652_FAM10
-config SB_HT_CHAIN_UNITID_OFFSET_ONLY
- bool
- default y
- depends on BOARD_MSI_MS9652_FAM10
-
config VAR_MTRR_HOLE
bool
default n
diff --git a/src/mainboard/sunw/ultra40/Kconfig b/src/mainboard/sunw/ultra40/Kconfig
index 06b51297d3..608a067fa1 100644
--- a/src/mainboard/sunw/ultra40/Kconfig
+++ b/src/mainboard/sunw/ultra40/Kconfig
@@ -44,11 +44,6 @@ config SB_HT_CHAIN_ON_BUS0
default 2
depends on BOARD_SUNW_ULTRA40
-config SB_HT_CHAIN_UNITID_OFFSET_ONLY
- bool
- default n
- depends on BOARD_SUNW_ULTRA40
-
config MAINBOARD_PART_NUMBER
string
default "Ultra 40"
diff --git a/src/mainboard/supermicro/h8dme/Kconfig b/src/mainboard/supermicro/h8dme/Kconfig
index b31e73bcb5..5852f2714e 100644
--- a/src/mainboard/supermicro/h8dme/Kconfig
+++ b/src/mainboard/supermicro/h8dme/Kconfig
@@ -51,11 +51,6 @@ config SB_HT_CHAIN_ON_BUS0
default 2
depends on BOARD_SUPERMICRO_H8DME
-config SB_HT_CHAIN_UNITID_OFFSET_ONLY
- bool
- default n
- depends on BOARD_SUPERMICRO_H8DME
-
config MAINBOARD_PART_NUMBER
string
default "H8DME-2"
diff --git a/src/mainboard/supermicro/h8dmr/Kconfig b/src/mainboard/supermicro/h8dmr/Kconfig
index 842e40b03f..ae74b7af47 100644
--- a/src/mainboard/supermicro/h8dmr/Kconfig
+++ b/src/mainboard/supermicro/h8dmr/Kconfig
@@ -50,11 +50,6 @@ config SB_HT_CHAIN_ON_BUS0
default 2
depends on BOARD_SUPERMICRO_H8DMR
-config SB_HT_CHAIN_UNITID_OFFSET_ONLY
- bool
- default n
- depends on BOARD_SUPERMICRO_H8DMR
-
config MAINBOARD_PART_NUMBER
string
default "H8DMR-i2"
diff --git a/src/mainboard/supermicro/h8dmr_fam10/Kconfig b/src/mainboard/supermicro/h8dmr_fam10/Kconfig
index ebc87764d9..7a6e814911 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/Kconfig
+++ b/src/mainboard/supermicro/h8dmr_fam10/Kconfig
@@ -68,11 +68,6 @@ config SB_HT_CHAIN_ON_BUS0
default 2
depends on BOARD_SUPERMICRO_H8DMR_FAM10
-config SB_HT_CHAIN_UNITID_OFFSET_ONLY
- bool
- default n
- depends on BOARD_SUPERMICRO_H8DMR_FAM10
-
config MAINBOARD_PART_NUMBER
string
default "H8DMR-i2 (Fam10)"
diff --git a/src/mainboard/supermicro/h8qme_fam10/Kconfig b/src/mainboard/supermicro/h8qme_fam10/Kconfig
index 20462a1a57..17bfd7f48e 100644
--- a/src/mainboard/supermicro/h8qme_fam10/Kconfig
+++ b/src/mainboard/supermicro/h8qme_fam10/Kconfig
@@ -69,11 +69,6 @@ config SB_HT_CHAIN_ON_BUS0
default 2
depends on BOARD_SUPERMICRO_H8QME_FAM10
-config SB_HT_CHAIN_UNITID_OFFSET_ONLY
- bool
- default n
- depends on BOARD_SUPERMICRO_H8QME_FAM10
-
config MAINBOARD_PART_NUMBER
string
default "H8QME-2+ (Fam10)"
diff --git a/src/mainboard/tyan/s2850/Kconfig b/src/mainboard/tyan/s2850/Kconfig
index b8d8336fb1..ed08c225ed 100644
--- a/src/mainboard/tyan/s2850/Kconfig
+++ b/src/mainboard/tyan/s2850/Kconfig
@@ -10,6 +10,7 @@ config BOARD_TYAN_S2850
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select BOARD_ROMSIZE_KB_512
+ select SB_HT_CHAIN_UNITID_OFFSET_ONLY
config MAINBOARD_DIR
string
@@ -56,11 +57,6 @@ config HT_CHAIN_END_UNITID_BASE
default 0x20
depends on BOARD_TYAN_S2850
-config SB_HT_CHAIN_UNITID_OFFSET_ONLY
- bool
- default y
- depends on BOARD_TYAN_S2850
-
config SB_HT_CHAIN_ON_BUS0
int
default 0
diff --git a/src/mainboard/tyan/s2875/Kconfig b/src/mainboard/tyan/s2875/Kconfig
index aee7457466..e70f29ac59 100644
--- a/src/mainboard/tyan/s2875/Kconfig
+++ b/src/mainboard/tyan/s2875/Kconfig
@@ -11,6 +11,7 @@ config BOARD_TYAN_S2875
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select BOARD_ROMSIZE_KB_512
+ select SB_HT_CHAIN_UNITID_OFFSET_ONLY
config MAINBOARD_DIR
string
@@ -62,11 +63,6 @@ config HT_CHAIN_END_UNITID_BASE
default 0x20
depends on BOARD_TYAN_S2875
-config SB_HT_CHAIN_UNITID_OFFSET_ONLY
- bool
- default y
- depends on BOARD_TYAN_S2875
-
config SB_HT_CHAIN_ON_BUS0
int
default 0
diff --git a/src/mainboard/tyan/s2892/Kconfig b/src/mainboard/tyan/s2892/Kconfig
index 2aa603727a..20c806e310 100644
--- a/src/mainboard/tyan/s2892/Kconfig
+++ b/src/mainboard/tyan/s2892/Kconfig
@@ -75,11 +75,6 @@ config SB_HT_CHAIN_ON_BUS0
default 2
depends on BOARD_TYAN_S2892
-config SB_HT_CHAIN_UNITID_OFFSET_ONLY
- bool
- default n
- depends on BOARD_TYAN_S2892
-
config IRQ_SLOT_COUNT
int
default 11
diff --git a/src/mainboard/tyan/s2895/Kconfig b/src/mainboard/tyan/s2895/Kconfig
index 02dabf4d9b..f7775e14b3 100644
--- a/src/mainboard/tyan/s2895/Kconfig
+++ b/src/mainboard/tyan/s2895/Kconfig
@@ -75,11 +75,6 @@ config SB_HT_CHAIN_ON_BUS0
default 2
depends on BOARD_TYAN_S2895
-config SB_HT_CHAIN_UNITID_OFFSET_ONLY
- bool
- default n
- depends on BOARD_TYAN_S2895
-
config IRQ_SLOT_COUNT
int
default 11