[PATCH 1/9] fs: squashfs: don't reference UBI symbols if UBI isn't compiled in

[PATCH 1/9] fs: squashfs: don't reference UBI symbols if UBI isn't compiled in

[Lucas Stach]

There is no point in trying to append a UBI root option, if there is
no UBI support in barebox.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 fs/squashfs/squashfs.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/fs/squashfs/squashfs.c b/fs/squashfs/squashfs.c
index c4d0bac97443..4f4a307dafdd 100644
--- a/fs/squashfs/squashfs.c
+++ b/fs/squashfs/squashfs.c
@@ -120,6 +120,9 @@ void squashfs_set_rootarg(struct squashfs_priv *priv, struct fs_device_d *fsdev)
 	struct mtd_info *mtd;
 	char *str;
 
+	if (!IS_ENABLED(CONFIG_MTD_UBI))
+		return;
+
 	ubi_vol = ubi_open_volume_cdev(fsdev->cdev, UBI_READONLY);
 
 	if (IS_ERR(ubi_vol))
-- 
2.11.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 2/9] arm64: disable PBL support

[Lucas Stach]

PBL is another feature, which needs some love to work on ARM64.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 arch/arm/Kconfig     | 1 -
 arch/arm/cpu/Kconfig | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 39f5f0165e01..3e8ccf7661c4 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -3,7 +3,6 @@ config ARM
 	select HAS_KALLSYMS
 	select HAS_CACHE
 	select HAVE_CONFIGURABLE_TEXT_BASE
-	select HAVE_PBL_IMAGE
 	select HAVE_IMAGE_COMPRESSION
 	default y
 
diff --git a/arch/arm/cpu/Kconfig b/arch/arm/cpu/Kconfig
index e45e05bdb19d..d889e9afb1bb 100644
--- a/arch/arm/cpu/Kconfig
+++ b/arch/arm/cpu/Kconfig
@@ -7,6 +7,7 @@ config CPU_32
 	bool
 	select HAS_MODULES
 	select HAS_DMA
+	select HAVE_PBL_IMAGE
 
 config CPU_64
 	bool
-- 
2.11.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 3/9] net: e1000: don't try to register eeprom if MTD support is missing

[Lucas Stach]

EEPROM support is an optional feature and the driver should work
just fine without it.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 drivers/net/e1000/main.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/net/e1000/main.c b/drivers/net/e1000/main.c
index 6f9dddaf232a..00d18adff111 100644
--- a/drivers/net/e1000/main.c
+++ b/drivers/net/e1000/main.c
@@ -3588,10 +3588,13 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 		return -EINVAL;
 	}
 
-	ret = e1000_register_eeprom(hw);
-	if (ret < 0) {
-		dev_err(&pdev->dev, "failed to register EEPROM devices!\n");
-		return ret;
+	if (IS_ENABLED(CONFIG_MTD)) {
+		ret = e1000_register_eeprom(hw);
+		if (ret < 0) {
+			dev_err(&pdev->dev,
+			        "failed to register EEPROM devices!\n");
+			return ret;
+		}
 	}
 
 	if (e1000_validate_eeprom_checksum(hw))
-- 
2.11.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 4/9] globalvar: select FNMATCH

[Lucas Stach]

This is needed since support for wildcards has been introduced.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 common/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/Kconfig b/common/Kconfig
index 91c2cc4372ed..74e973999a3a 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -161,6 +161,7 @@ config ENVIRONMENT_VARIABLES
 config GLOBALVAR
 	bool "global environment variables support"
 	default y if !SHELL_NONE
+	select FNMATCH
 	help
 	  Global environment variables begin with "global.". Unlike normal
 	  shell variables they have the same values in all contexts. Global
-- 
2.11.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 5/9] nvvar: add static inline dummy for nvvar_save

[Lucas Stach]

Just as the other NVVAR functions, when support for NVVAR isn't
compiled in.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 include/globalvar.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/include/globalvar.h b/include/globalvar.h
index ecd9f1d1860b..80bc53e6803b 100644
--- a/include/globalvar.h
+++ b/include/globalvar.h
@@ -116,6 +116,11 @@ static inline int nvvar_remove(const char *name)
 	return 0;
 }
 
+static inline int nvvar_save(void)
+{
+	return 0;
+}
+
 static inline void dev_param_init_from_nv(struct device_d *dev, const char *name)
 {
 }
-- 
2.11.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 6/9] devparam: add static inline dummy for dev_add_param_bitmask

[Lucas Stach]

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 include/param.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/include/param.h b/include/param.h
index 0f7d2446a265..f5f82ee70c42 100644
--- a/include/param.h
+++ b/include/param.h
@@ -132,6 +132,14 @@ static inline struct param_d *dev_add_param_enum(struct device_d *dev, const cha
 	return ERR_PTR(-ENOSYS);
 }
 
