More Kconfig changes to improve match with newconfig:

DIMM_SUPPORT APIC_ID_OFFSET ACPI_SSDTX_NUM IRQ_SLOT_COUNT MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID (except msi/ms9185) MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID MEM_TRAIN_SEQ HAVE_ACPI_RESUME Also remove MMX (kconfig specific) and HAVE_MOVNTI and IOAPIC (which we deliberately differ in kconfig) from compareboard report. Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5052 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
2010-01-25 10:50:21 +00:00
parent 29647d97c5
commit 2b962a3c39
47 changed files with 108 additions and 66 deletions
--- a/src/cpu/amd/socket_754/Kconfig
+++ b/src/cpu/amd/socket_754/Kconfig
@@ -6,3 +6,8 @@ config CPU_SOCKET_TYPE
 	hex
 	default 0x10
 	depends on CPU_AMD_SOCKET_754
+
+config DIMM_SUPPORT
+	hex
+	default 0x108
+	depends on CPU_AMD_SOCKET_754
--- a/src/cpu/amd/socket_939/Kconfig
+++ b/src/cpu/amd/socket_939/Kconfig
@@ -6,3 +6,8 @@ config CPU_SOCKET_TYPE
 	hex
 	default 0x0
 	depends on CPU_AMD_SOCKET_939
+
+config DIMM_SUPPORT
+	hex
+	default 0x108
+	depends on CPU_AMD_SOCKET_939
--- a/src/cpu/amd/socket_940/Kconfig
+++ b/src/cpu/amd/socket_940/Kconfig
@@ -7,3 +7,8 @@ config CPU_SOCKET_TYPE
 	hex
 	default 0x0
 	depends on CPU_AMD_SOCKET_940
+
+config DIMM_SUPPORT
+	hex
+	default 0x108
+	depends on CPU_AMD_SOCKET_940
--- a/src/mainboard/Kconfig
+++ b/src/mainboard/Kconfig
@@ -287,6 +287,11 @@ config MAINBOARD_VENDOR
 	default "Roda"
 	depends on VENDOR_RODA

+config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
+	hex
+	default 0x4352
+	depends on VENDOR_RODA
+
 config MAINBOARD_VENDOR
 	string
 	default "Soyo"
@@ -302,6 +307,11 @@ config MAINBOARD_VENDOR
 	default "Supermicro"
 	depends on VENDOR_SUPERMICRO

+config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
+	hex
+	default 0x15d9
+	depends on VENDOR_SUPERMICRO
+
 config MAINBOARD_VENDOR
 	string
 	default "Technexion"
--- a/src/mainboard/amd/db800/Kconfig
+++ b/src/mainboard/amd/db800/Kconfig
@@ -29,7 +29,7 @@ config HAVE_OPTION_TABLE

 config IRQ_SLOT_COUNT
 	int
-	default 6
+	default 4
 	depends on BOARD_AMD_DB800

 config DCACHE_RAM_BASE
--- a/src/mainboard/amd/pistachio/Kconfig
+++ b/src/mainboard/amd/pistachio/Kconfig
@@ -38,7 +38,7 @@ config DCACHE_RAM_GLOBAL_VAR_SIZE

 config APIC_ID_OFFSET
 	hex
-	default 0x8
+	default 0x0
 	depends on BOARD_AMD_PISTACHIO

 config LB_CKS_RANGE_END
--- a/src/mainboard/amd/serengeti_cheetah/Kconfig
+++ b/src/mainboard/amd/serengeti_cheetah/Kconfig
@@ -124,3 +124,7 @@ config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
        default 0x2b80
 	depends on BOARD_AMD_SERENGETI_CHEETAH

+config ACPI_SSDTX_NUM
+	int
+	default 1
+	depends on BOARD_AMD_SERENGETI_CHEETAH
--- a/src/mainboard/asus/a8n_e/Kconfig
+++ b/src/mainboard/asus/a8n_e/Kconfig
@@ -30,7 +30,7 @@ config DCACHE_RAM_SIZE

 config APIC_ID_OFFSET
 	hex
-	default 0x10
+	default 0x0
 	depends on BOARD_ASUS_A8N_E

 config MEM_TRAIN_SEQ
