diff options
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 7 | ||||
| -rw-r--r-- | mk/kernel-ver.mk | 10 | ||||
| -rw-r--r-- | mk/modules.mk | 21 |
3 files changed, 28 insertions, 10 deletions
diff --git a/mk/build.mk b/mk/build.mk index f4e2ae6e4..8638e8747 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -486,17 +486,18 @@ endif # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y) bulktoolchain: for libc in glibc uclibc musl;do \ while read arch; do \ - mkdir -p $(TOPDIR)/firmware/toolchain_$${arch}_$$libc; \ + mkdir -p ${TOPDIR}/firmware; \ ( \ echo === building $$arch $$libc toolchain-$$arch on $$(date); \ tarch=$$(echo $$arch|sed -e "s#el##" -e "s#eb##" -e "s#mips64.*#mips#"); \ + if [ -f ${TOPDIR}/firmware/toolchain_$${arch}_$${libc}.tar.xz ];then exit;fi; \ $(GMAKE) prereq && \ $(GMAKE) ARCH=$$tarch SYSTEM=toolchain-$$arch LIBC=$$libc defconfig; \ $(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit;fi; \ - tar -cvJf ${TOPDIR}/firmware/toolchain_$${arch}_$${libc}.tar.xz host_* target_$${arch}_$${libc}_*; \ + tar -cvJf ${TOPDIR}/firmware/toolchain_$${arch}_$${libc}.tar.xz host_* target_$${arch}_$${libc}*; \ $(GMAKE) cleantoolchain; \ rm .config; \ - ) 2>&1 | tee $(TOPDIR)/firmware/toolchain_$${arch}_$${libc}/build.log; \ + ) 2>&1 | tee $(TOPDIR)/firmware/toolchain_$${arch}_$${libc}_build.log; \ if [ -f .exit ];then break;fi \ done <${TOPDIR}/target/tarch.lst ;\ if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; exit 1;fi \ diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk index ef9fee277..a61513d53 100644 --- a/mk/kernel-ver.mk +++ b/mk/kernel-ver.mk @@ -1,14 +1,14 @@ ifeq ($(ADK_KERNEL_VERSION_TOOLCHAIN),y) -KERNEL_VERSION:= 3.12.13 +KERNEL_VERSION:= 3.13.6 KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 345f5883cfb906dac4aef87e303d3a2d +KERNEL_MD5SUM:= 445aa27da818617409982f42902a6e41 endif -ifeq ($(ADK_KERNEL_VERSION_3_13_5),y) -KERNEL_VERSION:= 3.13.5 +ifeq ($(ADK_KERNEL_VERSION_3_13_6),y) +KERNEL_VERSION:= 3.13.6 KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= b9fa20262a7ecbbc3277aa2ee10412da +KERNEL_MD5SUM:= 445aa27da818617409982f42902a6e41 endif ifeq ($(ADK_KERNEL_VERSION_3_12_13),y) KERNEL_VERSION:= 3.12.13 diff --git a/mk/modules.mk b/mk/modules.mk index 00667de3e..32c9fe05c 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1198,8 +1198,11 @@ $(eval $(call KMOD_template,SND_CS5535AUDIO,snd-cs5535audio,\ $(MODULES_DIR)/kernel/sound/pci/cs5535audio/snd-cs5535audio \ ,55)) -$(eval $(call KMOD_template,SND_PXA2XX_SOC_SPITZ,snd-pxa2xx-soc-spitz,\ +$(eval $(call KMOD_template,SND_SOC,snd-soc,\ $(MODULES_DIR)/kernel/sound/soc/snd-soc-core \ +,54)) + +$(eval $(call KMOD_template,SND_PXA2XX_SOC_SPITZ,snd-pxa2xx-soc-spitz,\ $(MODULES_DIR)/kernel/sound/arm/snd-pxa2xx-lib \ $(MODULES_DIR)/kernel/sound/arm/snd-pxa2xx-pcm \ $(MODULES_DIR)/kernel/sound/arm/snd-pxa2xx-ac97 \ @@ -1207,12 +1210,26 @@ $(eval $(call KMOD_template,SND_PXA2XX_SOC_SPITZ,snd-pxa2xx-soc-spitz,\ $(MODULES_DIR)/kernel/sound/soc/pxa/snd-soc-pxa2xx-i2s \ $(MODULES_DIR)/kernel/sound/soc/pxa/snd-soc-pxa2xx \ $(MODULES_DIR)/kernel/sound/soc/pxa/snd-soc-spitz \ -,55)) +,55, kmod-snd-soc)) $(eval $(call KMOD_template,SND_BCM2835,snd-bcm2835,\ $(MODULES_DIR)/kernel/sound/arm/snd-bcm2835 \ ,55)) +$(eval $(call KMOD_template,SND_BCM2708_SOC_I2S,snd-bcm2709-soc-i2s,\ + $(MODULES_DIR)/kernel/sound/soc/codecs/snd-soc-pcm5102a \ + $(MODULES_DIR)/kernel/sound/soc/codecs/snd-soc-wm8804 \ + $(MODULES_DIR)/kernel/sound/soc/bcm/snd-soc-bcm2708-i2s \ +,55, kmod-snd-soc)) + +$(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)) + +$(eval $(call KMOD_template,SND_BCM2708_SOC_HIFIBERRY_DAC,snd-bcm2709-soc-hifiberry-dac,\ + $(MODULES_DIR)/kernel/sound/soc/bcm/snd-soc-hifiberry-digi \ +,56, kmod-snd-bcm2709-soc-i2s)) + #ifeq ($(ADK_LINUX_64),y) #V4L_COMPAT:=drivers/media/video/v4l2-compat-ioctl32 #endif |