diff options
| author | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2011-04-14 20:30:21 +0000 |
|---|---|---|
| committer | Stefan Reinauer <stepan@openbios.org> | 2011-04-14 20:30:21 +0000 |
| commit | 31853d8976ffd817bc773d559f104d2c42ed0c43 (patch) | |
| tree | b64e8d82064d060e8978758aedabeb2d46affc53 /src/arch | |
| parent | 8902502c4ad04909c5fdfa7b7a3384bfb696731b (diff) | |
- 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
Diffstat (limited to 'src/arch')
| -rw-r--r-- | src/arch/x86/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/arch/x86/init/bootblock.ld (renamed from src/arch/x86/init/ldscript_fallback_cbfs.lb) | 5 |
2 files changed, 3 insertions, 4 deletions
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 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"); } |