Merge pull request #5 from guoweikang/copilot/integrate-kconfig-with-cargo-kbuild

Integrate Kconfig with cargo-kbuild for unified build configuration

Author: Copilot

.gitignore

@@ -23,3 +23,5 @@ Cargo.lock
 
 # kernel config
 .config
+auto.conf
+autoconf.h

Kconfig

@@ -1,7 +1,114 @@
 mainmenu "X-kernel Configuration"
 
+choice
+    prompt "Target Architecture"
+    default ARCH_AARCH64
+
+config ARCH_AARCH64
+    bool "AArch64 (ARM 64-bit)"
+
+config ARCH_RISCV64
+    bool "RISC-V 64-bit"
+
+config ARCH_X86_64
+    bool "x86_64"
+
+config ARCH_LOONGARCH64
+    bool "LoongArch 64-bit"
+
+endchoice
+
 menu "Platform Selection"
 
+if ARCH_AARCH64
+
+choice
+    prompt "AArch64 Platform"
+    default PLATFORM_AARCH64_QEMU_VIRT
+
+config PLATFORM_AARCH64_QEMU_VIRT
+    bool "QEMU ARM64 Virtual Machine"
+
+config PLATFORM_AARCH64_CROSVM_VIRT
+    bool "CROSVM ARM64 Virtual Machine"
+
+config PLATFORM_AARCH64_RASPI
+    bool "Raspberry Pi 4B"
+
+endchoice
+
+endif # ARCH_AARCH64
+
+if ARCH_RISCV64
+
+choice
+    prompt "RISC-V 64 Platform"
+    default PLATFORM_RISCV64_QEMU_VIRT
+
+config PLATFORM_RISCV64_QEMU_VIRT
+    bool "QEMU RISC-V 64 Virtual Machine"
+
+endchoice
+
+endif # ARCH_RISCV64
+
+if ARCH_X86_64
+
+choice
+    prompt "x86_64 Platform"
+    default PLATFORM_X86_64_QEMU_VIRT
+
+config PLATFORM_X86_64_QEMU_VIRT
+    bool "QEMU x86_64 Virtual Machine"
+
+config PLATFORM_X86_CSV
+    bool "x86 CSV Platform"
+
+endchoice
+
+endif # ARCH_X86_64
+
+if ARCH_LOONGARCH64
+
+choice
+    prompt "LoongArch64 Platform"
+    default PLATFORM_LOONGARCH64_QEMU_VIRT
+
+config PLATFORM_LOONGARCH64_QEMU_VIRT
+    bool "QEMU LoongArch64 Virtual Machine"
+
+endchoice
+
+endif # ARCH_LOONGARCH64
+
 source "platforms/Kconfig"
 
 endmenu
+
+menu "Kernel Features"
+
+config FEAT_SMP
+    bool "Symmetric Multiprocessing (SMP)"
+    default y
+
+config FEAT_FP_SIMD
+    bool "Floating Point and SIMD"
+    default y
+
+config FEAT_NET
+    bool "Network Stack"
+    default y
+
+config FEAT_FS
+    bool "File System Support"
+    default y
+
+config FEAT_ALLOC
+    bool "Dynamic Memory Allocation"
+    default y
+
+config FEAT_IRQ
+    bool "Interrupt Support"
+    default y
+
+endmenu

Makefile

@@ -35,6 +35,10 @@
 # Enable unstable features
 export RUSTC_BOOTSTRAP := 1
 export DWARF := y
+
+# Include Kconfig extraction (must be before ARCH/PLAT defaults)
+-include scripts/make/kconfig.mk
+
 # General options
 ARCH ?= aarch64
 PLAT ?= $(ARCH)-qemu-virt
@@ -179,7 +183,12 @@ check_config:
 
 
 menuconfig:
-	xconf menuconfig
+	@xconf menuconfig -k Kconfig -s .
+	@if [ -f .config ]; then \
+		echo "✅ Configuration saved to .config"; \
+	else \
+		echo "ℹ️  No changes saved"; \
+	fi
 
 rootfs:
 	@if [ ! -f $(ROOTFS_IMG) ]; then \
@@ -193,10 +202,19 @@ teefs:
 	$(MAKE) -C tee_apps ARCH=$(ARCH)
 
 defconfig:
-	$(call defconfig)
+	@xconf saveconfig -o .config -k Kconfig -s .
+	@echo "✅ Default configuration saved to .config"
+
+saveconfig:
+	@xconf saveconfig -o .config -k Kconfig -s .
 
-oldconfig: check_config
-	$(call oldconfig)
+oldconfig:
+	@if [ ! -f .config ]; then \
+		echo "$(RED_C)Error$(END_C): .config not found."; \
+		echo "Please run 'make defconfig' or 'make menuconfig' first."; \
+		exit 1; \
+	fi
+	@xconf oldconfig -c .config -k Kconfig -s .
 
 build: $(OUT_DIR) $(FINAL_IMG)
 
