Patch set updated for coreboot: 7607aa4 libpayload: Provide selfboot() external declaration in a common file

[Marc Jones]

Marc Jones ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8003

-gerrit

commit 7607aa4964ec2371ee8ec1973f0a96027d15e26b
Author: Vadim Bendebury 
Date:   Fri May 23 14:37:10 2014 -0700

libpayload: Provide selfboot() external declaration in a common file

The earlier compilation warning fix (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 
    Original-Reviewed-on: https://chromium-review.googlesource.com/201386
    (cherry picked from commit d5090e8410530f41b9fd33e2caa1d8aa25438105)
    Signed-off-by: Marc Jones

Change-Id: I8404fb52112b391982f954a6d06fe4b451dfcb8a
---
 payloads/libpayload/include/cbfs.h       | 3 ---
 payloads/libpayload/include/libpayload.h | 6 +++---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/payloads/libpayload/include/cbfs.h b/payloads/libpayload/include/cbfs.h
index c5c811c..1b5c51a 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 1d4d0da..9781c9e 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