From 8052b4760050b89b2fdc87a284143ecef352839f Mon Sep 17 00:00:00 2001 From: Li-Ta Lo Date: Wed, 20 Feb 2002 02:42:27 +0000 Subject: [PATCH] more ifdef stuff --- src/northsouthbridge/sis/730/ipl.S | 8 ++++---- util/config/pcchips.config | 2 +- util/config/sis550.config | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/northsouthbridge/sis/730/ipl.S b/src/northsouthbridge/sis/730/ipl.S index ba6eee9a26..4bd5b8a2c5 100644 --- a/src/northsouthbridge/sis/730/ipl.S +++ b/src/northsouthbridge/sis/730/ipl.S @@ -220,9 +220,9 @@ sis730ipl_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 */ @@ -337,9 +337,9 @@ reset_vector: .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) +#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/util/config/pcchips.config b/util/config/pcchips.config index a516ea690e..54b7dfc1bf 100644 --- a/util/config/pcchips.config +++ b/util/config/pcchips.config @@ -9,7 +9,7 @@ mainboard pcchips/m810lmr option SERIAL_CONSOLE=1 # use DOC MIL -option USE_DOC_MIL +option USE_DOC_MIL=1 docipl northsouthbridge/sis/730/ipl.S # Use the internal VGA frame buffer device diff --git a/util/config/sis550.config b/util/config/sis550.config index 21cf4f1b72..9a3535c0bc 100644 --- a/util/config/sis550.config +++ b/util/config/sis550.config @@ -16,4 +16,4 @@ option HAVE_FRAMEBUFFER linux /usr/src/linux # Kernel command line parameters -commandline root=/dev/hda1 console=tty0 video=sisfb:1024x768-32@85,font:VGA8x16 +commandline root=/dev/hda5 console=tty0 video=sisfb:1024x768-32@85,font:VGA8x16