diff --git a/commands/ls.c b/commands/ls.c
index 1a5925d..09437af 100644
--- a/commands/ls.c
+++ b/commands/ls.c
@@ -32,7 +32,7 @@
 	unsigned int namelen = strlen(path);
 
 	mkmodestr(s->st_mode, modestr);
-	printf("%s %10llu %*.*s", modestr, s->st_size, namelen, namelen, path);
+	printf("%s %14llu %*.*s", modestr, s->st_size, namelen, namelen, path);
 
 	if (S_ISLNK(s->st_mode)) {
 		char realname[PATH_MAX];
diff --git a/commands/ubiformat.c b/commands/ubiformat.c
index f9d952c..8516e11 100644
--- a/commands/ubiformat.c
+++ b/commands/ubiformat.c
@@ -297,7 +297,7 @@
 static int flash_image(const struct mtd_dev_info *mtd,
 		       const struct ubigen_info *ui, struct ubi_scan_info *si)
 {
-	int fd, img_ebs, eb, written_ebs = 0, divisor, ret = -1;
+	int fd, img_ebs, eb, written_ebs = 0, ret = -1;
 	off_t st_size;
 	char *buf = NULL;
 
@@ -332,7 +332,6 @@
 	}
 
 	verbose(args.verbose, "will write %d eraseblocks", img_ebs);
-	divisor = img_ebs;
 	for (eb = 0; eb < mtd->eb_cnt; eb++) {
 		int err, new_len;
 		long long ec;
@@ -342,10 +341,8 @@
 			       eb, (eb + 1) * 100 / mtd->eb_cnt);
 		}
 
-		if (si->ec[eb] == EB_BAD) {
-			divisor += 1;
+		if (si->ec[eb] == EB_BAD)
 			continue;
-		}
 
 		if (args.verbose) {
 			normsg_cont("eraseblock %d: erase", eb);
diff --git a/common/blspec.c b/common/blspec.c
index ab18602..d5ddb4f 100644
--- a/common/blspec.c
+++ b/common/blspec.c
@@ -646,7 +646,7 @@
 	rootarg = path_get_linux_rootarg(entry->rootpath);
 	if (IS_ERR(rootarg)) {
 		pr_err("Getting root argument for %s failed with: %s\n",
-				entry->rootpath, strerror(-PTR_ERR(rootarg)));
+				entry->rootpath, strerrorp(rootarg));
 		return PTR_ERR(rootarg);
 	}
 
