diff options
| author | Dzmitry Yatsushkevich <dmitryya@nestlabs.com> | 2016-02-26 20:23:11 -0800 |
|---|---|---|
| committer | Treehugger Robot <treehugger-gerrit@google.com> | 2016-05-11 04:45:43 +0000 |
| commit | cddc462b6ede2bd80bdbbc9030eab133a6e10978 (patch) | |
| tree | 655743ee8ef7b9052a294fde2f7de72e84489e9c | |
| parent | 87f1e8d6f5dfc952df42c5bb2557077feb5b0e62 (diff) | |
| download | brillo-cddc462b6ede2bd80bdbbc9030eab133a6e10978.tar.gz | |
kernel.mk: fix kernel targets for arm and arm64
Use the Image.gz kernel target for arm64 to be able append DTB to kernel
bin at the end.
Also remove zImage-dtb for arm: v4.1 and v4.4 kernels do not have this target.
zImage-dtb is defined only in the android-3.18 kernel:
$(obj)/zImage-dtb: $(obj)/zImage $(DTB_OBJS) FORCE
$(call if_changed,cat)
The same thing implemented inside kernel.mk if TARGET_KERNEL_DTB_APPEND is
defined.
So, the zImage-dtb use is not necessary and will produce an
error if arm platform will not define TARGET_KERNEL_DTB.
Steps to verify it: just remove TARGET_KERNEL_DTB defenition from
brilloemulator_arm/bsp/qemu_arm.mk and try to build a kernel.
BUG: 27674989
Change-Id: I09e06b7f474df77f61b2f99d18628d4fc1bd5d89
Signed-off-by: Dzmitry Yatsushkevich <dmitryya@nestlabs.com>
| -rw-r--r-- | kernel.mk | 6 |
1 files changed, 1 insertions, 5 deletions
@@ -50,16 +50,12 @@ ifeq ($(TARGET_KERNEL_ARCH), arm) KERNEL_CROSS_COMPILE := $(KERNEL_TOOLCHAIN_ABS)/arm-linux-androidkernel- KERNEL_SRC_ARCH := arm KERNEL_CFLAGS := -ifdef TARGET_KERNEL_DTB KERNEL_NAME := zImage -else -KERNEL_NAME := zImage-dtb -endif else ifeq ($(TARGET_KERNEL_ARCH), arm64) KERNEL_CROSS_COMPILE := $(KERNEL_TOOLCHAIN_ABS)/aarch64-linux-androidkernel- KERNEL_SRC_ARCH := arm64 KERNEL_CFLAGS := -KERNEL_NAME := Image +KERNEL_NAME := Image.gz else ifeq ($(TARGET_KERNEL_ARCH), i386) KERNEL_CROSS_COMPILE := $(KERNEL_TOOLCHAIN_ABS)/x86_64-linux-androidkernel- KERNEL_SRC_ARCH := x86 |