OrgZephyr/zephyr
OrgZephyr
/
zephyr
mirror of https://github.com/zephyrproject-rtos/zephyr.git
1
0
Fork 0
Code Issues Releases Wiki Activity
zephyr/boards/x86/x86_jailhouse/board.cmake

41 lines
1.2 KiB
CMake
Raw Normal View History

Introduce cmake-based rewrite of KBuild Introducing CMake is an important step in a larger effort to make Zephyr easy to use for application developers working on different platforms with different development environment needs. Simplified, this change retains Kconfig as-is, and replaces all Makefiles with CMakeLists.txt. The DSL-like Make language that KBuild offers is replaced by a set of CMake extentions. These extentions have either provided simple one-to-one translations of KBuild features or introduced new concepts that replace KBuild concepts. This is a breaking change for existing test infrastructure and build scripts that are maintained out-of-tree. But for FW itself, no porting should be necessary. For users that just want to continue their work with minimal disruption the following should suffice: Install CMake 3.8.2+ Port any out-of-tree Makefiles to CMake. Learn the absolute minimum about the new command line interface: $ cd samples/hello_world $ mkdir build && cd build $ cmake -DBOARD=nrf52_pca10040 .. $ cd build $ make PR: zephyrproject-rtos#4692 docs: http://docs.zephyrproject.org/getting_started/getting_started.html Signed-off-by: Sebastian Boe <sebastian.boe@nordicsemi.no>
2017-10-27 21:43:34 +08:00
set(EMU_PLATFORM qemu)
cmake: Reorganize how qemu is found We don't want to pollute core-infrastructure with board-specific code, so we move the qemu discovery to after board.cmake has been executed, and we introduce the overridable QEMU_binary_suffix CMake variable. Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>
2017-12-07 17:20:03 +08:00
set(QEMU_binary_suffix x86_64)
cmake: qemu: Allow -kernel to be overridden This is needed by platforms like jailhouse. Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no> Signed-off-by: Gustavo Lima Chaves <gustavo.lima.chaves@intel.com>
2017-12-07 18:50:28 +08:00
# QEMU, in Jailhouse's case, is not emulating Zephyr's hardware
# directly, but the root cell/system, with a mount point reaching
# the kernel itself available
set(QEMU_KERNEL_OPTION ";")
Introduce cmake-based rewrite of KBuild Introducing CMake is an important step in a larger effort to make Zephyr easy to use for application developers working on different platforms with different development environment needs. Simplified, this change retains Kconfig as-is, and replaces all Makefiles with CMakeLists.txt. The DSL-like Make language that KBuild offers is replaced by a set of CMake extentions. These extentions have either provided simple one-to-one translations of KBuild features or introduced new concepts that replace KBuild concepts. This is a breaking change for existing test infrastructure and build scripts that are maintained out-of-tree. But for FW itself, no porting should be necessary. For users that just want to continue their work with minimal disruption the following should suffice: Install CMake 3.8.2+ Port any out-of-tree Makefiles to CMake. Learn the absolute minimum about the new command line interface: $ cd samples/hello_world $ mkdir build && cd build $ cmake -DBOARD=nrf52_pca10040 .. $ cd build $ make PR: zephyrproject-rtos#4692 docs: http://docs.zephyrproject.org/getting_started/getting_started.html Signed-off-by: Sebastian Boe <sebastian.boe@nordicsemi.no>
2017-10-27 21:43:34 +08:00
if(NOT CONFIG_REBOOT)
set(REBOOT_FLAG -no-reboot)
endif()
cmake: jailhouse: fix check for JAILHOUSE_QEMU_IMG_FILE Also remove old, now unused, makefile with previous logic on that. Signed-off-by: Gustavo Lima Chaves <gustavo.lima.chaves@intel.com>
2017-12-08 05:53:42 +08:00
if (NOT DEFINED JAILHOUSE_QEMU_IMG_FILE)
message(FATAL_ERROR "You have to provide a valid qcow2 QEMU image to be a Jailhouse root cell (variable JAILHOUSE_QEMU_IMG_FILE)!")
endif()
Introduce cmake-based rewrite of KBuild Introducing CMake is an important step in a larger effort to make Zephyr easy to use for application developers working on different platforms with different development environment needs. Simplified, this change retains Kconfig as-is, and replaces all Makefiles with CMakeLists.txt. The DSL-like Make language that KBuild offers is replaced by a set of CMake extentions. These extentions have either provided simple one-to-one translations of KBuild features or introduced new concepts that replace KBuild concepts. This is a breaking change for existing test infrastructure and build scripts that are maintained out-of-tree. But for FW itself, no porting should be necessary. For users that just want to continue their work with minimal disruption the following should suffice: Install CMake 3.8.2+ Port any out-of-tree Makefiles to CMake. Learn the absolute minimum about the new command line interface: $ cd samples/hello_world $ mkdir build && cd build $ cmake -DBOARD=nrf52_pca10040 .. $ cd build $ make PR: zephyrproject-rtos#4692 docs: http://docs.zephyrproject.org/getting_started/getting_started.html Signed-off-by: Sebastian Boe <sebastian.boe@nordicsemi.no>
2017-10-27 21:43:34 +08:00
set(QEMU_CPU_TYPE_${ARCH} kvm64,-kvm_pv_eoi,-kvm_steal_time,-kvm_asyncpf,-kvmclock,+vmx,+x2apic,+arat)
set(QEMU_FLAGS_${ARCH}
-machine q35,kernel_irqchip=split
${REBOOT_FLAG}
-m 1G
-enable-kvm
-smp 4
-device intel-iommu,intremap=on,x-buggy-eim=on
-cpu ${QEMU_CPU_TYPE_${ARCH}}
-drive file=${JAILHOUSE_QEMU_IMG_FILE},format=qcow2,id=disk,if=none
-device ide-hd,drive=disk
cmake: jailhouse: fix arguments passed to QEMU on make run target "-serial mon:stdio" was already injected elsewhere, so remove duplication. That argument, when coming from the common infrastructure, also comes as one of the last ones. Because of that, the former "-serial vc" was taking precedence and we were never seeing output on stdio. Removing the virtual console altogether, for now, fixes that. Finally, since cmake came in, we have to fix the path for the fsdev argument to QEMU as well. Signed-off-by: Gustavo Lima Chaves <gustavo.lima.chaves@intel.com>
2017-12-07 07:27:50 +08:00
-netdev user,id=net
Introduce cmake-based rewrite of KBuild Introducing CMake is an important step in a larger effort to make Zephyr easy to use for application developers working on different platforms with different development environment needs. Simplified, this change retains Kconfig as-is, and replaces all Makefiles with CMakeLists.txt. The DSL-like Make language that KBuild offers is replaced by a set of CMake extentions. These extentions have either provided simple one-to-one translations of KBuild features or introduced new concepts that replace KBuild concepts. This is a breaking change for existing test infrastructure and build scripts that are maintained out-of-tree. But for FW itself, no porting should be necessary. For users that just want to continue their work with minimal disruption the following should suffice: Install CMake 3.8.2+ Port any out-of-tree Makefiles to CMake. Learn the absolute minimum about the new command line interface: $ cd samples/hello_world $ mkdir build && cd build $ cmake -DBOARD=nrf52_pca10040 .. $ cd build $ make PR: zephyrproject-rtos#4692 docs: http://docs.zephyrproject.org/getting_started/getting_started.html Signed-off-by: Sebastian Boe <sebastian.boe@nordicsemi.no>
2017-10-27 21:43:34 +08:00
-device e1000e,addr=2.0,netdev=net
-device intel-hda,addr=1b.0
-device hda-duplex
cmake: jailhouse: fix arguments passed to QEMU on make run target "-serial mon:stdio" was already injected elsewhere, so remove duplication. That argument, when coming from the common infrastructure, also comes as one of the last ones. Because of that, the former "-serial vc" was taking precedence and we were never seeing output on stdio. Removing the virtual console altogether, for now, fixes that. Finally, since cmake came in, we have to fix the path for the fsdev argument to QEMU as well. Signed-off-by: Gustavo Lima Chaves <gustavo.lima.chaves@intel.com>
2017-12-07 07:27:50 +08:00
-fsdev local,path=./zephyr,security_model=passthrough,id=vfs
Introduce cmake-based rewrite of KBuild Introducing CMake is an important step in a larger effort to make Zephyr easy to use for application developers working on different platforms with different development environment needs. Simplified, this change retains Kconfig as-is, and replaces all Makefiles with CMakeLists.txt. The DSL-like Make language that KBuild offers is replaced by a set of CMake extentions. These extentions have either provided simple one-to-one translations of KBuild features or introduced new concepts that replace KBuild concepts. This is a breaking change for existing test infrastructure and build scripts that are maintained out-of-tree. But for FW itself, no porting should be necessary. For users that just want to continue their work with minimal disruption the following should suffice: Install CMake 3.8.2+ Port any out-of-tree Makefiles to CMake. Learn the absolute minimum about the new command line interface: $ cd samples/hello_world $ mkdir build && cd build $ cmake -DBOARD=nrf52_pca10040 .. $ cd build $ make PR: zephyrproject-rtos#4692 docs: http://docs.zephyrproject.org/getting_started/getting_started.html Signed-off-by: Sebastian Boe <sebastian.boe@nordicsemi.no>
2017-10-27 21:43:34 +08:00
-device virtio-9p-pci,addr=1f.7,mount_tag=host,fsdev=vfs
)
# TODO: Support debug
scripts: refactor flash/debug scripts to remove "shell" The Python-based runners have replaced the old shell scripts. Refactor the build system accordingly: - FLASH_SCRIPT is now BOARD_FLASH_RUNNER - DEBUG_SCRIPT is now BOARD_DEBUG_RUNNER The values, rather than being the names of files, are now the names of runners in scripts/support/runner. They are still short, descriptive names like "openocd", "jlink", "em-starterkit", etc. Adjust the zephyr_flash_debug.py call and runner internals accordingly. Have each runner class report a name and the commands it can handle. This lets us move some boilerplate from each do_run() method into the common run() routine, and enables further improvements in future patches. The handles_command() method is temporary, and will be replaced by a more general mechanism for describing runner capabilities in a subsequent patch. The initial use case for extending this is to add device tree awareness to the runners. To try to avoid user confusion, abort the configuration if an xxx_SCRIPT is defined. Signed-off-by: Marti Bolivar <marti@opensourcefoundries.com>
2017-11-17 02:32:00 +08:00
# set(BOARD_DEBUG_RUNNER qemu)
Introduce cmake-based rewrite of KBuild Introducing CMake is an important step in a larger effort to make Zephyr easy to use for application developers working on different platforms with different development environment needs. Simplified, this change retains Kconfig as-is, and replaces all Makefiles with CMakeLists.txt. The DSL-like Make language that KBuild offers is replaced by a set of CMake extentions. These extentions have either provided simple one-to-one translations of KBuild features or introduced new concepts that replace KBuild concepts. This is a breaking change for existing test infrastructure and build scripts that are maintained out-of-tree. But for FW itself, no porting should be necessary. For users that just want to continue their work with minimal disruption the following should suffice: Install CMake 3.8.2+ Port any out-of-tree Makefiles to CMake. Learn the absolute minimum about the new command line interface: $ cd samples/hello_world $ mkdir build && cd build $ cmake -DBOARD=nrf52_pca10040 .. $ cd build $ make PR: zephyrproject-rtos#4692 docs: http://docs.zephyrproject.org/getting_started/getting_started.html Signed-off-by: Sebastian Boe <sebastian.boe@nordicsemi.no>
2017-10-27 21:43:34 +08:00
# debugserver: QEMU_EXTRA_FLAGS += -s -S
# debugserver: qemu