From 4dffc92abf8f6a6e9b503c9809caaa99795d7a00 Mon Sep 17 00:00:00 2001 From: Kimplul Date: Sun, 19 Sep 2021 17:46:26 +0300 Subject: Added basic awareness of kernel size/bounds --- Makefile | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 339f63e..0771908 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ CC := gcc AR := ar CPP := cpp OBJCOPY ?= objcopy -OBJCOPY_FLAGS ?= -Obinary +OBJCOPY_FLAGS ?= -Obinary --set-section-flags .bss=alloc,load,contents COMMON_SOURCES != echo common/*.c KERNEL_SOURCES != echo kernel/*.c $(COMMON_SOURCES) @@ -36,29 +36,34 @@ GENELF = $(CROSS_COMPILE)$(CC) $(DEBUGFLAGS)\ GENLINK = $(CROSS_COMPILE)$(CPP) $(DEPFLAGS) $(INCLUDE_FLAGS) STRIPLINK = sed -n '/^[^\#]/p' +KERN_SIZE = wc -c kernel.bin | cut -d ' ' -f 1 +KERN_INFO = sed "s//$$($(KERN_SIZE))/" KERNEL_LINK := arch/$(ARCH)/conf/kernel-link INIT_LINK := arch/$(ARCH)/conf/init-link KERNEL_OBJECTS != ./scripts/gen-deps --kern "$(KERNEL_SOURCES)" INIT_OBJECTS != ./scripts/gen-deps --init "$(INIT_SOURCES)" -KERNEL_LD != ./scripts/gen-deps --link "$(KERNEL_LINK).S" -INIT_LD != ./scripts/gen-deps --link "$(INIT_LINK).S" +KERNEL_LD != ./scripts/gen-deps --kern-link "$(KERNEL_LINK).S" +INIT_LD != ./scripts/gen-deps --init-link "$(INIT_LINK).S" include deps.mk -apos.bin: kernel.elf init.elf - $(CROSS_COMPILE)$(OBJCOPY) $(OBJCOPY_FLAGS) kernel.elf kernel.bin - $(CROSS_COMPILE)$(OBJCOPY) $(OBJCOPY_FLAGS) init.elf init.bin - ./scripts/gen-padding 4096 init.bin +apos.bin: kernel.bin init.bin cat init.bin kernel.bin > $@ kernel.elf: $(KERNEL_OBJECTS) $(KERNEL_LD) $(GENELF) -T $(KERNEL_LD) $(KERNEL_OBJECTS) -o $@ -init.elf: $(INIT_OBJECTS) $(INIT_LD) +init.elf: kernel.bin $(INIT_OBJECTS) $(INIT_LD) $(GENELF) -T $(INIT_LD) $(INIT_OBJECTS) -o $@ +kernel.bin: kernel.elf + $(CROSS_COMPILE)$(OBJCOPY) $(OBJCOPY_FLAGS) $< $@ + +init.bin: init.elf + $(CROSS_COMPILE)$(OBJCOPY) $(OBJCOPY_FLAGS) $< $@ + clean: $(RM) -r $(CLEANUP) -- cgit v1.3