[v2] r4768 - in trunk/coreboot-v2/src: devices mainboard/tyan/s2892 mainboard/tyan/s2895

Author: myles
Date: 2009-10-13 22:00:09 +0200 (Tue, 13 Oct 2009)
New Revision: 4768

Modified:
   trunk/coreboot-v2/src/devices/device.c
   trunk/coreboot-v2/src/mainboard/tyan/s2892/mptable.c
   trunk/coreboot-v2/src/mainboard/tyan/s2895/irq_tables.c
   trunk/coreboot-v2/src/mainboard/tyan/s2895/mptable.c
Log:
Remove a couple more warnings.  Trivial.

Signed-off-by: Myles Watson 
Acked-by: Myles Watson

Modified: trunk/coreboot-v2/src/devices/device.c
===================================================================
--- trunk/coreboot-v2/src/devices/device.c	2009-10-13 19:21:44 UTC (rev 4767)
+++ trunk/coreboot-v2/src/devices/device.c	2009-10-13 20:00:09 UTC (rev 4768)
@@ -235,7 +235,7 @@
  *   the allocator. Also this allows handling of other types of bridges.
  *
  */
-void compute_resources(struct bus *bus, struct resource *bridge,
+static void compute_resources(struct bus *bus, struct resource *bridge,
    	       unsigned long type_mask, unsigned long type)
 {
    struct device *dev;
@@ -392,7 +392,7 @@
  * @param type_mask This value gets anded with the resource type.
  * @param type This value must match the result of the and.
  */
-void allocate_resources(struct bus *bus, struct resource *bridge,
+static void allocate_resources(struct bus *bus, struct resource *bridge,
    		unsigned long type_mask, unsigned long type)
 {
    struct device *dev;

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2892/mptable.c
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2892/mptable.c	2009-10-13 19:21:44 UTC (rev 4767)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2892/mptable.c	2009-10-13 20:00:09 UTC (rev 4768)
@@ -24,7 +24,7 @@

extern void get_bus_conf(void);

-void *smp_write_config_table(void *v)
+static void *smp_write_config_table(void *v)
 {
    static const char sig[4] = "PCMP";
    static const char oem[8] = "TYAN    ";

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2895/irq_tables.c
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2895/irq_tables.c	2009-10-13 19:21:44 UTC (rev 4767)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2895/irq_tables.c	2009-10-13 20:00:09 UTC (rev 4768)
@@ -163,6 +163,12 @@
    pirq_info++; slot_num++;
 #endif

+	if(sysconf.pci1234[2] & 0xf) {
+	//second pci beidge
+		write_pirq_info(pirq_info, bus_ck804b_0, ((sbdnb+9)<<3)|0, 0x1, 0xdef8, 0x2, 0xdef8, 0x3, 0xdef8, 0x4, 0xdef8, 0x0, 0);
+		pirq_info++; slot_num++;
+	}
+
    pirq->size = 32 + 16 * slot_num;

for (i = 0; i < pirq->size; i++)

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2895/mptable.c
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2895/mptable.c	2009-10-13 19:21:44 UTC (rev 4767)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2895/mptable.c	2009-10-13 20:00:09 UTC (rev 4768)
@@ -32,7 +32,7 @@

extern void get_bus_conf(void);

-void *smp_write_config_table(void *v)
+static void *smp_write_config_table(void *v)
 {
    static const char sig[4] = "PCMP";
    static const char oem[8] = "TYAN    ";