diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-13 13:44:08 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-13 13:44:08 +0200 |
| commit | 05d715df3ac052fb41a5ab42369d05a3e2a82de3 (patch) | |
| tree | e99502f671b83f6898a77b78f88fdc67be8aa251 /mk | |
| parent | e251f8299bf34e329613e68116d47e124192bc84 (diff) | |
resolve merge conflict
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/kernel.mk | 7 | ||||
| -rw-r--r-- | mk/modules.mk | 7 |
2 files changed, 5 insertions, 9 deletions
diff --git a/mk/kernel.mk b/mk/kernel.mk index 68e0e76ab..a624ad947 100644 --- a/mk/kernel.mk +++ b/mk/kernel.mk @@ -17,7 +17,7 @@ TARGETS:= # Adds a target for creating a package containing # the specified (kernel-provided) modules. # Parameters: -# 1: the config symbol name (without leading 'ADK_[K,]PACKAGE_KMOD_') +# 1: the config symbol name (without leading 'ADK_KERNEL_') # this _must_ be equal to the kernel config symbol name # 2: the name for the package, should be unique # 3: actual modules to add; absolute path inside $(MODULES_DIR) @@ -34,10 +34,7 @@ PKG_$(1) := $(PACKAGE_DIR)/kmod-$(2)_$(KERNEL_VERSION)-$(KERNEL_RELEASE)_$(CPU_A I_$(1) := $(KMOD_BUILD_DIR)/ipkg/$(2) ifeq ($${ADK_TARGET_KERNEL_CUSTOMISING},y) -ifeq ($$(ADK_KPACKAGE_KMOD_$(1)),m) -TARGETS+=$$(PKG_$(1)) -endif -ifeq ($$(ADK_KPACKAGE_KMOD_$(1)),y) +ifeq ($$(ADK_KERNEL_$(1)),m) TARGETS+=$$(PKG_$(1)) INSTALL_TARGETS+=$$(PKG_$(1)) endif diff --git a/mk/modules.mk b/mk/modules.mk index 67118a951..c0791abfa 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1749,10 +1749,6 @@ $(eval $(call KMOD_template,CRC32,crc32, \ $(MODULES_DIR)/kernel/lib/crc32 \ ,01)) -#$(eval $(call KMOD_template,LIBCRC32C,libcrc32c, \ -# $(MODULES_DIR)/kernel/lib/libcrc32c \ -#,10)) - # # parallel port support # @@ -1788,6 +1784,7 @@ $(eval $(call KMOD_template,OPROFILE,oprofile,\ # # SPI # + $(eval $(call KMOD_template,SPI_BITBANG,spi-bitbang,\ $(MODULES_DIR)/kernel/drivers/spi/spi-bitbang \ ,20)) @@ -1799,6 +1796,7 @@ $(eval $(call KMOD_template,SPI_IMX,spi-imx,\ # # I2C # + $(eval $(call KMOD_template,I2C_DEV,i2c-dev,\ $(MODULES_DIR)/kernel/drivers/i2c/i2c-dev \ ,20)) @@ -1814,6 +1812,7 @@ $(eval $(call KMOD_template,SCX200_ACB,scx200-acb,\ # # VirtIO # + $(eval $(call KMOD_template,VIRTIO_BLK,virtio-block,\ $(MODULES_DIR)/kernel/drivers/net/virtio_blk \ ,20)) |