--- a/src/mainboard/asus/a8v-e_se/Kconfig
+++ b/src/mainboard/asus/a8v-e_se/Kconfig
@@ -104,11 +104,6 @@ config HAVE_OPTION_TABLE
 	default n
 	depends on BOARD_ASUS_A8V_E_SE

-config IRQ_SLOT_COUNT
-	int
-	default 13
-	depends on BOARD_ASUS_A8V_E_SE
-
 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
 	hex
 	default 0x1043
--- a/src/mainboard/asus/m2v-mx_se/Kconfig
+++ b/src/mainboard/asus/m2v-mx_se/Kconfig
@@ -32,6 +32,7 @@ config BOARD_ASUS_M2V_MX_SE
 	select HAVE_HARD_RESET
 	select HAVE_OPTION_TABLE
 	select HAVE_ACPI_TABLES
+	select HAVE_ACPI_RESUME
 	select BOARD_ROMSIZE_KB_512
 	select VGA
 	select TINY_BOOTBLOCK
--- a/src/mainboard/broadcom/blast/Kconfig
+++ b/src/mainboard/broadcom/blast/Kconfig
@@ -37,7 +37,7 @@ config DCACHE_RAM_GLOBAL_VAR_SIZE

 config APIC_ID_OFFSET
 	hex
-	default 0x10
+	default 0x0
 	depends on BOARD_BROADCOM_BLAST

 config SB_HT_CHAIN_ON_BUS0
--- a/src/mainboard/digitallogic/adl855pc/Kconfig
+++ b/src/mainboard/digitallogic/adl855pc/Kconfig
@@ -23,8 +23,3 @@ config IRQ_SLOT_COUNT
 	int
 	default 5
 	depends on BOARD_DIGITALLOGIC_ADL855PC
-
-config HAVE_INIT_TIMER
-	bool
-	default n
-	depends on BOARD_DIGITALLOGIC_ADL855PC
--- a/src/mainboard/digitallogic/msm586seg/Kconfig
+++ b/src/mainboard/digitallogic/msm586seg/Kconfig
@@ -19,8 +19,3 @@ config IRQ_SLOT_COUNT
 	int
 	default 2
 	depends on BOARD_DIGITALLOGIC_MSM586SEG
-
-config HAVE_INIT_TIMER
-	bool
-	default n
-	depends on BOARD_DIGITALLOGIC_MSM586SEG
--- a/src/mainboard/digitallogic/msm800sev/Kconfig
+++ b/src/mainboard/digitallogic/msm800sev/Kconfig
@@ -29,7 +29,7 @@ config HAVE_OPTION_TABLE

 config IRQ_SLOT_COUNT
 	int
-	default 7
+	default 9
 	depends on BOARD_DIGITALLOGIC_MSM800SEV

 config DCACHE_RAM_BASE
--- a/src/mainboard/gigabyte/ga-6bxc/Kconfig
+++ b/src/mainboard/gigabyte/ga-6bxc/Kconfig
@@ -46,6 +46,6 @@ config HAVE_OPTION_TABLE

 config IRQ_SLOT_COUNT
 	int
-	default 5
+	default 6
 	depends on BOARD_GIGABYTE_GA_6BXC

--- a/src/mainboard/gigabyte/ga_2761gxdk/Kconfig
+++ b/src/mainboard/gigabyte/ga_2761gxdk/Kconfig
@@ -36,12 +36,12 @@ config DCACHE_RAM_GLOBAL_VAR_SIZE

 config APIC_ID_OFFSET
 	hex	
-	default 16
+	default 0x10
 	depends on BOARD_GIGABYTE_GA_2761GXDK

 config MEM_TRAIN_SEQ
 	int
-	default 1
+	default 2
 	depends on BOARD_GIGABYTE_GA_2761GXDK

 config SB_HT_CHAIN_ON_BUS0
--- a/src/mainboard/gigabyte/m57sli/Kconfig
+++ b/src/mainboard/gigabyte/m57sli/Kconfig
@@ -39,12 +39,12 @@ config DCACHE_RAM_GLOBAL_VAR_SIZE

 config APIC_ID_OFFSET
 	hex	
