12 files changed, 4 insertions, 16 deletions
diff --git a/src/southbridge/nvidia/ck804/Kconfig b/src/southbridge/nvidia/ck804/Kconfig
index 42dce07b14..dbd24b73d1 100644
--- a/src/southbridge/nvidia/ck804/Kconfig
+++ b/src/southbridge/nvidia/ck804/Kconfig
@@ -42,8 +42,4 @@ config HPET_MIN_TICKS
 	hex
 	default 0xfa
 
-config CHIPSET_BOOTBLOCK_INCLUDE
-	string
-	default "southbridge/nvidia/ck804/romstrap.inc"
-
 endif
diff --git a/src/southbridge/nvidia/ck804/Makefile.inc b/src/southbridge/nvidia/ck804/Makefile.inc
index 69dd4b271e..554a4407f0 100644
--- a/src/southbridge/nvidia/ck804/Makefile.inc
+++ b/src/southbridge/nvidia/ck804/Makefile.inc
@@ -22,5 +22,6 @@ ramstage-$(CONFIG_USBDEBUG) += enable_usbdebug.c
 romstage-y += early_smbus.c
 
 bootblock-y += romstrap.ld
+bootblock-y += romstrap.S
 
 endif
diff --git a/src/southbridge/nvidia/ck804/romstrap.inc b/src/southbridge/nvidia/ck804/romstrap.S
index 5a20107376..5a20107376 100644
--- a/src/southbridge/nvidia/ck804/romstrap.inc
+++ b/src/southbridge/nvidia/ck804/romstrap.S
diff --git a/src/southbridge/nvidia/mcp55/Kconfig b/src/southbridge/nvidia/mcp55/Kconfig
index 666d3f8962..89aa45258a 100644
--- a/src/southbridge/nvidia/mcp55/Kconfig
+++ b/src/southbridge/nvidia/mcp55/Kconfig
@@ -42,8 +42,4 @@ config MCP55_PCI_E_X_3
 	int
 	default 4
 
-config CHIPSET_BOOTBLOCK_INCLUDE
-	string
-	default "southbridge/nvidia/mcp55/romstrap.inc"
-
 endif
diff --git a/src/southbridge/nvidia/mcp55/Makefile.inc b/src/southbridge/nvidia/mcp55/Makefile.inc
index 74ef14cdbc..db275cc848 100644
--- a/src/southbridge/nvidia/mcp55/Makefile.inc
+++ b/src/southbridge/nvidia/mcp55/Makefile.inc
@@ -25,5 +25,6 @@ ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/hda_verb.c
 endif
 
 bootblock-y += romstrap.ld
+bootblock-y += romstrap.S
 
 endif
diff --git a/src/southbridge/nvidia/mcp55/romstrap.inc b/src/southbridge/nvidia/mcp55/romstrap.S
index ff170a9927..ff170a9927 100644
--- a/src/southbridge/nvidia/mcp55/romstrap.inc
+++ b/src/southbridge/nvidia/mcp55/romstrap.S
diff --git a/src/southbridge/sis/sis966/Kconfig b/src/southbridge/sis/sis966/Kconfig
index 20f3bff2e3..c6023a9998 100644
--- a/src/southbridge/sis/sis966/Kconfig
+++ b/src/southbridge/sis/sis966/Kconfig
@@ -14,8 +14,4 @@ config EHCI_BAR
 	hex
 	default 0xfef00000
 
-config CHIPSET_BOOTBLOCK_INCLUDE
-	string
-	default "southbridge/sis/sis966/romstrap.inc"
-
 endif
diff --git a/src/southbridge/sis/sis966/Makefile.inc b/src/southbridge/sis/sis966/Makefile.inc
index e703e1fcba..fa37762287 100644
--- a/src/southbridge/sis/sis966/Makefile.inc
+++ b/src/southbridge/sis/sis966/Makefile.inc
@@ -16,5 +16,6 @@ romstage-$(CONFIG_USBDEBUG_IN_ROMSTAGE) += enable_usbdebug.c
 ramstage-$(CONFIG_USBDEBUG) += enable_usbdebug.c
 
 bootblock-y += romstrap.ld
+bootblock-y += romstrap.S
 
 endif
diff --git a/src/southbridge/sis/sis966/romstrap.inc b/src/southbridge/sis/sis966/romstrap.S
index 1eb39e3e6a..1eb39e3e6a 100644
--- a/src/southbridge/sis/sis966/romstrap.inc
+++ b/src/southbridge/sis/sis966/romstrap.S
diff --git a/src/southbridge/via/k8t890/Kconfig b/src/southbridge/via/k8t890/Kconfig
index 76be0c1b4f..f6e51dccd1 100644
--- a/src/southbridge/via/k8t890/Kconfig
+++ b/src/southbridge/via/k8t890/Kconfig
@@ -51,8 +51,4 @@ config VIDEO_MB
 	default -1  if K8M890_VIDEO_MB_CMOS
 	depends on SOUTHBRIDGE_VIA_K8M890_VGA_EN
 
-config CHIPSET_BOOTBLOCK_INCLUDE
-	string
-	default "southbridge/via/k8t890/romstrap.inc"
-
 endif # SOUTHBRIDGE_K8T890
diff --git a/src/southbridge/via/k8t890/Makefile.inc b/src/southbridge/via/k8t890/Makefile.inc
index 2789499ee2..ed6d3edc78 100644
--- a/src/southbridge/via/k8t890/Makefile.inc
+++ b/src/southbridge/via/k8t890/Makefile.inc
@@ -11,5 +11,6 @@ ramstage-y += error.c
 ramstage-y += chrome.c
 
 bootblock-y += romstrap.ld
+bootblock-y += romstrap.S
 
 endif
diff --git a/src/southbridge/via/k8t890/romstrap.inc b/src/southbridge/via/k8t890/romstrap.S
index 2115eaa723..2115eaa723 100644
--- a/src/southbridge/via/k8t890/romstrap.inc
+++ b/src/southbridge/via/k8t890/romstrap.S