diff --git a/src/arch/i386/lib/hardwaremain.c b/src/arch/i386/lib/hardwaremain.c index b62a90d737..7522ccb4eb 100644 --- a/src/arch/i386/lib/hardwaremain.c +++ b/src/arch/i386/lib/hardwaremain.c @@ -207,7 +207,7 @@ void hardwaremain(int boot_complete) #ifdef USE_NEW_SUPERIO_INTERFACE extern struct superio *all_superio[]; extern int nsuperio; - extern void handle_superio(int pass, struct superio *s, int nsuperio); + extern void handle_superio(int pass, struct superio *s[], int nsuperio); #endif /* the order here is a bit tricky. We don't want to do much of * anything that uses config registers until after PciAllocateResources @@ -220,6 +220,9 @@ void hardwaremain(int boot_complete) unsigned long totalram = 0; extern void linuxbiosmain(unsigned long membase, unsigned long totalram); + // we don't call post code for this one -- since serial post could cause real + // trouble. + outb(0x38, 0x80); /* displayinit MUST PRECEDE ALL PRINTK! */ displayinit(); diff --git a/src/lib/do_inflate.c b/src/lib/do_inflate.c index f98c0e6aa4..592fbb5a68 100644 --- a/src/lib/do_inflate.c +++ b/src/lib/do_inflate.c @@ -98,6 +98,7 @@ static void flush_window(void) void gunzip_setup(void) { /* common globals -- don't rely on init! */ + printk_debug(__FUNCTION__ "\n"); outcnt = 0; bytes_out = 0; output_ptr = 0; diff --git a/src/lib/malloc.c b/src/lib/malloc.c index f5b164c1e9..484dfd7c75 100644 --- a/src/lib/malloc.c +++ b/src/lib/malloc.c @@ -2,7 +2,7 @@ #include #include -#if 1 +#if 0 #define MALLOCDBG(x) #else #define MALLOCDBG(x) printk_spew x @@ -28,6 +28,7 @@ void *malloc(size_t size) { void *p; + MALLOCDBG((__FUNCTION__ " Enter, size %d, free_mem_ptr %p\n", size, free_mem_ptr)); if (size < 0) error("Error! malloc: Size < 0"); if (free_mem_ptr <= 0) diff --git a/src/lib/subr.c b/src/lib/subr.c index d38d75a53b..64101b5647 100644 --- a/src/lib/subr.c +++ b/src/lib/subr.c @@ -79,6 +79,7 @@ void display(char *string) void error(char errmsg[]) { display(errmsg); + post_code(0xff); while (1); /* Halt */ } @@ -89,7 +90,8 @@ void post_code(uint8_t value) { #ifdef SERIAL_POST unsigned long hi, lo; - rdtsc(lo, hi); + // DAMMIT! This just broke! + //rdtsc(lo, hi); printk_info("POST: 0x%02x, TSC Lo: %d, Hi: %d\n", value, lo, hi); #endif diff --git a/src/mainboard/elitegroup/k7sem/config.example b/src/mainboard/elitegroup/k7sem/config.example index b177520b52..81324b3ff4 100644 --- a/src/mainboard/elitegroup/k7sem/config.example +++ b/src/mainboard/elitegroup/k7sem/config.example @@ -1,33 +1,37 @@ # This will make a target directory of ./winfast # Note that this is RELATIVE TO WHERE YOU ARE WHEN YOU RUN THE # CONFIG TOOL. Make it absolute if you like -target k7sem +target k7sem.new # Elitegroup K7sem mainboard elitegroup/k7sem +## Request this level of debugging output +option DEFAULT_CONSOLE_LOGLEVEL=8 +## At a maximum only compile in this level of debugging +option MAXIMUM_CONSOLE_LOGLEVEL=8 +#option DEBUG + # Enable Serial Console for debugging # It will come up at 115200,8n1 option SERIAL_CONSOLE=1 +option SERIAL_POST=1 # Use the internal VGA frame buffer device option HAVE_FRAMEBUFFER=1 #floppy is nice -option MUST_ENABLE_FLOPPY +option MUST_ENABLE_FLOPPY=1 # We're using disk on chip. Tell it where to find the docipl code -option USE_DOC_MIL +option USE_DOC_MIL=1 docipl northsouthbridge/sis/730/ipl.S # Path to your kernel (vmlinux) # NOTE; you need a path to your test12 kernel here. -linux /usr/src/linux-2.4 +linux ~/src/linux-2.4.12-sis # Kernel command line parameters commandline root=/dev/hda1 single console=ttyS0,115200 console=tty0 video=sisfb:1024x768-8@60 - - - diff --git a/src/rom/docmil_fill_inbuf.c b/src/rom/docmil_fill_inbuf.c index b1616ea052..089bb05321 100644 --- a/src/rom/docmil_fill_inbuf.c +++ b/src/rom/docmil_fill_inbuf.c @@ -143,7 +143,7 @@ read_bytes(void *vdest, byte_offset_t count) *(dest++) = c; } - printk_debug(__FUNCTION__ " vdest %p return count %d\n", + printk_spew(__FUNCTION__ " vdest %p return count %d\n", vdest, count); return count; }