diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2011-07-01 21:12:50 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2011-07-01 21:12:50 +0000 |
| commit | 3b88670664f7902000b83149e7fa1875ad5c6239 (patch) | |
| tree | 680e0ef80f570aed7e6c0686d7c7c7786364aa93 /pc-bios | |
| parent | ec1884298c96a8ce723880adb9e8ffe5e71fcf37 (diff) | |
| parent | 1c53accceeb01246aea0ec361e1efd15cac6db0f (diff) | |
Merge branch 'ppc-next' of git://repo.or.cz/qemu/agraf
* 'ppc-next' of git://repo.or.cz/qemu/agraf:
PPC: move TLBs to their own arrays
PPC: 440: Use 440 style MMU as default, so Qemu knows the MMU type
PPC: E500: Use MAS registers instead of internal TLB representation
PPC: Only set lower 32bits with mtmsr
PPC: update openbios firmware
PPC: mpc8544ds: Add hypervisor node
PPC: calculate kernel,initrd,cmdline locations dynamically
target-ppc: Handle memory-forced I/O controller access
PPC: E500: Implement reboot controller
Diffstat (limited to 'pc-bios')
| -rw-r--r-- | pc-bios/README | 6 | ||||
| -rw-r--r-- | pc-bios/mpc8544ds.dtb | bin | 12288 -> 2277 bytes | |||
| -rw-r--r-- | pc-bios/mpc8544ds.dts | 9 | ||||
| -rw-r--r-- | pc-bios/openbios-ppc | bin | 729876 -> 750392 bytes |
4 files changed, 13 insertions, 2 deletions
diff --git a/pc-bios/README b/pc-bios/README index fe221a940f..40568f82aa 100644 --- a/pc-bios/README +++ b/pc-bios/README @@ -10,8 +10,10 @@ - OpenBIOS (http://www.openbios.org/) is a free (GPL v2) portable firmware implementation. The goal is to implement a 100% IEEE 1275-1994 (referred to as Open Firmware) compliant firmware. - The included image for PowerPC (for 32 and 64 bit PPC CPUs), Sparc32 - and Sparc64 are built from OpenBIOS SVN revision 1018. + The included image for PowerPC (for 32 and 64 bit PPC CPUs), + + PowerPC is built from OpenBIOS SVN revision 1044 + Sparc32 and Sparc64 are built from OpenBIOS SVN revision 1018. - SLOF (Slimline Open Firmware) is a free IEEE 1275 Open Firmware implementation for certain IBM POWER hardware. The sources are at diff --git a/pc-bios/mpc8544ds.dtb b/pc-bios/mpc8544ds.dtb Binary files differindex 3299546696..ae318b1fe8 100644 --- a/pc-bios/mpc8544ds.dtb +++ b/pc-bios/mpc8544ds.dtb diff --git a/pc-bios/mpc8544ds.dts b/pc-bios/mpc8544ds.dts index 872152df93..a88b47c11b 100644 --- a/pc-bios/mpc8544ds.dts +++ b/pc-bios/mpc8544ds.dts @@ -82,6 +82,12 @@ compatible = "chrp,open-pic"; device_type = "open-pic"; }; + + global-utilities@e0000 { //global utilities block + compatible = "fsl,mpc8544-guts"; + reg = <0xe0000 0x1000>; + fsl,has-rstcr; + }; }; pci0: pci@e0008000 { @@ -119,4 +125,7 @@ chosen { linux,stdout-path = "/soc8544@e0000000/serial@4500"; }; + + hypervisor { + }; }; diff --git a/pc-bios/openbios-ppc b/pc-bios/openbios-ppc Binary files differindex ee6f5ae3b9..6525a9199a 100644 --- a/pc-bios/openbios-ppc +++ b/pc-bios/openbios-ppc |