From 2158be3aee93b6628bc2337fbdfa5c70bf75bf32 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Tue, 13 Jun 2017 21:43:57 -0600 Subject: [PATCH] Update kernel and bootloader --- bootloader | 2 +- kernel | 2 +- mk/kernel.mk | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bootloader b/bootloader index 76d3431..2ad0410 160000 --- a/bootloader +++ b/bootloader @@ -1 +1 @@ -Subproject commit 76d3431d89793ab13e1996ef4d3c6ec7c79acbc7 +Subproject commit 2ad0410ebcb1d468cdb00f7f28640109af6b3ddb diff --git a/kernel b/kernel index 8b05863..acab23d 160000 --- a/kernel +++ b/kernel @@ -1 +1 @@ -Subproject commit 8b05863ebbfcc1d854438e2cfd722f817dc714f3 +Subproject commit acab23d1e1fc1779b40caff0e710b352857ca7e8 diff --git a/mk/kernel.mk b/mk/kernel.mk index 5293900..0475f12 100644 --- a/mk/kernel.mk +++ b/mk/kernel.mk @@ -4,8 +4,8 @@ build/libkernel.a: kernel/Cargo.toml kernel/src/* kernel/src/*/* kernel/src/*/*/ build/libkernel_live.a: kernel/Cargo.toml kernel/src/* kernel/src/*/* kernel/src/*/*/* build/initfs.tag build/filesystem.bin cd kernel && FILESYSTEM="$(PWD)/build/filesystem.bin" xargo rustc --lib --features live --target $(KTARGET) --release -- -C soft-float --emit link=../$@ -build/kernel: build/libkernel.a +build/kernel: build/libkernel.a kernel/linkers/$(ARCH).ld $(LD) --gc-sections -z max-page-size=0x1000 -T kernel/linkers/$(ARCH).ld -o $@ $< -build/kernel_live: build/libkernel_live.a +build/kernel_live: build/libkernel_live.a kernel/linkers/$(ARCH).ld $(LD) --gc-sections -z max-page-size=0x1000 -T kernel/linkers/$(ARCH).ld -o $@ $<