diff options
| author | Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> | 2013-07-21 02:25:40 +0200 |
|---|---|---|
| committer | Paul Kocialkowski <contact@paulk.fr> | 2014-02-27 18:10:00 +0100 |
| commit | 853b638d95677ff5e48a829f4ef34cc31352d15c (patch) | |
| tree | dbd2172653912d5fac9a96e39d15fb8a80d8830c | |
| parent | f6fe3cf558313b14f3555b8d3746e6249dc704cf (diff) | |
| download | build-853b638d95677ff5e48a829f4ef34cc31352d15c.zip build-853b638d95677ff5e48a829f4ef34cc31352d15c.tar.gz build-853b638d95677ff5e48a829f4ef34cc31352d15c.tar.bz2 | |
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 <GNUtoo@no-log.org>
| -rw-r--r-- | core/tasks/kernel.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/core/tasks/kernel.mk b/core/tasks/kernel.mk index 9f21fdc..1db8ec0 100644 --- a/core/tasks/kernel.mk +++ b/core/tasks/kernel.mk @@ -46,6 +46,10 @@ else TARGET_PREBUILT_INT_KERNEL_TYPE := zImage endif +ifneq ($(TARGET_KERNEL_LOADADDR),) + KERNEL_LOADADDR := LOADADDR=$(TARGET_KERNEL_LOADADDR) +endif + ifeq "$(wildcard $(KERNEL_SRC) )" "" ifneq ($(TARGET_PREBUILT_KERNEL),) HAS_PREBUILT_KERNEL := true @@ -190,14 +194,14 @@ $(KERNEL_RECOVERY_OUT)/piggy : $(TARGET_PREBUILT_INT_KERNEL_RECOVERY) $(hide) gunzip -c $(KERNEL_OUT)/arch/$(TARGET_ARCH)/boot/compressed/piggy.gzip > $(KERNEL_RECOVERY_OUT)/piggy TARGET_KERNEL_BINARIES: $(BUILT_RAMDISK_TARGET) $(KERNEL_OUT) $(KERNEL_CONFIG) $(KERNEL_HEADERS_INSTALL) - $(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(TARGET_ARCH) $(ARM_CROSS_COMPILE) $(TARGET_PREBUILT_INT_KERNEL_TYPE) + $(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(TARGET_ARCH) $(ARM_CROSS_COMPILE) $(KERNEL_LOADADDR) $(TARGET_PREBUILT_INT_KERNEL_TYPE) -$(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(TARGET_ARCH) $(ARM_CROSS_COMPILE) modules -$(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) INSTALL_MOD_PATH=../../$(KERNEL_MODULES_INSTALL) ARCH=$(TARGET_ARCH) $(ARM_CROSS_COMPILE) modules_install $(mv-modules) $(clean-module-folder) $(TARGET_PREBUILT_INT_KERNEL_RECOVERY): $(recovery_ramdisk) $(KERNEL_RECOVERY_OUT) $(KERNEL_RECOVERY_CONFIG) - $(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_RECOVERY_OUT) ARCH=$(TARGET_ARCH) $(ARM_CROSS_COMPILE) $(TARGET_PREBUILT_INT_KERNEL_TYPE) + $(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_RECOVERY_OUT) ARCH=$(TARGET_ARCH) $(ARM_CROSS_COMPILE) $(KERNEL_LOADADDR) $(TARGET_PREBUILT_INT_KERNEL_TYPE) $(TARGET_KERNEL_MODULES): TARGET_KERNEL_BINARIES |