From 1f4bcd9b43bd86f53967e50ebe27064694eec5bd Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Sun, 21 Jul 2013 02:25:40 +0200 Subject: kernel: Add support for the LOADADDR parameter. Without that fix we have: Kernel: arch/arm/boot/zImage is ready multiple (or no) load addresses: This is incompatible with uImages Specify LOADADDR on the commandline to build an uImage make[3]: *** [arch/arm/boot/uImage] Error 1 make[2]: *** [uImage] Error 2 make[1]: *** [sub-make] Error 2 make[1]: Leaving directory `/home/gnutoo/embedded/android/replicant-4.0/kernel/goldelico/gta04' make: *** [TARGET_KERNEL_BINARIES] Error 2 While building a recent kernel (3.10 based in that case). Signed-off-by: Denis 'GNUtoo' Carikli --- core/tasks/kernel.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/tasks/kernel.mk b/core/tasks/kernel.mk index 4f98fe2..dcfd689 100644 --- a/core/tasks/kernel.mk +++ b/core/tasks/kernel.mk @@ -141,6 +141,10 @@ else KERNEL_ADDITIONAL_CONFIG_SRC := /dev/null endif +ifneq ($(TARGET_KERNEL_LOADADDR),) + KERNEL_LOADADDR := LOADADDR=$(TARGET_KERNEL_LOADADDR) +endif + ifeq "$(wildcard $(KERNEL_SRC) )" "" ifneq ($(TARGET_PREBUILT_KERNEL),) HAS_PREBUILT_KERNEL := true @@ -303,7 +307,7 @@ $(KERNEL_RECOVERY_CONFIG): $(KERNEL_RECOVERY_OUT_STAMP) $(KERNEL_RECOVERY_DEFCON TARGET_KERNEL_BINARIES: $(BUILT_RAMDISK_TARGET) $(KERNEL_OUT_STAMP) $(KERNEL_CONFIG) $(KERNEL_HEADERS_INSTALL_STAMP) @echo -e ${CL_GRN}"Building Kernel"${CL_RST} - $(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(TARGET_PREBUILT_INT_KERNEL_TYPE) + $(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_LOADADDR) $(TARGET_PREBUILT_INT_KERNEL_TYPE) $(hide) if grep -q 'CONFIG_OF=y' $(KERNEL_CONFIG) ; \ then \ echo -e ${CL_GRN}"Building DTBs"${CL_RST} ; \ -- cgit v1.1