From a8b276a87c173ee664789cc788b4869eaab736c3 Mon Sep 17 00:00:00 2001
From: Aaron Durbin <adurbin@chromium.org>
Date: Wed, 27 Aug 2014 09:46:39 -0500
Subject: [PATCH] arm64: clean up ramstage.ld

This just removes some unneeded symbols and comments. Additionally,
moved most of the absolute symbols into the individual sections.
Also, aligned data sections to 64 bytes (typical cache line size).

BUG=chrome-os-partner:31545
BRANCH=None
TEST=Built and booted through coreboot normally on ryu.

Change-Id: I8ceed5a48078f70911122d304f2953795af0b421
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: 0524d4769613dc4a762e0a8e1bc1d2549d2df743
Original-Change-Id: I304e3702247a06507f5f4e23f8776331a3562c68
Original-Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/214662
Original-Reviewed-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-on: http://review.coreboot.org/9005
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
---
 src/arch/arm64/ramstage.ld | 56 ++++++++++++++------------------------
 1 file changed, 21 insertions(+), 35 deletions(-)

diff --git a/src/arch/arm64/ramstage.ld b/src/arch/arm64/ramstage.ld
index 784e62da92..c1c2221dd7 100644
--- a/src/arch/arm64/ramstage.ld
+++ b/src/arch/arm64/ramstage.ld
@@ -33,9 +33,7 @@ PHDRS
 SECTIONS
 {
 	. = CONFIG_RAMSTAGE_BASE;
-	/* First we place the code and read only data (typically const declared).
-	 * This could theoretically be placed in rom.
-	 */
+
 	.text : {
 		_text = .;
 		_start = .;
@@ -51,16 +49,17 @@ SECTIONS
 		__CTOR_LIST__ = .;
 		KEEP(*(.ctors));
 		LONG(0);
+		LONG(0);
 		__CTOR_END__ = .;
 	}
 
 	.rodata : {
+		. = ALIGN(64);
 		_rodata = .;
-		. = ALIGN(16);
 		console_drivers = .;
 		KEEP(*(.rodata.console_drivers));
 		econsole_drivers = . ;
-		. = ALIGN(16);
+		. = ALIGN(64);
 		pci_drivers = . ;
 		KEEP(*(.rodata.pci_driver));
 		epci_drivers = . ;
@@ -72,52 +71,39 @@ SECTIONS
 		LONG(0);
 		LONG(0);
 		_bs_init_end = .;
+		. = ALIGN(64);
 		*(.rodata)
 		*(.rodata.*)
-		/* kevinh/Ispiri - Added an align, because the objcopy tool
-		 * incorrectly converts sections that are not long word aligned.
-		 */
-		 . = ALIGN(16);
-
 		_erodata = .;
 	}
-	/* After the code we place initialized data (typically initialized
-	 * global variables). This gets copied into ram by startup code.
-	 * __data_start and __data_end shows where in ram this should be placed,
-	 * whereas __data_loadstart and __data_loadend shows where in rom to
-	 * copy from.
-	 */
+
 	.data : {
+		 . = ALIGN(64);
 		_data = .;
 		*(.data)
+		*(.data.*)
+		 . = ALIGN(64);
 		_edata = .;
 	}
 
-	/* bss does not contain data, it is just a space that should be zero
-	 * initialized on startup. (typically uninitialized global variables)
-	 * crt0.S fills between _bss and _ebss with zeroes.
-	 */
-	_bss = .;
-	.bss . : {
+	.bss : {
+		 . = ALIGN(64);
+		_bss = .;
 		*(.bss)
-		*(.sbss)
+		*(.bss.*)
+		*(.sbss.*)
 		*(COMMON)
-		. = ALIGN(16);
+		. = ALIGN(64);
+		_ebss = .;
 	}
-	_ebss = .;
-	_end = .;
 
-	/* coreboot really "ends" here. Only heap and stack are placed after
-	 * this line.
-	 */
-
-	_heap = .;
-	.heap . : {
+	.heap : {
+		_heap = .;
 		/* Reserve CONFIG_HEAP_SIZE bytes for the heap */
-		. = CONFIG_HEAP_SIZE ;
-		. = ALIGN(16);
+		. = . + CONFIG_HEAP_SIZE ;
+		. = ALIGN(64);
+		_eheap = .;
 	}
-	_eheap = .;
 
 	/* arm64 chipsets need to define CONFIG_RAMSTAGE_STACK_(TOP|BOTTOM) */
 	_stack = CONFIG_RAMSTAGE_STACK_BOTTOM;