Fix bootloader build failure on aarch64

6 years ago · e4df6d6788
parent 7f36069b11
commit e4df6d6788
4 changed files with 3 additions and 8 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -31,7 +31,6 @@ env:

 matrix:
    allow_failures:
-        - env: ARCH="aarch64"
        - os: osx

 install:
--- a/Cargo.toml
+++ b/Cargo.toml
@ -1,9 +1,8 @@
 [workspace]
 members = [
-    "bootloader",
    "crate/bit-allocator",
    "crate/memory",
    "crate/sync",
    "crate/thread",
 ]
-exclude = ["kernel", "user/rust"]
+exclude = ["kernel", "bootloader", "user/rust"]
--- a/kernel/Makefile
+++ b/kernel/Makefile
@ -54,10 +54,7 @@ export SMP = $(smp)
 export SFSIMG = $(user_dir)/build/$(arch).qcow2
 ifeq ($(arch), aarch64)
 board := raspi3
-endif
-
-ifeq ($(arch), aarch64)
-graphic := on
+export SFSIMG = $(user_dir)/build/$(arch).img
 endif

 ### qemu options ###
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit af7bd73cba82b258267244ea2b045278faa750db
+Subproject commit 96548d046474f6ae0ba66da6cd832e1a52d12997