diff options
author | Blue Swirl <blauwirbel@gmail.com> | 2011-11-01 20:57:01 +0000 |
---|---|---|
committer | Blue Swirl <blauwirbel@gmail.com> | 2011-11-01 20:57:01 +0000 |
commit | e927dab1fda0eee41fa5fe51ae98293f66a86db1 (patch) | |
tree | f4e2c0f47ef3f0e4821d019bb796a1a1c0c225a8 /configure | |
parent | 2ff6458116546ced7ce00cc39423ee30b1477e67 (diff) | |
parent | 3384f95c59e5db381cf3e605c8acec71baf0e6b8 (diff) | |
download | qemu-e927dab1fda0eee41fa5fe51ae98293f66a86db1.zip qemu-e927dab1fda0eee41fa5fe51ae98293f66a86db1.tar.gz qemu-e927dab1fda0eee41fa5fe51ae98293f66a86db1.tar.bz2 |
Merge branch 'ppc-next' of git://repo.or.cz/qemu/agraf
* 'ppc-next' of git://repo.or.cz/qemu/agraf: (24 commits)
pseries: Add partial support for PCI
ppc: Alter CPU state to mask out TCG unimplemented instructions as appropriate
pseries: Allow writes to KVM accelerated TCE table
KVM: PPC: Override host vmx/vsx/dfp only when information known
ppc: Fix up usermode only builds
pseries: Correct vmx/dfp handling in both KVM and TCG cases
PPC: Fail configure when libfdt is not available
ppc: Avoid decrementer related kvm exits
PPC: Disable non-440 CPUs for ppcemb target
PPC: Bump qemu-system-ppc to 64-bit physical address space
pseries: Under kvm use guest cpu = host cpu by default
ppc: Add cpu defs for POWER7 revisions 2.1 and 2.3
ppc: First cut implementation of -cpu host
ppc: Remove broken partial PVR matching
pseries: Update SLOF firmware image
pseries: Add device tree properties for VMX/VSX and DFP under kvm
ppc: Generalize the kvmppc_get_clockfreq() function
Set an invalid-bits mask for each SPE instructions
pseries: Update SLOF firmware image
pseries: Use Book3S-HV TCE acceleration capabilities
...
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 13 |
1 files changed, 11 insertions, 2 deletions
@@ -3341,7 +3341,7 @@ case "$target_arch2" in ;; ppc) gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml power-spe.xml" - target_phys_bits=32 + target_phys_bits=64 target_nptl="yes" target_libs_softmmu="$fdt_libs" ;; @@ -3454,7 +3454,16 @@ case "$target_arch2" in fi fi esac -if test "$target_arch2" = "ppc64" -a "$fdt" = "yes"; then +if test "$fdt" != "yes" && test "$target_arch2" = "ppc" -o \ + "$target_arch2" = "ppc64" -o "$target_arch2" = "ppcemb"; then + echo + echo "Error: libfdt missing" + echo "The PowerPC target requires libfdt to work properly." + echo "Please make sure to have it and its development packages installed." + echo + exit 1 +fi +if test "$target_arch2" = "ppc64"; then echo "CONFIG_PSERIES=y" >> $config_target_mak fi if test "$target_bigendian" = "yes" ; then |