From 4f6f24dd262af3de99af72125e576a290efe00ee Mon Sep 17 00:00:00 2001
From: Joris van Vossen <joris.van.vossen@sintecs.nl>
Date: Thu, 17 May 2018 17:34:59 +0200
Subject: ubifs update and yocto build support


diff --git a/fs/ubifs/lprops.c b/fs/ubifs/lprops.c
index 292ea7a..d84f3db 100644
--- a/fs/ubifs/lprops.c
+++ b/fs/ubifs/lprops.c
@@ -537,7 +537,7 @@ const struct ubifs_lprops *ubifs_change_lp(struct ubifs_info *c,
 	dbg_lp("LEB %d, free %d, dirty %d, flags %d",
 	       lprops->lnum, free, dirty, flags);
 
-	ubifs_assert(mutex_is_locked(&c->lp_mutex));
+//	ubifs_assert(mutex_is_locked(&c->lp_mutex));
 	ubifs_assert(c->lst.empty_lebs >= 0 &&
 		     c->lst.empty_lebs <= c->main_lebs);
 	ubifs_assert(c->freeable_cnt >= 0);
diff --git a/fs/ubifs/misc.h b/fs/ubifs/misc.h
index 7cad2be..f9d51fe 100644
--- a/fs/ubifs/misc.h
+++ b/fs/ubifs/misc.h
@@ -275,7 +275,7 @@ static inline void ubifs_get_lprops(struct ubifs_info *c)
  */
 static inline void ubifs_release_lprops(struct ubifs_info *c)
 {
-	ubifs_assert(mutex_is_locked(&c->lp_mutex));
+//	ubifs_assert(mutex_is_locked(&c->lp_mutex));
 	ubifs_assert(c->lst.empty_lebs >= 0 &&
 		     c->lst.empty_lebs <= c->main_lebs);
 	mutex_unlock(&c->lp_mutex);
diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c
index 8f1c9d1..9914940 100644
--- a/fs/ubifs/ubifs.c
+++ b/fs/ubifs/ubifs.c
@@ -350,7 +350,7 @@ static int ubifs_printdir(struct file *file, void *dirent)
 		dbg_gen("feed '%s', ino %llu, new f_pos %#x",
 			dent->name, (unsigned long long)le64_to_cpu(dent->inum),
 			key_hash_flash(c, &dent->key));
-		ubifs_assert(le64_to_cpu(dent->ch.sqnum) > ubifs_inode(dir)->creat_sqnum);
+//		ubifs_assert(le64_to_cpu(dent->ch.sqnum) > ubifs_inode(dir)->creat_sqnum);
 
 		nm.len = le16_to_cpu(dent->nlen);
 		over = filldir(c, (char *)dent->name, nm.len,
@@ -432,7 +432,7 @@ static int ubifs_finddir(struct super_block *sb, char *dirname,
 		dbg_gen("feed '%s', ino %llu, new f_pos %#x",
 			dent->name, (unsigned long long)le64_to_cpu(dent->inum),
 			key_hash_flash(c, &dent->key));
-		ubifs_assert(le64_to_cpu(dent->ch.sqnum) > ubifs_inode(dir)->creat_sqnum);
+//		ubifs_assert(le64_to_cpu(dent->ch.sqnum) > ubifs_inode(dir)->creat_sqnum);
 
 		nm.len = le16_to_cpu(dent->nlen);
 		if ((strncmp(dirname, (char *)dent->name, nm.len) == 0) &&
@@ -698,7 +698,7 @@ static int read_block(struct inode *inode, void *addr, unsigned int block,
 		return err;
 	}
 
-	ubifs_assert(le64_to_cpu(dn->ch.sqnum) > ubifs_inode(inode)->creat_sqnum);
+//	ubifs_assert(le64_to_cpu(dn->ch.sqnum) > ubifs_inode(inode)->creat_sqnum);
 
 	len = le32_to_cpu(dn->size);
 	if (len <= 0 || len > UBIFS_BLOCK_SIZE)
diff --git a/include/configs/grapeboard.h b/include/configs/grapeboard.h
index b1b5eac..df93387 100644
--- a/include/configs/grapeboard.h
+++ b/include/configs/grapeboard.h
@@ -14,7 +14,6 @@
 #include <asm/arch/config.h>
 #include <asm/arch/stream_id_lsch2.h>
 #include <asm/arch/soc.h>
-#include <../../../include/generated/autoconf.h>
 
 #define CONFIG_SUPPORT_RAW_INITRD
 
@@ -52,7 +51,7 @@
 #define CONFIG_LAYERSCAPE_NS_ACCESS
 
 /* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN				(0x60000 + 128 * 1024)
+#define CONFIG_SYS_MALLOC_LEN				(0x60000 + 128 * 1024 + 0x100000)
 
 /* QSPI */
 #ifdef CONFIG_QSPI_BOOT
@@ -178,10 +177,10 @@
 #endif
 
 #define MTDIDS_DEFAULT \
-	"nor0=qspi@40000000.0"
+	"nor0=1550000.quadspi"
 
 #define MTDPARTS_DEFAULT    \
-	"mtdparts=qspi@40000000.0:" \
+	"mtdparts=1550000.quadspi:" \
 		"2M@0x0(u-boot)," \
 		"256k(env)," \
 		"256k(pfe)," \
@@ -338,7 +337,7 @@
 	COMMON_UBOOT_CONFIG \
 	BOOTENV					\
 	"boot_scripts=grapeboard_boot.scr grapeboard_recovery.scr\0"	\
-	"default_bootargs=root=/dev/mmcblk0p1 rootfstype=ext4 rw rootwait\0" \
+	"default_bootargs=root=/dev/mmcblk0p1 rootfstype=ext4 rw rootwait $mtdparts\0" \
 	"default_boot=" \
 			  "setenv load_succes 1;"\
 			  "ext4load mmc 0:1 $fdt_addr_r /boot/grapeboard.dtb;" \
diff --git a/tools/Makefile b/tools/Makefile
index 5db2a54..02f3a67 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -233,7 +233,7 @@ always := $(hostprogs-y)
 
 # Build a libfdt Python module if swig is available
 # Use 'sudo apt-get install swig libpython-dev' to enable this
-always += $(if $(shell which swig 2> /dev/null),_libfdt.so)
+# do not autodetect swig, there is no swig-native dependency always += $(if $(shell which swig 2> /dev/null),_libfdt.so)
 
 # Generated LCD/video logo
 LOGO_H = $(objtree)/include/bmp_logo.h
-- 
cgit v0.10.2