diff --git a/.travis.yml b/.travis.yml
index c5b1228..e7ecc38 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,7 +31,6 @@ env:
 
 matrix:
     allow_failures:
-        - env: ARCH="aarch64"
         - os: osx
 
 install:
diff --git a/Cargo.toml b/Cargo.toml
index e5d3a41..00d2e95 100644
--- 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"]
diff --git a/kernel/Makefile b/kernel/Makefile
index c49c4d3..6a82f38 100644
--- 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 ###
diff --git a/user b/user
index af7bd73..96548d0 160000
--- a/user
+++ b/user
@@ -1 +1 @@
-Subproject commit af7bd73cba82b258267244ea2b045278faa750db
+Subproject commit 96548d046474f6ae0ba66da6cd832e1a52d12997