-	default 16
+	default 0x10
 	depends on BOARD_GIGABYTE_M57SLI

 config MEM_TRAIN_SEQ
 	int
-	default 1
+	default 2
 	depends on BOARD_GIGABYTE_M57SLI

 config SB_HT_CHAIN_ON_BUS0
--- a/src/mainboard/hp/dl145_g3/Kconfig
+++ b/src/mainboard/hp/dl145_g3/Kconfig
@@ -38,7 +38,7 @@ config DCACHE_RAM_GLOBAL_VAR_SIZE

 config APIC_ID_OFFSET
 	hex
-	default 0x10
+	default 0x8
 	depends on BOARD_HP_DL145_G3

 config SB_HT_CHAIN_ON_BUS0
--- a/src/mainboard/ibm/e325/Kconfig
+++ b/src/mainboard/ibm/e325/Kconfig
@@ -38,7 +38,7 @@ config DCACHE_RAM_GLOBAL_VAR_SIZE

 config APIC_ID_OFFSET
 	hex
-	default 0x8
+	default 0x0
 	depends on BOARD_IBM_E325

 config LB_CKS_RANGE_END
--- a/src/mainboard/ibm/e326/Kconfig
+++ b/src/mainboard/ibm/e326/Kconfig
@@ -38,7 +38,7 @@ config DCACHE_RAM_GLOBAL_VAR_SIZE

 config APIC_ID_OFFSET
 	hex
-	default 0x8
+	default 0x0
 	depends on BOARD_IBM_E326

 config LB_CKS_RANGE_END
--- a/src/mainboard/intel/d945gclf/Kconfig
+++ b/src/mainboard/intel/d945gclf/Kconfig
@@ -28,6 +28,7 @@ config BOARD_INTEL_D945GCLF
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
 	select HAVE_ACPI_TABLES
+	select HAVE_ACPI_RESUME
 	select MMCONF_SUPPORT
 	select USE_PRINTK_IN_CAR
 	select AP_IN_SIPI_WAIT
@@ -90,8 +91,3 @@ config MAX_PHYSICAL_CPUS
 	int
 	default 2
 	depends on BOARD_INTEL_D945GCLF
-
-config HAVE_INIT_TIMER
-	bool
-	default n
-	depends on BOARD_INTEL_D945GCLF
--- a/src/mainboard/intel/eagleheights/Kconfig
+++ b/src/mainboard/intel/eagleheights/Kconfig
@@ -57,7 +57,7 @@ config MMCONF_BASE_ADDRESS

 config IRQ_SLOT_COUNT
 	int
-	default 18
+	default 9
 	depends on BOARD_INTEL_EAGLEHEIGHTS

 config MAX_CPUS
--- a/src/mainboard/intel/jarrell/Kconfig
+++ b/src/mainboard/intel/jarrell/Kconfig
@@ -40,7 +40,7 @@ config MAX_CPUS

 config IRQ_SLOT_COUNT
 	int
-	default 9
+	default 18
 	depends on BOARD_INTEL_JARRELL

 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
--- a/src/mainboard/iwill/dk8_htx/Kconfig
+++ b/src/mainboard/iwill/dk8_htx/Kconfig
@@ -40,7 +40,7 @@ config DCACHE_RAM_GLOBAL_VAR_SIZE

 config APIC_ID_OFFSET
 	hex
-	default 0x8
+	default 0x10
 	depends on BOARD_IWILL_DK8_HTX

 config LB_CKS_RANGE_END
@@ -118,3 +118,7 @@ config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	default 0x2b80
 	depends on BOARD_IWILL_DK8_HTX

+config ACPI_SSDTX_NUM
+	int
+	default 3
+	depends on BOARD_IWILL_DK8_HTX
--- a/src/mainboard/iwill/dk8s2/Kconfig
+++ b/src/mainboard/iwill/dk8s2/Kconfig
@@ -39,7 +39,7 @@ config DCACHE_RAM_GLOBAL_VAR_SIZE

 config APIC_ID_OFFSET
 	hex
-	default 0x8
+	default 0x0
 	depends on BOARD_IWILL_DK8S2

 config LB_CKS_RANGE_END
@@ -104,7 +104,7 @@ config SERIAL_CPU_INIT

 config IRQ_SLOT_COUNT
 	int
