summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim Bendebury <vbendeb@chromium.org>2014-05-23 14:37:10 -0700
committerMarc Jones <marc.jones@se-eng.com>2015-01-04 00:27:20 +0100
commit66fdbced5e61ad2387bfae2db7caf507fef88f37 (patch)
treecac95a749890ecf2caaab490b811c5d30668908e
parent0b70bd13363b560039788f60e1bdd5f3727f489c (diff)
downloadcoreboot-66fdbced5e61ad2387bfae2db7caf507fef88f37.tar.xz
libpayload: Provide selfboot() external declaration in a common file
The earlier compilation warning fix (chromium 7e4aa17) incorrectly assumed that selfboot() is a function defined in the cbfs driver. This is a commonly available function, it should not come from cbfs.h. BUG=none TEST=the following build command succeeds: rambi storm nyan_big Original-Change-Id: I3ef49d849168ad9dc24589cbd9ce7382052345bd Original-Signed-off-by: Vadim Bendebury <vbendeb@chromium.org> Original-Reviewed-on: https://chromium-review.googlesource.com/201386 (cherry picked from commit d5090e8410530f41b9fd33e2caa1d8aa25438105) Signed-off-by: Marc Jones <marc.jones@se-eng.com> Change-Id: I8404fb52112b391982f954a6d06fe4b451dfcb8a Reviewed-on: http://review.coreboot.org/8003 Reviewed-by: Ronald G. Minnich <rminnich@gmail.com> Tested-by: build bot (Jenkins)
-rw-r--r--payloads/libpayload/include/cbfs.h3
-rw-r--r--payloads/libpayload/include/libpayload.h6
2 files changed, 3 insertions, 6 deletions
diff --git a/payloads/libpayload/include/cbfs.h b/payloads/libpayload/include/cbfs.h
index c5c811cd3d..1b5c51a669 100644
--- a/payloads/libpayload/include/cbfs.h
+++ b/payloads/libpayload/include/cbfs.h
@@ -81,9 +81,6 @@ void *cbfs_simple_buffer_unmap(struct cbfs_simple_buffer *buffer,
// Utility functions
int run_address(void *f);
-/* Defined in src/lib/selfboot.c */
-void selfboot(void *entry);
-
/* Defined in individual arch / board implementation. */
int init_default_cbfs_media(struct cbfs_media *media);
diff --git a/payloads/libpayload/include/libpayload.h b/payloads/libpayload/include/libpayload.h
index 1d4d0da10c..9781c9eab5 100644
--- a/payloads/libpayload/include/libpayload.h
+++ b/payloads/libpayload/include/libpayload.h
@@ -60,9 +60,6 @@
#ifdef CONFIG_LP_LAR
#include <lar.h>
#endif
-#ifdef CONFIG_LP_CBFS
-#include <cbfs.h>
-#endif
#define MIN(a,b) ((a) < (b) ? (a) : (b))
#define MAX(a,b) ((a) > (b) ? (a) : (b))
@@ -445,4 +442,7 @@ char *readline(const char *prompt);
int getline(char *buffer, int len);
/** @} */
+/* Defined in arch/${ARCH}/selfboot.c */
+void selfboot(void *entry);
+
#endif