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

Commit f43404e8 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira Committed by Ricardo Cerqueira
Browse files

kernel: Improve support for non-arm architectures 

Remove hardwired references to the ARM arch and toolchains, and replace
them with the respective android build variables

Change-Id: Iae3eb548ca1d58ac808b5fa430d415283a809106
parent a7936fa8

core/tasks/kernel.mk

+8 −8
Original line number Diff line number Diff line
@@ -14,10 +14,10 @@ KERNEL_OUT := $(ANDROID_BUILD_TOP)/$(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ 
KERNEL_CONFIG := $(KERNEL_OUT)/.config



ifeq ($(BOARD_USES_UBOOT),true)

	TARGET_PREBUILT_INT_KERNEL := $(KERNEL_OUT)/arch/arm/boot/uImage

	TARGET_PREBUILT_INT_KERNEL := $(KERNEL_OUT)/arch/$(TARGET_ARCH)/boot/uImage

	TARGET_PREBUILT_INT_KERNEL_TYPE := uImage

else

	TARGET_PREBUILT_INT_KERNEL := $(KERNEL_OUT)/arch/arm/boot/zImage

	TARGET_PREBUILT_INT_KERNEL := $(KERNEL_OUT)/arch/$(TARGET_ARCH)/boot/zImage

	TARGET_PREBUILT_INT_KERNEL_TYPE := zImage

endif
@@ -99,15 +99,15 @@ $(KERNEL_OUT): 
	mkdir -p $(KERNEL_MODULES_OUT)



$(KERNEL_CONFIG): $(KERNEL_OUT)

	$(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=arm CROSS_COMPILE=arm-eabi- $(KERNEL_DEFCONFIG)

	$(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(TARGET_ARCH) CROSS_COMPILE=$(ANDROID_BUILD_TOP)/$(TARGET_TOOLS_PREFIX) $(KERNEL_DEFCONFIG)



$(KERNEL_OUT)/piggy : $(TARGET_PREBUILT_INT_KERNEL)

	$(hide) gunzip -c $(KERNEL_OUT)/arch/arm/boot/compressed/piggy.gzip > $(KERNEL_OUT)/piggy

	$(hide) gunzip -c $(KERNEL_OUT)/arch/$(TARGET_ARCH)/boot/compressed/piggy.gzip > $(KERNEL_OUT)/piggy



TARGET_KERNEL_BINARIES: $(KERNEL_OUT) $(KERNEL_CONFIG) $(KERNEL_HEADERS_INSTALL)

	$(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=arm CROSS_COMPILE=arm-eabi- $(TARGET_PREBUILT_INT_KERNEL_TYPE)

	$(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=arm CROSS_COMPILE=arm-eabi- modules

	$(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) INSTALL_MOD_PATH=../../$(KERNEL_MODULES_INSTALL) ARCH=arm CROSS_COMPILE=arm-eabi- modules_install

	$(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(TARGET_ARCH) CROSS_COMPILE=$(ANDROID_BUILD_TOP)/$(TARGET_TOOLS_PREFIX) $(TARGET_PREBUILT_INT_KERNEL_TYPE)

	$(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(TARGET_ARCH) CROSS_COMPILE=$(ANDROID_BUILD_TOP)/$(TARGET_TOOLS_PREFIX) modules

	$(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) INSTALL_MOD_PATH=../../$(KERNEL_MODULES_INSTALL) ARCH=$(TARGET_ARCH) CROSS_COMPILE=$(ANDROID_BUILD_TOP)/$(TARGET_TOOLS_PREFIX) modules_install



$(TARGET_KERNEL_MODULES): TARGET_KERNEL_BINARIES
@@ -116,7 +116,7 @@ $(TARGET_PREBUILT_INT_KERNEL): $(TARGET_KERNEL_MODULES) 
	$(clean-module-folder)



$(KERNEL_HEADERS_INSTALL): $(KERNEL_OUT) $(KERNEL_CONFIG)

	$(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=arm CROSS_COMPILE=arm-eabi- headers_install

	$(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(TARGET_ARCH) CROSS_COMPILE=$(ANDROID_BUILD_TOP)/$(TARGET_TOOLS_PREFIX) headers_install



endif # FULL_KERNEL_BUILD