linking: move romstage and bootblock to use program.ld
Instead of having separate <stage>.ld files in src/lib one file can be used: program.ld. There's now only one touch point for stage layout. BUG=chrome-os-partner:44827 BRANCH=None TEST=Built a myriad of boards. Analyzed readelf output. Change-Id: I4c3e3671d696caa2c7601065a85fab803e86f971 Signed-off-by: Aaron Durbin <adubin@chromium.org> Reviewed-on: http://review.coreboot.org/11509 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
parent
cce557b793
commit
b2a62622ba
|
@ -96,24 +96,24 @@
|
|||
#endif
|
||||
|
||||
/* Careful: 'INCLUDE <filename>' must always be at the end of the output line */
|
||||
#ifdef __BOOTBLOCK__
|
||||
#if ENV_BOOTBLOCK
|
||||
#define BOOTBLOCK(addr, sz) \
|
||||
SET_COUNTER(bootblock, addr) \
|
||||
_ = ASSERT(_ebootblock - _bootblock <= sz, \
|
||||
_ = ASSERT(_eprogram - _program <= sz, \
|
||||
STR(Bootblock exceeded its allotted size! (sz))); \
|
||||
INCLUDE "lib/bootblock.bootblock.ld"
|
||||
INCLUDE "lib/program.bootblock.ld"
|
||||
#else
|
||||
#define BOOTBLOCK(addr, sz) \
|
||||
SET_COUNTER(bootblock, addr) \
|
||||
. += sz;
|
||||
#endif
|
||||
|
||||
#ifdef __ROMSTAGE__
|
||||
#if ENV_ROMSTAGE
|
||||
#define ROMSTAGE(addr, sz) \
|
||||
SET_COUNTER(romstage, addr) \
|
||||
_ = ASSERT(_eromstage - _romstage <= sz, \
|
||||
_ = ASSERT(_eprogram - _program <= sz, \
|
||||
STR(Romstage exceeded its allotted size! (sz))); \
|
||||
INCLUDE "lib/romstage.romstage.ld"
|
||||
INCLUDE "lib/program.romstage.ld"
|
||||
#else
|
||||
#define ROMSTAGE(addr, sz) \
|
||||
SET_COUNTER(romstage, addr) \
|
||||
|
|
|
@ -194,8 +194,8 @@ secmon-y += halt.c
|
|||
ifneq ($(CONFIG_ARCH_X86),y)
|
||||
# X86 bootblock and romstage use custom ldscripts that are all glued together,
|
||||
# so we need to exclude it here or it would pick these up as well
|
||||
bootblock-y += bootblock.ld
|
||||
romstage-y += romstage.ld
|
||||
bootblock-y += program.ld
|
||||
romstage-y += program.ld
|
||||
endif
|
||||
|
||||
ramstage-y += program.ld
|
||||
|
|
|
@ -1,51 +0,0 @@
|
|||
/*
|
||||
* This file is part of the coreboot project.
|
||||
*
|
||||
* Copyright 2014 Google Inc.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; version 2 of the License.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc.
|
||||
*/
|
||||
|
||||
/* This file is included inside a SECTIONS block */
|
||||
|
||||
.bootblock . : {
|
||||
_program = .;
|
||||
_bootblock = .;
|
||||
*(.text._start);
|
||||
*(.text.stage_entry);
|
||||
KEEP(*(.id));
|
||||
*(.text);
|
||||
*(.text.*);
|
||||
*(.rodata);
|
||||
*(.rodata.*);
|
||||
*(.data);
|
||||
*(.data.*);
|
||||
*(.bss);
|
||||
*(.bss.*);
|
||||
*(.sbss);
|
||||
*(.sbss.*);
|
||||
_preram_cbmem_console = DEFINED(_preram_cbmem_console) ? _preram_cbmem_console : 0;
|
||||
_epreram_cbmem_console = DEFINED(_epreram_cbmem_console) ? _epreram_cbmem_console : 0;
|
||||
_ebootblock = .;
|
||||
_eprogram = .;
|
||||
} : to_load = 0xff
|
||||
|
||||
/DISCARD/ : {
|
||||
*(.comment)
|
||||
*(.note)
|
||||
*(.comment.*)
|
||||
*(.note.*)
|
||||
*(.ARM.*)
|
||||
*(.MIPS.*)
|
||||
}
|
|
@ -1,64 +0,0 @@
|
|||
/*
|
||||
* This file is part of the coreboot project.
|
||||
*
|
||||
* Copyright 2014 Google Inc.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; version 2 of the License.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc.
|
||||
*/
|
||||
|
||||
/* This file is included inside a SECTIONS block */
|
||||
|
||||
.text . : {
|
||||
_program = .;
|
||||
_romstage = .;
|
||||
*(.text._start);
|
||||
*(.text.stage_entry);
|
||||
*(.text);
|
||||
*(.text.*);
|
||||
} : to_load
|
||||
|
||||
.data . : {
|
||||
. = ALIGN(8);
|
||||
_cbmem_init_hooks = .;
|
||||
KEEP(*(.rodata.cbmem_init_hooks));
|
||||
_ecbmem_init_hooks = .;
|
||||
*(.rodata);
|
||||
*(.rodata.*);
|
||||
*(.data);
|
||||
*(.data.*);
|
||||
PROVIDE(_preram_cbmem_console = .);
|
||||
PROVIDE(_epreram_cbmem_console = _preram_cbmem_console);
|
||||
. = ALIGN(8);
|
||||
}
|
||||
|
||||
.bss . : {
|
||||
. = ALIGN(8);
|
||||
_bss = .;
|
||||
*(.bss)
|
||||
*(.bss.*)
|
||||
*(.sbss)
|
||||
*(.sbss.*)
|
||||
_ebss = .;
|
||||
_eromstage = .;
|
||||
_eprogram = .;
|
||||
}
|
||||
|
||||
/* Discard the sections we don't need/want */
|
||||
/DISCARD/ : {
|
||||
*(.comment)
|
||||
*(.note)
|
||||
*(.comment.*)
|
||||
*(.note.*)
|
||||
*(.eh_frame);
|
||||
}
|
Loading…
Reference in New Issue