diff --git a/common/console_common.c b/common/console_common.c
index fcf89e8..a9bbce9 100644
--- a/common/console_common.c
+++ b/common/console_common.c
@@ -105,7 +105,7 @@
 int pr_print(int level, const char *fmt, ...)
 {
 	va_list args;
-	uint i;
+	int i;
 	char printbuffer[CFG_PBSIZE];
 
 	if (!IS_ENABLED(CONFIG_LOGBUF) && level > barebox_loglevel)
@@ -191,7 +191,7 @@
 int printf(const char *fmt, ...)
 {
 	va_list args;
-	uint i;
+	int i;
 	char printbuffer[CFG_PBSIZE];
 
 	va_start(args, fmt);
@@ -212,7 +212,7 @@
 
 int vprintf(const char *fmt, va_list args)
 {
-	uint i;
+	int i;
 	char printbuffer[CFG_PBSIZE];
 
 	/*
diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
index b357e5a..27f4abc 100644
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
@@ -541,6 +541,7 @@
 	{ "s25fl016k",  INFO(0xef4015,      0,  64 * 1024,  32, SECT_4K) },
 	{ "s25fl064k",  INFO(0xef4017,      0,  64 * 1024, 128, SECT_4K) },
 	{ "s25fl132k",  INFO(0x014016,      0,  64 * 1024,  64, 0) },
+	{ "s25fl204k",  INFO(0x014013,      0,  64 * 1024,   8, SECT_4K) },
 
 	/* SST -- large erase sizes are "overlays", "sectors" are 4K */
 	{ "sst25vf040b", INFO(0xbf258d, 0, 64 * 1024,  8, SECT_4K | SST_WRITE) },
diff --git a/drivers/usb/imx/imx-usb-phy.c b/drivers/usb/imx/imx-usb-phy.c
index a573c7f..837c1b5 100644
--- a/drivers/usb/imx/imx-usb-phy.c
+++ b/drivers/usb/imx/imx-usb-phy.c
@@ -78,7 +78,7 @@
 
 	imxphy->clk = clk_get(dev, NULL);
 	if (IS_ERR(imxphy->clk)) {
-		dev_err(dev, "could not get clk: %s\n", strerror(-PTR_ERR(imxphy->clk)));
+		dev_err(dev, "could not get clk: %s\n", strerrorp(imxphy->clk));
 		goto err_clk;
 	}
 
diff --git a/drivers/usb/storage/transport.c b/drivers/usb/storage/transport.c
index ac1fe79..4140991 100644
--- a/drivers/usb/storage/transport.c
+++ b/drivers/usb/storage/transport.c
@@ -54,7 +54,7 @@
  */
 
 /* Clear a stall on an endpoint - special for bulk-only devices */
-int usb_stor_Bulk_clear_endpt_stall(struct us_data *us, unsigned int pipe)
+static int usb_stor_Bulk_clear_endpt_stall(struct us_data *us, unsigned int pipe)
 {
 	return usb_clear_halt(us->pusb_dev, pipe);
 }
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 501e9fa..d31bdfe 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -13,6 +13,7 @@
 	prompt "framebuffer console support"
 
 config VIDEO_VPL
+	depends on OFTREE
 	bool
 
 config DRIVER_VIDEO_ATMEL
@@ -121,6 +122,7 @@
 	bool "MTL017 LVDS encoder"
 	select VIDEO_VPL
 	depends on I2C
+	depends on OFTREE
 	help
 	  The MTL017 is a parallel to lvds video encoder chip found on the
 	  Efika MX Smartbook.
@@ -128,6 +130,7 @@
 config DRIVER_VIDEO_SIMPLE_PANEL
 	bool "Simple panel support"
 	select VIDEO_VPL
+	depends on OFTREE
 	help
 	  This enabled support for simple panels, i.e. panels which consist of
 	  a mode definition and enable gpios in the devicetree. Unlike the
diff --git a/drivers/video/imx-ipu-v3/Kconfig b/drivers/video/imx-ipu-v3/Kconfig
index 386ff5b..b5ee4ef 100644
--- a/drivers/video/imx-ipu-v3/Kconfig
+++ b/drivers/video/imx-ipu-v3/Kconfig
@@ -13,6 +13,7 @@
 
 config DRIVER_VIDEO_IMX_IPUV3_HDMI
 	bool "IPUv3 HDMI support"
+	depends on DRIVER_VIDEO_EDID
 	select OFDEVICE
 
 endif
diff --git a/drivers/video/imx-ipu-v3/imx-hdmi.c b/drivers/video/imx-ipu-v3/imx-hdmi.c
index fa55b19..25fcb0c 100644
--- a/drivers/video/imx-ipu-v3/imx-hdmi.c
+++ b/drivers/video/imx-ipu-v3/imx-hdmi.c
@@ -132,7 +132,6 @@
 
 	bool phy_enabled;
 
-	struct regmap *regmap;
 	struct device_node *ddc_node;;
 	void __iomem *regs;
 
diff --git a/drivers/video/imx-ipu-v3/imx-ldb.c b/drivers/video/imx-ipu-v3/imx-ldb.c
index 1e9231f..a41eb1a 100644
--- a/drivers/video/imx-ipu-v3/imx-ldb.c
+++ b/drivers/video/imx-ipu-v3/imx-ldb.c
@@ -163,7 +163,7 @@
 	diclk = clk_lookup(clkname);
 	free(clkname);
 	if (IS_ERR(diclk)) {
-		dev_err(ldb->dev, "failed to get di clk: %s\n", strerror(PTR_ERR(diclk)));
+		dev_err(ldb->dev, "failed to get di clk: %s\n", strerrorp(diclk));
 		return PTR_ERR(diclk);
 	}
 
@@ -171,7 +171,7 @@
 	ldbclk = clk_lookup(clkname);
 	free(clkname);
 	if (IS_ERR(ldbclk)) {
-		dev_err(ldb->dev, "failed to get ldb clk: %s\n", strerror(PTR_ERR(ldbclk)));
+		dev_err(ldb->dev, "failed to get ldb clk: %s\n", strerrorp(ldbclk));
 		return PTR_ERR(ldbclk);
 	}
 
@@ -203,7 +203,7 @@
 	diclk = clk_lookup(clkname);
 	free(clkname);
 	if (IS_ERR(diclk)) {
-		dev_err(ldb->dev, "failed to get di clk: %s\n", strerror(PTR_ERR(diclk)));
+		dev_err(ldb->dev, "failed to get di clk: %s\n", strerrorp(diclk));
 		return PTR_ERR(diclk);
 	}
 
@@ -211,7 +211,7 @@
 	ldbclk = clk_lookup(clkname);
 	free(clkname);
 	if (IS_ERR(ldbclk)) {
-		dev_err(ldb->dev, "failed to get ldb clk: %s\n", strerror(PTR_ERR(ldbclk)));
+		dev_err(ldb->dev, "failed to get ldb clk: %s\n", strerrorp(ldbclk));
 		return PTR_ERR(ldbclk);
 	}
 
diff --git a/fs/ramfs.c b/fs/ramfs.c
index 716f40f..a97f0a6 100644
--- a/fs/ramfs.c
+++ b/fs/ramfs.c
@@ -495,7 +495,7 @@
 			data->next = ramfs_get_chunk();
 			if (!data->next)
 				return -ENOMEM;
-		data = data->next;
+			data = data->next;
 		}
 	}
 	node->size = size;
diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c
index a9189f7..4368203 100644
--- a/fs/ubifs/ubifs.c
+++ b/fs/ubifs/ubifs.c
@@ -622,7 +622,7 @@
 	priv->ubi = ubi_open_volume_cdev(priv->cdev, UBI_READONLY);
 	if (IS_ERR(priv->ubi)) {
 		dev_err(dev, "failed to open ubi volume: %s\n",
-				strerror(-PTR_ERR(priv->ubi)));
+				strerrorp(priv->ubi));
 		ret = PTR_ERR(priv->ubi);
 		goto err_free;
 	}
