lby/lk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[project][qemu-virt-arm] rename to arm32 and arm64

Browse Source 
Less confusing than a15 and a53
This commit is contained in:
Travis Geiselbrecht
2019-03-30 20:11:22 -07:00
parent 41a7937444
commit 291bdce364
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.travis.yml
View File

@@ -1,8 +1,8 @@
language: c language: c
script: ./scripts/travis-build.sh script: ./scripts/travis-build.sh
env: env:
- PROJECT=qemu-virt-a15-test TOOLCHAIN=arm-eabi-7.3.0-Linux-x86_64 - PROJECT=qemu-virt-arm32-test TOOLCHAIN=arm-eabi-7.3.0-Linux-x86_64
- PROJECT=qemu-virt-a53-test TOOLCHAIN=aarch64-elf-7.3.0-Linux-x86_64 - PROJECT=qemu-virt-arm64-test TOOLCHAIN=aarch64-elf-7.3.0-Linux-x86_64
- PROJECT=vim2-test TOOLCHAIN=aarch64-elf-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=zybo-test TOOLCHAIN=arm-eabi-7.3.0-Linux-x86_64
- PROJECT=rpi2-test TOOLCHAIN=arm-eabi-7.3.0-Linux-x86_64 - PROJECT=rpi2-test TOOLCHAIN=arm-eabi-7.3.0-Linux-x86_64
@@ -20,12 +20,12 @@ env:
- PROJECT=pc-x86-64-test TOOLCHAIN=x86_64-elf-7.3.0-Linux-x86_64 - PROJECT=pc-x86-64-test TOOLCHAIN=x86_64-elf-7.3.0-Linux-x86_64
# do one build with an older toolchain # do one build with an older toolchain
- PROJECT=qemu-virt-a15-test TOOLCHAIN=arm-eabi-5.3.0-Linux-x86_64 - PROJECT=qemu-virt-arm32-test TOOLCHAIN=arm-eabi-5.3.0-Linux-x86_64
- PROJECT=qemu-virt-a15-test TOOLCHAIN=arm-eabi-4.8.2-Linux-x86_64 - PROJECT=qemu-virt-arm32-test TOOLCHAIN=arm-eabi-4.8.2-Linux-x86_64
# a few release mode builds # a few release mode builds
- PROJECT=qemu-virt-a15-test TOOLCHAIN=arm-eabi-7.3.0-Linux-x86_64 DEBUG=0 - PROJECT=qemu-virt-arm32-test TOOLCHAIN=arm-eabi-7.3.0-Linux-x86_64 DEBUG=0
- PROJECT=qemu-virt-a53-test TOOLCHAIN=aarch64-elf-7.3.0-Linux-x86_64 DEBUG=0 - PROJECT=qemu-virt-arm64-test TOOLCHAIN=aarch64-elf-7.3.0-Linux-x86_64 DEBUG=0
- PROJECT=stm32f746g-disco-test TOOLCHAIN=arm-eabi-7.3.0-Linux-x86_64 DEBUG=0 - PROJECT=stm32f746g-disco-test TOOLCHAIN=arm-eabi-7.3.0-Linux-x86_64 DEBUG=0
- PROJECT=pc-x86-test TOOLCHAIN=i386-elf-7.3.0-Linux-x86_64 DEBUG=0 - PROJECT=pc-x86-test TOOLCHAIN=i386-elf-7.3.0-Linux-x86_64 DEBUG=0
- PROJECT=pc-x86-64-test TOOLCHAIN=x86_64-elf-7.3.0-Linux-x86_64 DEBUG=0 - PROJECT=pc-x86-64-test TOOLCHAIN=x86_64-elf-7.3.0-Linux-x86_64 DEBUG=0

2
project/qemu-virt-a15-test.mk → project/qemu-virt-arm32-test.mk
View File

@@ -5,5 +5,5 @@ MODULES += \
include project/virtual/test.mk include project/virtual/test.mk
include project/virtual/fs.mk include project/virtual/fs.mk
include project/virtual/minip.mk include project/virtual/minip.mk
include project/target/qemu-virt-a15.mk include project/target/qemu-virt-arm32.mk

2
project/qemu-virt-a53-test.mk → project/qemu-virt-arm64-test.mk
View File

@@ -5,5 +5,5 @@ MODULES += \
include project/virtual/test.mk include project/virtual/test.mk
include project/virtual/fs.mk include project/virtual/fs.mk
include project/virtual/minip.mk include project/virtual/minip.mk
include project/target/qemu-virt-a53.mk include project/target/qemu-virt-arm64.mk

0
project/target/qemu-virt-a15.mk → project/target/qemu-virt-arm32.mk
View File

0
project/target/qemu-virt-a53.mk → project/target/qemu-virt-arm64.mk
View File

4
scripts/do-qemuarm
View File

@@ -54,13 +54,13 @@ shift $((OPTIND-1))
if [ $DO_64BIT == 1 ]; then if [ $DO_64BIT == 1 ]; then
QEMU="qemu-system-aarch64 -machine virt -cpu cortex-a53" QEMU="qemu-system-aarch64 -machine virt -cpu cortex-a53"
PROJECT="qemu-virt-a53-test" PROJECT="qemu-virt-arm64-test"
elif [ $DO_CORTEX_M3 == 1 ]; then elif [ $DO_CORTEX_M3 == 1 ]; then
QEMU="qemu-system-arm -machine lm3s6965evb -cpu cortex-m3" QEMU="qemu-system-arm -machine lm3s6965evb -cpu cortex-m3"
PROJECT="lm3s6965evb-test" PROJECT="lm3s6965evb-test"
else else
QEMU="qemu-system-arm -machine virt -cpu cortex-a15" QEMU="qemu-system-arm -machine virt -cpu cortex-a15"
PROJECT="qemu-virt-a15-test" PROJECT="qemu-virt-arm32-test"
fi fi
ARGS=" -m $MEMSIZE -smp $SMP -kernel build-${PROJECT}/lk.elf" ARGS=" -m $MEMSIZE -smp $SMP -kernel build-${PROJECT}/lk.elf"