[LinuxBIOS] r539 - LinuxBIOSv3/arch/x86

Author: hailfinger
Date: 2007-12-05 02:45:55 +0100 (Wed, 05 Dec 2007)
New Revision: 539

Modified:
   LinuxBIOSv3/arch/x86/Makefile
   LinuxBIOSv3/arch/x86/stage1.c
Log:
linuxbios.stage2.o (and stage2.o in the LAR) are NOT .o files, they are
ELF executables. Remove the .o suffix to reduce confusion.

Signed-off-by: Carl-Daniel Hailfinger 
Acked-by: Corey Osgood

Modified: LinuxBIOSv3/arch/x86/Makefile
===================================================================
--- LinuxBIOSv3/arch/x86/Makefile	2007-12-04 23:15:33 UTC (rev 538)
+++ LinuxBIOSv3/arch/x86/Makefile	2007-12-05 01:45:55 UTC (rev 539)
@@ -36,7 +36,7 @@

ROM_SIZE := $(shell expr $(CONFIG_LINUXBIOS_ROMSIZE_KB) * 1024)

-LARFILES := nocompress:normal/initram normal/stage2.o nocompress:normal/option_table
+LARFILES := nocompress:normal/initram normal/stage2 nocompress:normal/option_table
 ifneq ($(CONFIG_PAYLOAD_NONE),y)
 LARFILES += normal/payload
 endif
@@ -57,12 +57,12 @@
 COMPRESSFLAG := -C nrv2b
 endif

-$(obj)/linuxbios.rom $(obj)/linuxbios.map: $(obj)/linuxbios.bootblock $(obj)/util/lar/lar lzma nrv2b $(obj)/linuxbios.initram $(obj)/linuxbios.stage2.o $(obj)/option_table
+$(obj)/linuxbios.rom $(obj)/linuxbios.map: $(obj)/linuxbios.bootblock $(obj)/util/lar/lar lzma nrv2b $(obj)/linuxbios.initram $(obj)/linuxbios.stage2 $(obj)/option_table
    $(Q)rm -rf $(obj)/lar.tmp
    $(Q)mkdir $(obj)/lar.tmp
    $(Q)mkdir $(obj)/lar.tmp/normal
    $(Q)cp $(obj)/linuxbios.initram $(obj)/lar.tmp/normal/initram
-	$(Q)cp $(obj)/linuxbios.stage2.o $(obj)/lar.tmp/normal/stage2.o
+	$(Q)cp $(obj)/linuxbios.stage2 $(obj)/lar.tmp/normal/stage2
    $(Q)cp $(obj)/option_table $(obj)/lar.tmp/normal/option_table
 ifeq ($(CONFIG_PAYLOAD_NONE),y)
    $(Q)printf "  PAYLOAD none (as specified by user)\n"
@@ -198,12 +198,12 @@
 STAGE2_OBJ += $(obj)/util/x86emu/libx86emu.a $(LIBGCC_FILE_NAME)
 endif

-$(obj)/linuxbios.stage2.o $(obj)/linuxbios.stage2.map: $(obj)/stage0.init $(STAGE2_OBJ)
+$(obj)/linuxbios.stage2 $(obj)/linuxbios.stage2.map: $(obj)/stage0.init $(STAGE2_OBJ)
    $(Q)# leave a .o with full symbols in it for debugging.
    $(Q)printf "  LD      $(subst $(shell pwd)/,,$(@))\n"
    $(Q)$(LD) -R $(obj)/stage0.o -Ttext 0x1000 --entry=stage2 \
-		  -o $(obj)/linuxbios.stage2.o $(STAGE2_OBJ)
-	$(Q)$(NM) $(obj)/linuxbios.stage2.o | sort -u > $(obj)/linuxbios.stage2.map
+		  -o $(obj)/linuxbios.stage2 $(STAGE2_OBJ)
+	$(Q)$(NM) $(obj)/linuxbios.stage2 | sort -u > $(obj)/linuxbios.stage2.map

#
 # Build rules.

Modified: LinuxBIOSv3/arch/x86/stage1.c
===================================================================
--- LinuxBIOSv3/arch/x86/stage1.c	2007-12-04 23:15:33 UTC (rev 538)
+++ LinuxBIOSv3/arch/x86/stage1.c	2007-12-05 01:45:55 UTC (rev 539)
@@ -160,7 +160,7 @@
    /* Turn off Cache-As-Ram */
    disable_car();

-	entry = load_file_segments(&archive, "normal/stage2.o");
+	entry = load_file_segments(&archive, "normal/stage2");
    if (entry == (void *)-1)
    	die("FATAL: Failed loading stage2.");
    ret = run_address(entry);