-	default 11
+	default 12
 	depends on BOARD_IWILL_DK8S2

 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
--- a/src/mainboard/iwill/dk8x/Kconfig
+++ b/src/mainboard/iwill/dk8x/Kconfig
@@ -38,7 +38,7 @@ config DCACHE_RAM_GLOBAL_VAR_SIZE

 config APIC_ID_OFFSET
 	hex
-	default 0x8
+	default 0x0
 	depends on BOARD_IWILL_DK8X

 config LB_CKS_RANGE_END
@@ -103,5 +103,5 @@ config SERIAL_CPU_INIT

 config IRQ_SLOT_COUNT
 	int
-	default 11
+	default 9
 	depends on BOARD_IWILL_DK8X
--- a/src/mainboard/msi/ms7135/Kconfig
+++ b/src/mainboard/msi/ms7135/Kconfig
@@ -19,12 +19,12 @@ config MAINBOARD_DIR

 config APIC_ID_OFFSET
 	hex
-	default 0x10
+	default 0x0
 	depends on BOARD_MSI_MS7135

 config MEM_TRAIN_SEQ
 	int
-	default 0
+	default 2
 	depends on BOARD_MSI_MS7135

 config SB_HT_CHAIN_ON_BUS0
--- a/src/mainboard/msi/ms7260/Kconfig
+++ b/src/mainboard/msi/ms7260/Kconfig
@@ -37,12 +37,12 @@ config DCACHE_RAM_GLOBAL_VAR_SIZE

 config APIC_ID_OFFSET
 	hex	
-	default 16
+	default 0x10
 	depends on BOARD_MSI_MS7260

 config MEM_TRAIN_SEQ
 	int
-	default 1
+	default 2
 	depends on BOARD_MSI_MS7260

 config SB_HT_CHAIN_ON_BUS0
--- a/src/mainboard/msi/ms9185/Kconfig
+++ b/src/mainboard/msi/ms9185/Kconfig
@@ -38,7 +38,7 @@ config DCACHE_RAM_GLOBAL_VAR_SIZE

 config APIC_ID_OFFSET
 	hex
-	default 0x10
+	default 0x8
 	depends on BOARD_MSI_MS9185

 config SB_HT_CHAIN_ON_BUS0
--- a/src/mainboard/msi/ms9282/Kconfig
+++ b/src/mainboard/msi/ms9282/Kconfig
@@ -36,7 +36,7 @@ config DCACHE_RAM_GLOBAL_VAR_SIZE

 config APIC_ID_OFFSET
 	hex	
-	default 16
+	default 0x10
 	depends on BOARD_MSI_MS9282

 config SB_HT_CHAIN_ON_BUS0
--- a/src/mainboard/newisys/khepri/Kconfig
+++ b/src/mainboard/newisys/khepri/Kconfig
@@ -32,7 +32,7 @@ config DCACHE_RAM_SIZE

 config APIC_ID_OFFSET
 	hex
-	default 0x10
+	default 0x0
 	depends on BOARD_NEWISYS_KHEPRI

 config K8_REV_F_SUPPORT
@@ -97,7 +97,7 @@ config SB_HT_CHAIN_ON_BUS0

 config IRQ_SLOT_COUNT
 	int
-	default 11
+	default 9
 	depends on BOARD_NEWISYS_KHEPRI

 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
--- a/src/mainboard/nvidia/l1_2pvv/Kconfig
+++ b/src/mainboard/nvidia/l1_2pvv/Kconfig
@@ -37,7 +37,7 @@ config DCACHE_RAM_GLOBAL_VAR_SIZE

 config APIC_ID_OFFSET
 	hex	
-	default 16
+	default 0x10
 	depends on BOARD_NVIDIA_L1_2PVV

 config MEM_TRAIN_SEQ
--- a/src/mainboard/roda/rk886ex/Kconfig
+++ b/src/mainboard/roda/rk886ex/Kconfig
@@ -14,8 +14,9 @@ config BOARD_RODA_RK886EX
 	select USE_PRINTK_IN_CAR
 	select AP_IN_SIPI_WAIT
 	select UDELAY_LAPIC
