diff options
| author | Kees Cook <keescook@google.com> | 2016-05-12 14:49:57 -0700 |
|---|---|---|
| committer | Kees Cook <keescook@google.com> | 2016-05-12 14:51:02 -0700 |
| commit | f4e8f5d08840a8bb56449bc2ead78dd56cf31591 (patch) | |
| tree | 835c90f0b7faed60b845a6824c8354b41693a2ee | |
| parent | ebcf19b60ecf8be46c10416ccebf6f43cc230412 (diff) | |
| download | brillo-f4e8f5d08840a8bb56449bc2ead78dd56cf31591.tar.gz | |
Revert "kernel.mk: fix kernel targets for arm and arm64"
This reverts commit cddc462b6ede2bd80bdbbc9030eab133a6e10978.
Bug: 28564526
Change-Id: I9cae0dc1d808e22c3369069fefdc21ecf267f171
| -rw-r--r-- | kernel.mk | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -56,12 +56,16 @@ 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.gz +KERNEL_NAME := Image else ifeq ($(TARGET_KERNEL_ARCH), i386) KERNEL_CROSS_COMPILE := $(KERNEL_TOOLCHAIN_ABS)/x86_64-linux-androidkernel- KERNEL_SRC_ARCH := x86 |