+static inline struct param_d *dev_add_param_bitmask(struct device_d *dev, const char *name,
+                int (*set)(struct param_d *p, void *priv),
+                int (*get)(struct param_d *p, void *priv),
+                unsigned long *value, const char * const *names, int max, void *priv)
+{
+	return ERR_PTR(-ENOSYS);
+}
+
 static inline struct param_d *dev_add_param_bool(struct device_d *dev, const char *name,
 		int (*set)(struct param_d *p, void *priv),
 		int (*get)(struct param_d *p, void *priv),
-- 
2.11.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 7/9] arm: pbl: rename linker script for uncompressed image data

[Lucas Stach]

This has been missed in commit 5e61dd3fb550
(Add comp_copy function for use with CONFIG_IMAGE_COMPRESSION_NONE).

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 arch/arm/pbl/piggy.comp_copy.S | 6 ++++++
 arch/arm/pbl/piggy.shipped.S   | 6 ------
 2 files changed, 6 insertions(+), 6 deletions(-)
 create mode 100644 arch/arm/pbl/piggy.comp_copy.S
 delete mode 100644 arch/arm/pbl/piggy.shipped.S

diff --git a/arch/arm/pbl/piggy.comp_copy.S b/arch/arm/pbl/piggy.comp_copy.S
new file mode 100644
index 000000000000..2b5a812ded9c
--- /dev/null
+++ b/arch/arm/pbl/piggy.comp_copy.S
@@ -0,0 +1,6 @@
+	.section .piggydata,#alloc
+	.globl	input_data
+input_data:
+	.incbin	"arch/arm/pbl/piggy.comp_copy"
+	.globl	input_data_end
+input_data_end:
diff --git a/arch/arm/pbl/piggy.shipped.S b/arch/arm/pbl/piggy.shipped.S
deleted file mode 100644
index dbc2569de5c5..000000000000
--- a/arch/arm/pbl/piggy.shipped.S
+++ /dev/null
@@ -1,6 +0,0 @@
-	.section .piggydata,#alloc
-	.globl  input_data
-input_data:
-	.incbin "arch/arm/pbl/piggy.shipped"
-	.globl  input_data_end
-input_data_end:
-- 
2.11.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 8/9] lib: add generic find_bit implementation from Linux and use in ARMv8

[Lucas Stach]

ARMv8 doesn't have an optimized version of the find_bit operations,
pull in the generic ones from the Linux kernel.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 arch/arm/include/asm/bitops.h |   6 +-
 lib/Makefile                  |   1 +
 lib/find_bit.c                | 185 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 191 insertions(+), 1 deletion(-)
 create mode 100644 lib/find_bit.c

diff --git a/arch/arm/include/asm/bitops.h b/arch/arm/include/asm/bitops.h
index b51225efe5b8..abf7d0cb0922 100644
--- a/arch/arm/include/asm/bitops.h
+++ b/arch/arm/include/asm/bitops.h
@@ -82,6 +82,7 @@ static inline int test_bit(int nr, const void * addr)
 #define test_and_clear_bit(x, y)	__test_and_clear_bit(x, y)
 #define test_and_change_bit(x, y)	__test_and_change_bit(x, y)
 
+#if defined(__LINUX_ARM_ARCH__) && (__LINUX_ARM_ARCH__ < 8)
 #ifndef __ARMEB__
 /*
  * These are the little endian definitions.
@@ -114,6 +115,7 @@ extern int _find_next_bit_be(const unsigned long *p, int size, int offset);
 #define WORD_BITOFF_TO_LE(x)		((x) ^ 0x18)
 
 #endif		/* __ARMEB__ */
+#endif		/* < ARMv8 */
 
 #if defined(__LINUX_ARM_ARCH__) && (__LINUX_ARM_ARCH__ >= 5)
 static inline int constant_fls(int x)
@@ -178,8 +180,10 @@ static inline unsigned long ffz(unsigned long word)
 #include <asm-generic/bitops/fls.h>
 #endif		/* __ARM__USE_GENERIC_FF */
 
-#if __LINUX_ARM_ARCH__ == 8
 #include <asm-generic/bitops/__fls.h>
+
+#if __LINUX_ARM_ARCH__ == 8
+#include <asm-generic/bitops/find.h>
 #endif
 
 #include <asm-generic/bitops/fls64.h>
diff --git a/lib/Makefile b/lib/Makefile
index 1be1742499b8..9078d8e93af1 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -59,3 +59,4 @@ obj-y			+= reed_solomon/
 obj-$(CONFIG_RATP)	+= ratp.o
 obj-y			+= list_sort.o
 obj-y			+= int_sqrt.o
