diff --git a/src/cpu/dmp/vortex86ex/Kconfig b/src/cpu/dmp/vortex86ex/Kconfig
index 1f43f769b2..1af7ec4bf8 100644
--- a/src/cpu/dmp/vortex86ex/Kconfig
+++ b/src/cpu/dmp/vortex86ex/Kconfig
@@ -73,8 +73,4 @@ config PLL_500_375_33
 
 endchoice
 
-config CHIPSET_BOOTBLOCK_INCLUDE
-	string
-	default "cpu/dmp/vortex86ex/chipset_bootblock.inc"
-
 endif
diff --git a/src/cpu/dmp/vortex86ex/Makefile.inc b/src/cpu/dmp/vortex86ex/Makefile.inc
index 76df34caae..6b4d0ba74e 100644
--- a/src/cpu/dmp/vortex86ex/Makefile.inc
+++ b/src/cpu/dmp/vortex86ex/Makefile.inc
@@ -21,5 +21,7 @@ subdirs-y += ../../x86/smm
 
 bootblock-y += biosdata.ld
 bootblock-y += biosdata_ex.ld
+bootblock-y += biosdata.S
+bootblock-y += biosdata_ex.S
 
 ROMCCFLAGS := -mcpu=i386 -O2
diff --git a/src/cpu/dmp/vortex86ex/biosdata.inc b/src/cpu/dmp/vortex86ex/biosdata.S
similarity index 100%
rename from src/cpu/dmp/vortex86ex/biosdata.inc
rename to src/cpu/dmp/vortex86ex/biosdata.S
diff --git a/src/cpu/dmp/vortex86ex/biosdata_ex.inc b/src/cpu/dmp/vortex86ex/biosdata_ex.S
similarity index 100%
rename from src/cpu/dmp/vortex86ex/biosdata_ex.inc
rename to src/cpu/dmp/vortex86ex/biosdata_ex.S
diff --git a/src/cpu/dmp/vortex86ex/chipset_bootblock.inc b/src/cpu/dmp/vortex86ex/chipset_bootblock.inc
deleted file mode 100644
index bdcda1d40f..0000000000
--- a/src/cpu/dmp/vortex86ex/chipset_bootblock.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "biosdata.inc"
-#include "biosdata_ex.inc"
diff --git a/src/northbridge/via/vx800/Kconfig b/src/northbridge/via/vx800/Kconfig
index d7d5349685..9eb84fb14e 100644
--- a/src/northbridge/via/vx800/Kconfig
+++ b/src/northbridge/via/vx800/Kconfig
@@ -3,11 +3,3 @@ config NORTHBRIDGE_VIA_VX800
 	select HAVE_DEBUG_RAM_SETUP
 	select HAVE_DEBUG_SMBUS
 	select LATE_CBMEM_INIT
-
-if NORTHBRIDGE_VIA_VX800
-
-config CHIPSET_BOOTBLOCK_INCLUDE
-	string
-	default "northbridge/via/vx800/romstrap.inc"
-
-endif
diff --git a/src/northbridge/via/vx800/Makefile.inc b/src/northbridge/via/vx800/Makefile.inc
index 069ea8e1b7..90574eda67 100644
--- a/src/northbridge/via/vx800/Makefile.inc
+++ b/src/northbridge/via/vx800/Makefile.inc
@@ -22,5 +22,6 @@ ramstage-y += lpc.c
 ramstage-y += ide.c
 
 bootblock-y += romstrap.ld
+bootblock-y += romstrap.S
 
 endif
diff --git a/src/northbridge/via/vx800/romstrap.inc b/src/northbridge/via/vx800/romstrap.S
similarity index 100%
rename from src/northbridge/via/vx800/romstrap.inc
rename to src/northbridge/via/vx800/romstrap.S
diff --git a/src/northbridge/via/vx900/Kconfig b/src/northbridge/via/vx900/Kconfig
index c7641d14ce..2d2dffaa69 100644
--- a/src/northbridge/via/vx900/Kconfig
+++ b/src/northbridge/via/vx900/Kconfig
@@ -39,8 +39,4 @@ config VGA_BIOS_ID
 	string
 	default "1106,7122"
 
-config CHIPSET_BOOTBLOCK_INCLUDE
-	string
-	default "northbridge/via/vx900/romstrap.inc"
-
 endif
diff --git a/src/northbridge/via/vx900/Makefile.inc b/src/northbridge/via/vx900/Makefile.inc
index 4cac1e7d1f..44f0ae01ce 100644
--- a/src/northbridge/via/vx900/Makefile.inc
+++ b/src/northbridge/via/vx900/Makefile.inc
@@ -44,5 +44,6 @@ ramstage-y += ./../../../drivers/pc80/vga/vga_io.c
 
 
 bootblock-y += romstrap.ld
+bootblock-y += romstrap.S
 
 endif
diff --git a/src/northbridge/via/vx900/romstrap.inc b/src/northbridge/via/vx900/romstrap.S
similarity index 100%
rename from src/northbridge/via/vx900/romstrap.inc
rename to src/northbridge/via/vx900/romstrap.S
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
similarity index 100%
rename from src/southbridge/nvidia/ck804/romstrap.inc
rename to 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
similarity index 100%
rename from src/southbridge/nvidia/mcp55/romstrap.inc
rename to 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
similarity index 100%
rename from src/southbridge/sis/sis966/romstrap.inc
rename to 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
similarity index 100%
rename from src/southbridge/via/k8t890/romstrap.inc
rename to src/southbridge/via/k8t890/romstrap.S