summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
Diffstat (limited to 'mk')
-rw-r--r--mk/build.mk7
-rw-r--r--mk/kernel-build.mk16
-rw-r--r--mk/kernel-ver.mk4
-rw-r--r--mk/modules.mk7
-rw-r--r--mk/pkg-bottom.mk5
5 files changed, 18 insertions, 21 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-build.mk b/mk/kernel-build.mk
index 8fe0799a0..b2dc77d82 100644
--- a/mk/kernel-build.mk
+++ b/mk/kernel-build.mk
@@ -42,28 +42,30 @@ else
$(CP) $(BUILD_DIR)/.kernelconfig $(LINUX_DIR)/.config
echo N | ${KERNEL_MAKE_ENV} $(MAKE) ${KERNEL_MAKE_OPTS} oldconfig $(MAKE_TRACE)
endif
- ${KERNEL_MAKE_ENV} $(MAKE) ${KERNEL_MAKE_OPTS} prepare scripts $(MAKE_TRACE)
touch -c $(LINUX_DIR)/.config
$(LINUX_DIR)/$(KERNEL_FILE): $(LINUX_DIR)/.config
- -rm $(LINUX_DIR)/$(KERNEL_TARGET) 2>/dev/null
$(TRACE) target/$(ADK_TARGET_ARCH)-kernel-compile
- ${KERNEL_MAKE_ENV} $(MAKE) V=1 ${KERNEL_MAKE_OPTS} -j${ADK_MAKE_JOBS} LOCALVERSION="" $(KERNEL_TARGET) $(MAKE_TRACE)
+ ${KERNEL_MAKE_ENV} $(MAKE) ${KERNEL_MAKE_OPTS} -j${ADK_MAKE_JOBS} LOCALVERSION="" $(KERNEL_TARGET) modules $(MAKE_TRACE)
+ touch -c $(LINUX_DIR)/$(KERNEL_FILE)
+
+$(LINUX_BUILD_DIR)/modules: $(LINUX_DIR)/$(KERNEL_FILE)
$(TRACE) target/$(ADK_TARGET_ARCH)-kernel-modules-install
rm -rf $(LINUX_BUILD_DIR)/modules
${KERNEL_MAKE_ENV} $(MAKE) ${KERNEL_MAKE_OPTS} DEPMOD=true \
INSTALL_MOD_PATH=$(LINUX_BUILD_DIR)/modules \
LOCALVERSION="" \
- modules modules_install $(MAKE_TRACE)
+ modules_install $(MAKE_TRACE)
$(TRACE) target/$(ADK_TARGET_ARCH)-create-packages
ifneq ($(strip $(TARGETS)),)
$(MAKE) $(TARGETS)
endif
- touch -c $(LINUX_DIR)/$(KERNEL_FILE)
+
+$(INSTALL_TARGETS): $(LINUX_BUILD_DIR)/modules
prepare:
-compile: $(LINUX_DIR)/$(KERNEL_FILE)
-install: compile
+compile: $(LINUX_BUILD_DIR)/modules
+install: compile $(INSTALL_TARGETS)
ifneq ($(strip $(INSTALL_TARGETS)),)
$(TRACE) target/${ADK_TARGET_ARCH}-modules-install
ifeq ($(ADK_TARGET_PACKAGE_IPKG),y)
diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk
index 28f20dd24..a61513d53 100644
--- a/mk/kernel-ver.mk
+++ b/mk/kernel-ver.mk
@@ -1,8 +1,8 @@
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_6),y)
KERNEL_VERSION:= 3.13.6
diff --git a/mk/modules.mk b/mk/modules.mk
index 32c9fe05c..428fe2700 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -1218,7 +1218,6 @@ $(eval $(call KMOD_template,SND_BCM2835,snd-bcm2835,\
$(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))
@@ -1226,7 +1225,7 @@ $(eval $(call KMOD_template,SND_BCM2708_SOC_HIFIBERRY_DAC,snd-bcm2709-soc-hifibe
$(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,\
+$(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))
@@ -1418,8 +1417,8 @@ $(eval $(call KMOD_template,BT_RFCOMM,bt-rfcomm,\
# Misc devices
#
-$(eval $(call KMOD_template,SOFTDOG,softdog,\
- $(MODULES_DIR)/kernel/drivers/char/watchdog/softdog \
+$(eval $(call KMOD_template,SOFT_WATCHDOG,soft-watchdog,\
+ $(MODULES_DIR)/kernel/drivers/watchdog/softdog \
,95))
$(eval $(call KMOD_template,FW_LOADER,fw-loader,\
diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk
index 941970cbc..3e454ee5a 100644
--- a/mk/pkg-bottom.mk
+++ b/mk/pkg-bottom.mk
@@ -213,11 +213,6 @@ endif
touch $@
${_IPKGS_COOKIE}:
- @clean=0; \
- for f in ${ALL_IPKGS}; do \
- [[ -e $$f ]] && clean=1; \
- done; \
- [[ $$clean = 0 ]] || ${MAKE} clean
exec ${MAKE} package
package: ${ALL_IPKGS}