+obj-y			+= find_bit.o
diff --git a/lib/find_bit.c b/lib/find_bit.c
new file mode 100644
index 000000000000..87929ef93f5a
--- /dev/null
+++ b/lib/find_bit.c
@@ -0,0 +1,185 @@
+/* bit search implementation
+ *
+ * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * Copyright (C) 2008 IBM Corporation
+ * 'find_last_bit' is written by Rusty Russell <rusty@rustcorp.com.au>
+ * (Inspired by David Howell's find_next_bit implementation)
+ *
+ * Rewritten by Yury Norov <yury.norov@gmail.com> to decrease
+ * size and improve performance, 2015.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#include <linux/bitops.h>
+#include <linux/bitmap.h>
+#include <linux/kernel.h>
+
+#if !defined(find_next_bit) || !defined(find_next_zero_bit)
+
+/*
+ * This is a common helper function for find_next_bit and
+ * find_next_zero_bit.  The difference is the "invert" argument, which
+ * is XORed with each fetched word before searching it for one bits.
+ */
+static unsigned long _find_next_bit(const unsigned long *addr,
+		unsigned long nbits, unsigned long start, unsigned long invert)
+{
+	unsigned long tmp;
+
+	if (!nbits || start >= nbits)
+		return nbits;
+
+	tmp = addr[start / BITS_PER_LONG] ^ invert;
+
+	/* Handle 1st word. */
+	tmp &= BITMAP_FIRST_WORD_MASK(start);
+	start = round_down(start, BITS_PER_LONG);
+
+	while (!tmp) {
+		start += BITS_PER_LONG;
+		if (start >= nbits)
+			return nbits;
+
+		tmp = addr[start / BITS_PER_LONG] ^ invert;
+	}
+
+	return min(start + __ffs(tmp), nbits);
+}
+#endif
+
+#ifndef find_next_bit
+/*
+ * Find the next set bit in a memory region.
+ */
+unsigned long find_next_bit(const unsigned long *addr, unsigned long size,
+			    unsigned long offset)
+{
+	return _find_next_bit(addr, size, offset, 0UL);
+}
+#endif
+
+#ifndef find_next_zero_bit
+unsigned long find_next_zero_bit(const unsigned long *addr, unsigned long size,
+				 unsigned long offset)
+{
+	return _find_next_bit(addr, size, offset, ~0UL);
+}
+#endif
+
+#ifndef find_first_bit
+/*
+ * Find the first set bit in a memory region.
+ */
+unsigned long find_first_bit(const unsigned long *addr, unsigned long size)
+{
+	unsigned long idx;
+
+	for (idx = 0; idx * BITS_PER_LONG < size; idx++) {
+		if (addr[idx])
+			return min(idx * BITS_PER_LONG + __ffs(addr[idx]), size);
+	}
+
+	return size;
+}
+#endif
+
+#ifndef find_first_zero_bit
+/*
+ * Find the first cleared bit in a memory region.
+ */
+unsigned long find_first_zero_bit(const unsigned long *addr, unsigned long size)
+{
+	unsigned long idx;
+
+	for (idx = 0; idx * BITS_PER_LONG < size; idx++) {
+		if (addr[idx] != ~0UL)
+			return min(idx * BITS_PER_LONG + ffz(addr[idx]), size);
+	}
+
+	return size;
+}
+#endif
+
+#ifndef find_last_bit
+unsigned long find_last_bit(const unsigned long *addr, unsigned long size)
+{
+	if (size) {
+		unsigned long val = BITMAP_LAST_WORD_MASK(size);
+		unsigned long idx = (size-1) / BITS_PER_LONG;
+
+		do {
+			val &= addr[idx];
+			if (val)
+				return idx * BITS_PER_LONG + __fls(val);
+
+			val = ~0ul;
+		} while (idx--);
+	}
+	return size;
+}
+#endif
+
+#ifdef __BIG_ENDIAN
+
+/* include/linux/byteorder does not support "unsigned long" type */
+static inline unsigned long ext2_swab(const unsigned long y)
+{
+#if BITS_PER_LONG == 64
+	return (unsigned long) __swab64((u64) y);
+#elif BITS_PER_LONG == 32
+	return (unsigned long) __swab32((u32) y);
+#else
+#error BITS_PER_LONG not defined
+#endif
+}
+
+#if !defined(find_next_bit_le) || !defined(find_next_zero_bit_le)
+static unsigned long _find_next_bit_le(const unsigned long *addr,
+		unsigned long nbits, unsigned long start, unsigned long invert)
+{
+	unsigned long tmp;
+
+	if (!nbits || start >= nbits)
+		return nbits;
+
+	tmp = addr[start / BITS_PER_LONG] ^ invert;
+
+	/* Handle 1st word. */
+	tmp &= ext2_swab(BITMAP_FIRST_WORD_MASK(start));
+	start = round_down(start, BITS_PER_LONG);
+
+	while (!tmp) {
+		start += BITS_PER_LONG;
+		if (start >= nbits)
+			return nbits;
+
+		tmp = addr[start / BITS_PER_LONG] ^ invert;
+	}
+
+	return min(start + __ffs(ext2_swab(tmp)), nbits);
+}
+#endif
+
+#ifndef find_next_zero_bit_le
+unsigned long find_next_zero_bit_le(const void *addr, unsigned
+		long size, unsigned long offset)
+{
+	return _find_next_bit_le(addr, size, offset, ~0UL);
+}
+#endif
+
+#ifndef find_next_bit_le
+unsigned long find_next_bit_le(const void *addr, unsigned
+		long size, unsigned long offset)
+{
+	return _find_next_bit_le(addr, size, offset, 0UL);
+}
+#endif
+
+#endif /* __BIG_ENDIAN */
-- 
2.11.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 9/9] arm: ARM64 doesn't provide the armlinux_* functions

