Merge branch 'master' of git+ssh://openadk.org/git/openadk

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)

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,\

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}

package/base-files/src/etc/fstab

@@ -1,7 +1,6 @@
 # /etc/fstab: static file system information.
 #
 # <file system> <mount pt>     <type>   <options>         <dump> <pass>
-#/dev/root       /              ext2     rw,noauto         0      1
 proc            /proc          proc     defaults          0      0
 devpts          /dev/pts       devpts   defaults,gid=5,mode=620   0      0
 tmpfs           /dev/shm       tmpfs    mode=0777         0      0

package/base-files/src/etc/group

@@ -1,4 +1,9 @@
 root:x:0:
-video:x:1:
-audio:x:2:
+daemon:x:1:
+bin:x:2:
+sys:x:3:
+adm:x:4:
+tty:x:5:
+video:x:6:
+audio:x:7:
 nogroup:x:65534:

package/base-files/src/etc/init.d/fs

@@ -0,0 +1,69 @@
+#!/bin/sh
+#INIT 60
+[[ $1 = autostart ]] || exit 0
+
+# activate swap
+[ -x /sbin/swapon ] && { swapon -a; }
+
+# activate any logical volumes
+[ -x /usr/sbin/lvm ] && { lvm vgscan; lvm vgchange -ay; }
+
+# filesystem checks
+[ -x /sbin/fsck.ext2 ] && {
+	for i in $(grep ext2 /etc/fstab|awk '{ print $1}');do fsck.ext2 $i;done;
+}
+[ -x /sbin/fsck.ext3 ] && {
+	for i in $(grep ext3 /etc/fstab|awk '{ print $1}');do fsck.ext3 $i;done;
+}
+[ -x /sbin/fsck.ext4 ] && {
+	for i in $(grep ext4 /etc/fstab|awk '{ print $1}');do fsck.ext4 $i;done;
+}
+[ -x /sbin/fsck.xfs ] && {
+	for i in $(grep xfs /etc/fstab|awk '{ print $1}');do xfs_repair $i;done;
+}
+# local filesystems
+grep ext2 /proc/filesystems  >/dev/null 2>&1
+if [ $? -eq 0 ];then
+	grep ext2 /etc/fstab  >/dev/null 2>&1
+	if [ $? -eq 0 ];then
+		mount -a -t ext2
+	fi
+fi
+grep ext3 /proc/filesystems  >/dev/null 2>&1
+if [ $? -eq 0 ];then
+	grep ext3 /etc/fstab  >/dev/null 2>&1
+	if [ $? -eq 0 ];then
+		mount -a -t ext3
+	fi
+fi
+grep ext4 /proc/filesystems  >/dev/null 2>&1
+if [ $? -eq 0 ];then
+	grep ext4 /etc/fstab  >/dev/null 2>&1
+	if [ $? -eq 0 ];then
+		mount -a -t ext4
+	fi
+fi
+grep xfs /proc/filesystems  >/dev/null 2>&1
+if [ $? -eq 0 ];then
+	grep xfs /etc/fstab  >/dev/null 2>&1
+	if [ $? -eq 0 ];then
+		mount -a -t xfs
+	fi
+fi
+
+# mount net filesystems (nfs/cifs)
+grep nfs /proc/filesystems  >/dev/null 2>&1
+if [ $? -eq 0 ];then
+	grep nfs /etc/fstab  >/dev/null 2>&1
+	if [ $? -eq 0 ];then
+		mount -a -t nfs
+	fi
+fi
+grep cifs /proc/filesystems  >/dev/null 2>&1
+if [ $? -eq 0 ];then
+	grep cifs /etc/fstab >/dev/null 2>&1
+	if [ $? -eq 0 ];then
+		mount -a -t cifs
+	fi
+fi
+exit 0

package/base-files/src/etc/inittab

@@ -1,7 +1,9 @@
 null::sysinit:/bin/mount -t proc proc /proc
+null::sysinit:/bin/mount -t sysfs sys /sys
 null::sysinit:/bin/mkdir -p /dev/pts
 null::sysinit:/bin/mkdir -p /dev/shm
-null::sysinit:/bin/mount -a
+null::sysinit:/bin/mount -a -t devpts
+null::sysinit:/bin/mount -a -t tmpfs
 ::sysinit:/etc/init.d/rcS
 ::shutdown:/etc/init.d/rcK
 null::shutdown:/bin/umount -a -r

