vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Arm!

Browse source
This commit is contained in:
Jeremy Soller 2016-08-25 17:03:01 -06:00
parent c2a95c96d5
commit 6715d5c534
29 changed files with 385 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

53
Makefile
View file

@ -1,24 +1,27 @@
ARCH?=x86_64
ARCH?=arm
LD=ld
QEMU=qemu-system-$(ARCH)
QEMUFLAGS=-enable-kvm -cpu host
QEMUFLAGS=-serial mon:stdio -d guest_errors
UNAME := $(shell uname)
ifeq ($(UNAME),Darwin)
LD=$(ARCH)-elf-ld
QEMUFLAGS=
ifeq ($(ARCH),arm)
LD=$(ARCH)-none-eabi-ld
QEMUFLAGS+=-cpu arm1176 -machine integratorcp
QEMUFLAGS+=-nographic
else
LD=ld
QEMUFLAGS+=-enable-kvm -cpu host -machine q35 -smp 4
#,int,pcall
#-nographic
#-device intel-iommu
UNAME := $(shell uname)
ifeq ($(UNAME),Darwin)
LD=$(ARCH)-elf-ld
QEMUFLAGS=
endif
endif
QEMUFLAGS+=-smp 4 -machine q35
QEMUFLAGS+=-serial mon:stdio
QEMUFLAGS+=-d guest_errors
#,int,pcall
#-nographic
#-device intel-iommu
all: build/harddrive.bin
all: build/kernel.bin
list: build/kernel.list
@ -27,9 +30,6 @@ run: bochs
bochs: build/harddrive.bin
bochs -f bochs.$(ARCH)
qemu: build/harddrive.bin
$(QEMU) $(QEMUFLAGS) -drive file=$<,format=raw,index=0,media=disk
FORCE:
build/libcore.rlib: rust/src/libcore/lib.rs
@ -53,13 +53,24 @@ build/libkernel.a: build/libcore.rlib build/liballoc.rlib build/libcollections.r
RUSTC="./rustc.sh" cargo rustc --target $(ARCH)-unknown-none.json -- -C soft-float -o $@
build/kernel.bin: build/libkernel.a
$(LD) --gc-sections -z max-page-size=0x1000 -T bootloader/x86/kernel.ld -o $@ $<
$(LD) --gc-sections -z max-page-size=0x1000 -T arch/$(ARCH)/src/linker.ld -o $@ $<
ifeq ($(ARCH),arm)
build/kernel.list: build/kernel.bin
$(ARCH)-none-eabi-objdump -C -D $< > $@
qemu: build/kernel.bin
$(QEMU) $(QEMUFLAGS) -kernel $<
else
build/kernel.list: build/kernel.bin
objdump -C -M intel -D $< > $@
build/harddrive.bin: build/kernel.bin
nasm -f bin -o $@ -D ARCH_$(ARCH) -ibootloader/x86/ -ibuild/ bootloader/x86/harddrive.asm
nasm -f bin -o $@ -D ARCH_$(ARCH) -ibootloader/$(ARCH)/ -ibuild/ bootloader/$(ARCH)/harddrive.asm
qemu: build/harddrive.bin
$(QEMU) $(QEMUFLAGS) -drive file=$<,format=raw,index=0,media=disk
endif
clean:
rm -rf build/* target/*