thermosphere: enable traps, works around qemu brk bug

This commit is contained in:
TuxSH 2019-07-30 02:16:25 +02:00
parent ad6db14526
commit a291bddcc1
2 changed files with 4 additions and 2 deletions

View file

@ -133,7 +133,7 @@ all: $(BUILD)
ifeq ($(PLATFORM), qemu) ifeq ($(PLATFORM), qemu)
QEMUFLAGS := -nographic -machine virt,secure=on,virtualization=on,gic-version=2 -cpu cortex-a57 -smp 4 -m 1024\ QEMUFLAGS := -nographic -machine virt,secure=on,virtualization=on,gic-version=2 -cpu cortex-a57 -smp 4 -m 1024\
-bios bl1.bin -d unimp -semihosting-config enable,target=native -serial mon:stdio -bios bl1.bin -d unimp,int -semihosting-config enable,target=native -serial mon:stdio
# NOTE: copy bl1.bin, bl2.bin, bl31.bin from your own build of Arm Trusted Firmware! # NOTE: copy bl1.bin, bl2.bin, bl31.bin from your own build of Arm Trusted Firmware!

View file

@ -2,15 +2,17 @@
#include "core_ctx.h" #include "core_ctx.h"
#include "log.h" #include "log.h"
#include "platform/uart.h" #include "platform/uart.h"
#include "traps.h"
int main(void) int main(void)
{ {
enableTraps();
if (currentCoreCtx->coreId == 0) { if (currentCoreCtx->coreId == 0) {
uartInit(115200); uartInit(115200);
serialLog("Hello from Thermosphere!\n"); serialLog("Hello from Thermosphere!\n");
__builtin_trap(); __builtin_trap();
} }
else { else {
serialLog("Core %u booted\n", currentCoreCtx->coreId); serialLog("Core %u booted\n", currentCoreCtx->coreId);
} }