[coreboot-gerrit] Patch set updated for coreboot: libpayload: x86/main - propagate return value of main()

[Mathias Krause]

Mathias Krause ([e-mail]) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/18334

-gerrit

commit fee9a47058beafa7568e3fc2f3457cefc0f7280d
Author: Mathias Krause 
Date:   Tue Feb 7 19:03:29 2017 +0100

libpayload: x86/main - propagate return value of main()

According to coreboot’s payload API [1], the called payload should be
    able to return a value via %eax. Support this by changing the prototype
    of start_main() and pass on the return value of main() to the caller
    instead of discarding it.

[1] https://www.coreboot.org/Payload_API

Change-Id: I8442faea19cc8e04487092f8e61aa4e5cba3ba76
    Signed-off-by: Mathias Krause 
---
 payloads/libpayload/arch/x86/main.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/payloads/libpayload/arch/x86/main.c b/payloads/libpayload/arch/x86/main.c
index fbd4dc4..f9a5e2c 100644
--- a/payloads/libpayload/arch/x86/main.c
+++ b/payloads/libpayload/arch/x86/main.c
@@ -42,8 +42,8 @@ char *main_argv[MAX_ARGC_COUNT];
  * This is our C entry function - set up the system
  * and jump into the payload entry point.
  */
-void start_main(void);
-void start_main(void)
+int start_main(void);
+int start_main(void)
 {
    extern int main(int argc, char **argv);

@@ -67,10 +67,9 @@ void start_main(void)
     * In the future we may care about the return value.
     */

-	(void) main(main_argc, (main_argc != 0) ? main_argv : NULL);
-
    /*
-	 * Returning here will go to the _leave function to return
+	 * Returning from main() will go to the _leave function to return
     * us to the original context.
     */
+	return main(main_argc, (main_argc != 0) ? main_argv : NULL);
 }