- drop remaining CONFIG_ROM_IMAGE_SIZE

- re-enable .data section check for bootblock.
- rename ldscript_fallback_cbfs.lb to bootblock.ld

Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Acked-by: Stefan Reinauer <stefan.reinauer@coreboot.org>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6497 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

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");
 }