From f979b4753d5ccfb4273ced777a95b10a801440ef Mon Sep 17 00:00:00 2001 From: chenjinxiang3 Date: Thu, 21 May 2026 03:23:26 +0000 Subject: [PATCH] #125 Isolate LOADADDR config to qemu-arm-linux-min product only Remove unconditional KERNEL_LOADADDR from ARM arch block. Add product-specific KERNEL_LOADADDR only for qemu-arm-linux-min. Make LOADADDR conditional in KERNEL_MAKE via ifdef. Co-Authored-By: Agent Signed-off-by: chenjinxiang3 Change-Id: I3ce30e4fd317622835446690f161db0a77d2171f --- kernel.mk | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/kernel.mk b/kernel.mk index 198247f..cf8f1dc 100644 --- a/kernel.mk +++ b/kernel.mk @@ -37,8 +37,6 @@ KERNEL_CROSS_COMPILE := ifeq ($(KERNEL_ARCH), arm) KERNEL_TARGET_TOOLCHAIN := $(PREBUILTS_GCC_DIR)/linux-x86/arm/gcc-linaro-7.5.0-arm-linux-gnueabi/bin KERNEL_TARGET_TOOLCHAIN_PREFIX := $(KERNEL_TARGET_TOOLCHAIN)/arm-linux-gnueabi- - # Set LOADADDR for uImage generation (required for ARM) - KERNEL_LOADADDR := 0x40008000 else ifeq ($(KERNEL_ARCH), arm64) KERNEL_TARGET_TOOLCHAIN := $(PREBUILTS_GCC_DIR)/linux-x86/aarch64/gcc-linaro-7.5.0-2019.12-x86_64_aarch64-linux-gnu/bin KERNEL_TARGET_TOOLCHAIN_PREFIX := $(KERNEL_TARGET_TOOLCHAIN)/aarch64-linux-gnu- @@ -61,6 +59,10 @@ ifeq ($(DEVICE_NAME), hispark_phoenix) KERNEL_CROSS_COMPILE += CONFIG_MSP="y" endif +ifeq ($(PRODUCT_NAME), qemu-arm-linux-min) +KERNEL_LOADADDR := 0x40008000 +endif + ifneq ($(KERNEL_ARCH), loongarch) KERNEL_CROSS_COMPILE += CC="$(CLANG_CC)" endif @@ -71,9 +73,12 @@ endif KERNEL_MAKE := \ PATH="$(BOOT_IMAGE_PATH):$$PATH" \ - LOADADDR="$(KERNEL_LOADADDR)" \ $(KERNEL_PREBUILT_MAKE) +ifdef KERNEL_LOADADDR +KERNEL_MAKE += LOADADDR="$(KERNEL_LOADADDR)" +endif + ifneq ($(findstring $(BUILD_TYPE), small standard),) DEVICE_PATCH_DIR := $(OHOS_BUILD_HOME)/kernel/linux/patches/${KERNEL_VERSION}/$(DEVICE_NAME)_patch