diff --git a/src/arch/armv7/Makefile.inc b/src/arch/armv7/Makefile.inc
index cc306335cd..ca64f7873f 100644
--- a/src/arch/armv7/Makefile.inc
+++ b/src/arch/armv7/Makefile.inc
@@ -148,6 +148,7 @@ CFLAGS += \
 # For various headers imported from Linux
 CFLAGS += -D__LINUX_ARM_ARCH__=7
 
+#crt0s = $(src)/arch/armv7/bootblock.inc
 ldscripts =
 ldscripts += $(src)/arch/armv7/romstage.ld
 
@@ -164,17 +165,18 @@ ifeq ($(CONFIG_LLSHELL),y)
 crt0s += $(src)/arch/armv7/llshell/llshell.inc
 endif
 
-crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc
+# FIXME: do we need romstage.inc? Maybe just get rid of this entirely.
+#crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc
 
 $(obj)/mainboard/$(MAINBOARDDIR)/romstage.pre.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(OPTION_TABLE_H) $(obj)/build.h $(obj)/config.h
 	@printf "    CC         romstage.inc\n"
 	$(CC) -MMD $(CFLAGS) -D__PRE_RAM__ -I$(src) -I. -I$(obj) -c -S $< -o $@
 
-$(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(obj)/mainboard/$(MAINBOARDDIR)/romstage.pre.inc
-	@printf "    POST       romstage.inc\n"
-	sed -e 's/\.rodata/.rom.data/g' -e 's/\^\.text/.section .rom.text/g' \
-		-e 's/\^\.section \.text/.section .rom.text/g' $^ > $@.tmp
-	mv $@.tmp $@
+#$(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(obj)/mainboard/$(MAINBOARDDIR)/romstage.pre.inc
+#	@printf "    POST       romstage.inc\n"
+#	sed -e 's/\.rodata/.rom.data/g' -e 's/\^\.text/.section .rom.text/g' \
+#		-e 's/\^\.section \.text/.section .rom.text/g' $^ > $@.tmp
+#	mv $@.tmp $@
 
 # Things that appear in every board
 romstage-srcs += $(objgenerated)/crt0.s
diff --git a/src/arch/armv7/romstage.ld b/src/arch/armv7/romstage.ld
index b63a78e05e..61e3479cae 100644
--- a/src/arch/armv7/romstage.ld
+++ b/src/arch/armv7/romstage.ld
@@ -43,6 +43,8 @@ SECTIONS
 
 	.romtext . : {
 		_rom = .;
+		_start = .;
+		*(.text.startup);
 		*(.text);
 	}
 
diff --git a/src/mainboard/google/snow/Makefile.inc b/src/mainboard/google/snow/Makefile.inc
index 01488d0545..26378dbbbe 100644
--- a/src/mainboard/google/snow/Makefile.inc
+++ b/src/mainboard/google/snow/Makefile.inc
@@ -17,7 +17,7 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 ##
 
-#romstage-y += romstage.c
+romstage-y += romstage.c
 
 # ramstage-y += ec.c