Merge "AndroidKernel: add support to configure DLKM install path" (272879fc) · Commits · e / devices / android_kernel_sony_msm8998

AndroidKernel.mk

+21 −14

Original line number	Diff line number	Diff line
		@@ -6,6 +6,13 @@ ifeq ($(KERNEL_TARGET),)
		INSTALLED_KERNEL_TARGET := $(PRODUCT_OUT)/kernel
		endif

		TARGET_KERNEL_MAKE_ENV := $(strip $(TARGET_KERNEL_MAKE_ENV))
		ifeq ($(TARGET_KERNEL_MAKE_ENV),)
		KERNEL_MAKE_ENV :=
		else
		KERNEL_MAKE_ENV := $(TARGET_KERNEL_MAKE_ENV)
		endif

		TARGET_KERNEL_ARCH := $(strip $(TARGET_KERNEL_ARCH))
		ifeq ($(TARGET_KERNEL_ARCH),)
		KERNEL_ARCH := arm
		@@ -91,8 +98,8 @@ 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
		KERNEL_MODULES_INSTALL ?= system
		KERNEL_MODULES_OUT ?= $(PRODUCT_OUT)/$(KERNEL_MODULES_INSTALL)/lib/modules

		TARGET_PREBUILT_KERNEL := $(TARGET_PREBUILT_INT_KERNEL)

		@@ -124,43 +131,43 @@ $(KERNEL_OUT):
		mkdir -p $(KERNEL_OUT)

		$(KERNEL_CONFIG): $(KERNEL_OUT)
		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(KERNEL_DEFCONFIG)
		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(KERNEL_DEFCONFIG)
		$(hide) if [ ! -z "$(KERNEL_CONFIG_OVERRIDE)" ]; then \
		echo "Overriding kernel config with '$(KERNEL_CONFIG_OVERRIDE)'"; \
		echo $(KERNEL_CONFIG_OVERRIDE) >> $(KERNEL_OUT)/.config; \
		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) oldconfig; fi
		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) oldconfig; fi

		$(TARGET_PREBUILT_INT_KERNEL): $(KERNEL_OUT) $(KERNEL_HEADERS_INSTALL)
		$(hide) echo "Building kernel..."
		$(hide) rm -rf $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/dts
		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(KERNEL_CFLAGS)
		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(KERNEL_CFLAGS) modules
		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) INSTALL_MOD_PATH=$(BUILD_ROOT_LOC)../$(KERNEL_MODULES_INSTALL) INSTALL_MOD_STRIP=1 ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) modules_install
		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(KERNEL_CFLAGS)
		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(KERNEL_CFLAGS) modules
		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) INSTALL_MOD_PATH=$(BUILD_ROOT_LOC)../$(KERNEL_MODULES_INSTALL) INSTALL_MOD_STRIP=1 $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) modules_install
		$(mv-modules)
		$(clean-module-folder)

		$(KERNEL_HEADERS_INSTALL): $(KERNEL_OUT)
		$(hide) if [ ! -z "$(KERNEL_HEADER_DEFCONFIG)" ]; then \
		rm -f $(BUILD_ROOT_LOC)$(KERNEL_CONFIG); \
		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) ARCH=$(KERNEL_HEADER_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(KERNEL_HEADER_DEFCONFIG); \
		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) ARCH=$(KERNEL_HEADER_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) headers_install; fi
		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_HEADER_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(KERNEL_HEADER_DEFCONFIG); \
		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_HEADER_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) headers_install; fi
		$(hide) if [ "$(KERNEL_HEADER_DEFCONFIG)" != "$(KERNEL_DEFCONFIG)" ]; then \
		echo "Used a different defconfig for header generation"; \
		rm -f $(BUILD_ROOT_LOC)$(KERNEL_CONFIG); \
		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(KERNEL_DEFCONFIG); fi
		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(KERNEL_DEFCONFIG); fi
		$(hide) if [ ! -z "$(KERNEL_CONFIG_OVERRIDE)" ]; then \
		echo "Overriding kernel config with '$(KERNEL_CONFIG_OVERRIDE)'"; \
		echo $(KERNEL_CONFIG_OVERRIDE) >> $(KERNEL_OUT)/.config; \
		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) oldconfig; fi
		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) oldconfig; fi

		kerneltags: $(KERNEL_OUT) $(KERNEL_CONFIG)
		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) tags
		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) tags

		kernelconfig: $(KERNEL_OUT) $(KERNEL_CONFIG)
		env KCONFIG_NOTIMESTAMP=true \
		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) menuconfig
		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) menuconfig
		env KCONFIG_NOTIMESTAMP=true \
		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) savedefconfig
		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) savedefconfig
		cp $(KERNEL_OUT)/defconfig $(TARGET_KERNEL_SOURCE)/arch/$(KERNEL_ARCH)/configs/$(KERNEL_DEFCONFIG)

		endif

arch/arm64/Kconfig

+5 −0

Original line number	Diff line number	Diff line
		@@ -1030,6 +1030,11 @@ config BUILD_ARM64_APPENDED_DTB_IMAGE_NAMES
		Space separated list of names of dtbs to append when
		building a concatenated Image.gz-dtb.

		config BUILD_ARM64_DT_OVERLAY
		bool "enable DT overlay compilation support"
		depends on OF
		help
		This option enables support for DT overlay compilation.
		endmenu

		menu "Userspace binary formats"

arch/arm64/Makefile

+4 −0

Original line number	Diff line number	Diff line
		@@ -92,6 +92,10 @@ endif

		KBUILD_DTBS := dtbs

		ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
		export DTC_FLAGS := -@
		endif

		all: $(KBUILD_IMAGE) $(KBUILD_DTBS)

		boot := arch/arm64/boot

scripts/Makefile.build

+5 −0

Original line number	Diff line number	Diff line
		@@ -64,6 +64,11 @@ ifneq ($(hostprogs-y)$(hostprogs-m),)
		include scripts/Makefile.host
		endif

		# Do not include host rules unless needed
		ifneq ($(dtbo-y),)
		include scripts/Makefile.dtbo
		endif

		ifneq ($(KBUILD_SRC),)
		# Create output directory if not already present
		_dummy := $(shell [ -d $(obj) ] \|\| mkdir -p $(obj))

scripts/Makefile.dtbo

0 → 100644

+24 −0

Original line number	Diff line number	Diff line
		__dtbo := $(sort $(dtbo-y))

		dtbo-base := $(sort $(foreach m,$(__dtbo),$($(m)-base)))
		dtbo := $(foreach m,$(__dtbo),$(if $($(m)-base),$(m)))

		__dtbo := $(addprefix $(obj)/,$(__dtbo))
		dtbo-base := $(addprefix $(obj)/,$(dtbo-base))
		dtbo := $(addprefix $(obj)/,$(dtbo))

		ifneq ($(DTC_OVERLAY_TEST_EXT),)
		DTC_OVERLAY_TEST = $(DTC_OVERLAY_TEST_EXT)
		quiet_cmd_dtbo_verify = VERIFY $@
		cmd_dtbo_verify = $(DTC_OVERLAY_TEST) $(addprefix $(obj)/,$($(@F)-base)) $@ $(dot-target).dtb
		else
		cmd_dtbo_verify = true
		endif

		$(obj)/%.dtbo: $(src)/%.dts FORCE
		$(call if_changed_dep,dtc)
		$(call if_changed,dtbo_verify)

		$(call multi_depend, $(dtbo), , -base)

		always += $(dtbo)