diff --git a/src/northsouthbridge/sis/550/ipl.S b/src/northsouthbridge/sis/550/ipl.S index a8e72ae6d2..40896b3421 100644 --- a/src/northsouthbridge/sis/550/ipl.S +++ b/src/northsouthbridge/sis/550/ipl.S @@ -225,9 +225,9 @@ sis630ipl_start: #ifdef STD_FLASH #include "rom/std_flash.inc" #else /* !STD_FLASH */ -#if defined(USE_DOC_MIL) || defined(USE_DOC_2000_TSOP) +#if (USE_DOC_MIL == 1) || (USE_DOC_2000_TSOP == 1) # include "rom/doc_mil.inc" -#else defined(USE_DOC_MIL_PLUS) +#else (USE_DOC_MIL_PLUS == 1) # include "rom/doc_mil_plus.inc" #endif #endif /* STD_FLASH */ @@ -353,9 +353,9 @@ reset_vector: .byte 0xea # jmp to f000:fe00, where IPL .word 0xfe00, 0xf000 # starts in Standard Flash #else /* !STD_FLASH i.e. DoC Mil */ -#if defined(USE_DOC_MIL) +#if (USE_DOC_MIL == 1) .org 0x1f0 -#elif defined(USE_DOC_2000_TSOP) || defined(USE_DOC_MIL_PLUS) +#elif (USE_DOC_2000_TSOP == 1) || (USE_DOC_MIL_PLUS == 1) .org 0x3f0 #endif reset_vector: @@ -367,9 +367,9 @@ spl_vector: .byte 0xea # jmp to 8000:0000, where SPL .word 0x0000, SPL_RAM_SEG # (LinuxBIOS) starts in RAM -#if defined(USE_DOC_MIL) +#if (USE_DOC_MIL == 1) .org 0x1ff -#elif defined(USE_DOC_2000_TSOP) || defined(USE_DOC_MIL_PLUS) +#elif (USE_DOC_2000_TSOP == 1) || (USE_DOC_MIL_PLUS == 1) .org 0x3ff #endif diff --git a/src/northsouthbridge/sis/550/ipl.h b/src/northsouthbridge/sis/550/ipl.h index 76f747361c..642b0a9a06 100644 --- a/src/northsouthbridge/sis/550/ipl.h +++ b/src/northsouthbridge/sis/550/ipl.h @@ -10,7 +10,7 @@ #define DOC_STACK_SEG 0x0400 #define SPL_RAM_SEG 0x8000 -#if defined(USE_DOC_2000_TSOP) +#if (USE_DOC_2000_TSOP == 1) #define DOC_SPL_START_PAGE 4 /* 0-3 for IPL (each of 1KB size) */ #else /* defined (USE_DOC_MIL) */ #define DOC_SPL_START_PAGE 2 /* 0,1 for IPL (each of 512B size) */ diff --git a/src/northsouthbridge/sis/630/ipl.S b/src/northsouthbridge/sis/630/ipl.S index b27407f747..8cb83b6730 100644 --- a/src/northsouthbridge/sis/630/ipl.S +++ b/src/northsouthbridge/sis/630/ipl.S @@ -220,9 +220,9 @@ sis630ipl_start: #include "rom/std_flash.inc" #else /* !STD_FLASH */ #include "unlock_flash.inc" -#if defined(USE_DOC_MIL) || defined(USE_DOC_2000_TSOP) +#if (USE_DOC_MIL == 1) || (USE_DOC_2000_TSOP == 1) # include "rom/doc_mil.inc" -#elif defined(USE_DOC_MIL_PLUS) +#elif (USE_DOC_MIL_PLUS == 1) # include "rom/doc_mil_plus.inc" #endif #endif /* STD_FLASH */ @@ -329,9 +329,9 @@ reset_vector: .byte 0xea # jmp to f000:fe00, where IPL .word 0xfe00, 0xf000 # starts in Standard Flash #else /* !STD_FLASH i.e. DoC Mil */ -#if defined(USE_DOC_MIL) +#if (USE_DOC_MIL == 1) .org 0x1f0 -#elif defined(USE_DOC_2000_TSOP) || defined(USE_DOC_MIL_PLUS) +#elif USE_DOC_2000_TSOP == 1) || (USE_DOC_MIL_PLUS == 1) .org 0x3f0 #endif reset_vector: diff --git a/src/northsouthbridge/sis/630/ipl.h b/src/northsouthbridge/sis/630/ipl.h index f676e85974..670e6b3d29 100644 --- a/src/northsouthbridge/sis/630/ipl.h +++ b/src/northsouthbridge/sis/630/ipl.h @@ -10,7 +10,7 @@ #define DOC_STACK_SEG 0x0400 #define SPL_RAM_SEG 0x8000 -#if defined(USE_DOC_2000_TSOP) +#if (USE_DOC_2000_TSOP == 1) #define DOC_SPL_START_PAGE 4 /* 0-3 for IPL (each of 1KB size) */ #else /* defined (USE_DOC_MIL) */ #define DOC_SPL_START_PAGE 2 /* 0,1 for IPL (each of 512B size) */ diff --git a/util/config/sis550.config b/util/config/sis550.config index 2d8759d760..21cf4f1b72 100644 --- a/util/config/sis550.config +++ b/util/config/sis550.config @@ -6,7 +6,7 @@ target sis550 mainboard sis/550 # use DOC MIL -option USE_DOC_MIL +option USE_DOC_MIL=1 docipl northsouthbridge/sis/550/ipl.S # Use the internal VGA frame buffer device diff --git a/util/config/winfast.config b/util/config/winfast.config index 5fecc25476..c40efa338b 100644 --- a/util/config/winfast.config +++ b/util/config/winfast.config @@ -9,7 +9,7 @@ mainboard leadtek/winfast6300 option SERIAL_CONSOLE=1 # use DOC MIL -option USE_DOC_MIL +option USE_DOC_MIL=1 docipl northsouthbridge/sis/630/ipl.S # Enable MicroCode update and L2 Cache init for PII and PIII