Created
November 5, 2015 16:40
-
-
Save tophyr/3bdbfcf024299e63f126 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| From a10d8f54ad837de012bd029c8113143edbe6120b Mon Sep 17 00:00:00 2001 | |
| From: Chris Sarbora <[email protected]> | |
| Date: Thu, 29 Oct 2015 16:24:42 -0700 | |
| Subject: [PATCH] WIP build goldfish kernel along with device | |
| Change-Id: I9c0b28a7d4ed9e69063661f16df9d278439da4be | |
| --- | |
| core/tasks/kernel.mk | 44 +++++++++++++++++++++++++++----------------- | |
| 1 file changed, 27 insertions(+), 17 deletions(-) | |
| diff --git a/core/tasks/kernel.mk b/core/tasks/kernel.mk | |
| index e10adeb..9d7389b 100644 | |
| --- a/core/tasks/kernel.mk | |
| +++ b/core/tasks/kernel.mk | |
| @@ -176,7 +176,7 @@ ifeq ($(KERNEL_TOOLCHAIN),) | |
| KERNEL_TOOLCHAIN_PATH := $(KERNEL_TOOLCHAIN_PREFIX) | |
| else | |
| ifneq ($(KERNEL_TOOLCHAIN_PREFIX),) | |
| -KERNEL_TOOLCHAIN_PATH := $(KERNEL_TOOLCHAIN)/$(KERNEL_TOOLCHAIN_PREFIX) | |
| +KERNEL_TOOLCHAIN_PATH := $(abspath $(KERNEL_TOOLCHAIN))/$(KERNEL_TOOLCHAIN_PREFIX) | |
| endif | |
| endif | |
| @@ -186,7 +186,11 @@ ifneq ($(USE_CCACHE),) | |
| ccache := $(strip $(wildcard $(ccache))) | |
| endif | |
| -KERNEL_CROSS_COMPILE := CROSS_COMPILE="$(ccache) $(KERNEL_TOOLCHAIN_PATH)" | |
| +ifeq ($(KERNEL_REAL_TOOLCHAIN_PREFIX),) | |
| + KERNEL_CROSS_COMPILE := CROSS_COMPILE="$(ccache) $(KERNEL_TOOLCHAIN_PATH)" | |
| +else | |
| + KERNEL_CROSS_COMPILE := CROSS_COMPILE=$(KERNEL_TOOLCHAIN_PATH) REAL_CROSS_COMPILE="$(ccache) $(KERNEL_REAL_TOOLCHAIN_PREFIX)" | |
| +endif | |
| ccache = | |
| define mv-modules | |
| @@ -214,26 +218,32 @@ ifeq ($(TARGET_KERNEL_MODULES),) | |
| TARGET_KERNEL_MODULES := no-external-modules | |
| endif | |
| +ifneq ($(strip $(SHOW_COMMANDS)),) | |
| + VERBOSE := V=1 | |
| +else | |
| + VERBOSE := | |
| +endif | |
| + | |
| $(KERNEL_OUT): | |
| mkdir -p $(KERNEL_OUT) | |
| mkdir -p $(KERNEL_MODULES_OUT) | |
| $(KERNEL_CONFIG): $(KERNEL_OUT) | |
| - $(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) VARIANT_DEFCONFIG=$(VARIANT_DEFCONFIG) SELINUX_DEFCONFIG=$(SELINUX_DEFCONFIG) $(KERNEL_DEFCONFIG) | |
| + $(MAKE) $(VERBOSE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) VARIANT_DEFCONFIG=$(VARIANT_DEFCONFIG) SELINUX_DEFCONFIG=$(SELINUX_DEFCONFIG) $(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 $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) oldconfig; fi | |
| + $(MAKE) $(MAKE_FLAGS) $(VERBOSE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) oldconfig; fi | |
| $(hide) if [ ! -z "$(KERNEL_ADDITIONAL_CONFIG)" ]; then \ | |
| echo "Using additional config '$(KERNEL_ADDITIONAL_CONFIG)'"; \ | |
| $(KERNEL_SRC)/scripts/kconfig/merge_config.sh -m -O $(KERNEL_OUT) $(KERNEL_OUT)/.config $(KERNEL_SRC)/arch/$(KERNEL_ARCH)/configs/$(KERNEL_ADDITIONAL_CONFIG); \ | |
| - $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) KCONFIG_ALLCONFIG=$(KERNEL_OUT)/.config alldefconfig; fi | |
| + $(MAKE) $(MAKE_FLAGS) $(VERBOSE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) KCONFIG_ALLCONFIG=$(KERNEL_OUT)/.config alldefconfig; fi | |
| TARGET_KERNEL_BINARIES: $(KERNEL_OUT) $(KERNEL_CONFIG) $(KERNEL_HEADERS_INSTALL) | |
| - $(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(TARGET_PREBUILT_INT_KERNEL_TYPE) | |
| - -$(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) dtbs | |
| - -$(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) modules | |
| - -$(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) INSTALL_MOD_PATH=../../$(KERNEL_MODULES_INSTALL) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) modules_install | |
| + $(MAKE) $(VERBOSE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(TARGET_PREBUILT_INT_KERNEL_TYPE) | |
| + -$(MAKE) $(VERBOSE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) dtbs | |
| + -$(MAKE) $(VERBOSE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) modules | |
| + -$(MAKE) $(VERBOSE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) INSTALL_MOD_PATH=../../$(KERNEL_MODULES_INSTALL) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) modules_install | |
| $(mv-modules) | |
| $(clean-module-folder) | |
| @@ -246,23 +256,23 @@ $(TARGET_PREBUILT_INT_KERNEL): $(TARGET_KERNEL_MODULES) | |
| $(KERNEL_HEADERS_INSTALL): $(KERNEL_OUT) $(KERNEL_CONFIG) | |
| $(hide) if [ ! -z "$(KERNEL_HEADER_DEFCONFIG)" ]; then \ | |
| rm -f ../$(KERNEL_CONFIG); \ | |
| - $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_HEADER_ARCH) $(KERNEL_CROSS_COMPILE) VARIANT_DEFCONFIG=$(VARIANT_DEFCONFIG) SELINUX_DEFCONFIG=$(SELINUX_DEFCONFIG) $(KERNEL_HEADER_DEFCONFIG); \ | |
| - $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_HEADER_ARCH) $(KERNEL_CROSS_COMPILE) headers_install; fi | |
| + $(MAKE) $(MAKE_FLAGS) $(VERBOSE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_HEADER_ARCH) $(KERNEL_CROSS_COMPILE) VARIANT_DEFCONFIG=$(VARIANT_DEFCONFIG) SELINUX_DEFCONFIG=$(SELINUX_DEFCONFIG) $(KERNEL_HEADER_DEFCONFIG); \ | |
| + $(MAKE) $(MAKE_FLAGS) $(VERBOSE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_HEADER_ARCH) $(KERNEL_CROSS_COMPILE) headers_install; fi | |
| $(hide) if [ "$(KERNEL_HEADER_DEFCONFIG)" != "$(KERNEL_DEFCONFIG)" ]; then \ | |
| echo "Used a different defconfig for header generation"; \ | |
| rm -f ../$(KERNEL_CONFIG); \ | |
| - $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) VARIANT_DEFCONFIG=$(VARIANT_DEFCONFIG) SELINUX_DEFCONFIG=$(SELINUX_DEFCONFIG) $(KERNEL_DEFCONFIG); fi | |
| + $(MAKE) $(MAKE_FLAGS) $(VERBOSE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) VARIANT_DEFCONFIG=$(VARIANT_DEFCONFIG) SELINUX_DEFCONFIG=$(SELINUX_DEFCONFIG) $(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 $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) oldconfig; fi | |
| + $(MAKE) $(MAKE_FLAGS) $(VERBOSE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) oldconfig; fi | |
| $(hide) if [ ! -z "$(KERNEL_ADDITIONAL_CONFIG)" ]; then \ | |
| echo "Using additional config '$(KERNEL_ADDITIONAL_CONFIG)'"; \ | |
| $(KERNEL_SRC)/scripts/kconfig/merge_config.sh -m -O $(KERNEL_OUT) $(KERNEL_OUT)/.config $(KERNEL_SRC)/arch/$(KERNEL_ARCH)/configs/$(KERNEL_ADDITIONAL_CONFIG); \ | |
| - $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) KCONFIG_ALLCONFIG=$(KERNEL_OUT)/.config alldefconfig; fi | |
| + $(MAKE) $(MAKE_FLAGS) $(VERBOSE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) KCONFIG_ALLCONFIG=$(KERNEL_OUT)/.config alldefconfig; fi | |
| kerneltags: $(KERNEL_OUT) $(KERNEL_CONFIG) | |
| - $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) tags | |
| + $(MAKE) $(MAKE_FLAGS) $(VERBOSE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) tags | |
| kernelconfig: $(KERNEL_OUT) | |
| $(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) VARIANT_DEFCONFIG=$(VARIANT_DEFCONFIG) SELINUX_DEFCONFIG=$(SELINUX_DEFCONFIG) $(KERNEL_DEFCONFIG) | |
| @@ -270,9 +280,9 @@ kernelconfig: $(KERNEL_OUT) | |
| echo "Overriding kernel config with '$(KERNEL_CONFIG_OVERRIDE)'"; \ | |
| echo $(KERNEL_CONFIG_OVERRIDE) >> $(KERNEL_OUT)/.config; fi | |
| env KCONFIG_NOTIMESTAMP=true \ | |
| - $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) menuconfig | |
| + $(MAKE) $(MAKE_FLAGS) $(VERBOSE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) menuconfig | |
| env KCONFIG_NOTIMESTAMP=true \ | |
| - $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) savedefconfig | |
| + $(MAKE) $(MAKE_FLAGS) $(VERBOSE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) savedefconfig | |
| cp $(KERNEL_OUT)/defconfig $(KERNEL_SRC)/arch/$(KERNEL_ARCH)/configs/$(KERNEL_DEFCONFIG) | |
| alldefconfig: $(KERNEL_OUT) | |
| -- | |
| 1.9.1 | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment