OSDN Git Service

kernel.mk: remove obsolete rules android-x86-7.1-r4
authorChih-Wei Huang <cwhuang@linux.org.tw>
Thu, 14 May 2020 05:36:32 +0000 (13:36 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Thu, 14 May 2020 05:36:32 +0000 (13:36 +0800)
core/tasks/kernel.mk

index 89377f1..423ef08 100644 (file)
@@ -48,11 +48,8 @@ $(KERNEL_DOTCONFIG_FILE): $(KERNEL_CONFIG_FILE) $(wildcard $(TARGET_KERNEL_DIFFC
        $(hide) ln -sf ../../../../../../external $(@D)
        $(mk_kernel) olddefconfig
 
-# bison is needed to build kernel and external modules from source
-BISON := $(HOST_OUT_EXECUTABLES)/bison$(HOST_EXECUTABLE_SUFFIX)
-
 BUILT_KERNEL_TARGET := $(KBUILD_OUTPUT)/arch/$(TARGET_ARCH)/boot/$(KERNEL_TARGET)
-$(BUILT_KERNEL_TARGET): $(KERNEL_DOTCONFIG_FILE) | $(BISON)
+$(BUILT_KERNEL_TARGET): $(KERNEL_DOTCONFIG_FILE)
        $(mk_kernel) $(KERNEL_TARGET) $(if $(MOD_ENABLED),modules)
        $(if $(FIRMWARE_ENABLED),$(mk_kernel) INSTALL_MOD_PATH=$(abspath $(TARGET_OUT)) firmware_install)
 
@@ -61,7 +58,7 @@ KERNEL_MODULES_DEP := $(firstword $(wildcard $(TARGET_OUT)/lib/modules/*/modules
 KERNEL_MODULES_DEP := $(if $(KERNEL_MODULES_DEP),$(KERNEL_MODULES_DEP),$(TARGET_OUT)/lib/modules)
 
 ALL_EXTRA_MODULES := $(patsubst %,$(TARGET_OUT_INTERMEDIATES)/kmodule/%,$(TARGET_EXTRA_KERNEL_MODULES))
-$(ALL_EXTRA_MODULES): $(TARGET_OUT_INTERMEDIATES)/kmodule/%: $(BUILT_KERNEL_TARGET)
+$(ALL_EXTRA_MODULES): $(TARGET_OUT_INTERMEDIATES)/kmodule/%: $(BUILT_KERNEL_TARGET) | $(ACP)
        @echo Building additional kernel module $*
        $(hide) mkdir -p $(@D) && $(ACP) -fr $(EXTRA_KERNEL_MODULE_PATH_$*) $(@D)
        $(mk_kernel) M=$(abspath $@) modules || ( rm -rf $@ && exit 1 )
@@ -78,14 +75,6 @@ endif
 
 $(BUILT_SYSTEMIMAGE): $(KERNEL_MODULES_DEP)
 
-# rules to get source of Broadcom 802.11a/b/g/n hybrid device driver
-# based on broadcomsetup.sh of Kyle Evans
-WL_PATH := $(KERNEL_DIR)/drivers/net/wireless/broadcom/wl
-ifeq ($(wildcard $(WL_PATH)/build.mk),)
-WL_PATH := $(KERNEL_DIR)/drivers/net/wireless/wl
-endif
--include $(WL_PATH)/build.mk
-
 installclean: FILES += $(KBUILD_OUTPUT) $(INSTALLED_KERNEL_TARGET)
 
 TARGET_PREBUILT_KERNEL := $(BUILT_KERNEL_TARGET)