Skip to content

Commit

Permalink
feat(qemu): Use common platform support
Browse files Browse the repository at this point in the history
Apart from a couple configuration variables, QEMU doesn't need special
platform support anymore, and can use the common arm platform code.

Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
Change-Id: Ic3368375d35a2e4c0bc4152a5ea6ba2bb96eaf86
  • Loading branch information
jpbrucker committed Apr 23, 2024
1 parent 5fdea06 commit e8c1b4f
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 133 deletions.
25 changes: 1 addition & 24 deletions configs/qemu_virt_defcfg.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -6,42 +6,19 @@
#
# Set the RMM_PLATFORM variable to Cmake cache.
#
set(RMM_PLATFORM "qemu" CACHE STRING "platform")
set(RMM_PLATFORM "arm" CACHE STRING "platform")
arm_config_option_override(NAME RMM_TOOLCHAIN DEFAULT "gnu")

#
# Width of the virtual address space for the system.
#
arm_config_option_override(NAME VIRT_ADDR_SPACE_WIDTH DEFAULT 38)

#
# Set RMM_MAX_SIZE for this platform (24MB)
#
arm_config_option_override(NAME RMM_MAX_SIZE DEFAULT 0x01800000)

#
# UART Base address. This must be dynamically discovered in future.
# Use NS UART.
#
arm_config_option_override(NAME RMM_UART_ADDR DEFAULT 0x09000000)

#
# Extra memory regions needed by this platform: one region for UART.
#
arm_config_option_override(NAME PLAT_CMN_EXTRA_MMAP_REGIONS DEFAULT 1)

#
# Maximum number of translation tables allocated by the runtime context
# for the translation library.
#
arm_config_option_override(NAME PLAT_CMN_CTX_MAX_XLAT_TABLES DEFAULT 7)

#
# Disable FPU/SIMD usage in RMM for now. Enabling this causes the Realm guest
# boot to hang, and needs to be investigated.
#
arm_config_option_override(NAME RMM_FPU_USE_AT_REL2 DEFAULT OFF)

#
# Maximum number of granules supported.
#
Expand Down
26 changes: 0 additions & 26 deletions plat/qemu/src/include/qemu_dram.h

This file was deleted.

16 changes: 0 additions & 16 deletions plat/qemu/src/include/qemu_private.h

This file was deleted.

37 changes: 0 additions & 37 deletions plat/qemu/src/qemu_granule.c

This file was deleted.

30 changes: 0 additions & 30 deletions plat/qemu/src/qemu_memory.c

This file was deleted.

0 comments on commit e8c1b4f

Please sign in to comment.