@@ -248,11 +266,16 @@ endif
 clean: clean_c
 	rm -rf $(APP)/*.bin $(APP)/*.elf $(OUT_CONFIG)
 	cargo clean
+	@rm -f target/kbuild/config.rs .cargo/config.toml
+
+distclean: clean
+	@rm -f .config auto.conf autoconf.h
+	@echo "✅ Removed all configuration files"
 
 clean_c::
 	rm -rf $(app-objs)
 
-.PHONY: all check_config defconfig oldconfig menuconfig \
+.PHONY: all check_config defconfig oldconfig menuconfig saveconfig \
 	build disasm run justrun debug \
 	clippy doc doc_check_missing fmt fmt_c unittest unittest_no_fail_fast \
-	disk_img clean clean_c
+	disk_img clean distclean clean_c

scripts/make/build.mk

@@ -42,11 +42,18 @@ else
   RUSTFLAGS += --check-cfg cfg(unittest)
 endif
 
-_cargo_build: oldconfig
+# Build requires platform configuration ($(OUT_CONFIG))
+# oldconfig generates .platconfig.toml from platform-specific TOML files
+# This is separate from the xconf Kconfig system (.config)
+_cargo_build: $(OUT_CONFIG)
 	@printf "    $(GREEN_C)Building$(END_C) App: $(APP_NAME), Arch: $(ARCH), Platform: $(PLAT_NAME)\n"
 	$(call cargo_build,$(APP),$(KFEAT) $(APP_FEAT))
 	@cp $(rust_elf) $(OUT_ELF)
 
+# Generate .platconfig.toml if it doesn't exist
+$(OUT_CONFIG):
+	$(call oldconfig)
+
 $(OUT_DIR):
 	$(call run_cmd,mkdir,-p $@)
 

scripts/make/cargo.mk

@@ -24,8 +24,12 @@ ifeq ($(MAKECMDGOALS), doc_check_missing)
   RUSTDOCFLAGS += -D missing-docs
 endif
 
+# Select cargo command: use cargo-kbuild if .config exists, otherwise use cargo
+CARGO_CMD := $(if $(wildcard .config),cargo-kbuild,cargo)
+CARGO_KCONFIG_ARG := $(if $(wildcard .config),--kconfig .config,)
+
 define cargo_build
-  $(call run_cmd,cargo -C $(1) build,$(build_args) --features "$(strip $(2))")
+  $(call run_cmd,$(CARGO_CMD) -C $(1) build $(CARGO_KCONFIG_ARG),$(build_args) --features "$(strip $(2))")
 endef
 
 clippy_args := -A unsafe_op_in_unsafe_fn

scripts/make/kconfig.mk

@@ -0,0 +1,44 @@
+# Extract ARCH and PLAT from .config if it exists
+
+ifneq ($(wildcard .config),)
+  # Read .config once and extract ARCH and PLAT in a single pass
+  CONFIG_VALUES := $(shell awk '/^(CONFIG_)?ARCH_[A-Z0-9_]+=y/ { print $$0 } /^(CONFIG_)?PLATFORM_[A-Z0-9_]+=y/ { print $$0 }' .config)
+  
+  # Parse architecture
+  ifeq ($(findstring ARCH_AARCH64=y,$(CONFIG_VALUES)),ARCH_AARCH64=y)
+    ARCH_FROM_CONFIG := aarch64
+  else ifeq ($(findstring ARCH_RISCV64=y,$(CONFIG_VALUES)),ARCH_RISCV64=y)
+    ARCH_FROM_CONFIG := riscv64
+  else ifeq ($(findstring ARCH_X86_64=y,$(CONFIG_VALUES)),ARCH_X86_64=y)
+    ARCH_FROM_CONFIG := x86_64
+  else ifeq ($(findstring ARCH_LOONGARCH64=y,$(CONFIG_VALUES)),ARCH_LOONGARCH64=y)
+    ARCH_FROM_CONFIG := loongarch64
+  endif
+  
+  # Parse platform
+  ifeq ($(findstring PLATFORM_AARCH64_QEMU_VIRT=y,$(CONFIG_VALUES)),PLATFORM_AARCH64_QEMU_VIRT=y)
+    PLAT_FROM_CONFIG := aarch64-qemu-virt
+  else ifeq ($(findstring PLATFORM_AARCH64_CROSVM_VIRT=y,$(CONFIG_VALUES)),PLATFORM_AARCH64_CROSVM_VIRT=y)
+    PLAT_FROM_CONFIG := aarch64-crosvm-virt
+  else ifeq ($(findstring PLATFORM_AARCH64_RASPI=y,$(CONFIG_VALUES)),PLATFORM_AARCH64_RASPI=y)
+    PLAT_FROM_CONFIG := aarch64-raspi
+  else ifeq ($(findstring PLATFORM_RISCV64_QEMU_VIRT=y,$(CONFIG_VALUES)),PLATFORM_RISCV64_QEMU_VIRT=y)
+    PLAT_FROM_CONFIG := riscv64-qemu-virt
+  else ifeq ($(findstring PLATFORM_X86_64_QEMU_VIRT=y,$(CONFIG_VALUES)),PLATFORM_X86_64_QEMU_VIRT=y)
+    PLAT_FROM_CONFIG := x86_64-qemu-virt
+  else ifeq ($(findstring PLATFORM_X86_CSV=y,$(CONFIG_VALUES)),PLATFORM_X86_CSV=y)
+    PLAT_FROM_CONFIG := x86-csv
+  else ifeq ($(findstring PLATFORM_LOONGARCH64_QEMU_VIRT=y,$(CONFIG_VALUES)),PLATFORM_LOONGARCH64_QEMU_VIRT=y)
+    PLAT_FROM_CONFIG := loongarch64-qemu-virt
+  endif
+  
+  # Use config values as defaults, but allow command line override
+  ARCH ?= $(ARCH_FROM_CONFIG)
+  PLAT ?= $(PLAT_FROM_CONFIG)
+endif
+
+# Final defaults if not set from config or command line
+ARCH ?= aarch64
+PLAT ?= $(ARCH)-qemu-virt
+
+export ARCH PLAT