diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index a2fb71d4c6..e620e1cd09 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -165,7 +165,7 @@ endif
 
 crt0s = $(src)/arch/x86/init/prologue.inc
 ldscripts =
-ldscripts += $(src)/arch/x86/init/ldscript_fallback_cbfs.lb
+ldscripts += $(src)/arch/x86/init/bootblock.ld
 ifeq ($(CONFIG_BIG_BOOTBLOCK),y)
 crt0s += $(src)/cpu/x86/16bit/entry16.inc
 ldscripts += $(src)/cpu/x86/16bit/entry16.lds
diff --git a/src/arch/x86/init/ldscript_fallback_cbfs.lb b/src/arch/x86/init/bootblock.ld
similarity index 81%
rename from src/arch/x86/init/ldscript_fallback_cbfs.lb
rename to src/arch/x86/init/bootblock.ld
index 082b21193c..8363ab1e66 100644
--- a/src/arch/x86/init/ldscript_fallback_cbfs.lb
+++ b/src/arch/x86/init/bootblock.ld
@@ -29,7 +29,7 @@ SECTIONS
 
 	/* cut _start into last 64k*/
 	_x = .;
-	. = (_x < (CONFIG_ROMBASE - 0x10000 +  CONFIG_ROM_IMAGE_SIZE)) ? (CONFIG_ROMBASE - 0x10000 +  CONFIG_ROM_IMAGE_SIZE) : _x;
+	. = (_x < CONFIG_ROMBASE) ? (CONFIG_ROMBASE) : _x;
 
 	/* This section might be better named .setup */
 	.rom . : {
@@ -49,6 +49,5 @@ SECTIONS
 		*(.comment.*)
 		*(.note.*)
 	}
-/*	_bogus = ASSERT((SIZEOF(.bss) + SIZEOF(.data)) == 0, "Do not use global variables in romstage"); */
-	_bogus = ASSERT((SIZEOF(.bss)) == 0, "Do not use global variables in romstage"); 
+	_bogus = ASSERT((SIZEOF(.bss) + SIZEOF(.data)) == 0, "Do not use global variables in romstage");
 }