GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- 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
This commit is contained in:
Stefan Reinauer 2011-04-14 20:30:21 +00:00 committed by Stefan Reinauer
parent 8902502c4a
commit 31853d8976
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/arch/x86/Makefile.inc
View File

@ -165,7 +165,7 @@ endif
crt0s = $(src)/arch/x86/init/prologue.inc crt0s = $(src)/arch/x86/init/prologue.inc
ldscripts = ldscripts =
ldscripts += $(src)/arch/x86/init/ldscript_fallback_cbfs.lb ldscripts += $(src)/arch/x86/init/bootblock.ld
ifeq ($(CONFIG_BIG_BOOTBLOCK),y) ifeq ($(CONFIG_BIG_BOOTBLOCK),y)
crt0s += $(src)/cpu/x86/16bit/entry16.inc crt0s += $(src)/cpu/x86/16bit/entry16.inc
ldscripts += $(src)/cpu/x86/16bit/entry16.lds ldscripts += $(src)/cpu/x86/16bit/entry16.lds

5
src/arch/x86/init/ldscript_fallback_cbfs.lb → src/arch/x86/init/bootblock.ld
View File

@ -29,7 +29,7 @@ SECTIONS
/* cut _start into last 64k*/ /* cut _start into last 64k*/
_x = .; _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 */ /* This section might be better named .setup */
.rom . : { .rom . : {
@ -49,6 +49,5 @@ SECTIONS
*(.comment.*) *(.comment.*)
*(.note.*) *(.note.*)
} }
/* _bogus = ASSERT((SIZEOF(.bss) + SIZEOF(.data)) == 0, "Do not use global variables in romstage"); */ _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");
} }