From 162114dd66d1f35ffbcb6c56468869fe0896b717 Mon Sep 17 00:00:00 2001 From: Li-Ta Lo Date: Fri, 15 Jun 2001 04:22:55 +0000 Subject: [PATCH] make SMA_SIZE a comiple time option --- src/northsouthbridge/sis/540/Config | 1 + src/northsouthbridge/sis/540/ipl.S | 8 ++++---- src/northsouthbridge/sis/550/Config | 1 + src/northsouthbridge/sis/550/ipl.S | 9 +++++---- src/northsouthbridge/sis/630/Config | 1 + src/northsouthbridge/sis/630/ipl.S | 8 ++++---- src/northsouthbridge/sis/730/Config | 1 + src/northsouthbridge/sis/730/ipl.S | 8 ++++---- 8 files changed, 21 insertions(+), 16 deletions(-) diff --git a/src/northsouthbridge/sis/540/Config b/src/northsouthbridge/sis/540/Config index c1405c8685..9f61db9f87 100644 --- a/src/northsouthbridge/sis/540/Config +++ b/src/northsouthbridge/sis/540/Config @@ -1,5 +1,6 @@ option SIS540 option USE_DOC_MIL +option SMA_SIZE=0x90 docipl northsouthbridge/sis/540/ipl.S raminit northsouthbridge/sis/540/raminit.inc diff --git a/src/northsouthbridge/sis/540/ipl.S b/src/northsouthbridge/sis/540/ipl.S index dbc8a66957..da1153bf92 100644 --- a/src/northsouthbridge/sis/540/ipl.S +++ b/src/northsouthbridge/sis/540/ipl.S @@ -177,17 +177,17 @@ no_sdram: movw %fs, %ax movb $0x63, %ah #ifdef HAVE_FRAMEBUFFER - orb $0x90, %al # enable SMA 4 MB for VGA + orb $SMA_SIZE, %al # enable SMA 8 MB for VGA #endif /* HAVE_FRAMEBUFFER */ #else /* !SIZE_ALL */ no_sdram: #ifdef HAVE_FRAMEBUFFER - # enable DIMM 0 and - movw $0x6391, %ax # enable SMA 4 MB for VGA + movb $0x63, %ah # enable DIMM 0 and + movw $SMA_SIZE + $0x01, %ax # enable SMA 8 MB for VGA #else /* HAVE_FRAMEBUFFER */ - movw $0x6301, %ax # enable DIMM 0 + movw $0x6301, %ax # enable DIMM 0 #endif /* HAVE_FRAMEBUFFER */ #endif /* SIZE_ALL */ diff --git a/src/northsouthbridge/sis/550/Config b/src/northsouthbridge/sis/550/Config index 03f5b5caf9..c710e026fa 100644 --- a/src/northsouthbridge/sis/550/Config +++ b/src/northsouthbridge/sis/550/Config @@ -1,5 +1,6 @@ option SIS550 option USE_DOC_MIL +option SMA_SIZE=0xA0 docipl northsouthbridge/sis/550/ipl.S raminit northsouthbridge/sis/550/raminit.inc diff --git a/src/northsouthbridge/sis/550/ipl.S b/src/northsouthbridge/sis/550/ipl.S index 63001bc9f8..2a21985d83 100644 --- a/src/northsouthbridge/sis/550/ipl.S +++ b/src/northsouthbridge/sis/550/ipl.S @@ -40,6 +40,7 @@ sis630spd_start: cli # Disables the maskable + # hardware interrupts. movw %cs, %ax # makes data segment == movw %ax, %ds # code segment @@ -183,17 +184,17 @@ no_sdram: movw %fs, %ax movb $0x63, %ah #ifdef HAVE_FRAMEBUFFER - orb $0xA0, %al # enable SMA 8 MB for VGA + orb $SMA_SIZE, %al # enable SMA 8 MB for VGA #endif /* HAVE_FRAMEBUFFER */ #else /* !SIZE_ALL */ no_sdram: #ifdef HAVE_FRAMEBUFFER - # enable DIMM 0 and - movw $0x63A1, %ax # enable SMA 8 MB for VGA + movb $0x63, %ah # enable DIMM 0 and + movw $SMA_SIZE + $0x01, %ax # enable SMA 8 MB for VGA #else /* HAVE_FRAMEBUFFER */ - movw $0x6301, %ax # enable DIMM 0 + movw $0x6301, %ax # enable DIMM 0 #endif /* HAVE_FRAMEBUFFER */ #endif /* SIZE_ALL */ diff --git a/src/northsouthbridge/sis/630/Config b/src/northsouthbridge/sis/630/Config index 6d84c943ee..3179e56284 100644 --- a/src/northsouthbridge/sis/630/Config +++ b/src/northsouthbridge/sis/630/Config @@ -1,5 +1,6 @@ option SIS630 option USE_DOC_MIL +option SMA_SIZE=0xA0 docipl northsouthbridge/sis/630/ipl.S raminit northsouthbridge/sis/630/raminit.inc diff --git a/src/northsouthbridge/sis/630/ipl.S b/src/northsouthbridge/sis/630/ipl.S index 6932f07f32..db3eb66879 100644 --- a/src/northsouthbridge/sis/630/ipl.S +++ b/src/northsouthbridge/sis/630/ipl.S @@ -177,17 +177,17 @@ no_sdram: movw %fs, %ax movb $0x63, %ah #ifdef HAVE_FRAMEBUFFER - orb $0xA0, %al # enable SMA 8 MB for VGA + orb $SMA_SIZE, %al # enable SMA 8 MB for VGA #endif /* HAVE_FRAMEBUFFER */ #else /* !SIZE_ALL */ no_sdram: #ifdef HAVE_FRAMEBUFFER - # enable DIMM 0 and - movw $0x63A1, %ax # enable SMA 8 MB for VGA + movb $0x63, %ah # enable DIMM 0 and + movw $SMA_SIZE + $0x01, %ax # enable SMA 8 MB for VGA #else /* HAVE_FRAMEBUFFER */ - movw $0x6301, %ax # enable DIMM 0 + movw $0x6301, %ax # enable DIMM 0 #endif /* HAVE_FRAMEBUFFER */ #endif /* SIZE_ALL */ diff --git a/src/northsouthbridge/sis/730/Config b/src/northsouthbridge/sis/730/Config index 7ee231bcf5..c93eae7642 100644 --- a/src/northsouthbridge/sis/730/Config +++ b/src/northsouthbridge/sis/730/Config @@ -1,5 +1,6 @@ option SIS730 option USE_DOC_MIL +option SMA_SIZE=0xA0 docipl northsouthbridge/sis/730/ipl.S raminit northsouthbridge/sis/730/raminit.inc diff --git a/src/northsouthbridge/sis/730/ipl.S b/src/northsouthbridge/sis/730/ipl.S index ff5219d01e..1364e29646 100644 --- a/src/northsouthbridge/sis/730/ipl.S +++ b/src/northsouthbridge/sis/730/ipl.S @@ -177,17 +177,17 @@ no_sdram: movw %fs, %ax movb $0x63, %ah #ifdef HAVE_FRAMEBUFFER - orb $0xA0, %al # enable SMA 8 MB for VGA + orb $SMA_SIZE, %al # enable SMA 8 MB for VGA #endif /* HAVE_FRAMEBUFFER */ #else /* !SIZE_ALL */ no_sdram: #ifdef HAVE_FRAMEBUFFER - # enable DIMM 0 and - movw $0x63A1, %ax # enable SMA 8 MB for VGA + movb $0x63, %ah # enable DIMM 0 and + movw $SMA_SIZE + $0x01, %ax # enable SMA 8 MB for VGA #else /* HAVE_FRAMEBUFFER */ - movw $0x6301, %ax # enable DIMM 0 + movw $0x6301, %ax # enable DIMM 0 #endif /* HAVE_FRAMEBUFFER */ #endif /* SIZE_ALL */