Update kernel and bootloader

This commit is contained in:
Jeremy Soller 2017-06-13 21:43:57 -06:00
parent a19d3d1229
commit 2158be3aee
3 changed files with 4 additions and 4 deletions

@ -1 +1 @@
Subproject commit 76d3431d89793ab13e1996ef4d3c6ec7c79acbc7
Subproject commit 2ad0410ebcb1d468cdb00f7f28640109af6b3ddb

2
kernel

@ -1 +1 @@
Subproject commit 8b05863ebbfcc1d854438e2cfd722f817dc714f3
Subproject commit acab23d1e1fc1779b40caff0e710b352857ca7e8

View file

@ -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 $@ $<