]> git.proxmox.com Git - mirror_qemu.git/commitdiff
ppc: add skiboot firmware for the pnv platform
authorCédric Le Goater <clg@kaod.org>
Sat, 22 Oct 2016 09:46:34 +0000 (11:46 +0200)
committerDavid Gibson <david@gibson.dropbear.id.au>
Thu, 27 Oct 2016 22:36:58 +0000 (09:36 +1100)
This is the initial image of skiboot 5.3.7 (commit 762d0082) for
the PowerPC PowerNV (Non-Virtualized) platform. Built from
submodule.

Signed-off-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
.gitmodules
MAINTAINERS
Makefile
pc-bios/README
pc-bios/skiboot.lid [new file with mode: 0644]
roms/Makefile
roms/skiboot [new submodule]

index 9da9ede26161bc5c6f12552b55bc54f55bb1e839..ca323b4d872c3e01e9a52c725574fb2a07468391 100644 (file)
@@ -31,3 +31,6 @@
 [submodule "roms/u-boot"]
        path = roms/u-boot
        url = git://git.qemu-project.org/u-boot.git
+[submodule "roms/skiboot"]
+       path = roms/skiboot
+       url = git://git.qemu.org/skiboot.git
index b01fec0a7b9523dfbfc76c97b3cd83730cca7ba4..280ee1fcd263705f085f4e2112a088feadb352cb 100644 (file)
@@ -656,6 +656,7 @@ F: include/hw/*/xics*
 F: pc-bios/spapr-rtas/*
 F: pc-bios/spapr-rtas.bin
 F: pc-bios/slof.bin
+F: pc-bios/skiboot.lid
 F: docs/specs/ppc-spapr-hcalls.txt
 F: docs/specs/ppc-spapr-hotplug.txt
 F: tests/spapr*
index 3bcb0565b60abb8b8b7af3a290773969151e8955..11f5154c81222b432d91a2aa8cd1db97bfc9cc43 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -421,7 +421,7 @@ qemu-icon.bmp qemu_logo_no_text.svg \
 bamboo.dtb petalogix-s3adsp1800.dtb petalogix-ml605.dtb \
 multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin \
 s390-ccw.img \
-spapr-rtas.bin slof.bin \
+spapr-rtas.bin slof.bin skiboot.lid \
 palcode-clipper \
 u-boot.e500
 else
index 779192eb7cea311914b8b6a08c249b459629edc2..47a913f9c7cc41e70001e1bc86e5fc1e5ac5d5f1 100644 (file)
@@ -42,3 +42,8 @@
   it was compiled using the qemu-ppce500 target.
   A git mirror is available at: git://git.qemu-project.org/u-boot.git
   The hash used to compile the current version is: 2072e72
+
+- Skiboot (https://github.com/open-power/skiboot/) is an OPAL
+  (OpenPower Abstraction Layer) firmware for OpenPOWER systems. It can
+  run an hypervisor OS or simply a host OS on the "baremetal"
+  platform, also known as the PowerNV (Non-Virtualized) platform.
diff --git a/pc-bios/skiboot.lid b/pc-bios/skiboot.lid
new file mode 100644 (file)
index 0000000..0e59a82
Binary files /dev/null and b/pc-bios/skiboot.lid differ
index 88b3709d4dc2441349c044c01e4f386864a10114..b5e5a69e910052681230e752ff89e422f356decd 100644 (file)
@@ -63,6 +63,7 @@ default:
        @echo "  efirom         -- update nic roms (bios+efi, this needs"
        @echo "                    the EfiRom utility from edk2 / tianocore)"
        @echo "  slof           -- update slof.bin"
+       @echo "  skiboot        -- update skiboot.lid"
        @echo "  u-boot.e500    -- update u-boot.e500"
 
 bios: build-seabios-config-seabios-128k build-seabios-config-seabios-256k
@@ -103,7 +104,7 @@ build-lgplvgabios:
        $(MAKE) -C vgabios $(vgabios_targets)
 
 
-.PHONY: sgabios
+.PHONY: sgabios skiboot
 sgabios:
        $(MAKE) -C sgabios
        cp sgabios/sgabios.bin ../pc-bios
@@ -146,6 +147,10 @@ u-boot.e500:
        $(powerpc_cross_prefix)strip u-boot/build.e500/u-boot -o \
                ../pc-bios/u-boot.e500
 
+skiboot:
+       $(MAKE) -C skiboot CROSS=$(powerpc64_cross_prefix)
+       cp skiboot/skiboot.lid ../pc-bios/skiboot.lid
+
 clean:
        rm -rf seabios/.config seabios/out seabios/builds
        $(MAKE) -C vgabios clean
@@ -155,3 +160,4 @@ clean:
        $(MAKE) -C ipxe/src veryclean
        $(MAKE) -C SLOF clean
        rm -rf u-boot/build.e500
+       $(MAKE) -C skiboot clean
diff --git a/roms/skiboot b/roms/skiboot
new file mode 160000 (submodule)
index 0000000..762d008
--- /dev/null
@@ -0,0 +1 @@
+Subproject commit 762d0082f18e4fb921a2d44a1051b02d8b0f6381