From 7aa486fe6bac2a471b92c3c4aef1ba5c214f06df Mon Sep 17 00:00:00 2001
From: Anthony Liguori <aliguori@us.ibm.com>
Date: Sat, 11 Jul 2009 08:48:29 -0500
Subject: Fix multiboot.bin build on mingw32

This combination of ld/object was suggested by Bartlomiej Celary

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---
 pc-bios/optionrom/Makefile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'pc-bios/optionrom/Makefile')

diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile
index 7f987d898f..69e6c22acc 100644
--- a/pc-bios/optionrom/Makefile
+++ b/pc-bios/optionrom/Makefile
@@ -3,7 +3,6 @@ all: build-all
 include ../../config-host.mak
 
 VPATH=$(SRC_PATH)/pc-bios/optionrom
-OBJCOPY=objcopy
 
 # from kernel sources - scripts/Kbuild.include
 # try-run
@@ -35,9 +34,12 @@ build-all: multiboot.bin
 	$(CC) $(CFLAGS) -o $@ -c $<
 
 %.img: %.o
-	$(LD) --oformat binary -Ttext 0 -o $@ $<
+	$(LD) -Ttext 0 -e _start -s -o $@ $<
 
-%.bin: %.img
+%.raw: %.img
+	$(OBJCOPY) -O binary -j .text $< $@
+
+%.bin: %.raw
 	$(SRC_PATH)/pc-bios/optionrom/signrom.sh $< $@
 	cp $@ $(SRC_PATH)/pc-bios/
 
-- 
cgit v1.2.3