Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c222c25 authored by Michael Bestas's avatar Michael Bestas Committed by Gerrit Code Review
Browse files

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
parent 6c82f91f

core/tasks/kernel.mk

+8 −2
Original line number Diff line number Diff line
@@ -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