diff options
| -rw-r--r-- | README.txt | 12 | ||||
| -rw-r--r-- | conf/distro/zephyr.conf | 4 | ||||
| -rw-r--r-- | conf/machine/include/tune-cortexm3.inc (renamed from conf/distro/machine/include/tune-cortexm3.inc) | 2 | ||||
| -rw-r--r-- | conf/machine/qemu-cortex-m3.conf | 11 | ||||
| -rw-r--r-- | lib/oeqa/utils/qemuzephyrrunner.py | 2 |
5 files changed, 17 insertions, 14 deletions
@@ -13,10 +13,6 @@ Building and Running Zephyr tests ================================= Presently only toolchains for ARM and x86 are supported. (For ARM we use CortexM3 toolchain) -The toolchain is selected via the MACHINE variable: - -MACHINE=qemux86 : selects x86 toolchain -MACHINE=qemuarm : selects ARM CortexM3 toolchain Default Zephyr BOARD is selected as follows: @@ -35,8 +31,8 @@ zephyr-kernel-test.inc). For example: $ MACHINE=qemux86 bitbake zephyr-kernel-test-all $ MACHINE=qemux86 bitbake zephyr-kernel-test-all -ctestimage or - $ MACHINE=qemuarm bitbake zephyr-kernel-test-all - $ MACHINE=qemuarm bitbake zephyr-kernel-test-all -ctestimage + $ MACHINE=qemu-cortex-m3 bitbake zephyr-kernel-test-all + $ MACHINE=qemu-cortex-m3 bitbake zephyr-kernel-test-all -ctestimage @@ -56,8 +52,8 @@ the various paths have to be entered manually): -no-acpi -balloon none The same sample, for ARM image: - $ MACHINE=qemuarm bitbake zephyr-philosophers + $ MACHINE=qemu-cortex-m3 bitbake zephyr-philosophers $ ./tmp/sysroots/x86_64-linux/usr/bin/qemu-system-arm \ - -kernel ./tmp/deploy/images/qemuarm/philosophers.elf \ + -kernel ./tmp/deploy/images/qemu-cortex-m3/philosophers.elf \ -cpu cortex-m3 -machine lm3s6965evb -nographic -vga none diff --git a/conf/distro/zephyr.conf b/conf/distro/zephyr.conf index b97e967..9f57c9e 100644 --- a/conf/distro/zephyr.conf +++ b/conf/distro/zephyr.conf @@ -1,6 +1,4 @@ -require conf/distro/machine/include/tune-cortexm3.inc - DISTRO = "zephyr" DISTRO_NAME = "Zephyr" DISTRO_VERSION = "1.0" @@ -13,7 +11,5 @@ TCLIBCAPPEND = "" TEST_TARGET = "QemuTargetZephyr" TEST_SUITES = "zephyr" -DEFAULTTUNE_arm ?= "cortexm3" - BOARD_arm ?= "qemu_cortex_m3" BOARD_x86 ?= "qemu_x86" diff --git a/conf/distro/machine/include/tune-cortexm3.inc b/conf/machine/include/tune-cortexm3.inc index 7714ee3..25d7590 100644 --- a/conf/distro/machine/include/tune-cortexm3.inc +++ b/conf/machine/include/tune-cortexm3.inc @@ -1,6 +1,6 @@ DEFAULTTUNE ?= "cortexm3" -#require conf/machine/include/arm/arch-armv7a.inc +require conf/machine/include/arm/arch-armv7a.inc TUNEVALID[cortexm3] = "Enable Cortex-M3 specific processor optimizations" TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'cortexm3', ' -mcpu=cortex-m3', '', d)}" diff --git a/conf/machine/qemu-cortex-m3.conf b/conf/machine/qemu-cortex-m3.conf new file mode 100644 index 0000000..13f76af --- /dev/null +++ b/conf/machine/qemu-cortex-m3.conf @@ -0,0 +1,11 @@ +#@TYPE: Machine +#@NAME: lm3s6965evb +#@DESCRIPTION: lm3s6965evb + +require conf/machine/include/qemu.inc +require conf/machine/include/tune-cortexm3.inc + +# For runqemu (TBD) +QB_SYSTEM_NAME = "qemu-system-arm" +QB_MACHINE = "-machine lm3s6965evb" +QB_OPT_APPEND = "-nographic -vga none -cpu=cortex-m3" diff --git a/lib/oeqa/utils/qemuzephyrrunner.py b/lib/oeqa/utils/qemuzephyrrunner.py index 52939b5..441e0d6 100644 --- a/lib/oeqa/utils/qemuzephyrrunner.py +++ b/lib/oeqa/utils/qemuzephyrrunner.py @@ -68,7 +68,7 @@ class QemuZephyrRunner(QemuRunner): self.qemuparams = '-nographic -serial unix:%s,server' % (self.socketname) qemu_binary = "" - if 'arm' in self.machine: + if 'arm' in self.machine or 'cortex' in self.machine: qemu_binary = 'qemu-system-arm' qemu_machine_args = '-machine lm3s6965evb' elif 'x86' in self.machine: |