fix up sb600 and it8712f tree.

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



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5449 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Stefan Reinauer 2010-04-16 01:14:50 +00:00 committed by Stefan Reinauer
parent d6532116c9
commit 94c27b3d47
3 changed files with 6 additions and 6 deletions

View File

@ -17,6 +17,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <reset.h>
#include <arch/cpu.h> #include <arch/cpu.h>
#include "sb600.h" #include "sb600.h"
#include "sb600_smbus.c" #include "sb600_smbus.c"
@ -196,7 +197,7 @@ static void enable_fid_change_on_sb(u32 sbbusn, u32 sbdn)
} }
static void hard_reset(void) void hard_reset(void)
{ {
set_bios_reset(); set_bios_reset();
@ -205,14 +206,13 @@ static void hard_reset(void)
outb(0x0e, 0x0cf9); outb(0x0e, 0x0cf9);
} }
static void soft_reset(void) void soft_reset(void)
{ {
set_bios_reset(); set_bios_reset();
/* link reset */ /* link reset */
outb(0x06, 0x0cf9); outb(0x06, 0x0cf9);
} }
static void sb600_pci_port80(void) static void sb600_pci_port80(void)
{ {
u8 byte; u8 byte;

View File

@ -36,6 +36,6 @@
#ifndef __ROMCC__ #ifndef __ROMCC__
void it8712f_kill_watchdog(void); void it8712f_kill_watchdog(void);
void it8712f_enable_serial(device_t dev, unsigned iobase); void it8712f_enable_serial(device_t dev, unsigned iobase);
void it8712f_24mhz_clkin(void) void it8712f_24mhz_clkin(void);
void it8712f_enable_3vsbsw(void) void it8712f_enable_3vsbsw(void);
#endif #endif

View File

@ -91,7 +91,7 @@ void it8712f_enable_3vsbsw(void)
it8712f_exit_conf(); it8712f_exit_conf();
} }
static void it8712f_kill_watchdog(void) void it8712f_kill_watchdog(void)
{ {
it8712f_enter_conf(); it8712f_enter_conf();