package/musl/Makefile

@@ -55,13 +55,13 @@ endif
 
 # do nothing, musl is already build in toolchain directory
 do-install:
-	${INSTALL_DIR} $(IDIR_MUSL)/usr/bin
+	${INSTALL_DIR} $(IDIR_MUSL)/bin
 	${INSTALL_DIR} $(IDIR_MUSL)/$(ADK_TARGET_LIBC_PATH)
 	$(CP) $(STAGING_TARGET_DIR)/usr/lib/libc.so $(IDIR_MUSL)/$(ADK_TARGET_LIBC_PATH)
 	(cd $(IDIR_MUSL)/$(ADK_TARGET_LIBC_PATH) && \
 		ln -sf libc.so ld-musl-$(MARCH).so.1)
-	(cd $(IDIR_MUSL)/usr/bin && \
-		ln -sf ../../lib/ld-musl-$(MARCH).so.1 ldd)
+	(cd $(IDIR_MUSL)/bin && \
+		ln -sf ../lib/ld-musl-$(MARCH).so.1 ldd)
 	
 
 musl-dev-install:

target/linux/config/Config.in.watchdog

@@ -73,7 +73,7 @@ config ADK_KERNEL_RC32434_WDT
 	 Routerboard 532's SoC, the IDT RC32434.
 
 config ADK_KPACKAGE_KMOD_SOFT_WATCHDOG
-	prompt "kmod-softdog...................... Software watchdog"
+	prompt "kmod-soft-watchdog...................... Software watchdog"
 	tristate
 	default n
 	select ADK_KERNEL_WATCHDOG

toolchain/musl/patches/xxx-hotfix-sh.patch

@@ -1,80 +0,0 @@
-* thx to nsz from #musl
-diff -Nur musl-git/arch/sh/bits/user.h musl-sh/arch/sh/bits/user.h
---- musl-git/arch/sh/bits/user.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-sh/arch/sh/bits/user.h	2014-03-07 15:08:42.000000000 +0100
-@@ -0,0 +1,75 @@
-+#undef __WORDSIZE
-+#define __WORDSIZE 32
-+
-+#define REG_REG0	 0
-+#define REG_REG15	15
-+#define REG_PC		16
-+#define REG_PR		17
-+#define REG_SR		18
-+#define REG_GBR		19
-+#define REG_MACH	20
-+#define REG_MACL	21
-+#define REG_SYSCALL	22
-+#define REG_FPREG0	23
-+#define REG_FPREG15	38
-+#define REG_XFREG0	39
-+#define REG_XFREG15	54
-+#define REG_FPSCR	55
-+#define REG_FPUL	56
-+
-+struct pt_regs {
-+	unsigned long regs[16];
-+	unsigned long pc;
-+	unsigned long pr;
-+	unsigned long sr;
-+	unsigned long gbr;
-+	unsigned long mach;
-+	unsigned long macl;
-+	long tra;
-+};
-+
-+struct pt_dspregs {
-+	unsigned long a1;
-+	unsigned long a0g;
-+	unsigned long a1g;
-+	unsigned long m0;
-+	unsigned long m1;
-+	unsigned long a0;
-+	unsigned long x0;
-+	unsigned long x1;
-+	unsigned long y0;
-+	unsigned long y1;
-+	unsigned long dsr;
-+	unsigned long rs;
-+	unsigned long re;
-+	unsigned long mod;
-+};
-+
-+struct user_fpu_struct {
-+	unsigned long fp_regs[16];
-+	unsigned long xfp_regs[16];
-+	unsigned long fpscr;
-+	unsigned long fpul;
-+};
-+
-+#define ELF_NGREG 23
-+typedef unsigned long elf_greg_t;
-+typedef elf_greg_t elf_gregset_t[ELF_NGREG];
-+typedef struct user_fpu_struct elf_fpregset_t;
-+
-+struct user {
-+	struct pt_regs regs;
-+	struct user_fpu_struct fpu;
-+	int u_fpvalid;
-+	unsigned long u_tsize;
-+	unsigned long u_dsize;
-+	unsigned long u_ssize;
-+	unsigned long start_code;
-+	unsigned long start_data;
-+	unsigned long start_stack;
-+	long int signal;
-+	unsigned long u_ar0;
-+	struct user_fpu_struct *u_fpstate;
-+	unsigned long magic;
-+	char u_comm[32];
-+};