diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-13 15:51:40 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-13 15:51:40 +0100 |
| commit | c1e53e7fb3f2a605d8316606a6a793648458e862 (patch) | |
| tree | 5bc3cfb21455d70a092ba8d2865b5990ce05c278 /mk | |
| parent | 3af049612bff12f03d62fd02258acc2fb87124b8 (diff) | |
update to 3.10.33
- add support for system specific patches, cubox-i and raspberry-pi patches
are in conflict
- fix hifiberry driver support
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/kernel-build.mk | 2 | ||||
| -rw-r--r-- | mk/kernel-ver.mk | 6 | ||||
| -rw-r--r-- | mk/modules.mk | 15 |
3 files changed, 18 insertions, 5 deletions
diff --git a/mk/kernel-build.mk b/mk/kernel-build.mk index b2dc77d82..f95796950 100644 --- a/mk/kernel-build.mk +++ b/mk/kernel-build.mk @@ -24,6 +24,8 @@ $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNE $(TRACE) target/kernel-patch $(PATCH) $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION) \ ../linux/patches/$(KERNEL_VERSION) *.patch $(MAKE_TRACE) + $(PATCH) $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION) \ + ../$(ARCH)/$(ADK_TARGET_SYSTEM)/patches/$(KERNEL_VERSION) *.patch $(MAKE_TRACE) touch $@ $(LINUX_DIR)/.prepared: $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION)/.patched diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk index a61513d53..6355af1d8 100644 --- a/mk/kernel-ver.mk +++ b/mk/kernel-ver.mk @@ -22,11 +22,11 @@ KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 KERNEL_MD5SUM:= 59f352d3f4e2cdf6755f79e09fa09176 endif -ifeq ($(ADK_KERNEL_VERSION_3_10_30),y) -KERNEL_VERSION:= 3.10.30 +ifeq ($(ADK_KERNEL_VERSION_3_10_33),y) +KERNEL_VERSION:= 3.10.33 KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= f48ca7dd9f2eb14a2903cb6a4fbe07ed +KERNEL_MD5SUM:= 01865f9c129f3c7eee51e25b3781a364 endif ifeq ($(ADK_KERNEL_VERSION_3_4_82),y) KERNEL_VERSION:= 3.4.82 diff --git a/mk/modules.mk b/mk/modules.mk index d5ae0fc3f..5fd2f6419 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1154,6 +1154,17 @@ $(eval $(call KMOD_template,UDF_FS,udf-fs,\ # Multimedia # +$(eval $(call KMOD_template,REGMAP_MMIO,regmap-mmio,\ + $(MODULES_DIR)/kernel/drivers/base/regmap/regmap-mmio \ +,20)) + + +$(eval $(call KMOD_template,DMA_BCM2708,dma-bcm2708,\ + $(MODULES_DIR)/kernel/drivers/dma/virt-dma \ + $(MODULES_DIR)/kernel/drivers/dma/bcm2708-dmaengine \ +,25)) + + $(eval $(call KMOD_template,SOUND,sound,\ $(MODULES_DIR)/kernel/sound/soundcore \ ,30)) @@ -1225,11 +1236,11 @@ $(eval $(call KMOD_template,SND_BCM2708_SOC_I2S,snd-bcm2709-soc-i2s,\ $(eval $(call KMOD_template,SND_BCM2708_SOC_HIFIBERRY_DAC,snd-bcm2709-soc-hifiberry-dac,\ $(MODULES_DIR)/kernel/sound/soc/bcm/snd-soc-hifiberry-dac \ -,56, kmod-snd-bcm2709-soc-i2s)) +,56, kmod-snd-bcm2709-soc-i2s kmod-regmap-mmio)) $(eval $(call KMOD_template,SND_BCM2708_SOC_HIFIBERRY_DIGI,snd-bcm2709-soc-hifiberry-digi,\ $(MODULES_DIR)/kernel/sound/soc/bcm/snd-soc-hifiberry-digi \ -,56, kmod-snd-bcm2709-soc-i2s)) +,56, kmod-snd-bcm2709-soc-i2s kmod-regmap-mmio)) #ifeq ($(ADK_LINUX_64),y) #V4L_COMPAT:=drivers/media/video/v4l2-compat-ioctl32 |