From 6fb9c8394e33a38bd0e0092c9dbf9b286ed42472 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 12 Mar 2014 15:03:15 +0100 Subject: fix some modul depends --- mk/modules.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'mk') diff --git a/mk/modules.mk b/mk/modules.mk index 428fe2700..d5ae0fc3f 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1164,6 +1164,8 @@ $(eval $(call KMOD_template,SND,snd,\ $(MODULES_DIR)/kernel/sound/core/snd \ $(MODULES_DIR)/kernel/sound/core/snd-timer \ $(MODULES_DIR)/kernel/sound/core/snd-pcm \ + $(MODULES_DIR)/kernel/sound/core/snd-pcm-dmaengine \ + $(MODULES_DIR)/kernel/sound/core/snd-compress \ ,40)) $(eval $(call KMOD_template,SND_RAWMIDI,snd-rawmidi,\ -- cgit v1.2.3 From 30c861eecf9e1a6aa3c8b9a381f27dcd21a9afad Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 13 Mar 2014 15:24:59 +0100 Subject: create tarballs --- mk/build.mk | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'mk') diff --git a/mk/build.mk b/mk/build.mk index 5821e6c20..c4371f477 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -518,7 +518,6 @@ test-framework: libc="$(LIBC)"; \ fi; \ for libc in $$libc;do \ - mkdir -p $(TOPDIR)/firmware/$(SYSTEM)_$(ARCH)_$$libc; \ ( \ for arch in arm microblaze microblazeel mips mipsel mips64 mips64el ppc ppc64 sh4 sh4eb sparc sparc64 i686 x86_64;do \ tarch=$$(echo $$arch|sed -e "s#el##" -e "s#eb##" -e "s#mips64.*#mips#" -e "s#i686#x86#" -e "s#sh4#sh#"); \ @@ -526,9 +525,18 @@ test-framework: $(GMAKE) prereq && \ $(GMAKE) ARCH=$$tarch SYSTEM=qemu-$$arch LIBC=$$libc FS=archive COLLECTION=test defconfig; \ $(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; exit 1;fi; \ + tabi=$$(grep ^ADK_TARGET_ABI= .config|cut -d \" -f 2);\ + if [ -z $$tabi ];then abi="";else abi=_$$tabi;fi; \ + if [ -d root ];then rm -rf root;fi; \ + echo cp -a root_qemu_$${arch}_$${libc}$${abi} root; \ + cp -a root_qemu_$${arch}_$${libc}$${abi} root; \ + mkdir -p $(TOPDIR)/firmware/qemu/$$tarch; \ + tar cJvf $(TOPDIR)/firmware/qemu/$$tarch/root.tar.xz root; \ + cp $(TOPDIR)/firmware/qemu_$${arch}_$${libc}$${abi}/qemu-$${arch}-archive-kernel \ + $(TOPDIR)/firmware/qemu/$$tarch/kernel; \ rm .config; \ done; \ - ) 2>&1 | tee $(TOPDIR)/firmware/$(SYSTEM)_$(ARCH)_$$libc/build.log; \ + ) 2>&1 | tee $(TOPDIR)/firmware/test-framework-build.log; \ if [ -f .exit ];then echo "Bulk build failed!"; break;fi \ done if [ -f .exit ];then rm .exit;exit 1;fi -- cgit v1.2.3 From c1e53e7fb3f2a605d8316606a6a793648458e862 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 13 Mar 2014 15:51:40 +0100 Subject: update to 3.10.33 - add support for system specific patches, cubox-i and raspberry-pi patches are in conflict - fix hifiberry driver support --- mk/kernel-build.mk | 2 ++ mk/kernel-ver.mk | 6 +++--- mk/modules.mk | 15 +++++++++++++-- 3 files changed, 18 insertions(+), 5 deletions(-) (limited to 'mk') 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 -- cgit v1.2.3