diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-07 16:10:25 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-07 17:59:52 +0200 |
| commit | 660828b97932653e8f29779fa9ea23155c442ea2 (patch) | |
| tree | 0564ffaff2ea099ed693c70022678047cea12213 /mk | |
| parent | d231c4227ec215853fe51efbe55297c1a0a6062e (diff) | |
update to 3.14.3, convert some drivers to modules
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/kernel-ver.mk | 6 | ||||
| -rw-r--r-- | mk/modules.mk | 32 |
2 files changed, 32 insertions, 6 deletions
diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk index 0f6ae1151..46ef60cc2 100644 --- a/mk/kernel-ver.mk +++ b/mk/kernel-ver.mk @@ -4,11 +4,11 @@ KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 KERNEL_MD5SUM:= d4e06af8b674ac74ba745d52e4382bd3 endif -ifeq ($(ADK_KERNEL_VERSION_3_14_1),y) -KERNEL_VERSION:= 3.14.1 +ifeq ($(ADK_KERNEL_VERSION_3_14_3),y) +KERNEL_VERSION:= 3.14.3 KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= f53082540eed294f486a43fc67646ed2 +KERNEL_MD5SUM:= 99043433ad7368d2471b4743c9f562a2 endif ifeq ($(ADK_KERNEL_VERSION_3_13_11),y) KERNEL_VERSION:= 3.13.11 diff --git a/mk/modules.mk b/mk/modules.mk index 3dfffa548..017b39ecc 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -812,6 +812,17 @@ $(eval $(call KMOD_template,MD_RAID456,md-raid456,\ ,35)) # +# Regmap +# +$(eval $(call KMOD_template,REGMAP_I2C,regmap-i2c,\ + $(MODULES_DIR)/kernel/drivers/base/regmap/regmap-i2c \ +,30)) + +$(eval $(call KMOD_template,REGMAP_SPI,regmap-spi,\ + $(MODULES_DIR)/kernel/drivers/base/regmap/regmap-spi \ +,30)) + +# # Device Mapper # @@ -1420,6 +1431,7 @@ $(eval $(call KMOD_template,SND_USB_AUDIO,snd-usb-audio,\ # $(eval $(call KMOD_template,BT,bt,\ + $(MODULES_DIR)/kernel/net/ieee802154/6lowpan_iphc \ $(MODULES_DIR)/kernel/net/bluetooth/bluetooth \ ,70)) @@ -1791,14 +1803,28 @@ $(eval $(call KMOD_template,OPROFILE,oprofile,\ ,10)) # +# SPI +# +$(eval $(call KMOD_template,SPI_BITBANG,spi-bitbang,\ + $(MODULES_DIR)/kernel/drivers/spi/spi-bitbang \ +,20)) + +$(eval $(call KMOD_template,SPI_IMX,spi-imx,\ + $(MODULES_DIR)/kernel/drivers/spi/spi-imx \ +,25)) + +# # I2C # -$(eval $(call KMOD_template,I2C,i2c,\ - $(MODULES_DIR)/kernel/drivers/i2c/i2c-core \ +$(eval $(call KMOD_template,I2C_DEV,i2c-dev,\ $(MODULES_DIR)/kernel/drivers/i2c/i2c-dev \ ,20)) -$(eval $(call KMOD_template,SCx200_ACB,scx200-acb,\ +$(eval $(call KMOD_template,I2C_IMX,i2c-imx,\ + $(MODULES_DIR)/kernel/drivers/i2c/busses/i2c-imx \ +,25)) + +$(eval $(call KMOD_template,SCX200_ACB,scx200-acb,\ $(MODULES_DIR)/kernel/drivers/i2c/busses/scx200_acb \ ,25)) |