-	select HAVE_ACPI_TABLES
 	select HAVE_SMI_HANDLER
+	select HAVE_ACPI_TABLES
+	select HAVE_ACPI_RESUME
 	select BOARD_ROMSIZE_KB_1024

 config MAINBOARD_DIR
@@ -67,3 +68,8 @@ config MAX_PHYSICAL_CPUS
 	int
 	default 2
 	depends on BOARD_RODA_RK886EX
+
+config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
+	hex
+	default 0x6886
+	depends on BOARD_RODA_RK886EX
--- a/src/mainboard/supermicro/h8dmr_fam10/Kconfig
+++ b/src/mainboard/supermicro/h8dmr_fam10/Kconfig
@@ -136,3 +136,8 @@ config SERIAL_CPU_INIT
 	bool
 	default n
 	depends on BOARD_SUPERMICRO_H8DMR_FAM10
+
+config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
+	hex
+	default 0x1511
+	depends on BOARD_SUPERMICRO_H8DMR_FAM10
--- a/src/mainboard/technexion/tim8690/Kconfig
+++ b/src/mainboard/technexion/tim8690/Kconfig
@@ -39,7 +39,7 @@ config DCACHE_RAM_GLOBAL_VAR_SIZE

 config APIC_ID_OFFSET
 	hex
-	default 0x8
+	default 0x0
 	depends on BOARD_TECHNEXION_TIM8690

 config LB_CKS_RANGE_END
--- a/src/mainboard/technologic/ts5300/Kconfig
+++ b/src/mainboard/technologic/ts5300/Kconfig
@@ -19,8 +19,3 @@ config IRQ_SLOT_COUNT
 	int
 	default 2
 	depends on BOARD_TECHNOLOGIC_TS5300
-
-config HAVE_INIT_TIMER
-	bool
-	default n
-	depends on BOARD_TECHNOLOGIC_TS5300
--- a/src/mainboard/tyan/s2880/Kconfig
+++ b/src/mainboard/tyan/s2880/Kconfig
@@ -19,7 +19,7 @@ config MAINBOARD_DIR

 config APIC_ID_OFFSET
 	hex
-	default 0x10
+	default 0x0
 	depends on BOARD_TYAN_S2880

 config SB_HT_CHAIN_ON_BUS0
@@ -89,5 +89,5 @@ config WAIT_BEFORE_CPUS_INIT

 config IRQ_SLOT_COUNT
 	int
-	default 9
+	default 13
 	depends on BOARD_TYAN_S2880
--- a/src/mainboard/tyan/s2881/Kconfig
+++ b/src/mainboard/tyan/s2881/Kconfig
@@ -19,7 +19,7 @@ config MAINBOARD_DIR

 config APIC_ID_OFFSET
 	hex
-	default 0x10
+	default 0x0
 	depends on BOARD_TYAN_S2881

 config SB_HT_CHAIN_ON_BUS0
--- a/src/mainboard/tyan/s2882/Kconfig
+++ b/src/mainboard/tyan/s2882/Kconfig
@@ -19,7 +19,7 @@ config MAINBOARD_DIR

 config APIC_ID_OFFSET
 	hex
-	default 0x10
+	default 0x0
 	depends on BOARD_TYAN_S2882

 config SB_HT_CHAIN_ON_BUS0
@@ -89,5 +89,5 @@ config WAIT_BEFORE_CPUS_INIT

 config IRQ_SLOT_COUNT
 	int
-	default 9
+	default 15
 	depends on BOARD_TYAN_S2882
--- a/src/mainboard/tyan/s2885/Kconfig
+++ b/src/mainboard/tyan/s2885/Kconfig
@@ -89,5 +89,5 @@ config WAIT_BEFORE_CPUS_INIT

 config IRQ_SLOT_COUNT
 	int
-	default 9
+	default 11
 	depends on BOARD_TYAN_S2885
--- a/src/mainboard/tyan/s2892/Kconfig
+++ b/src/mainboard/tyan/s2892/Kconfig
@@ -20,7 +20,7 @@ config MAINBOARD_DIR

 config APIC_ID_OFFSET
 	hex
-	default 0x10
+	default 0x0
 	depends on BOARD_TYAN_S2892

 config SB_HT_CHAIN_ON_BUS0
