AndroidKernel.mk: Remove DTS compilation
The kernel compiles this and the android build system knows how to pick it up. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
This commit is contained in:
parent
9c78953e13
commit
a1417ab836
|
@ -13,31 +13,6 @@ endif
|
|||
KERNEL_HEADERS_INSTALL := $(KERNEL_OUT)/usr
|
||||
KERNEL_MODULES_INSTALL := system
|
||||
KERNEL_MODULES_OUT := $(TARGET_OUT)/lib/modules
|
||||
KERNEL_IMG=$(KERNEL_OUT)/arch/arm/boot/Image
|
||||
|
||||
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/arch/arm/configs/$(KERNEL_DEFCONFIG))
|
||||
|
||||
ifeq "$(KERNEL_USE_OF)" "y"
|
||||
DTS_FILES = $(wildcard $(TOP)/kernel/arch/arm/boot/dts/$(DTS_NAME)*.dts)
|
||||
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
|
||||
DTC = $(KERNEL_OUT)/scripts/dtc/dtc
|
||||
|
||||
define append-dtb
|
||||
mkdir -p $(KERNEL_OUT)/arch/arm/boot;\
|
||||
$(foreach DTS_NAME, $(DTS_NAMES), \
|
||||
$(foreach d, $(DTS_FILES), \
|
||||
$(DTC) -p 1024 -O dtb -o $(call DTB_FILE,$(d)) $(d); \
|
||||
cat $(KERNEL_ZIMG) $(call DTB_FILE,$(d)) > $(call ZIMG_FILE,$(d));))
|
||||
endef
|
||||
else
|
||||
|
||||
define append-dtb
|
||||
endef
|
||||
endif
|
||||
|
||||
ifeq ($(TARGET_USES_UNCOMPRESSED_KERNEL),true)
|
||||
$(info Using uncompressed kernel)
|
||||
|
@ -77,7 +52,6 @@ $(TARGET_PREBUILT_INT_KERNEL): $(KERNEL_OUT) $(KERNEL_CONFIG) $(KERNEL_HEADERS_I
|
|||
$(MAKE) -C kernel O=../$(KERNEL_OUT) INSTALL_MOD_PATH=../../$(KERNEL_MODULES_INSTALL) INSTALL_MOD_STRIP=1 ARCH=arm CROSS_COMPILE=arm-eabi- modules_install
|
||||
$(mv-modules)
|
||||
$(clean-module-folder)
|
||||
$(append-dtb)
|
||||
|
||||
$(KERNEL_HEADERS_INSTALL): $(KERNEL_OUT) $(KERNEL_CONFIG)
|
||||
$(MAKE) -C kernel O=../$(KERNEL_OUT) ARCH=arm CROSS_COMPILE=arm-eabi- headers_install
|
||||
|
|
Loading…
Reference in New Issue