Fix bootloader build failure on aarch64

master
equation314 6 years ago
parent 7f36069b11
commit e4df6d6788

@ -31,7 +31,6 @@ env:
matrix: matrix:
allow_failures: allow_failures:
- env: ARCH="aarch64"
- os: osx - os: osx
install: install:

@ -1,9 +1,8 @@
[workspace] [workspace]
members = [ members = [
"bootloader",
"crate/bit-allocator", "crate/bit-allocator",
"crate/memory", "crate/memory",
"crate/sync", "crate/sync",
"crate/thread", "crate/thread",
] ]
exclude = ["kernel", "user/rust"] exclude = ["kernel", "bootloader", "user/rust"]

@ -54,10 +54,7 @@ export SMP = $(smp)
export SFSIMG = $(user_dir)/build/$(arch).qcow2 export SFSIMG = $(user_dir)/build/$(arch).qcow2
ifeq ($(arch), aarch64) ifeq ($(arch), aarch64)
board := raspi3 board := raspi3
endif export SFSIMG = $(user_dir)/build/$(arch).img
ifeq ($(arch), aarch64)
graphic := on
endif endif
### qemu options ### ### qemu options ###

@ -1 +1 @@
Subproject commit af7bd73cba82b258267244ea2b045278faa750db Subproject commit 96548d046474f6ae0ba66da6cd832e1a52d12997
Loading…
Cancel
Save