GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix a couple of warnings 

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5236 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Stefan Reinauer 2010-03-17 01:51:11 +00:00 committed by Stefan Reinauer
parent 37e781706b
commit 348a1ba589
10 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/arch/i386/include/arch/romcc_io.h
View File

@ -273,7 +273,7 @@ static inline __attribute__((always_inline)) void pci_write_config32(device_t de
} }
#define PCI_DEV_INVALID (0xffffffffU) #define PCI_DEV_INVALID (0xffffffffU)
static device_t pci_io_locate_device(unsigned pci_id, device_t dev) static inline device_t pci_io_locate_device(unsigned pci_id, device_t dev)
{ {
for(; dev <= PCI_DEV(255, 31, 7); dev += PCI_DEV(0,0,1)) { for(; dev <= PCI_DEV(255, 31, 7); dev += PCI_DEV(0,0,1)) {
unsigned int id; unsigned int id;
@ -285,7 +285,7 @@ static device_t pci_io_locate_device(unsigned pci_id, device_t dev)
return PCI_DEV_INVALID; return PCI_DEV_INVALID;
} }
static device_t pci_locate_device(unsigned pci_id, device_t dev) static inline device_t pci_locate_device(unsigned pci_id, device_t dev)
{ {
for(; dev <= PCI_DEV(255|(((1<<CONFIG_PCI_BUS_SEGN_BITS)-1)<<8), 31, 7); dev += PCI_DEV(0,0,1)) { for(; dev <= PCI_DEV(255|(((1<<CONFIG_PCI_BUS_SEGN_BITS)-1)<<8), 31, 7); dev += PCI_DEV(0,0,1)) {
unsigned int id; unsigned int id;
@ -297,7 +297,7 @@ static device_t pci_locate_device(unsigned pci_id, device_t dev)
return PCI_DEV_INVALID; return PCI_DEV_INVALID;
} }
static device_t pci_locate_device_on_bus(unsigned pci_id, unsigned bus) static inline device_t pci_locate_device_on_bus(unsigned pci_id, unsigned bus)
{ {
device_t dev, last; device_t dev, last;

2
src/cpu/x86/smm/Makefile.inc
View File

@ -32,7 +32,7 @@ $(obj)/cpu/x86/smm/smm.o: $(smmobjs) $(obj)/console/printk.o $(obj)/console/vtxp
$(obj)/cpu/x86/smm/smm: $(obj)/cpu/x86/smm/smm.o $(src)/cpu/x86/smm/smm.ld $(obj)/ldoptions $(obj)/cpu/x86/smm/smm: $(obj)/cpu/x86/smm/smm.o $(src)/cpu/x86/smm/smm.ld $(obj)/ldoptions
$(CC) $(LDFLAGS) -nostdlib -nostartfiles -static -o $(obj)/cpu/x86/smm/smm.elf -T $(src)/cpu/x86/smm/smm.ld $(obj)/cpu/x86/smm/smm.o $(CC) $(LDFLAGS) -nostdlib -nostartfiles -static -o $(obj)/cpu/x86/smm/smm.elf -T $(src)/cpu/x86/smm/smm.ld $(obj)/cpu/x86/smm/smm.o
$(CONFIG_CROSS_COMPILE)nm -n $(obj)/cpu/x86/smm/smm.elf | sort > $(obj)/cpu/x86/smm/smm.map $(NM) -n $(obj)/cpu/x86/smm/smm.elf | sort > $(obj)/cpu/x86/smm/smm.map
$(OBJCOPY) -O binary $(obj)/cpu/x86/smm/smm.elf $(obj)/cpu/x86/smm/smm $(OBJCOPY) -O binary $(obj)/cpu/x86/smm/smm.elf $(obj)/cpu/x86/smm/smm
$(obj)/cpu/x86/smm/smm_bin.c: $(obj)/cpu/x86/smm/smm $(obj)/cpu/x86/smm/smm_bin.c: $(obj)/cpu/x86/smm/smm

2
src/cpu/x86/smm/smihandler.c
View File

@ -25,8 +25,6 @@
#include <cpu/x86/cache.h> #include <cpu/x86/cache.h>
#include <cpu/x86/smm.h> #include <cpu/x86/smm.h>
void southbridge_smi_set_eos(void);
typedef enum { SMI_LOCKED, SMI_UNLOCKED } smi_semaphore; typedef enum { SMI_LOCKED, SMI_UNLOCKED } smi_semaphore;
/* SMI multiprocessing semaphore */ /* SMI multiprocessing semaphore */

4
src/cpu/x86/smm/smiutil.c
View File

@ -102,7 +102,8 @@ void console_tx_byte(unsigned char byte)
uart_tx_byte(byte); uart_tx_byte(byte);
} }
void uart_init(void) #if CONFIG_DEBUG_SMI
static void uart_init(void)
{ {
/* disable interrupts */ /* disable interrupts */
outb(0x0, CONFIG_TTYS0_BASE + UART_IER); outb(0x0, CONFIG_TTYS0_BASE + UART_IER);
@ -114,6 +115,7 @@ void uart_init(void)
outb((CONFIG_TTYS0_DIV >> 8) & 0xFF, CONFIG_TTYS0_BASE + UART_DLM); outb((CONFIG_TTYS0_DIV >> 8) & 0xFF, CONFIG_TTYS0_BASE + UART_DLM);
outb(UART_LCS, CONFIG_TTYS0_BASE + UART_LCR); outb(UART_LCS, CONFIG_TTYS0_BASE + UART_LCR);
} }
#endif
void console_init(void) void console_init(void)
{ {

4
src/include/cpu/x86/smm.h
View File

@ -250,10 +250,14 @@ typedef struct {
/* SMI handler function prototypes */ /* SMI handler function prototypes */
void smi_handler(u32 smm_revision);
void io_trap_handler(int smif); void io_trap_handler(int smif);
int southbridge_io_trap_handler(int smif); int southbridge_io_trap_handler(int smif);
int mainboard_io_trap_handler(int smif); int mainboard_io_trap_handler(int smif);
void southbridge_smi_set_eos(void);
void __attribute__((weak)) cpu_smi_handler(unsigned int node, smm_state_save_area_t *state_save); void __attribute__((weak)) cpu_smi_handler(unsigned int node, smm_state_save_area_t *state_save);
void __attribute__((weak)) northbridge_smi_handler(unsigned int node, smm_state_save_area_t *state_save); void __attribute__((weak)) northbridge_smi_handler(unsigned int node, smm_state_save_area_t *state_save);
void __attribute__((weak)) southbridge_smi_handler(unsigned int node, smm_state_save_area_t *state_save); void __attribute__((weak)) southbridge_smi_handler(unsigned int node, smm_state_save_area_t *state_save);

2
src/include/cpu/x86/tsc.h
View File

@ -7,7 +7,7 @@ struct tsc_struct {
}; };
typedef struct tsc_struct tsc_t; typedef struct tsc_struct tsc_t;
static tsc_t rdtsc(void) static inline tsc_t rdtsc(void)
{ {
tsc_t res; tsc_t res;
__asm__ __volatile__ ( __asm__ __volatile__ (

2
src/mainboard/kontron/986lcd-m/mainboard.c
View File

@ -21,7 +21,9 @@
#include <device/device.h> #include <device/device.h>
#include <console/console.h> #include <console/console.h>
#include <boot/tables.h> #include <boot/tables.h>
#if CONFIG_PCI_OPTION_ROM_RUN_YABEL
#include <x86emu/x86emu.h> #include <x86emu/x86emu.h>
#endif
#include <pc80/mc146818rtc.h> #include <pc80/mc146818rtc.h>
#include <arch/io.h> #include <arch/io.h>
#include <arch/coreboot_tables.h> #include <arch/coreboot_tables.h>

1
src/mainboard/kontron/986lcd-m/mainboard_smi.c
View File

@ -20,6 +20,7 @@
#include <arch/io.h> #include <arch/io.h>
#include <arch/romcc_io.h> #include <arch/romcc_io.h>
#include <console/console.h> #include <console/console.h>
#include <cpu/x86/smm.h>
#include "../../../southbridge/intel/i82801gx/i82801gx_nvs.h" #include "../../../southbridge/intel/i82801gx/i82801gx_nvs.h"
/* The southbridge SMI handler checks whether gnvs has a /* The southbridge SMI handler checks whether gnvs has a

4
src/southbridge/intel/i82801dx/i82801dx_smihandler.c
View File

@ -588,10 +588,10 @@ static void southbridge_smi_monitor(unsigned int node, smm_state_save_area_t *st
#undef IOTRAP #undef IOTRAP
} }
typedef void (*smi_handler)(unsigned int node, typedef void (*smi_handler_t)(unsigned int node,
smm_state_save_area_t *state_save); smm_state_save_area_t *state_save);
smi_handler southbridge_smi[32] = { smi_handler_t southbridge_smi[32] = {
NULL, // [0] reserved NULL, // [0] reserved
NULL, // [1] reserved NULL, // [1] reserved
NULL, // [2] BIOS_STS NULL, // [2] BIOS_STS

4
src/southbridge/intel/i82801gx/i82801gx_smihandler.c
View File

@ -568,10 +568,10 @@ static void southbridge_smi_monitor(unsigned int node, smm_state_save_area_t *st
#undef IOTRAP #undef IOTRAP
} }
typedef void (*smi_handler)(unsigned int node, typedef void (*smi_handler_t)(unsigned int node,
smm_state_save_area_t *state_save); smm_state_save_area_t *state_save);
smi_handler southbridge_smi[32] = { smi_handler_t southbridge_smi[32] = {
NULL, // [0] reserved NULL, // [0] reserved
NULL, // [1] reserved NULL, // [1] reserved
NULL, // [2] BIOS_STS NULL, // [2] BIOS_STS