more 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@5242 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
parent
b319b1778c
commit
bd112980ff
|
@ -22,3 +22,10 @@ config CPU_INTEL_SOCKET_PGA370
|
||||||
bool
|
bool
|
||||||
select MMX
|
select MMX
|
||||||
select UDELAY_TSC
|
select UDELAY_TSC
|
||||||
|
|
||||||
|
# Not all CPUs for Socket 370 can do SSE2
|
||||||
|
config SSE2
|
||||||
|
bool
|
||||||
|
default n
|
||||||
|
depends on CPU_INTEL_SOCKET_PGA370
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,9 @@
|
||||||
#ifndef RESET_H
|
#ifndef RESET_H
|
||||||
#define RESET_H
|
#define RESET_H
|
||||||
|
|
||||||
|
#if !defined( __ROMCC__ )
|
||||||
|
/* ROMCC can't do function prototypes... */
|
||||||
|
|
||||||
#if CONFIG_HAVE_HARD_RESET == 1
|
#if CONFIG_HAVE_HARD_RESET == 1
|
||||||
void hard_reset(void);
|
void hard_reset(void);
|
||||||
#else
|
#else
|
||||||
|
@ -9,3 +12,4 @@ void hard_reset(void);
|
||||||
void soft_reset(void);
|
void soft_reset(void);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
|
@ -7,6 +7,7 @@ config BOARD_DIGITALLOGIC_ADL855PC
|
||||||
select SUPERIO_WINBOND_W83627HF
|
select SUPERIO_WINBOND_W83627HF
|
||||||
select ROMCC
|
select ROMCC
|
||||||
select HAVE_PIRQ_TABLE
|
select HAVE_PIRQ_TABLE
|
||||||
|
select HAVE_HARD_RESET
|
||||||
select BOARD_ROMSIZE_KB_1024
|
select BOARD_ROMSIZE_KB_1024
|
||||||
|
|
||||||
config MAINBOARD_DIR
|
config MAINBOARD_DIR
|
||||||
|
|
|
@ -9,6 +9,7 @@ config BOARD_RCA_RM4100
|
||||||
select HAVE_PIRQ_TABLE
|
select HAVE_PIRQ_TABLE
|
||||||
select UDELAY_TSC
|
select UDELAY_TSC
|
||||||
select BOARD_ROMSIZE_KB_512
|
select BOARD_ROMSIZE_KB_512
|
||||||
|
select HAVE_HARD_RESET
|
||||||
select HAVE_SMI_HANDLER
|
select HAVE_SMI_HANDLER
|
||||||
|
|
||||||
config MAINBOARD_DIR
|
config MAINBOARD_DIR
|
||||||
|
|
|
@ -9,6 +9,7 @@ config BOARD_THOMSON_IP1000
|
||||||
select HAVE_PIRQ_TABLE
|
select HAVE_PIRQ_TABLE
|
||||||
select UDELAY_TSC
|
select UDELAY_TSC
|
||||||
select BOARD_ROMSIZE_KB_512
|
select BOARD_ROMSIZE_KB_512
|
||||||
|
select HAVE_HARD_RESET
|
||||||
select HAVE_SMI_HANDLER
|
select HAVE_SMI_HANDLER
|
||||||
|
|
||||||
config MAINBOARD_DIR
|
config MAINBOARD_DIR
|
||||||
|
|
|
@ -22,6 +22,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>
|
||||||
|
|
||||||
int mainboard_io_trap_handler(int smif)
|
int mainboard_io_trap_handler(int smif)
|
||||||
{
|
{
|
||||||
|
|
|
@ -25,7 +25,9 @@
|
||||||
#include <device/pci.h>
|
#include <device/pci.h>
|
||||||
#include <device/pci_ids.h>
|
#include <device/pci_ids.h>
|
||||||
#include <cbfs.h>
|
#include <cbfs.h>
|
||||||
|
#if defined(CONFIG_PCI_OPTION_ROM_RUN_YABEL) && CONFIG_PCI_OPTION_ROM_RUN_YABEL
|
||||||
#include <x86emu/x86emu.h>
|
#include <x86emu/x86emu.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
static void vga_init(device_t dev)
|
static void vga_init(device_t dev)
|
||||||
{
|
{
|
||||||
|
|
|
@ -36,6 +36,8 @@
|
||||||
extern void i82801dx_enable(device_t dev);
|
extern void i82801dx_enable(device_t dev);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#define DEBUG_PERIODIC_SMIS 0
|
||||||
|
|
||||||
#define MAINBOARD_POWER_OFF 0
|
#define MAINBOARD_POWER_OFF 0
|
||||||
#define MAINBOARD_POWER_ON 1
|
#define MAINBOARD_POWER_ON 1
|
||||||
#define MAINBOARD_POWER_KEEP 2
|
#define MAINBOARD_POWER_KEEP 2
|
||||||
|
|
|
@ -18,6 +18,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <arch/io.h>
|
#include <arch/io.h>
|
||||||
|
#include <reset.h>
|
||||||
|
|
||||||
void hard_reset(void)
|
void hard_reset(void)
|
||||||
{
|
{
|
||||||
|
|
|
@ -24,6 +24,7 @@
|
||||||
#include <device/pci.h>
|
#include <device/pci.h>
|
||||||
#include <console/console.h>
|
#include <console/console.h>
|
||||||
#include <arch/io.h>
|
#include <arch/io.h>
|
||||||
|
#include <cpu/cpu.h>
|
||||||
#include <cpu/x86/cache.h>
|
#include <cpu/x86/cache.h>
|
||||||
#include <cpu/x86/smm.h>
|
#include <cpu/x86/smm.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
@ -237,7 +238,7 @@ static void smi_set_eos(void)
|
||||||
|
|
||||||
extern uint8_t smm_relocation_start, smm_relocation_end;
|
extern uint8_t smm_relocation_start, smm_relocation_end;
|
||||||
|
|
||||||
void smm_relocate(void)
|
static void smm_relocate(void)
|
||||||
{
|
{
|
||||||
u32 smi_en;
|
u32 smi_en;
|
||||||
u16 pm1_en;
|
u16 pm1_en;
|
||||||
|
@ -317,7 +318,7 @@ void smm_relocate(void)
|
||||||
outb(0x00, 0xb2);
|
outb(0x00, 0xb2);
|
||||||
}
|
}
|
||||||
|
|
||||||
void smm_install(void)
|
static void smm_install(void)
|
||||||
{
|
{
|
||||||
/* enable the SMM memory window */
|
/* enable the SMM memory window */
|
||||||
pci_write_config8(dev_find_slot(0, PCI_DEVFN(0, 0)), SMRAM,
|
pci_write_config8(dev_find_slot(0, PCI_DEVFN(0, 0)), SMRAM,
|
||||||
|
|
|
@ -345,7 +345,7 @@ static void enable_dev(device_t dev)
|
||||||
|
|
||||||
/* Enable the specified devices (if present on the chip). */
|
/* Enable the specified devices (if present on the chip). */
|
||||||
pnp_enable_devices(dev, &pnp_ops, ARRAY_SIZE(pnp_dev_info),
|
pnp_enable_devices(dev, &pnp_ops, ARRAY_SIZE(pnp_dev_info),
|
||||||
&pnp_dev_info);
|
&pnp_dev_info[0]);
|
||||||
|
|
||||||
/* Restore LD_FOO values. */
|
/* Restore LD_FOO values. */
|
||||||
for (j = 0; j < ARRAY_SIZE(pnp_dev_info); j++)
|
for (j = 0; j < ARRAY_SIZE(pnp_dev_info); j++)
|
||||||
|
|
Loading…
Reference in New Issue