rename prog to init
This commit is contained in:
parent
9518c8e4ad
commit
62e8f0713b
8
Makefile
8
Makefile
@ -28,15 +28,15 @@ debug: os.iso kernel/kernel.elf
|
||||
@$(EMU) -s $(QFLAGS) &
|
||||
@$(GDB) -ex "target remote localhost:1234" -ex "symbol-file kernel/kernel.elf"
|
||||
|
||||
os.iso: kernel/kernel.elf initrd/* initrd/prog.elf
|
||||
os.iso: kernel/kernel.elf initrd/* initrd/init
|
||||
@cp kernel/kernel.elf iso/boot
|
||||
@cd initrd; tar -f ../iso/boot/initrd.tar -c *
|
||||
@# ruby makeinitrd.rb initrd iso/boot/initrd
|
||||
@grub-mkrescue -o $@ iso
|
||||
|
||||
initrd/prog.elf: prog/* kernel/start.o
|
||||
@cd prog && make
|
||||
@cp prog/prog.elf initrd/init
|
||||
initrd/init: init/* kernel/start.o
|
||||
@cd init && make
|
||||
@cp init/init initrd/init
|
||||
|
||||
kernel/kernel.elf: $(OBJ) $(ASM_OBJ) $(S_ASM_OBJ) libc/libc.a
|
||||
@$(CC) -z max-page-size=4096 -Xlinker -n -T cpu/$(PLAT)/linker.ld -o $@ $(CFLAGS) -nostdlib $^ -lgcc
|
||||
|
@ -3,7 +3,7 @@ OBJ = $(C_SOURCES:.c=.o ../kernel/start.o)
|
||||
CFLAGS = -I../sysroot/usr/include -Wall -g -ffreestanding
|
||||
CC = i386-elf-gcc
|
||||
|
||||
prog.elf: $(OBJ)
|
||||
init: $(OBJ)
|
||||
@i386-elf-ld -o $@ $^ ../libc/libc.a
|
||||
@rm -rf *.o
|
||||
|
BIN
initrd/init
BIN
initrd/init
Binary file not shown.
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user