From 4aa556b83788b50d584bc8cd6eace91fc31eb4a2 Mon Sep 17 00:00:00 2001 From: Travis Geiselbrecht Date: Sat, 13 Jul 2019 17:10:48 -0700 Subject: [PATCH] [project][qemu-virt-arm32-minimal] add a new project that doesnt' enable as much Useful for testing when the console is off. --- .travis.yml | 1 + project/qemu-virt-arm32-minimal.mk | 3 +++ scripts/do-qemuarm | 13 +++++++++---- 3 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 project/qemu-virt-arm32-minimal.mk diff --git a/.travis.yml b/.travis.yml index c9854392..5d2a1c31 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ script: ./scripts/travis-build.sh env: - PROJECT=qemu-virt-arm32-test TOOLCHAIN=arm-eabi-7.3.0-Linux-x86_64 - PROJECT=qemu-virt-arm64-test TOOLCHAIN=aarch64-elf-7.3.0-Linux-x86_64 + - PROJECT=qemu-virt-arm32-minimal TOOLCHAIN=arm-eabi-7.3.0-Linux-x86_64 - PROJECT=vim2-test TOOLCHAIN=aarch64-elf-7.3.0-Linux-x86_64 - PROJECT=zybo-test TOOLCHAIN=arm-eabi-7.3.0-Linux-x86_64 - PROJECT=rpi2-test TOOLCHAIN=arm-eabi-7.3.0-Linux-x86_64 diff --git a/project/qemu-virt-arm32-minimal.mk b/project/qemu-virt-arm32-minimal.mk new file mode 100644 index 00000000..e3271701 --- /dev/null +++ b/project/qemu-virt-arm32-minimal.mk @@ -0,0 +1,3 @@ +# main project for qemu-arm32 +include project/target/qemu-virt-arm32.mk + diff --git a/scripts/do-qemuarm b/scripts/do-qemuarm index 80cca870..0e72e5be 100755 --- a/scripts/do-qemuarm +++ b/scripts/do-qemuarm @@ -30,8 +30,9 @@ DO_MINIHEAP=0 SMP=1 MEMSIZE=512 SUDO="" +PROJECT="" -while getopts bdhm:cMnt36s: FLAG; do +while getopts bdhm:cMnt36p:s: FLAG; do case $FLAG in b) DO_BLOCK=1;; c) DO_CMPCTMALLOC=1;; @@ -43,6 +44,7 @@ while getopts bdhm:cMnt36s: FLAG; do 6) DO_64BIT=1;; m) MEMSIZE=$OPTARG;; s) SMP=$OPTARG;; + p) PROJECT=$OPTARG;; h) HELP;; \?) echo unrecognized option @@ -54,13 +56,16 @@ shift $((OPTIND-1)) if [ $DO_64BIT == 1 ]; then QEMU="qemu-system-aarch64 -machine virt -cpu cortex-a53" - PROJECT="qemu-virt-arm64-test" + _PROJECT="qemu-virt-arm64-test" elif [ $DO_CORTEX_M3 == 1 ]; then QEMU="qemu-system-arm -machine lm3s6965evb -cpu cortex-m3" - PROJECT="lm3s6965evb-test" + _PROJECT="lm3s6965evb-test" else QEMU="qemu-system-arm -machine virt -cpu cortex-a15" - PROJECT="qemu-virt-arm32-test" + _PROJECT="qemu-virt-arm32-test" +fi +if [ "$PROJECT" == "" ]; then + PROJECT=$_PROJECT fi ARGS=" -m $MEMSIZE -smp $SMP -kernel build-${PROJECT}/lk.elf"