[coreboot-gerrit] Change in coreboot[master]: arch/x86/car.ld: Drop CAR_GLOBAL region

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/37327 )

Change subject: arch/x86/car.ld: Drop CAR_GLOBAL region
......................................................................

arch/x86/car.ld: Drop CAR_GLOBAL region

Change-Id: Id66fd0528987fb3e464d400cf9ccac98752fb8f5
Signed-off-by: Arthur Heymans 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37327
Reviewed-by: Patrick Georgi 
Reviewed-by: HAOUAS Elyes 
Reviewed-by: Kyösti Mälkki 
Tested-by: build bot (Jenkins) 
---
M src/arch/x86/car.ld
1 file changed, 1 insertion(+), 14 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Patrick Georgi: Looks good to me, approved
  Kyösti Mälkki: Looks good to me, approved
  HAOUAS Elyes: Looks good to me, but someone else must approve

diff --git a/src/arch/x86/car.ld b/src/arch/x86/car.ld
index 483a908..d8ff4b3 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");