[Lucas Stach]

Those set parameters specific to the older ARM Linux implementation.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 arch/arm/include/asm/armlinux.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/include/asm/armlinux.h b/arch/arm/include/asm/armlinux.h
index 07479fb15c4f..b9ab4f9bf2ce 100644
--- a/arch/arm/include/asm/armlinux.h
+++ b/arch/arm/include/asm/armlinux.h
@@ -4,7 +4,7 @@
 #include <asm/memory.h>
 #include <asm/setup.h>
 
-#if defined CONFIG_ARM_LINUX
+#if defined CONFIG_ARM_LINUX && defined CONFIG_CPU_32
 void armlinux_set_bootparams(void *params);
 void armlinux_set_architecture(int architecture);
 void armlinux_set_revision(unsigned int);
-- 
2.11.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 1/9] fs: squashfs: don't reference UBI symbols if UBI isn't compiled in

[Sascha Hauer]

On Tue, Dec 20, 2016 at 10:33:32AM +0100, Lucas Stach wrote:
> There is no point in trying to append a UBI root option, if there is
> no UBI support in barebox.
> 
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> ---

Applied, thanks

Sascha

>  fs/squashfs/squashfs.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/fs/squashfs/squashfs.c b/fs/squashfs/squashfs.c
> index c4d0bac97443..4f4a307dafdd 100644
> --- a/fs/squashfs/squashfs.c
> +++ b/fs/squashfs/squashfs.c
> @@ -120,6 +120,9 @@ void squashfs_set_rootarg(struct squashfs_priv *priv, struct fs_device_d *fsdev)
>  	struct mtd_info *mtd;
>  	char *str;
>  
> +	if (!IS_ENABLED(CONFIG_MTD_UBI))
> +		return;
> +
>  	ubi_vol = ubi_open_volume_cdev(fsdev->cdev, UBI_READONLY);
>  
>  	if (IS_ERR(ubi_vol))
> -- 
> 2.11.0
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 8/9] lib: add generic find_bit implementation from Linux and use in ARMv8

[Sascha Hauer]

On Tue, Dec 20, 2016 at 10:33:39AM +0100, Lucas Stach wrote:
> ARMv8 doesn't have an optimized version of the find_bit operations,
> pull in the generic ones from the Linux kernel.
> 
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> ---
>  arch/arm/include/asm/bitops.h |   6 +-
>  lib/Makefile                  |   1 +
>  lib/find_bit.c                | 185 ++++++++++++++++++++++++++++++++++++++++++
>  3 files changed, 191 insertions(+), 1 deletion(-)
>  create mode 100644 lib/find_bit.c

I dropped the rest of this series beginning with this patch. It breaks
ppc with:

lib/find_bit.o: In function `find_last_bit':
/home/sha/dude/barebox/barebox-test/lib/find_bit.c:62: multiple
definition of `find_next_bit'
lib/find_next_bit.o:/home/sha/dude/barebox/barebox-test/lib/find_next_bit.c:28:
first defined here
lib/find_bit.o: In function `find_next_zero_bit':
/home/sha/dude/barebox/barebox-test/lib/find_bit.c:70: multiple
definition of `find_next_zero_bit'
lib/find_next_bit.o:/home/sha/dude/barebox/barebox-test/lib/find_next_bit.c:72:
first defined here
scripts/Makefile.build:321: recipe for target 'lib/built-in.o' failed
make[1]: *** [lib/built-in.o] Error 1
Makefile:775: recipe for target 'lib' failed
make: *** [lib] Error 2

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox