PowerPC needs firmware.
Signed-off-by: Andrew Jones <drjones@xxxxxxxxxx>
---
configure | 2 ++
powerpc/run | 4 ++--
scripts/mkstandalone.sh | 5 +++++
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index b2ad199da7873..7d5702e28d627 100755
--- a/configure
+++ b/configure
@@ -83,6 +83,7 @@ elif [ "$arch" = "arm" ] || [ "$arch" = "arm64" ]; then
testdir=arm
elif [ "$arch" = "ppc64" ]; then
testdir=powerpc
+ firmware="$testdir/boot_rom.bin"
else
testdir=$arch
fi
@@ -137,4 +138,5 @@ OBJDUMP=$cross_prefix$objdump
AR=$cross_prefix$ar
API=$api
TEST_DIR=$testdir
+FIRMWARE=$firmware
EOF
diff --git a/powerpc/run b/powerpc/run
index b317c6c0dc62e..4509429f9712b 100755
--- a/powerpc/run
+++ b/powerpc/run
@@ -40,8 +40,8 @@ if ! $qemu -machine '?' 2>&1 | grep 'pseries' > /dev/null; then
exit 2
fi
-boot_rom='powerpc/boot_rom.bin'
-if [ -f powerpc/rom/boot_rom.bin ]; then
+boot_rom=$FIRMWARE
+if [ -z "$STANDALONE" ] && [ -f powerpc/rom/boot_rom.bin ]; then
boot_rom='powerpc/rom/boot_rom.bin'
fi
diff --git a/scripts/mkstandalone.sh b/scripts/mkstandalone.sh
index b0f1e7c098afb..1788a8ef4e92a 100755
--- a/scripts/mkstandalone.sh
+++ b/scripts/mkstandalone.sh
@@ -51,6 +51,11 @@ generate_test ()
return 1
fi
+ if [ "$FIRMWARE" ]; then
+ temp_file firmware "$FIRMWARE"
+ echo 'export FIRMWARE=$firmware'
+ fi
+
echo "trap 'rm -f \$cleanup' EXIT"
temp_file bin "$kernel"
--
2.4.3
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
