This patch removes an unused variable, adds a necessary cast, and moves a
declaration into an #ifdef.
It removes these warnings:
/home/myles/buildrom/try/buildrom/buildrom-devel/work/coreboot-v3/svn/arch/x86/stage1.c:
In function 'stage1_phase1':
/home/myles/buildrom/try/buildrom/buildrom-devel/work/coreboot-v3/svn/arch/x86/stage1.c:173:
warning: unused variable 'me'
/home/myles/buildrom/try/buildrom/buildrom-devel/work/coreboot-v3/svn/arch/x86/stage1.c:
In function 'stage1_phase3':
/home/myles/buildrom/try/buildrom/buildrom-devel/work/coreboot-v3/svn/arch/x86/stage1.c:308:
warning: assignment makes pointer from integer without a cast
/home/myles/buildrom/try/buildrom/buildrom-devel/work/coreboot-v3/svn/arch/x86/stage1.c:282:
warning: unused variable 'ret'
Signed-off-by: Myles Watson <[EMAIL PROTECTED]>
Thanks,
Myles
Index: arch/x86/stage1.c
===================================================================
--- arch/x86/stage1.c (revision 956)
+++ arch/x86/stage1.c (working copy)
@@ -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.");
--
coreboot mailing list: [email protected]
http://www.coreboot.org/mailman/listinfo/coreboot
