From 9180eb5955c5495f422c5032310595d9de61486e Mon Sep 17 00:00:00 2001 From: Li-Ta Lo Date: Wed, 20 Feb 2002 02:35:31 +0000 Subject: [PATCH] leave more room for IPL in STD_FLASH case --- src/northsouthbridge/sis/550/ipl.S | 7 +++---- src/northsouthbridge/sis/630/ipl.S | 9 ++++++--- src/northsouthbridge/sis/730/ipl.S | 6 +++--- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/northsouthbridge/sis/550/ipl.S b/src/northsouthbridge/sis/550/ipl.S index 40896b3421..c87e049615 100644 --- a/src/northsouthbridge/sis/550/ipl.S +++ b/src/northsouthbridge/sis/550/ipl.S @@ -31,11 +31,10 @@ #include "ipl.h" -#define SIS550_BUG .code16 #ifdef STD_FLASH -.org 0xfe00 +.org 0xfc00 #endif #undef SIZE_ALL @@ -350,8 +349,8 @@ pci_init_table: #ifdef STD_FLASH .org 0xfff0 reset_vector: - .byte 0xea # jmp to f000:fe00, where IPL - .word 0xfe00, 0xf000 # starts in Standard Flash + .byte 0xea # jmp to f000:fc00, where IPL + .word 0xfc00, 0xf000 # starts in Standard Flash #else /* !STD_FLASH i.e. DoC Mil */ #if (USE_DOC_MIL == 1) .org 0x1f0 diff --git a/src/northsouthbridge/sis/630/ipl.S b/src/northsouthbridge/sis/630/ipl.S index 8cb83b6730..1d50125aa0 100644 --- a/src/northsouthbridge/sis/630/ipl.S +++ b/src/northsouthbridge/sis/630/ipl.S @@ -34,7 +34,7 @@ .code16 #ifdef STD_FLASH -.org 0xfe00 +.org 0xfc00 #endif #define SIZE_ALL @@ -47,6 +47,9 @@ sis630spd_start: movw %cs, %ax # makes data segment == movw %ax, %ds # code segment + movb $0x01, %al + outb %al, $0x80 + movw $0x408a, %ax # ACPI Enable. CALL_SP(write_lpc_register) # (for use of SMBus) @@ -326,8 +329,8 @@ pci_init_table: #ifdef STD_FLASH .org 0xfff0 reset_vector: - .byte 0xea # jmp to f000:fe00, where IPL - .word 0xfe00, 0xf000 # starts in Standard Flash + .byte 0xea # jmp to f000:fc00, where IPL + .word 0xfc00, 0xf000 # starts in Standard Flash #else /* !STD_FLASH i.e. DoC Mil */ #if (USE_DOC_MIL == 1) .org 0x1f0 diff --git a/src/northsouthbridge/sis/730/ipl.S b/src/northsouthbridge/sis/730/ipl.S index 205e5ad97a..ba6eee9a26 100644 --- a/src/northsouthbridge/sis/730/ipl.S +++ b/src/northsouthbridge/sis/730/ipl.S @@ -34,7 +34,7 @@ .code16 #ifdef STD_FLASH -.org 0xfe00 +.org 0xfc00 #endif #define SIZE_ALL @@ -334,8 +334,8 @@ pci_init_table: #ifdef STD_FLASH .org 0xfff0 reset_vector: - .byte 0xea # jmp to f000:fe00, where IPL - .word 0xfe00, 0xf000 # starts in Standard Flash + .byte 0xea # jmp to f000:fc00, where IPL + .word 0xfc00, 0xf000 # starts in Standard Flash #else /* !STD_FLASH i.e. DoC Mil */ #if defined(USE_DOC_MIL) .org 0x1f0