diff options
| author | Marcelo Tosatti <mtosatti@redhat.com> | 2011-04-14 11:04:29 -0300 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2011-04-14 11:04:29 -0300 |
| commit | 21415acd220064b0dc192a03fa4fb9710aa5fc46 (patch) | |
| tree | 2750a04924d8b87621cff6e4aef4ab9f1300f13a /Makefile | |
| parent | d434a68869d35940ad688c8e602fcb11c0518d1a (diff) | |
| parent | 39ac8455106af1ed669b8e10223420cf1ac5b190 (diff) | |
Merge commit '39ac8455106af1ed669b8e10223420cf1ac5b190' into upstream-merge
* commit '39ac8455106af1ed669b8e10223420cf1ac5b190':
Implement hcall based RTAS for pSeries machines
Virtual hash page table handling on pSeries machine
Implement the bus structure for PAPR virtual IO
Start implementing pSeries logical partition machine
Add POWER7 support for ppc
Support 1T segments on ppc
Better factor the ppc hash translation path
Use "hash" more consistently in ppc mmu code
Parse SDR1 on mtspr instead of at translate time
Clean up slb_lookup() function
Correct ppc popcntb logic, implement popcntw and popcntd
Implement missing parts of the logic for the POWER PURR
Implement PowerPC slbmfee and slbmfev instructions
Conflicts:
Makefile
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -213,7 +213,8 @@ pxe-ne2k_pci.bin pxe-pcnet.bin \ pxe-rtl8139.bin pxe-virtio.bin \ bamboo.dtb petalogix-s3adsp1800.dtb petalogix-ml605.dtb \ multiboot.bin linuxboot.bin \ -s390-zipl.rom +s390-zipl.rom \ +spapr-rtas.bin BLOBS += extboot.bin BLOBS += vapic.bin else |