Emulation/switch-coreboot
1
0
Fork 0
mirror of https://github.com/fail0verflow/switch-coreboot.git synced 2025-05-04 01:39:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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.

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


git-svn-id: svn://coreboot.org/repository/coreboot-v3@959 f3766cd6-281f-0410-b1cd-43a5c92072e9
This commit is contained in:
Myles Watson 2008-10-29 02:19:42 +00:00
parent e7ea68860d
commit 81b32098c1
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
arch/x86/stage1.c
View file

@ -170,7 +170,6 @@ void __attribute__((stdcall)) stage1_phase1(u32 bist, u32 init_detected)
struct global_vars globvars; struct global_vars globvars;
int ret; int ret;
struct mem_file archive; struct mem_file archive;
struct node_core_id me;
post_code(POST_STAGE1_MAIN); post_code(POST_STAGE1_MAIN);
@ -279,11 +278,11 @@ void stage1_phase2(void)
void __attribute__((stdcall)) stage1_phase3(void) void __attribute__((stdcall)) stage1_phase3(void)
{ {
void *entry; void *entry;
int ret;
struct mem_file archive; struct mem_file archive;
struct multiboot_info *mbi; struct multiboot_info *mbi;
#ifdef CONFIG_PAYLOAD_ELF_LOADER #ifdef CONFIG_PAYLOAD_ELF_LOADER
int ret;
struct mem_file result; struct mem_file result;
int elfboot_mem(struct lb_memory *mem, void *where, int size); int elfboot_mem(struct lb_memory *mem, void *where, int size);
@ -305,7 +304,7 @@ void __attribute__((stdcall)) stage1_phase3(void)
entry = load_file_segments(&archive, "normal/stage2"); entry = load_file_segments(&archive, "normal/stage2");
if (entry == (void *)-1) if (entry == (void *)-1)
die("FATAL: Failed loading stage2."); die("FATAL: Failed loading stage2.");
mbi = run_address(entry); mbi = (struct multiboot_info*) run_address(entry);
if (! mbi) if (! mbi)
die("FATAL: Failed in stage2 code."); die("FATAL: Failed in stage2 code.");