From d6532116c94c705c7e94a34ab2f046e431fb3682 Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Fri, 16 Apr 2010 00:31:44 +0000 Subject: zero warnings days: unify mp tables. fix warnings. Signed-off-by: Stefan Reinauer Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5448 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/mainboard/intel/eagleheights/debug.c | 2 +- src/mainboard/intel/eagleheights/mptable.c | 2 +- src/mainboard/intel/jarrell/mptable.c | 8 ++++---- src/mainboard/intel/mtarvon/mptable.c | 2 +- src/mainboard/intel/truxton/mptable.c | 2 +- src/mainboard/intel/xe7501devkit/mptable.c | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src/mainboard/intel') diff --git a/src/mainboard/intel/eagleheights/debug.c b/src/mainboard/intel/eagleheights/debug.c index f9d218d6aa..f98ca8e9b8 100644 --- a/src/mainboard/intel/eagleheights/debug.c +++ b/src/mainboard/intel/eagleheights/debug.c @@ -210,7 +210,7 @@ static inline void dump_bar14(unsigned dev) print_debug("\n"); } -static void dump_pci_devices(void) +static inline void dump_pci_devices(void) { device_t dev; for(dev = PCI_DEV(0, 0, 0); diff --git a/src/mainboard/intel/eagleheights/mptable.c b/src/mainboard/intel/eagleheights/mptable.c index d2ff79870b..74147cf888 100644 --- a/src/mainboard/intel/eagleheights/mptable.c +++ b/src/mainboard/intel/eagleheights/mptable.c @@ -61,7 +61,7 @@ static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; - static const char oem[8] = "Intel "; + static const char oem[8] = "COREBOOT"; static const char productid[12] = "EagleHeights"; struct mp_config_table *mc; unsigned char bus_num, bus_chipset, bus_isa, bus_pci; diff --git a/src/mainboard/intel/jarrell/mptable.c b/src/mainboard/intel/jarrell/mptable.c index c75657982a..73aa575540 100644 --- a/src/mainboard/intel/jarrell/mptable.c +++ b/src/mainboard/intel/jarrell/mptable.c @@ -7,7 +7,7 @@ static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; - static const char oem[8] = "LNXI "; + static const char oem[8] = "COREBOOT"; static const char productid[12] = "SE7520JR20 "; struct mp_config_table *mc; unsigned char bus_num; @@ -16,7 +16,7 @@ static void *smp_write_config_table(void *v) unsigned char bus_pxhd_2; unsigned char bus_pxhd_3 = 0; unsigned char bus_pxhd_4 = 0; - unsigned char bus_pxhd_x; + unsigned char bus_pxhd_x = 0; unsigned char bus_ich5r_1; unsigned int bus_pxhd_id; @@ -137,6 +137,7 @@ static void *smp_write_config_table(void *v) else { printk(BIOS_DEBUG, "ERROR - could not find IOAPIC PCI 1:00.3\n"); } + /* pxhd apic 5 */ if(bus_pxhd_3) { /* Active riser pxhd */ dev = dev_find_slot(bus_pxhd_x, PCI_DEVFN(0x00,1)); @@ -164,7 +165,6 @@ static void *smp_write_config_table(void *v) } } } - /* ISA backward compatibility interrupts */ smp_write_intsrc(mc, mp_ExtINT, MP_IRQ_TRIGGER_DEFAULT|MP_IRQ_POLARITY_DEFAULT, @@ -218,8 +218,8 @@ static void *smp_write_config_table(void *v) smp_write_lintsrc(mc, mp_NMI, MP_IRQ_TRIGGER_DEFAULT|MP_IRQ_POLARITY_DEFAULT, bus_isa, 0x00, MP_APIC_ALL, 0x01); + /* FIXME verify I have the irqs handled for all of the risers */ -#warning "FIXME verify I have the irqs handled for all of the risers" /* 2:3.0 PCI Slot 1 */ smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_DEFAULT|MP_IRQ_POLARITY_DEFAULT, bus_pxhd_1, (3<<2)|0, 0x9, 0x0); diff --git a/src/mainboard/intel/mtarvon/mptable.c b/src/mainboard/intel/mtarvon/mptable.c index 749745df43..da94a99faa 100644 --- a/src/mainboard/intel/mtarvon/mptable.c +++ b/src/mainboard/intel/mtarvon/mptable.c @@ -29,7 +29,7 @@ static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; - static const char oem[8] = "Intel "; + static const char oem[8] = "COREBOOT"; static const char productid[12] = "Mt. Arvon "; struct mp_config_table *mc; u8 bus_isa = 7; diff --git a/src/mainboard/intel/truxton/mptable.c b/src/mainboard/intel/truxton/mptable.c index 64ebc20199..2b63d2abd8 100644 --- a/src/mainboard/intel/truxton/mptable.c +++ b/src/mainboard/intel/truxton/mptable.c @@ -27,7 +27,7 @@ static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; - static const char oem[8] = "Intel "; + static const char oem[8] = "COREBOOT"; static const char productid[12] = "Truxton "; struct mp_config_table *mc; u8 bus_num; diff --git a/src/mainboard/intel/xe7501devkit/mptable.c b/src/mainboard/intel/xe7501devkit/mptable.c index 6bc85929b5..ee8299389d 100644 --- a/src/mainboard/intel/xe7501devkit/mptable.c +++ b/src/mainboard/intel/xe7501devkit/mptable.c @@ -145,7 +145,7 @@ static void xe7501devkit_register_interrupts(struct mp_config_table *mc) static void *smp_write_config_table(void* v) { static const char sig[4] = MPC_SIGNATURE; - static const char oem[8] = "INTEL "; + static const char oem[8] = "COREBOOT"; static const char productid[12] = "XE7501DEVKIT"; struct mp_config_table *mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN); memset(mc, 0, sizeof(*mc)); -- cgit v1.2.3