diff --git a/include/clock.h b/include/clock.h
index 691befc..681e3ad 100644
--- a/include/clock.h
+++ b/include/clock.h
@@ -34,9 +34,8 @@
 int is_timeout(uint64_t start_ns, uint64_t time_offset_ns);
 int is_timeout_non_interruptible(uint64_t start_ns, uint64_t time_offset_ns);
 
-// void udelay(unsigned long usecs);
-
 void ndelay(unsigned long nsecs);
+void udelay(unsigned long usecs);
 void mdelay(unsigned long msecs);
 
 #define SECOND ((uint64_t)(1000 * 1000 * 1000))
diff --git a/include/common.h b/include/common.h
index 553a7f4..03ceec2 100644
--- a/include/common.h
+++ b/include/common.h
@@ -23,6 +23,7 @@
 #include <stdio.h>
 #include <module.h>
 #include <config.h>
+#include <clock.h>
 #include <linux/bitops.h>
 #include <linux/types.h>
 #include <linux/string.h>
@@ -69,10 +70,6 @@
 /* $(CPU)/cpu.c */
 void __noreturn poweroff(void);
 
-/* lib_$(ARCH)/time.c */
-void	udelay (unsigned long);
-void	mdelay (unsigned long);
-
 /* lib_generic/crc32.c */
 uint32_t crc32(uint32_t, const void*, unsigned int);
 uint32_t crc32_no_comp(uint32_t, const void*, unsigned int);
diff --git a/include/errno.h b/include/errno.h
index 025816e..496ccab 100644
--- a/include/errno.h
+++ b/include/errno.h
@@ -2,6 +2,7 @@
 #define __ERRNO_H
 
 #include <asm-generic/errno.h>
+#include <linux/err.h>
 
 extern int errno;
 
@@ -9,4 +10,9 @@
 const char *errno_str(void);
 const char *strerror(int errnum);
 
+static inline const char *strerrorp(const void *errp)
+{
+	return strerror(-PTR_ERR(errp));
+}
+
 #endif /* __ERRNO_H */
diff --git a/lib/logo/Kconfig b/lib/logo/Kconfig
index 5b40d75..0718053 100644
--- a/lib/logo/Kconfig
+++ b/lib/logo/Kconfig
@@ -5,6 +5,8 @@
 	  dependencies. The logo can be found under /logo/barebox-logo-<width>.png
 	  in the running barebox.
 
+if BAREBOX_LOGO
+
 config BAREBOX_LOGO_64
 	bool "include 64x32 pixel logo"
 
@@ -19,3 +21,5 @@
 
 config BAREBOX_LOGO_640
 	bool "include 640x320 pixel logo"
+
+endif # BAREBOX_LOGO