Merge "AndroidKernel.mk: Change uncompressed kernel to use Image" (79880d37) · Commits · e / devices / android_kernel_sony_msm8994

AndroidKernel.mk

+10 −10

Original line number	Diff line number	Diff line
		@@ -32,21 +32,24 @@ ifeq ($(TARGET_PREBUILT_KERNEL),)

		KERNEL_OUT := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ
		KERNEL_CONFIG := $(KERNEL_OUT)/.config
		ifeq ($(TARGET_KERNEL_APPEND_DTB), true)
		TARGET_PREBUILT_INT_KERNEL := $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/zImage-dtb

		ifeq ($(TARGET_USES_UNCOMPRESSED_KERNEL),true)
		$(info Using uncompressed kernel)
		TARGET_PREBUILT_INT_KERNEL := $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/Image
		else
		TARGET_PREBUILT_INT_KERNEL := $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/zImage
		endif

		ifeq ($(TARGET_KERNEL_APPEND_DTB), true)
		$(info Using appended DTB)
		TARGET_PREBUILT_INT_KERNEL := $(TARGET_PREBUILT_INT_KERNEL)-dtb
		endif

		KERNEL_HEADERS_INSTALL := $(KERNEL_OUT)/usr
		KERNEL_MODULES_INSTALL := system
		KERNEL_MODULES_OUT := $(TARGET_OUT)/lib/modules

		ifeq ($(TARGET_USES_UNCOMPRESSED_KERNEL),true)
		$(info Using uncompressed kernel)
		TARGET_PREBUILT_KERNEL := $(KERNEL_OUT)/piggy
		else
		TARGET_PREBUILT_KERNEL := $(TARGET_PREBUILT_INT_KERNEL)
		endif

		define mv-modules
		mdpath=`find $(KERNEL_MODULES_OUT) -type f -name modules.dep`;\
		@@ -70,9 +73,6 @@ $(KERNEL_OUT):
		$(KERNEL_CONFIG): $(KERNEL_OUT)
		$(MAKE) -C kernel O=../$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(KERNEL_DEFCONFIG)

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

		$(TARGET_PREBUILT_INT_KERNEL): $(KERNEL_OUT) $(KERNEL_HEADERS_INSTALL)
		$(hide) rm -rf $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/dts
		$(MAKE) -C kernel O=../$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE)