GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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)
This commit is contained in:
Vadim Bendebury 2014-05-23 14:37:10 -07:00 committed by Marc Jones
parent 0b70bd1336
commit 66fdbced5e
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
payloads/libpayload/include/cbfs.h
View File

@ -81,9 +81,6 @@ void *cbfs_simple_buffer_unmap(struct cbfs_simple_buffer *buffer,
// Utility functions // Utility functions
int run_address(void *f); int run_address(void *f);
/* Defined in src/lib/selfboot.c */
void selfboot(void *entry);
/* Defined in individual arch / board implementation. */ /* Defined in individual arch / board implementation. */
int init_default_cbfs_media(struct cbfs_media *media); int init_default_cbfs_media(struct cbfs_media *media);

6
payloads/libpayload/include/libpayload.h
View File

@ -60,9 +60,6 @@
#ifdef CONFIG_LP_LAR #ifdef CONFIG_LP_LAR
#include <lar.h> #include <lar.h>
#endif #endif
#ifdef CONFIG_LP_CBFS
#include <cbfs.h>
#endif
#define MIN(a,b) ((a) < (b) ? (a) : (b)) #define MIN(a,b) ((a) < (b) ? (a) : (b))
#define MAX(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); int getline(char *buffer, int len);
/** @} */ /** @} */
/* Defined in arch/${ARCH}/selfboot.c */
void selfboot(void *entry);
#endif #endif