[coreboot] r959 - coreboot-v3/arch/x86

[svn at coreboot.org]

Author: myles
Date: 2008-10-29 03:19:42 +0100 (Wed, 29 Oct 2008)
New Revision: 959

Modified:
   coreboot-v3/arch/x86/stage1.c
Log:
This patch clears up a few warnings in stage1 code.  It removes an unused variable, moves a declaration into an ifdef, and adds a cast.

Signed-off-by: Myles Watson <mylesgw at gmail.com>
Acked-by: Ronald G. Minnich <rminnich at gmail.com>


Modified: coreboot-v3/arch/x86/stage1.c
===================================================================
--- coreboot-v3/arch/x86/stage1.c	2008-10-28 17:29:07 UTC (rev 958)
+++ coreboot-v3/arch/x86/stage1.c	2008-10-29 02:19:42 UTC (rev 959)
@@ -170,7 +170,6 @@
 	struct global_vars globvars;
 	int ret;
 	struct mem_file archive;
-	struct node_core_id me;
 
 	post_code(POST_STAGE1_MAIN);
 
@@ -279,11 +278,11 @@
 void __attribute__((stdcall)) stage1_phase3(void)
 {
 	void *entry;
-	int ret;
 	struct mem_file archive;
 	struct multiboot_info *mbi;
 
 #ifdef CONFIG_PAYLOAD_ELF_LOADER
+	int ret;
 	struct mem_file result;
 	int elfboot_mem(struct lb_memory *mem, void *where, int size);
 
@@ -305,7 +304,7 @@
 	entry = load_file_segments(&archive, "normal/stage2");
 	if (entry == (void *)-1)
 		die("FATAL: Failed loading stage2.");
-	mbi = run_address(entry);
+	mbi = (struct multiboot_info*) run_address(entry);
 	if (! mbi)
 		die("FATAL: Failed in stage2 code.");