diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2017-06-05 21:59:51 +0200 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2017-06-05 21:59:51 +0200 |
| commit | 792ede808fef0ea8f3f4a2ab0bc52193a4399c4b (patch) | |
| tree | 86478e75a85b49b5354ab50794518e47a3d9fe07 | |
| parent | 147407d0a1de958b515b784061e5084336ebfe97 (diff) | |
| download | build-792ede808fef0ea8f3f4a2ab0bc52193a4399c4b.tar.gz build-792ede808fef0ea8f3f4a2ab0bc52193a4399c4b.tar.bz2 build-792ede808fef0ea8f3f4a2ab0bc52193a4399c4b.zip | |
kernel: mkimage dependency for U-Boot kernels
Based on Paul's Replicant 4.2 patch:
commit 3e39ecabad250118c613b71e01738bb4c7a4d51c
Author: Paul Kocialkowski <contact@paulk.fr>
Date: Fri Apr 25 11:43:26 2014 +0200
kernel: mkimage dependency for U-Boot kernels
Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
| -rw-r--r-- | core/tasks/kernel.mk | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/core/tasks/kernel.mk b/core/tasks/kernel.mk index dcfd689b0..9d1de53df 100644 --- a/core/tasks/kernel.mk +++ b/core/tasks/kernel.mk @@ -73,6 +73,7 @@ KERNEL_RECOVERY_OUT := $(TARGET_OUT_INTERMEDIATES)/KERNEL_RECOVERY_OBJ KERNEL_RECOVERY_CONFIG := $(KERNEL_RECOVERY_OUT)/.config KERNEL_OUT_STAMP := $(KERNEL_OUT)/.mkdir_stamp KERNEL_RECOVERY_OUT_STAMP := $(KERNEL_RECOVERY_OUT)/.mkdir_stamp +KERNEL_DEPS := TARGET_KERNEL_ARCH := $(strip $(TARGET_KERNEL_ARCH)) ifeq ($(TARGET_KERNEL_ARCH),) @@ -119,6 +120,10 @@ endif TARGET_PREBUILT_INT_KERNEL := $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/$(TARGET_PREBUILT_INT_KERNEL_TYPE) TARGET_PREBUILT_INT_KERNEL_RECOVERY := $(KERNEL_RECOVERY_OUT)/arch/$(KERNEL_ARCH)/boot/$(TARGET_PREBUILT_INT_KERNEL_TYPE) +ifeq ($(BOARD_USES_UBOOT),true) + KERNEL_DEPS := $(MKIMAGE) +endif + # Clear this first to prevent accidental poisoning from env MAKE_FLAGS := @@ -305,7 +310,7 @@ $(KERNEL_RECOVERY_CONFIG): $(KERNEL_RECOVERY_OUT_STAMP) $(KERNEL_RECOVERY_DEFCON @echo -e ${CL_GRN}"Building Recovery Kernel Config"${CL_RST} $(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_RECOVERY_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_RECOVERY_DEFCONFIG) -TARGET_KERNEL_BINARIES: $(BUILT_RAMDISK_TARGET) $(KERNEL_OUT_STAMP) $(KERNEL_CONFIG) $(KERNEL_HEADERS_INSTALL_STAMP) +TARGET_KERNEL_BINARIES: $(BUILT_RAMDISK_TARGET) $(KERNEL_OUT_STAMP) $(KERNEL_CONFIG) $(KERNEL_DEPS) $(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) $(KERNEL_LOADADDR) $(TARGET_PREBUILT_INT_KERNEL_TYPE) $(hide) if grep -q 'CONFIG_OF=y' $(KERNEL_CONFIG) ; \ |