diff options
| author | Michael Bestas <mikeioannina@cyanogenmod.org> | 2016-01-05 16:03:45 +0200 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-01-05 11:39:43 -0800 |
| commit | 2c222c257552a3c0c204a0d140a2fbfb2a769adb (patch) | |
| tree | 85098c5bc53d3601ad19bbcd5b82d50115a0c1c5 /core/tasks | |
| parent | 6c82f91f2429588d64cb33c12455e4bcbb6b511c (diff) | |
| download | build-2c222c257552a3c0c204a0d140a2fbfb2a769adb.zip build-2c222c257552a3c0c204a0d140a2fbfb2a769adb.tar.gz build-2c222c257552a3c0c204a0d140a2fbfb2a769adb.tar.bz2 | |
kernel: Fix usage of KERNEL_ARCH
* x86_64 defconfigs live in arch/x86/configs
* Use KERNEL_ARCH instead of TARGET_KERNEL_ARCH
Change-Id: Idc191ea658fc4100bc7ad40958023c5f936daf44
Diffstat (limited to 'core/tasks')
| -rw-r--r-- | core/tasks/kernel.mk | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/core/tasks/kernel.mk b/core/tasks/kernel.mk index cc1b5ce..763df73 100644 --- a/core/tasks/kernel.mk +++ b/core/tasks/kernel.mk @@ -36,7 +36,13 @@ KERNEL_ARCH := $(TARGET_ARCH) else KERNEL_ARCH := $(TARGET_KERNEL_ARCH) endif -KERNEL_DEFCONFIG_SRC := $(KERNEL_SRC)/arch/$(KERNEL_ARCH)/configs/$(KERNEL_DEFCONFIG) + +ifeq ($(KERNEL_ARCH),x86_64) +KERNEL_DEFCONFIG_ARCH := x86 +else +KERNEL_DEFCONFIG_ARCH := $(KERNEL_ARCH) +endif +KERNEL_DEFCONFIG_SRC := $(KERNEL_SRC)/arch/$(KERNEL_DEFCONFIG_ARCH)/configs/$(KERNEL_DEFCONFIG) TARGET_KERNEL_HEADER_ARCH := $(strip $(TARGET_KERNEL_HEADER_ARCH)) ifeq ($(TARGET_KERNEL_HEADER_ARCH),) @@ -57,7 +63,7 @@ else ifeq ($(TARGET_USES_UNCOMPRESSED_KERNEL),true) TARGET_PREBUILT_INT_KERNEL_TYPE := Image else - ifeq ($(TARGET_KERNEL_ARCH),arm64) + ifeq ($(KERNEL_ARCH),arm64) TARGET_PREBUILT_INT_KERNEL_TYPE := Image.gz else TARGET_PREBUILT_INT_KERNEL_TYPE := zImage |