Skip to content

Commit

Permalink
x86: add minimal_64 application for 64-bit tests
Browse files Browse the repository at this point in the history
Signed-off-by: Chris Guikema <chris.guikema@dornerworks.com>
  • Loading branch information
chrisguikema authored and lsf37 committed Nov 14, 2023
1 parent 74632a6 commit cfb4cb9
Show file tree
Hide file tree
Showing 3 changed files with 85 additions and 0 deletions.
36 changes: 36 additions & 0 deletions apps/x86/minimal_64/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
#
# Copyright 2023, DornerWorks
#
# SPDX-License-Identifier: BSD-2-Clause
#

cmake_minimum_required(VERSION 3.8.2)

project(minimal_64)

# Include CAmkES VM helper functions
include(${CAMKES_VM_HELPERS_PATH})
find_package(camkes-vm-linux REQUIRED)
include(${CAMKES_VM_LINUX_HELPERS_PATH})

# Declare VM component: Init0
DeclareCAmkESVM(Init0)

# Get Default Linux VM files
GetDefaultLinuxKernelFile(kernel_file)
GetDefaultLinuxRootfsFile(rootfs_file)

# Decompress Linux Kernel image and add to file server
DecompressLinuxKernel(extract_linux_kernel decompressed_kernel ${kernel_file})
AddToFileServer("bzimage" ${decompressed_kernel} DEPENDS extract_linux_kernel)

# Add rootfs images into file server
AddToFileServer("rootfs.cpio" ${rootfs_file})

# Initialise CAmkES Root Server with addition CPP includes
DeclareCAmkESVMRootServer(minimal.camkes)

if(SIMULATION)
include(simulation)
GenerateSimulateScript()
endif()
12 changes: 12 additions & 0 deletions apps/x86/minimal_64/app_settings.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#
# Copyright 2023, DornerWorks
#
# SPDX-License-Identifier: BSD-2-Clause
#

cmake_minimum_required(VERSION 3.8.2)

# Define kernel config options
set(KernelSel4Arch x86_64 CACHE STRING "" FORCE)
set(KernelX86_64VTX64BitGuests ON CACHE BOOL "" FORCE)
set(KernelMaxNumNodes 1 CACHE STRING "" FORCE)
37 changes: 37 additions & 0 deletions apps/x86/minimal_64/minimal.camkes
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
/*
* Copyright 2023, DornerWorks
*
* SPDX-License-Identifier: BSD-2-Clause
*/

import <VM/vm.camkes>;

#include <configurations/vm.h>

#define VM_GUEST_CMDLINE "earlyprintk=ttyS0,115200 console=ttyS0,115200 i8042.nokbd=y i8042.nomux=y \
i8042.noaux=y io_delay=udelay noisapnp pci=nomsi debug root=/dev/mem"

component Init0 {
VM_INIT_DEF()
}

assembly {
composition {
VM_COMPOSITION_DEF()
VM_PER_VM_COMP_DEF(0)
}

configuration {
VM_CONFIGURATION_DEF()
VM_PER_VM_CONFIG_DEF(0)

vm0.simple_untyped23_pool = 20;
vm0.heap_size = 0x2000000;
vm0.guest_ram_mb = 128;
vm0.kernel_cmdline = VM_GUEST_CMDLINE;
vm0.kernel_image = "bzimage";
vm0.kernel_relocs = "";
vm0.initrd_image = "rootfs.cpio";
vm0.iospace_domain = 0x0f;
}
}

0 comments on commit cfb4cb9

Please sign in to comment.