From c7c02673e45a1c35ee020049c3dcf6da7e7ed1f0 Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Fri, 26 Dec 2014 13:28:35 +0200 Subject: RELOCATABLE_RAMSTAGE: Fix weak symbols with ramstage_cache MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We had NULL reference with cache_loaded_ramstage() if CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM was not set so boot never proceeded to ramstage. Cache implementation outside CBMEM provides means for platform-specific location so there is no need of weak attributes here. Change-Id: I1eb1a713896395c424fde23252c374f9065fe74d Signed-off-by: Kyösti Mälkki Reviewed-on: http://review.coreboot.org/7954 Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan --- src/include/cbfs.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/include/cbfs.h') diff --git a/src/include/cbfs.h b/src/include/cbfs.h index ebdbf4365d..52972300e2 100644 --- a/src/include/cbfs.h +++ b/src/include/cbfs.h @@ -92,13 +92,11 @@ struct cbmem_entry; * structure to store information, but note that the handoff variable can be * NULL. The ramstage cbmem_entry represents the region occupied by the loaded * ramstage. */ -void __attribute__((weak)) -cache_loaded_ramstage(struct romstage_handoff *handoff, +void cache_loaded_ramstage(struct romstage_handoff *handoff, const struct cbmem_entry *ramstage, void *entry_point); /* Return NULL on error or entry point on success. The ramstage cbmem_entry is * the region where to load the cached contents to. */ -void * __attribute__((weak)) -load_cached_ramstage(struct romstage_handoff *handoff, +void * load_cached_ramstage(struct romstage_handoff *handoff, const struct cbmem_entry *ramstage); #else /* CONFIG_RELOCATABLE_RAMSTAGE */ -- cgit v1.2.3