aboutsummaryrefslogtreecommitdiffstats
path: root/src/arch/x86/init
diff options
context:
space:
mode:
authorGabe Black <gabeblack@google.com>2011-10-01 04:27:32 -0700
committerStefan Reinauer <stefan.reinauer@coreboot.org>2012-03-29 23:19:13 +0200
commit19e7e7d2e7cb4ff0ae821448355ec8b14e0bd2bf (patch)
tree11d9084a2c1b1712fe94d5e8b6d20dd1096080ec /src/arch/x86/init
parent4d04a715475a60f627ddeded3385ca04d883a55b (diff)
downloadcoreboot-19e7e7d2e7cb4ff0ae821448355ec8b14e0bd2bf.tar.gz
coreboot-19e7e7d2e7cb4ff0ae821448355ec8b14e0bd2bf.tar.xz
coreboot-19e7e7d2e7cb4ff0ae821448355ec8b14e0bd2bf.zip
Add infrastructure for global data in the CAR phase of boot
The cbmem console structure and car global data are put in their own section, with the cbmem console coming after the global data. These areas are linked to be where CAR is available and at the very bottom of the stack. There is one shortcoming of this change: The section created by this change needs to be stripped out by the Makefile since leaving it in confuses cbfstool when it installs the stage in the image. I would like to make the tools link those symbols at the right location but leave allocation of that space out of the ELF. Change-Id: Iccfb99b128d59c5b7d6164796d21ba46d2a674e0 Signed-off-by: Gabe Black <gabeblack@google.com> Reviewed-on: http://review.coreboot.org/727 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src/arch/x86/init')
-rw-r--r--src/arch/x86/init/bootblock.ld7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/arch/x86/init/bootblock.ld b/src/arch/x86/init/bootblock.ld
index 27d718fcb..ca4e82021 100644
--- a/src/arch/x86/init/bootblock.ld
+++ b/src/arch/x86/init/bootblock.ld
@@ -46,5 +46,12 @@ SECTIONS
*(.eh_frame);
}
+ . = CONFIG_DCACHE_RAM_BASE;
+ .car.data . (NOLOAD) : {
+ *(.car.global_data);
+ *(.car.cbmem_console);
+ }
+
+ _bogus = ASSERT((SIZEOF(.car.data) <= CONFIG_DCACHE_RAM_SIZE), "Cache as RAM area is too full");
_bogus = ASSERT((SIZEOF(.bss) + SIZEOF(.data)) == 0 || CONFIG_CPU_AMD_AGESA, "Do not use global variables in romstage");
}