aboutsummaryrefslogtreecommitdiffstats
path: root/src/arch/x86/init
diff options
context:
space:
mode:
authorScott Duplichan <scott@notabs.org>2011-04-19 01:36:24 +0000
committerStefan Reinauer <stepan@openbios.org>2011-04-19 01:36:24 +0000
commit52ffb2b66d3c7400f5338901129c3066913b3d54 (patch)
tree79fdb91d9bcee7a8fe7f66875459c15b5d0e6b5c /src/arch/x86/init
parent582748fbb35f930f1d40e62dc685b526f4ab74cc (diff)
downloadcoreboot-52ffb2b66d3c7400f5338901129c3066913b3d54.tar.gz
coreboot-52ffb2b66d3c7400f5338901129c3066913b3d54.tar.xz
coreboot-52ffb2b66d3c7400f5338901129c3066913b3d54.zip
Recently the 3 projects using the new AMD reference code have been
failing the check for globals (or statics) in romstage. This causes ASRock E350M1, AMD Inagua, and AMD Persimmon builds to fail with the message "Do not use global variables in romstage". The message is working as intended. It is detecting data declared as 'static' when 'static const' was intended. The code executes correctly because it never tries to modify the data. To make reference code updates easy, it is probably best to avoid modifying the AMD provided code if possible. The following change bypasses the "Do not use global variables in romstage" check for the AMD reference code only. Signed-off-by: Scott Duplichan <scott@notabs.org> Acked-by: Stefan Reinauer <stefan.reinauer@coreboot.org> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6516 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/arch/x86/init')
-rw-r--r--src/arch/x86/init/bootblock.ld3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/arch/x86/init/bootblock.ld b/src/arch/x86/init/bootblock.ld
index edba8e6f6..eab64cf8d 100644
--- a/src/arch/x86/init/bootblock.ld
+++ b/src/arch/x86/init/bootblock.ld
@@ -49,5 +49,6 @@ SECTIONS
*(.comment.*)
*(.note.*)
}
- _bogus = ASSERT((SIZEOF(.bss) + SIZEOF(.data)) == 0, "Do not use global variables in romstage");
+
+ _bogus = ASSERT((SIZEOF(.bss) + SIZEOF(.data)) == 0 || CONFIG_AMD_AGESA, "Do not use global variables in romstage");
}