| Revision | b17a511faa8a42338ad5879371284be7c3364621 (tree) |
|---|---|
| Time | 2020-05-20 23:33:24 |
| Author | Chih-Wei Huang <cwhuang@linu...> |
| Commiter | Chih-Wei Huang |
Merge remote-tracking branch 'x86/nougat-x86' into cm-14.1-x86
core/tasks/kernel.mk (diff)| @@ -48,11 +48,8 @@ $(KERNEL_DOTCONFIG_FILE): $(KERNEL_CONFIG_FILE) $(wildcard $(TARGET_KERNEL_DIFFC | ||
| 48 | 48 | $(hide) ln -sf ../../../../../../external $(@D) |
| 49 | 49 | $(mk_kernel) olddefconfig |
| 50 | 50 | |
| 51 | -# bison is needed to build kernel and external modules from source | |
| 52 | -BISON := $(HOST_OUT_EXECUTABLES)/bison$(HOST_EXECUTABLE_SUFFIX) | |
| 53 | - | |
| 54 | 51 | BUILT_KERNEL_TARGET := $(KBUILD_OUTPUT)/arch/$(TARGET_ARCH)/boot/$(KERNEL_TARGET) |
| 55 | -$(BUILT_KERNEL_TARGET): $(KERNEL_DOTCONFIG_FILE) | $(BISON) | |
| 52 | +$(BUILT_KERNEL_TARGET): $(KERNEL_DOTCONFIG_FILE) | |
| 56 | 53 | $(mk_kernel) $(KERNEL_TARGET) $(if $(MOD_ENABLED),modules) |
| 57 | 54 | $(if $(FIRMWARE_ENABLED),$(mk_kernel) INSTALL_MOD_PATH=$(abspath $(TARGET_OUT)) firmware_install) |
| 58 | 55 |
| @@ -61,7 +58,7 @@ KERNEL_MODULES_DEP := $(firstword $(wildcard $(TARGET_OUT)/lib/modules/*/modules | ||
| 61 | 58 | KERNEL_MODULES_DEP := $(if $(KERNEL_MODULES_DEP),$(KERNEL_MODULES_DEP),$(TARGET_OUT)/lib/modules) |
| 62 | 59 | |
| 63 | 60 | ALL_EXTRA_MODULES := $(patsubst %,$(TARGET_OUT_INTERMEDIATES)/kmodule/%,$(TARGET_EXTRA_KERNEL_MODULES)) |
| 64 | -$(ALL_EXTRA_MODULES): $(TARGET_OUT_INTERMEDIATES)/kmodule/%: $(BUILT_KERNEL_TARGET) | |
| 61 | +$(ALL_EXTRA_MODULES): $(TARGET_OUT_INTERMEDIATES)/kmodule/%: $(BUILT_KERNEL_TARGET) | $(ACP) | |
| 65 | 62 | @echo Building additional kernel module $* |
| 66 | 63 | $(hide) mkdir -p $(@D) && $(ACP) -fr $(EXTRA_KERNEL_MODULE_PATH_$*) $(@D) |
| 67 | 64 | $(mk_kernel) M=$(abspath $@) modules || ( rm -rf $@ && exit 1 ) |
| @@ -78,14 +75,6 @@ endif | ||
| 78 | 75 | |
| 79 | 76 | $(BUILT_SYSTEMIMAGE): $(KERNEL_MODULES_DEP) |
| 80 | 77 | |
| 81 | -# rules to get source of Broadcom 802.11a/b/g/n hybrid device driver | |
| 82 | -# based on broadcomsetup.sh of Kyle Evans | |
| 83 | -WL_PATH := $(KERNEL_DIR)/drivers/net/wireless/broadcom/wl | |
| 84 | -ifeq ($(wildcard $(WL_PATH)/build.mk),) | |
| 85 | -WL_PATH := $(KERNEL_DIR)/drivers/net/wireless/wl | |
| 86 | -endif | |
| 87 | --include $(WL_PATH)/build.mk | |
| 88 | - | |
| 89 | 78 | installclean: FILES += $(KBUILD_OUTPUT) $(INSTALLED_KERNEL_TARGET) |
| 90 | 79 | |
| 91 | 80 | TARGET_PREBUILT_KERNEL := $(BUILT_KERNEL_TARGET) |
Android-x86
Fork