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

[svn at coreboot.org]

Author: hailfinger
Date: 2008-08-18 15:03:43 +0200 (Mon, 18 Aug 2008)
New Revision: 783

Modified:
   coreboot-v3/arch/x86/stage1.c
Log:
Move otherwise unused stuff inside CONFIG_PAYLOAD_ELF_LOADER.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006 at gmx.net>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006 at gmx.net>


Modified: coreboot-v3/arch/x86/stage1.c
===================================================================
--- coreboot-v3/arch/x86/stage1.c	2008-08-18 11:15:43 UTC (rev 782)
+++ coreboot-v3/arch/x86/stage1.c	2008-08-18 13:03:43 UTC (rev 783)
@@ -124,13 +124,12 @@
 {
 	int ret;
 	struct mem_file archive;
+	void *entry;
 #ifdef CONFIG_PAYLOAD_ELF_LOADER
 	struct mem_file result;
 	int elfboot_mem(struct lb_memory *mem, void *where, int size);
-#endif /* CONFIG_PAYLOAD_ELF_LOADER */
-	void *entry;
 
-	/* we can't statically init this hack. */
+	/* Why can't we statically init this hack? */
 	unsigned char faker[64];
 	struct lb_memory *mem = (struct lb_memory*) faker;
 
@@ -140,8 +139,8 @@
 	mem->map[0].size.lo = (32*1024*1024);
 	mem->map[0].size.hi = 0;
 	mem->map[0].type = LB_MEM_RAM;
+#endif /* CONFIG_PAYLOAD_ELF_LOADER */
 
-
 	post_code(POST_STAGE1_MAIN);
 
 	// before we do anything, we want to stop if we dont run