diff --git a/Makefile.inc b/Makefile.inc
index 29e22eb8e9..a33dc7bc71 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -458,6 +458,7 @@ $(obj)/mainboard/$(MAINBOARDDIR)/static.c: $(src)/mainboard/$(MAINBOARDDIR)/devi
 ramstage-y+=$(obj)/mainboard/$(MAINBOARDDIR)/static.c
 romstage-y+=$(obj)/mainboard/$(MAINBOARDDIR)/static.c
 verstage-y+=$(obj)/mainboard/$(MAINBOARDDIR)/static.c
+bootblock-y+=$(obj)/mainboard/$(MAINBOARDDIR)/static.c
 
 $(objgenerated)/libverstage.a: $$(libverstage-objs)
 	rm -f $@
diff --git a/src/device/Makefile.inc b/src/device/Makefile.inc
index 261ed53656..232a981122 100644
--- a/src/device/Makefile.inc
+++ b/src/device/Makefile.inc
@@ -20,8 +20,9 @@ ifeq ($(CONFIG_AZALIA_PLUGIN_SUPPORT),y)
 ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/hda_verb.c
 endif
 
-verstage-y += device_romstage.c
-romstage-y += device_romstage.c
+bootblock-y += device_simple.c
+verstage-y += device_simple.c
+romstage-y += device_simple.c
 romstage-$(CONFIG_PCI) += pci_early.c
 
 subdirs-y += oprom dram
diff --git a/src/device/device_romstage.c b/src/device/device_simple.c
similarity index 100%
rename from src/device/device_romstage.c
rename to src/device/device_simple.c