From 1b5965a7a71542f62b8a250b1bb259258c3e66a1 Mon Sep 17 00:00:00 2001 From: Li-Ta Lo Date: Wed, 22 May 2002 02:56:45 +0000 Subject: [PATCH] Config file cleanup for P6 and K7 mtrrs --- src/mainboard/elitegroup/k7sem/Config | 6 ++---- src/mainboard/leadtek/winfast6300/Config | 6 +++--- src/mainboard/matsonic/ms7308e/Config | 6 +++--- src/mainboard/pcchips/m810lmr/Config | 4 ++-- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/mainboard/elitegroup/k7sem/Config b/src/mainboard/elitegroup/k7sem/Config index d853e3ca10..d122384b00 100644 --- a/src/mainboard/elitegroup/k7sem/Config +++ b/src/mainboard/elitegroup/k7sem/Config @@ -7,18 +7,16 @@ ldscript cpu/i386/entry32.lds mainboardinit superio/sis/950/setup_serial.inc mainboardinit pc80/serial.inc mainboardinit arch/i386/lib/console.inc +mainboardinit cpu/k7/earlymtrr.inc + northsouthbridge sis/730 -# superio sis/950 nsuperio sis/950 com1={1} floppy=1 lpt=1 -mainboardinit cpu/p6/earlymtrr.inc option ENABLE_FIXED_AND_VARIABLE_MTRRS=1 option FINAL_MAINBOARD_FIXUP=1 option HAVE_PIRQ_TABLE=1 option DISABLE_INTERNAL_DEVICES -# this makes ipl.S too big -#option CONFIG_SIS_DISABLE_ETHERNET object mainboard.o object irq_tables.o keyboard pc80 diff --git a/src/mainboard/leadtek/winfast6300/Config b/src/mainboard/leadtek/winfast6300/Config index f953f3f0ca..bc5c805f95 100644 --- a/src/mainboard/leadtek/winfast6300/Config +++ b/src/mainboard/leadtek/winfast6300/Config @@ -7,11 +7,11 @@ ldscript cpu/i386/entry32.lds mainboardinit superio/sis/950/setup_serial.inc mainboardinit pc80/serial.inc mainboardinit arch/i386/lib/console.inc -northsouthbridge sis/630 -# superio sis/950 -nsuperio sis/950 com1={1} floppy=1 lpt=1 mainboardinit cpu/p6/earlymtrr.inc +northsouthbridge sis/630 +nsuperio sis/950 com1={1} floppy=1 lpt=1 + option ENABLE_FIXED_AND_VARIABLE_MTRRS option FINAL_MAINBOARD_FIXUP option HAVE_PIRQ_TABLE=1 diff --git a/src/mainboard/matsonic/ms7308e/Config b/src/mainboard/matsonic/ms7308e/Config index f953f3f0ca..bc5c805f95 100644 --- a/src/mainboard/matsonic/ms7308e/Config +++ b/src/mainboard/matsonic/ms7308e/Config @@ -7,11 +7,11 @@ ldscript cpu/i386/entry32.lds mainboardinit superio/sis/950/setup_serial.inc mainboardinit pc80/serial.inc mainboardinit arch/i386/lib/console.inc -northsouthbridge sis/630 -# superio sis/950 -nsuperio sis/950 com1={1} floppy=1 lpt=1 mainboardinit cpu/p6/earlymtrr.inc +northsouthbridge sis/630 +nsuperio sis/950 com1={1} floppy=1 lpt=1 + option ENABLE_FIXED_AND_VARIABLE_MTRRS option FINAL_MAINBOARD_FIXUP option HAVE_PIRQ_TABLE=1 diff --git a/src/mainboard/pcchips/m810lmr/Config b/src/mainboard/pcchips/m810lmr/Config index 8a65017393..c96d2d2ace 100644 --- a/src/mainboard/pcchips/m810lmr/Config +++ b/src/mainboard/pcchips/m810lmr/Config @@ -7,10 +7,10 @@ ldscript cpu/i386/entry32.lds mainboardinit superio/sis/950/setup_serial.inc mainboardinit pc80/serial.inc mainboardinit arch/i386/lib/console.inc +mainboardinit cpu/k7/earlymtrr.inc + northsouthbridge sis/730 -# superio sis/950 nsuperio sis/950 com1={1} floppy=1 lpt=1 -mainboardinit cpu/p6/earlymtrr.inc option ENABLE_FIXED_AND_VARIABLE_MTRRS=1 option FINAL_MAINBOARD_FIXUP=1