summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArthur Heymans <arthur@aheymans.xyz>2019-11-28 14:00:01 +0100
committerPatrick Georgi <pgeorgi@google.com>2019-11-30 16:11:42 +0000
commitfdb8b13e64d233296486ca9a4ca9eb34c0386934 (patch)
tree9e49056fb98f92a219a2fc3deba9fe5eaf0c0268
parent1b8df77ac10769abfe5a028ee0b62a23a1ea5db2 (diff)
downloadcoreboot-fdb8b13e64d233296486ca9a4ca9eb34c0386934.tar.xz
arch/x86/car.ld: Drop CAR_GLOBAL region
Change-Id: Id66fd0528987fb3e464d400cf9ccac98752fb8f5 Signed-off-by: Arthur Heymans <arthur@aheymans.xyz> Reviewed-on: https://review.coreboot.org/c/coreboot/+/37327 Reviewed-by: Patrick Georgi <pgeorgi@google.com> Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr> Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/arch/x86/car.ld15
1 files changed, 1 insertions, 14 deletions
diff --git a/src/arch/x86/car.ld b/src/arch/x86/car.ld
index 483a908816..d8ff4b36b7 100644
--- a/src/arch/x86/car.ld
+++ b/src/arch/x86/car.ld
@@ -71,7 +71,7 @@
/* _bss and _ebss provide symbols to per-stage
* variables that are not shared like the timestamp and the pre-ram
* cbmem console. This is useful for clearing this area on a per-stage
- * basis when more than one stage uses cache-as-ram for CAR_GLOBALs. */
+ * basis when more than one stage uses cache-as-ram. */
. = ALIGN(ARCH_POINTER_ALIGN_SIZE);
_bss = .;
@@ -81,10 +81,6 @@
*(.bss.*)
*(.sbss)
*(.sbss.*)
-#else
- _car_global_start = .;
- *(.car.global_data);
- _car_global_end = .;
#endif
. = ALIGN(ARCH_POINTER_ALIGN_SIZE);
_ebss = .;
@@ -106,15 +102,6 @@
.illegal_globals . : {
*(EXCLUDE_FILE ("*/libagesa.*.a:" "*/romstage*/buildOpts.o" "*/romstage*/agesawrapper.o" "*/vendorcode/amd/agesa/*" "*/vendorcode/amd/cimx/*") .data)
*(EXCLUDE_FILE ("*/libagesa.*.a:" "*/romstage*/buildOpts.o" "*/romstage*/agesawrapper.o" "*/vendorcode/amd/agesa/*" "*/vendorcode/amd/cimx/*") .data.*)
-#if CONFIG(CAR_GLOBAL_MIGRATION)
- *(.bss)
- *(.bss.*)
- *(.sbss)
- *(.sbss.*)
-#else
- /* In case something sneaks through when it shouldn't. */
- *(.car.global_data);
-#endif
}
_bogus = ASSERT((CONFIG_DCACHE_RAM_SIZE == 0) || (SIZEOF(.car.data) <= CONFIG_DCACHE_RAM_SIZE), "Cache as RAM area is too full");