--- a/src/mainboard/tyan/s2912/Kconfig
+++ b/src/mainboard/tyan/s2912/Kconfig
@@ -37,7 +37,7 @@ config DCACHE_RAM_GLOBAL_VAR_SIZE

 config APIC_ID_OFFSET
 	hex	
-	default 16
+	default 0x10
 	depends on BOARD_TYAN_S2912

 config MEM_TRAIN_SEQ
@@ -139,3 +139,8 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 	depends on BOARD_TYAN_S2912
+
+config ACPI_SSDTX_NUM
+	int
+	default 3
+	depends on BOARD_TYAN_S2912
--- a/src/mainboard/tyan/s4880/Kconfig
+++ b/src/mainboard/tyan/s4880/Kconfig
@@ -92,7 +92,7 @@ config USE_INIT

 config IRQ_SLOT_COUNT
 	int
-	default 11
+	default 22
 	depends on BOARD_TYAN_S4880

 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
--- a/src/mainboard/tyan/s4882/Kconfig
+++ b/src/mainboard/tyan/s4882/Kconfig
@@ -92,7 +92,7 @@ config USE_INIT

 config IRQ_SLOT_COUNT
 	int
-	default 11
+	default 22
 	depends on BOARD_TYAN_S4882

 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
--- a/src/mainboard/via/pc2500e/Kconfig
+++ b/src/mainboard/via/pc2500e/Kconfig
@@ -21,6 +21,16 @@ config MAINBOARD_PART_NUMBER
 	default "pc2500e"
 	depends on BOARD_VIA_PC2500E

+config DCACHE_RAM_BASE
+	hex
+	default 0xc0000
+	depends on BOARD_VIA_PC2500E
+
+config DCACHE_RAM_SIZE
+	hex
+	default 0x1000
+	depends on BOARD_VIA_PC2500E
+
 config RAMBASE
 	hex
 	default 0x4000
--- a/src/mainboard/via/vt8454c/Kconfig
+++ b/src/mainboard/via/vt8454c/Kconfig
@@ -11,6 +11,7 @@ config BOARD_VIA_VT8454C
 	select USE_PRINTK_IN_CAR
 	select HAVE_ACPI_TABLES
 	select BOARD_ROMSIZE_KB_512
+	select USE_DCACHE_RAM

 config MAINBOARD_DIR
 	string
--- a/util/compareboard/compareboard
+++ b/util/compareboard/compareboard
@@ -77,6 +77,8 @@ sed \
 	-e "/^CONFIG_STACK_SIZE / d" \
 	-e "/^CONFIG_GDB_STUB / d" \
 	-e "/^CONFIG_VIDEO_MB / d" \
+	-e "/^CONFIG_IOAPIC / d" \
+	-e "/^CONFIG_HAVE_MOVNTI / d" \
 	-e "/^CONFIG_PCIE_CONFIGSPACE_HOLE / d" \
 	$A/old > $A/old.filtered
 sed \
@@ -85,6 +87,8 @@ sed \
 	-e "/^CONFIG_[MAXIMUMDEFAULT]*_CONSOLE_LOGLEVEL_/ d" \
 	-e "/^CONFIG_COREBOOT_ROMSIZE_/ d" \
 	-e "/^CONFIG_BOARD_/ d" \
+	-e "/^CONFIG_IOAPIC / d" \
+	-e "/^CONFIG_HAVE_MOVNTI / d" \
 	-e "/^CONFIG_[NORTHSOUTH]*BRIDGE_/ d" \
 	-e "/^CONFIG_SUPERIO_/ d" \
 	-e "/^CONFIG_GX1_VIDEOMODE_/ d" \
@@ -103,6 +107,7 @@ sed \
 	-e "/^CONFIG_VIDEO_MB / d" \
 	-e "/^CONFIG_EXPERT / d" \
 	-e "/^CONFIG_SSE / d" \
+	-e "/^CONFIG_MMX / d" \
 	-e "/^CONFIG_VGA_BIOS / d" \
 	-e "/^CONFIG_WARNINGS_ARE_ERRORS / d" \
 	-e "/^CONFIG_TINY_BOOTBLOCK / d" \