Introduced the 'boot' package

Kernel/Sources/startup_bootfs.c → Kernel/Sources/boot/bootfs.c

@@ -1,5 +1,5 @@
 //
-//  startup_bootfs.c
+//  bootfs.c
 //  kernel
 //
 //  Created by Dietmar Planitzer on 2/4/21.

Kernel/Sources/startup.c → Kernel/Sources/boot/main.c

@@ -1,5 +1,5 @@
 //
-//  startup.c
+//  main.c
 //  kernel
 //
 //  Created by Dietmar Planitzer on 2/4/21.

Kernel/Sources/boot/package.mk

@@ -0,0 +1,36 @@
+# --------------------------------------------------------------------------
+# Build variables
+#
+
+BOOT_C_SOURCES := $(wildcard $(BOOT_SOURCES_DIR)/*.c)
+BOOT_ASM_SOURCES := $(wildcard $(BOOT_SOURCES_DIR)/*.s)
+
+BOOT_OBJS := $(patsubst $(BOOT_SOURCES_DIR)/%.c,$(BOOT_OBJS_DIR)/%.o,$(BOOT_C_SOURCES))
+BOOT_DEPS := $(BOOT_OBJS:.o=.d)
+BOOT_OBJS += $(patsubst $(BOOT_SOURCES_DIR)/%.s,$(BOOT_OBJS_DIR)/%.o,$(BOOT_ASM_SOURCES))
+
+BOOT_C_INCLUDES := -I$(LIBSYSTEM_HEADERS_DIR) -I$(KERNEL_SOURCES_DIR) -I$(BOOT_SOURCES_DIR)
+BOOT_ASM_INCLUDES := -I$(LIBSYSTEM_HEADERS_DIR) -I$(KERNEL_SOURCES_DIR) -I$(BOOT_SOURCES_DIR)
+
+#BOOT_GENERATE_DEPS = -deps -depfile=$(patsubst $(BOOT_OBJS_DIR)/%.o,$(BOOT_OBJS_DIR)/%.d,$@)
+BOOT_GENERATE_DEPS := 
+
+
+# --------------------------------------------------------------------------
+# Build rules
+#
+
+$(BOOT_OBJS): | $(BOOT_OBJS_DIR)
+
+$(BOOT_OBJS_DIR):
+	$(call mkdir_if_needed,$(BOOT_OBJS_DIR))
+
+-include $(BOOT_DEPS)
+
+$(BOOT_OBJS_DIR)/%.o : $(BOOT_SOURCES_DIR)/%.c
+	@echo $<
+	@$(CC) $(KERNEL_CC_CONFIG) $(CC_KOPT_SETTING) $(CC_GEN_DEBUG_INFO) $(KERNEL_CC_PREPROC_DEFS) $(BOOT_C_INCLUDES) $(KERNEL_CC_DONTWARN) $(BOOT_GENERATE_DEPS) -o $@ $<
+
+$(BOOT_OBJS_DIR)/%.o : $(BOOT_SOURCES_DIR)/%.s
+	@echo $<
+	@$(AS) $(KERNEL_ASM_CONFIG) $(BOOT_ASM_INCLUDES) $(KERNEL_AS_DONTWARN) -o $@ $<

Kernel/Sources/dispatcher/VirtualProcessorScheduler.h

@@ -10,8 +10,8 @@
 #define VirtualProcessorScheduler_h
 
 #include <klib/klib.h>
+#include <boot/BootAllocator.h>
 #include <hal/SystemDescription.h>
-#include "BootAllocator.h"
 #include "VirtualProcessor.h"
 
 

Kernel/project.mk

@@ -5,6 +5,9 @@
 KERNEL_SOURCES_DIR := $(KERNEL_PROJECT_DIR)/Sources
 
 
+BOOT_SOURCES_DIR := $(KERNEL_SOURCES_DIR)/boot
+BOOT_OBJS_DIR := $(KERNEL_OBJS_DIR)/boot
+
 CONSOLE_SOURCES_DIR := $(KERNEL_SOURCES_DIR)/console
 CONSOLE_OBJS_DIR := $(KERNEL_OBJS_DIR)/console
 
@@ -94,9 +97,7 @@ $(KERNEL_OBJS_DIR):
 	$(call mkdir_if_needed,$(KERNEL_OBJS_DIR))
 
 
--include $(KRT_SOURCES_DIR)/package.mk
--include $(KOBJ_SOURCES_DIR)/package.mk
--include $(KLIB_SOURCES_DIR)/package.mk
+-include $(BOOT_SOURCES_DIR)/package.mk
 -include $(CONSOLE_SOURCES_DIR)/package.mk
 -include $(DISK_SOURCES_DIR)/package.mk
 -include $(DISPATCHER_SOURCES_DIR)/package.mk
@@ -111,10 +112,14 @@ $(KERNEL_OBJS_DIR):
 -include $(FILESYSTEM_SOURCES_DIR)/package.mk
 -include $(FILESYSTEM_SERENAFS_SOURCES_DIR)/package.mk
 -include $(HAL_SOURCES_DIR)/package.mk
+-include $(KRT_SOURCES_DIR)/package.mk
+-include $(KOBJ_SOURCES_DIR)/package.mk
+-include $(KLIB_SOURCES_DIR)/package.mk
 -include $(PROCESS_SOURCES_DIR)/package.mk
 
 
-$(KERNEL_FILE): $(KRT_OBJS) $(KOBJ_OBJS) $(KLIB_OBJS) $(CONSOLE_OBJS) \
+$(KERNEL_FILE):	$(BOOT_OBJS) \
+				$(KRT_OBJS) $(KOBJ_OBJS) $(KLIB_OBJS) $(CONSOLE_OBJS) \
 				$(DISK_OBJS) $(DISPATCHER_OBJS) $(DISPATCHQUEUE_OBJS) \
 				$(DRIVER_AMIGA_OBJS) \
 				$(DRIVER_AMIGA_FLOPPY_OBJS) $(DRIVER_AMIGA_GRAPHICS_OBJS) \