Multiboot build system v4

In order to build the multiboot option rom, we need a Makefile and a tool
to sign the rom with.

Both are provided by this patch and mostly taken from the extboot source,
written by Anthony Liguori.

Once built, the resulting binary gets copied to pc-bios automatically.

Building also occurs automatically when on an x86 host.

Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

diff --git a/Makefile b/Makefile
index 8a03d87..bc3c1d7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,7 @@ ifdef CONFIG_WIN32
 LIBS+=-lwinmm -lws2_32 -liphlpapi
 endif
 
-build-all: $(TOOLS) $(DOCS) recurse-all
+build-all: $(TOOLS) $(DOCS) roms recurse-all
 
 config-host.mak: configure
 ifneq ($(wildcard config-host.mak),)
@@ -263,7 +263,7 @@ clean:
        rm -f slirp/*.o slirp/*.d audio/*.o audio/*.d block/*.o block/*.d
        rm -f qemu-img-cmds.h
        $(MAKE) -C tests clean
-       for d in $(TARGET_DIRS) libhw32 libhw64; do \
+       for d in $(TARGET_DIRS) $(ROMS) libhw32 libhw64; do \
        $(MAKE) -C $$d $@ || exit 1 ; \
         done
 
@@ -282,11 +282,17 @@ ifdef INSTALL_BLOBS
 BLOBS=bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \
 video.x openbios-sparc32 openbios-sparc64 openbios-ppc \
 pxe-ne2k_pci.bin pxe-rtl8139.bin pxe-pcnet.bin pxe-e1000.bin \
-bamboo.dtb petalogix-s3adsp1800.dtb
+bamboo.dtb petalogix-s3adsp1800.dtb \
+multiboot.bin
 else
 BLOBS=
 endif
 
+roms:
+       for d in $(ROMS); do \
+       $(MAKE) -C $$d || exit 1 ; \
+        done
+
 install-doc: $(DOCS)
        $(INSTALL_DIR) "$(DESTDIR)$(docdir)"
        $(INSTALL_DATA) qemu-doc.html  qemu-tech.html "$(DESTDIR)$(docdir)"

diff --git a/configure b/configure
index ebaf03a..a778fa2 100755 (executable)
--- a/configure
+++ b/configure
@@ -1868,6 +1868,12 @@ if test `expr "$target_list" : ".*softmmu.*"` != 0 ; then
 fi
 echo "TOOLS=$tools" >> $config_mak
 
+roms=
+if test "$cpu" = "i386" -o "$cpu" = "x86_64" ; then
+  roms="pc-bios/optionrom"
+fi
+echo "ROMS=$roms" >> $config_mak
+
 if test -f ${config_h}~ ; then
   if cmp -s $config_h ${config_h}~ ; then
     mv ${config_h}~ $config_h
@@ -2230,10 +2236,11 @@ done # for target in $targets
 
 # build tree in object directory if source path is different from current one
 if test "$source_path_used" = "yes" ; then
-    DIRS="tests tests/cris slirp audio block"
+    DIRS="tests tests/cris slirp audio block pc-bios/optionrom"
     FILES="Makefile tests/Makefile"
     FILES="$FILES tests/cris/Makefile tests/cris/.gdbinit"
     FILES="$FILES tests/test-mmap.c"
+    FILES="$FILES pc-bios/optionrom/Makefile"
     for dir in $DIRS ; do
             mkdir -p $dir
     done

diff --git a/pc-bios/multiboot.bin b/pc-bios/multiboot.bin
new file mode 100644 (file)
index 0000000..59737c3
Binary files /dev/null and b/pc-bios/multiboot.bin differ

diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile
new file mode 100644 (file)
index 0000000..c4a6f42
--- /dev/null
+++ b/pc-bios/optionrom/Makefile
@@ -0,0 +1,48 @@
+all: build-all
+
+include ../../config-host.mak
+
+VPATH=$(SRC_PATH)/pc-bios/optionrom
+OBJCOPY=objcopy
+
+# from kernel sources - scripts/Kbuild.include
+# try-run
+# Usage: option = $(call try-run, $(CC)...-o "$$TMP",option-ok,otherwise)
+# Exit code chooses option. "$$TMP" is can be used as temporary file and
+# is automatically cleaned up.
+try-run = $(shell set -e;              \
+       TMP="$(TMPOUT).$$$$.tmp";       \
+       if ($(1)) >/dev/null 2>&1;      \
+       then echo "$(2)";               \
+       else echo "$(3)";               \
+       fi;                             \
+       rm -f "$$TMP")
+
+# cc-option-yn
+# Usage: flag := $(call cc-option-yn,-march=winchip-c6)
+cc-option-yn = $(call try-run,\
+       $(CC) $(KBUILD_CFLAGS) $(1) -S -xc /dev/null -o "$$TMP",y,n)
+
+CFLAGS = -Wall -Wstrict-prototypes -Werror -fomit-frame-pointer -fno-builtin
+CFLAGS += -I$(SRC_PATH)
+ifeq ($(call cc-option-yn,-fno-stack-protector),y)
+CFLAGS += -fno-stack-protector
+endif
+
+build-all: multiboot.bin
+
+%.o: %.S
+       $(CC) $(CFLAGS) -o $@ -c $<
+
+%.img: %.o
+       $(LD) --oformat binary -Ttext 0 -o $@ $<
+
+%.bin: %.img signrom
+       ./signrom $< $@
+       cp $@ $(SRC_PATH)/pc-bios/
+
+signrom: signrom.c
+       $(CC) -o $@ -g -Wall $^
+
+clean:
+       $(RM) *.o *.img *.bin signrom *~

diff --git a/pc-bios/optionrom/signrom.c b/pc-bios/optionrom/signrom.c
new file mode 100644 (file)
index 0000000..fe8d677
--- /dev/null
+++ b/pc-bios/optionrom/signrom.c
@@ -0,0 +1,79 @@
+/*
+ * Extended Boot Option ROM
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Copyright IBM Corporation, 2007
+ *   Authors: Anthony Liguori <aliguori@us.ibm.com>
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+
+int main(int argc, char **argv)
+{
+       FILE *fin, *fout;
+       char buffer[512], oldbuffer[512];
+       int i, size, lag = 0;
+       uint8_t sum = 0;
+
+       if (argc != 3) {
+               printf("Usage: %s ROM OUTPUT\n", argv[0]);
+               return 1;
+       }
+
+       fin = fopen(argv[1], "rb");
+       fout = fopen(argv[2], "wb");
+
+       if (fin == NULL || fout == NULL) {
+               fprintf(stderr, "Could not open input/output files\n");
+               return 1;
+       }
+
+       do {
+               size = fread(buffer, 512, 1, fin);
+               if (size == 1) {
+                       for (i = 0; i < 512; i++)
+                               sum += buffer[i];
+
+                       if (lag) {
+                               if (fwrite(oldbuffer, 512, 1, fout) != 1) {
+                                       fprintf(stderr, "Write failed\n");
+                                       return 1;
+                               }
+                       }
+                       lag = 1;
+                       memcpy(oldbuffer, buffer, 512);
+               }
+       } while (size == 1);
+
+       if (size != 0) {
+               fprintf(stderr, "Failed to read from input file\n");
+               return 1;
+       }
+
+       oldbuffer[511] = -sum;
+
+       if (fwrite(oldbuffer, 512, 1, fout) != 1) {
+               fprintf(stderr, "Failed to write to output file\n");
+               return 1;
+       }
+
+       fclose(fin);
+       fclose(fout);
+
+       return 0;
+}