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

Commit 3d7cb500 authored by ddalex's avatar ddalex
Browse files

kernel: do not assume arch is arm 

In the kernel.mk file the target architecture is
assumed to be ARM. This may not be true, so
it's changed to use the $(TARGET_ARCH) variable.

Change-Id: Ia9347a44fcfdc40846e1cd6626c4e574bd93b16f
parent 8cff3b51

core/tasks/kernel.mk

+8 −8
Original line number Diff line number Diff line
@@ -99,29 +99,29 @@ else 
    endif

endif



USE_SOMC_BOARD ?= $(shell perl -e '$$somc = "n"; while (<>) { if (/CONFIG_MACH_SONY_.+=y/) { $$somc = "y"; break } } print $$somc;' $(KERNEL_SRC)/arch/arm/configs/$(KERNEL_DEFCONFIG))

USE_SOMC_BOARD ?= $(shell perl -e '$$somc = "n"; while (<>) { if (/CONFIG_MACH_SONY_.+=y/) { $$somc = "y"; break } } print $$somc;' $(KERNEL_SRC)/arch/$(TARGET_ARCH)/configs/$(KERNEL_DEFCONFIG))



ifeq "$(USE_SOMC_BOARD)" "y"

DTS_NAMES ?= msm8974 apq8074

SOMC_BOARD = $(shell echo $(KERNEL_DEFCONFIG) | sed -e "s/cm_//" | sed -e "s/_defconfig//")

endif

DTS_NAMES ?= $(shell perl -e 'while (<>) {$$a = $$1 if /CONFIG_ARCH_((?:MSM|QSD|MPQ)[a-zA-Z0-9]+)=y/; $$r = $$1 if /CONFIG_MSM_SOC_REV_(?!NONE)(\w+)=y/; $$arch = $$arch.lc("$$a$$r ") if /CONFIG_ARCH_((?:MSM|QSD|MPQ)[a-zA-Z0-9]+)=y/} print $$arch;' $(KERNEL_CONFIG))

KERNEL_USE_OF ?= $(shell perl -e '$$of = "n"; while (<>) { if (/CONFIG_USE_OF=y/) { $$of = "y"; break; } } print $$of;' $(KERNEL_SRC)/arch/arm/configs/$(KERNEL_DEFCONFIG))

KERNEL_USE_OF ?= $(shell perl -e '$$of = "n"; while (<>) { if (/CONFIG_USE_OF=y/) { $$of = "y"; break; } } print $$of;' $(KERNEL_SRC)/arch/$(TARGET_ARCH)/configs/$(KERNEL_DEFCONFIG))



ifeq "$(KERNEL_USE_OF)" "y"

ifeq "$(USE_SOMC_BOARD)" "y"

DTS_FILES = $(wildcard $(TOP)/$(KERNEL_SRC)/arch/arm/boot/dts/$(DTS_NAME)*$(SOMC_BOARD).dts)

DTS_FILES = $(wildcard $(TOP)/$(KERNEL_SRC)/arch/$(TARGET_ARCH)/boot/dts/$(DTS_NAME)*$(SOMC_BOARD).dts)

else

DTS_FILES = $(wildcard $(TOP)/$(KERNEL_SRC)/arch/arm/boot/dts/$(DTS_NAME)*.dts)

DTS_FILES = $(wildcard $(TOP)/$(KERNEL_SRC)/arch/$(TARGET_ARCH)/boot/dts/$(DTS_NAME)*.dts)

endif

DTS_FILE = $(lastword $(subst /, ,$(1)))

DTB_FILE = $(addprefix $(KERNEL_OUT)/arch/arm/boot/,$(patsubst %.dts,%.dtb,$(call DTS_FILE,$(1))))

ZIMG_FILE = $(addprefix $(KERNEL_OUT)/arch/arm/boot/,$(patsubst %.dts,%-zImage,$(call DTS_FILE,$(1))))

KERNEL_ZIMG = $(KERNEL_OUT)/arch/arm/boot/zImage

DTB_FILE = $(addprefix $(KERNEL_OUT)/arch/$(TARGET_ARCH)/boot/,$(patsubst %.dts,%.dtb,$(call DTS_FILE,$(1))))

ZIMG_FILE = $(addprefix $(KERNEL_OUT)/arch/$(TARGET_ARCH)/boot/,$(patsubst %.dts,%-zImage,$(call DTS_FILE,$(1))))

KERNEL_ZIMG = $(KERNEL_OUT)/arch/$(TARGET_ARCH)/boot/zImage

DTC = $(KERNEL_OUT)/scripts/dtc/dtc



define append-dtb

mkdir -p $(KERNEL_OUT)/arch/arm/boot;\

mkdir -p $(KERNEL_OUT)/arch/$(TARGET_ARCH)/boot;\

$(foreach DTS_NAME, $(DTS_NAMES), \

   $(foreach d, $(DTS_FILES), \

      $(DTC) -p 1024 -O dtb -o $(call DTB_FILE,$(d)) $(d); \