Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions cmake-tool/helpers/simulation.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,12 @@ function(GenerateSimulateScript)
set(sim_graphic_opt "-nographic")
set(sim_cpu "${KernelArmCPU}")
SetDefaultMemSize("${QEMU_MEMORY}")
elseif(KernelPlatformMorelloQEMU)
set(QemuBinaryMachine "qemu-system-${QEMU_ARCH}")
set(sim_machine "virt,gic-version=2")
set(sim_graphic_opt "-nographic")
set(sim_cpu "morello")
SetDefaultMemSize("2048")
elseif(KernelPlatformQEMURiscVVirt)
set(QemuBinaryMachine "qemu-system-${KernelSel4Arch}")
set(sim_machine "virt")
Expand Down
21 changes: 21 additions & 0 deletions elfloader-tool/src/plat/morello-qemu/platform_init.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
/*
* Copyright 2021, Data61, CSIRO (ABN 41 687 119 230)
*
* SPDX-License-Identifier: GPL-2.0-only
*/

#include <autoconf.h>
#include <mode/arm_generic_timer.h>

/* Reset the virtual offset for the platform timer to 0 */
void platform_init(void)
{
reset_cntvoff();
}

#if CONFIG_MAX_NUM_NODES > 1
void non_boot_init(void)
{
reset_cntvoff();
}
#endif