summaryrefslogtreecommitdiff
path: root/src/boot/hardwaremain.c
diff options
context:
space:
mode:
authorMyles Watson <mylesgw@gmail.com>2009-04-30 22:45:41 +0000
committerMyles Watson <mylesgw@gmail.com>2009-04-30 22:45:41 +0000
commitfa12b67771f73f0e7acf2308a13cf33b8c619884 (patch)
tree853c5b64915c1b13749561d30bbd34c8d46f1bc4 /src/boot/hardwaremain.c
parentd233f363c129dae2ba5fd7ac536cf92fb4c2dd6e (diff)
downloadcoreboot-fa12b67771f73f0e7acf2308a13cf33b8c619884.tar.xz
Remove warnings from compilation of the s2892 with and without CBFS.
I didn't try to remove "defined but not used" warnings because there are too many ifdefs to be sure I wouldn't break something. For shadowed variable declarations I renamed the inner-most variable. The one in src/pc80/keyboard.c might need help. I didn't change the functionality but it looks like a bug. I boot tested it on s2892 and abuild tested it. Signed-off-by: Myles Watson <mylesgw@gmail.com> Acked-by: Ronald G. Minnich <rminnich@gmail.com> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4240 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/boot/hardwaremain.c')
-rw-r--r--src/boot/hardwaremain.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/boot/hardwaremain.c b/src/boot/hardwaremain.c
index d6e88de374..2419dc2134 100644
--- a/src/boot/hardwaremain.c
+++ b/src/boot/hardwaremain.c
@@ -99,9 +99,9 @@ void hardwaremain(int boot_complete)
lb_mem = write_tables();
#if CONFIG_CBFS == 1
# if USE_FALLBACK_IMAGE == 1
- void (*pl)(void) = cbfs_load_payload(lb_mem, "fallback/payload");
+ cbfs_load_payload(lb_mem, "fallback/payload");
# else
- void (*pl)(void) = cbfs_load_payload(lb_mem, "normal/payload");
+ cbfs_load_payload(lb_mem, "normal/payload");
# endif
#else