[coreboot-gerrit] New patch to review for coreboot: 7dab238 memlayout: Make sure preram_cbmem_console symbols exist

Patrick Georgi (pgeorgi@google.com) gerrit at coreboot.org
Thu Apr 23 14:41:53 CEST 2015


Patrick Georgi (pgeorgi at google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9973

-gerrit

commit 7dab23847b2a20e421ed44f89a40d6d53e4fdf01
Author: Patrick Georgi <pgeorgi at chromium.org>
Date:   Thu Apr 23 14:40:22 2015 +0200

    memlayout: Make sure preram_cbmem_console symbols exist
    
    This enables its _size variable (a macro) to work even when
    the console has no location assigned to it in the chip/board's
    memlayout.ld.
    Since _size == 0, the code will do the right thing.
    
    Change-Id: I6b42ed0c5c3aaa613603680728b61cbdb24c4b61
    Signed-off-by: Patrick Georgi <pgeorgi at chromium.org>
---
 src/lib/bootblock.ld | 2 ++
 src/lib/romstage.ld  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/lib/bootblock.ld b/src/lib/bootblock.ld
index 9bd8a86..8c93342 100644
--- a/src/lib/bootblock.ld
+++ b/src/lib/bootblock.ld
@@ -35,6 +35,8 @@
 	*(.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
diff --git a/src/lib/romstage.ld b/src/lib/romstage.ld
index c3a2643..1e80962 100644
--- a/src/lib/romstage.ld
+++ b/src/lib/romstage.ld
@@ -33,6 +33,8 @@
 	*(.rodata.*);
 	*(.data);
 	*(.data.*);
+	_preram_cbmem_console = DEFINED(_preram_cbmem_console) ? _preram_cbmem_console : 0;
+	_epreram_cbmem_console = DEFINED(_epreram_cbmem_console) ? _epreram_cbmem_console : 0;
 	. = ALIGN(8);
 }
 



More information about the coreboot-gerrit mailing list