diff --git a/Makefile b/Makefile index a932cb4..73f0587 100644 --- a/Makefile +++ b/Makefile @@ -3,17 +3,17 @@ PPC = powerpc-eabi QEMU = qemu-system-ppc RES = 1600x900x32 -SOURCES_C = $(shell find entry -name "*.c") -SOURCES_S = $(shell find entry -name "*.s") +SOURCES_C = $(shell find src -name "*.c") +SOURCES_S = $(shell find src -name "*.s") OBJECTS = $(SOURCES_C:.c=.elf) $(SOURCES_S:.s=.elf) .PHONY: clean run debug beige -DISK.APM: kernel.elf bootinfo.txt scripts/kpartx.sh +DISK.APM: kernel.elf bootinfo.txt kpartx/kpartx.sh dd bs=512K count=2 if=/dev/zero of=DISK.APM parted DISK.APM --script mklabel mac mkpart primary hfs+ 32.8KB 100% - sudo chmod +x scripts/kpartx.sh - sudo ./scripts/kpartx.sh + sudo chmod +x kpartx/kpartx.sh + sudo ./kpartx/kpartx.sh sudo mkdir -p /mnt/ppc /mnt/boot sudo cp bootinfo.txt /mnt/ppc sudo cp kernel.elf /mnt/boot @@ -37,7 +37,7 @@ kernel.elf: $(OBJECTS) clean: rm -f *.APM *txt - find entry -name "*.elf" -type f -delete + find src -name "*.elf" -type f -delete run: $(QEMU) -hda *.APM -g $(RES) -machine $(MACHINE) diff --git a/scripts/kpartx.sh b/kpartx/kpartx.sh similarity index 100% rename from scripts/kpartx.sh rename to kpartx/kpartx.sh diff --git a/entry/boot.c b/src/boot.c similarity index 82% rename from entry/boot.c rename to src/boot.c index 0db78ea..22e64b7 100644 --- a/entry/boot.c +++ b/src/boot.c @@ -12,6 +12,8 @@ void __eabi(void) void main(void) { + while(1) + interpret("blink-screen", 0, 0, 0, 0); if (test("open")) { asm("mr 27, 28"); diff --git a/entry/ofw/common.c b/src/ofw/common.c similarity index 100% rename from entry/ofw/common.c rename to src/ofw/common.c diff --git a/entry/ofw/control.c b/src/ofw/control.c similarity index 100% rename from entry/ofw/control.c rename to src/ofw/control.c diff --git a/entry/ofw/interface.c b/src/ofw/interface.c similarity index 100% rename from entry/ofw/interface.c rename to src/ofw/interface.c diff --git a/entry/ofw/io.c b/src/ofw/io.c similarity index 100% rename from entry/ofw/io.c rename to src/ofw/io.c diff --git a/entry/ofw/mem.c b/src/ofw/mem.c similarity index 100% rename from entry/ofw/mem.c rename to src/ofw/mem.c diff --git a/entry/ofw/time.c b/src/ofw/time.c similarity index 100% rename from entry/ofw/time.c rename to src/ofw/time.c diff --git a/entry/ofw/tree.c b/src/ofw/tree.c similarity index 100% rename from entry/ofw/tree.c rename to src/ofw/tree.c diff --git a/entry/start.s b/src/start.s similarity index 100% rename from entry/start.s rename to src/start.s