Skip to content

Commit

Permalink
vexpress_a15: Disable HYP mode for now
Browse files Browse the repository at this point in the history
QEMU v3.1.0 by default exposed EL2 (HYP) support in the A7 and A15 CPU
models.

For unknown reasons, that regresses the QEMU bootefi test case. Because
it is an unrelated bug, the best option for now is to force everything
back to the old behavior and then figure out concurrently what is broken.

Once we know we have a working base with HYP enabled, we can reenable it
for the test case again.

Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
  • Loading branch information
agraf authored and nvswarren committed Jan 7, 2019
1 parent 4f50981 commit 35066ae
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion bin/travis-ci/conf.vexpress_ca15_tc2_qemu
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
console_impl=qemu
qemu_machine="vexpress-a15"
qemu_binary="qemu-system-arm"
qemu_extra_args="-nographic -m 1G -tftp ${UBOOT_TRAVIS_BUILD_DIR}"
qemu_extra_args="-nographic -m 1G -tftp ${UBOOT_TRAVIS_BUILD_DIR} -cpu cortex-a15,has_el2=off"
qemu_kernel_args="-kernel ${U_BOOT_BUILD_DIR}/u-boot"
reset_impl=none
flash_impl=none

0 comments on commit 35066ae

Please sign in to comment.