From 5d73ba1059771f3226c1f45d41a9e3f52d68ee3d Mon Sep 17 00:00:00 2001 From: Jon Santmyer Date: Mon, 15 Sep 2025 15:51:13 -0400 Subject: begin init staging refactor --- apps/init/Makefile | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'apps/init/Makefile') diff --git a/apps/init/Makefile b/apps/init/Makefile index 1834d0b..679f2c4 100644 --- a/apps/init/Makefile +++ b/apps/init/Makefile @@ -1,22 +1,21 @@ include $(CONFIG) -CFILES := $(wildcard *.c) -CFILES += $(wildcard arch/$(TARGET_MACHINE)/*.c) -OFILES := $(patsubst %.c,%.o,$(CFILES)) -OFILES += $(STATICLIBS) +STAGE1_CFILES := $(wildcard stage1/*.c) +STAGE1_CFILES += $(wildcard stage1/$(TARGET_MACHINE)/*.c) +STAGE1_OFILES := $(patsubst %.c,%.o,$(STAGE1_CFILES)) -CFLAGS := -ffreestanding -nostdlib -g -LDFLAGS := -T arch/$(TARGET_MACHINE)/link.ld -OCFLAGS := -O binary \ - --set-section-flags .bss=alloc,load,contents +STAGE2_CFILES := $(wildcard stage2/*.c) +STAGE2_CFILES += $(wildcard stage2/$(TARGET_MACHINE)/*.c) -all: $(OFILES) - $(LD) $(LDFLAGS) ${OFILES} -o init.elf - objcopy $(OCFLAGS) init.elf $(OUT)/init +STAGE1_CFLAGS := -ffreestanding -nostdlib -I. +STAGE1_LDFLAGS := + +all: $(STAGE1_OFILES) + $(CC) $(STAGE1_CFLAGS) $(STAGE1_LDFLAGS) ${STAGE1_OFILES} -o $(OUT)/init clean: -rm ${OFILES} -rm init.elf -%.o:%.c - $(CC) $(CFLAGS) -c $< -o $@ +stage1/%.o:stage1/%.c + $(CC) $(STAGE1_CFLAGS) -c $< -o $@ -- cgit v1.2.1