[PATCH 00/20] First batch of randconfig fixes

[PATCH 00/20] First batch of randconfig fixes

[Lucas Stach]

This series is the first batch of fixes for errors found by doing
some randconfig builds. Seems we have a good way to go, currently
*all* randconfig builds produced at least one error.

Sascha, are you ok with applying such patches to master? That's the
branch Sisyphus is currently using for doing those tests. If you would
rather like those patches to go into -next please tell me, so I can
adapt Sisyphus to build that in order to keep a resonably short loop
between tests and fixes.

Lucas Stach (20):
  firmware: socfpga: depend on ARCH_SOCFPGA
  firmware: altera-serial: depend on SPI
  firmware: altera-serial: don't try to check void return value
  firmware: altera-serial: fix printf message
  common: firmware: include libfile
  arm: imx: select MFD_MC13XXX for all boards that need it
  arm: imx: select I2C for all boards that need it in their board init
  arm: imx: pca100: select USB ULPI support
  arm: imx: nand update handler depends on MTD layer
  arm: imx: properly stub out NAND bbu handler
  arm: phyflex-imx6: move common.h before other includes
  video: ipuv3: select OFDEVICE for HDMI and LVDS
  mci: esdhc: add back PIO_TIMEOUT
  arm: don't allow to select BUILTIN_DTB when building multiimage
  arm: fill BUILTIN_DTB_NAME for boards that still use this option
  net: ethoc: depend on OPENRISC
  blspec: depend on, not select flexible bootargs
  common: menu needs PROCESS_ESCAPE_SEQUENCE
  usb: gadget: fastboot: select BANNER
  lib: decompress_xz: fix function header to match prototype

 arch/arm/Kconfig                            |  6 ++++++
 arch/arm/boards/phytec-phyflex-imx6/board.c |  2 +-
 arch/arm/mach-imx/Kconfig                   | 24 ++++++++++++++++++++++++
 arch/arm/mach-imx/include/mach/bbu.h        | 12 +++++++-----
 common/Kconfig                              |  3 ++-
 common/firmware.c                           |  1 +
 drivers/firmware/Kconfig                    |  2 ++
 drivers/firmware/altera_serial.c            |  6 ++----
 drivers/mci/imx-esdhc.h                     |  2 ++
 drivers/net/Kconfig                         |  1 +
 drivers/usb/gadget/Kconfig                  |  1 +
 drivers/video/imx-ipu-v3/Kconfig            |  2 ++
 include/linux/xz.h                          |  8 ++++----
 lib/decompress_unxz.c                       |  8 ++++----
 14 files changed, 59 insertions(+), 19 deletions(-)

-- 
2.1.1


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

[PATCH 01/20] firmware: socfpga: depend on ARCH_SOCFPGA

[Lucas Stach]

This driver uses a lot of arch specific functionality and
fails to build on anything but SOCFPGA.

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

diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
index 58660632519e..a907eaf85457 100644
--- a/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
@@ -10,5 +10,6 @@ config FIRMWARE_ALTERA_SERIAL
 
 config FIRMWARE_ALTERA_SOCFPGA
 	bool "Altera SoCFPGA fpga loader"
+	depends on ARCH_SOCFPGA
 
 endmenu
-- 
2.1.1


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

[PATCH 02/20] firmware: altera-serial: depend on SPI

[Lucas Stach]

This driver uses SPI bus functions.

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

diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
index a907eaf85457..ac96bc0280f6 100644
--- a/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
@@ -3,6 +3,7 @@ menu "Firmware Drivers"
 config FIRMWARE_ALTERA_SERIAL
 	bool "Altera SPI programming"
 	depends on OFDEVICE
+	depends on SPI
 	select FIRMWARE
 	help
 	  Programming an Altera FPGA via a few GPIOs for the control lines and
-- 
2.1.1


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

[PATCH 03/20] firmware: altera-serial: don't try to check void return value

[Lucas Stach]

Fixes:
.../altera_serial.c:84:6: error: void value not ignored as it ought to be

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 drivers/firmware/altera_serial.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/firmware/altera_serial.c b/drivers/firmware/altera_serial.c
index 23ba3b00a478..232f1a682619 100644
--- a/drivers/firmware/altera_serial.c
+++ b/drivers/firmware/altera_serial.c
@@ -81,9 +81,7 @@ static int altera_spi_open(struct firmware_handler *fh)
 	}
 
 	/* arm the FPGA to await its new firmware */
-	ret = gpio_set_value(this->nconfig_gpio, 1);
-	if (ret)
-		return ret;
+	gpio_set_value(this->nconfig_gpio, 1);
 
 	/* once again, we might need padding the data */
 	this->padding_done = false;
-- 
2.1.1


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

[PATCH 04/20] firmware: altera-serial: fix printf message

[Lucas Stach]

Fixes:
.../altera_serial.c:118:2: warning: too many arguments for format

Also sz is of type size_t, so use proper format specifier.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 drivers/firmware/altera_serial.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/firmware/altera_serial.c b/drivers/firmware/altera_serial.c
index 232f1a682619..c5ffbb6393bb 100644
--- a/drivers/firmware/altera_serial.c
+++ b/drivers/firmware/altera_serial.c
@@ -113,7 +113,7 @@ static int altera_spi_write(struct firmware_handler *fh, const void *buf, size_t
 	u32 dummy;
 	int ret;
 
-	dev_dbg(dev, "Start writing %d bytes.\n", __func__, sz);
+	dev_dbg(dev, "Start writing %zu bytes.\n", sz);
 
 	spi_message_init(&m);
 
-- 
2.1.1


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

[PATCH 05/20] common: firmware: include libfile

[Lucas Stach]

Fixes
common/firmware.c:206:2: error: implicit declaration of function 'copy_file'
in a number of configuration where this file isn't pulled in through
other headers.

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

diff --git a/common/firmware.c b/common/firmware.c
index 2a62a81c7845..a6f75bf88747 100644
--- a/common/firmware.c
+++ b/common/firmware.c
@@ -17,6 +17,7 @@
 #include <xfuncs.h>
 #include <fcntl.h>
 #include <libbb.h>
+#include <libfile.h>
 #include <fs.h>
 #include <linux/list.h>
 #include <linux/stat.h>
-- 
2.1.1


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

[PATCH 06/20] arm: imx: select MFD_MC13XXX for all boards that need it

[Lucas Stach]

This was only done for some of the boards and while it is ok to build
those boards without regulator support it may potentially yield non-working
barebox binaries. This is clearly not what the user wanted.

Also select the appropriate bus support needed for the MC13xxx.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 arch/arm/mach-imx/Kconfig | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 46d0f3d11af0..6dcec3bd450e 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -196,6 +196,9 @@ config MACH_PCA100
 config MACH_PCM038
 	bool "phyCORE-i.MX27"
 	select ARCH_IMX27
+	select SPI
+	select DRIVER_SPI_IMX
+	select MFD_MC13XXX
 	select HAVE_DEFAULT_ENVIRONMENT_NEW
 	select ARCH_IMX_EXTERNAL_BOOT_NAND
 	help
@@ -205,6 +208,9 @@ config MACH_PCM038
 config MACH_EFIKA_MX_SMARTBOOK
 	bool "Efika MX smartbook"
 	select ARCH_IMX51
+	select SPI
+	select DRIVER_SPI_IMX
+	select MFD_MC13XXX
 	help
 	  Choose this to compile barebox for the Efika MX Smartbook
 
@@ -217,10 +223,16 @@ config MACH_EMBEDSKY_E9
 config MACH_FREESCALE_MX51_PDK
 	bool "Freescale i.MX51 PDK"
 	select ARCH_IMX51
+	select SPI
+	select DRIVER_SPI_IMX
+	select MFD_MC13XXX
 
 config MACH_FREESCALE_MX53_LOCO
 	bool "Freescale i.MX53 LOCO"
 	select ARCH_IMX53
+	select I2C
+	select I2C_IMX
+	select MFD_MC13XXX
 
 config MACH_TQMA53
 	bool "TQ i.MX53 TQMa53"
-- 
2.1.1


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

[PATCH 07/20] arm: imx: select I2C for all boards that need it in their board init

[Lucas Stach]

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 arch/arm/mach-imx/Kconfig | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 6dcec3bd450e..cdc1dba34fec 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -276,6 +276,8 @@ config MACH_TQMA6X
 config MACH_TX6X
 	bool "Karo TX6x"
 	select ARCH_IMX6
+	select I2C
+	select I2C_IMX
 
 config MACH_SABRELITE
 	bool "Freescale i.MX6 Sabre Lite"
@@ -306,10 +308,14 @@ config MACH_UDOO
 config MACH_VARISCITE_MX6
 	bool "Variscite i.MX6 Quad SOM"
 	select ARCH_IMX6
+	select I2C
+	select I2C_IMX
 
 config MACH_GW_VENTANA
 	bool "Gateworks Ventana SBC"
 	select ARCH_IMX6
+	select I2C
+	select I2C_IMX
 
 endif
 
-- 
2.1.1


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

[PATCH 08/20] arm: imx: pca100: select USB ULPI support

[Lucas Stach]

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 arch/arm/mach-imx/Kconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index cdc1dba34fec..39637bee8b6d 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -189,6 +189,8 @@ config MACH_PCA100
 	select ARCH_IMX27
 	select HAVE_DEFAULT_ENVIRONMENT_NEW
 	select ARCH_IMX_EXTERNAL_BOOT_NAND
+	select USB_HOST
+	select USB_ULPI
 	help
 	  Say Y here if you are using Phytec's phyCard-i.MX27 (pca100) equipped
 	  with a Freescale i.MX27 Processor
-- 
2.1.1


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

Re: [PATCH 08/20] arm: imx: pca100: select USB ULPI support

[Sascha Hauer]

On Mon, Nov 24, 2014 at 12:06:48PM +0100, Lucas Stach wrote:
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> ---
>  arch/arm/mach-imx/Kconfig | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
> index cdc1dba34fec..39637bee8b6d 100644
> --- a/arch/arm/mach-imx/Kconfig
> +++ b/arch/arm/mach-imx/Kconfig
> @@ -189,6 +189,8 @@ config MACH_PCA100
>  	select ARCH_IMX27
>  	select HAVE_DEFAULT_ENVIRONMENT_NEW
>  	select ARCH_IMX_EXTERNAL_BOOT_NAND
> +	select USB_HOST
> +	select USB_ULPI

You probably did this because the boardcode initializes the ULPI phys. I
think it would be better to only initialize the phys when USB_ULPI is
enabled so that we can build the phycard without USB support.

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

[PATCH 09/20] arm: imx: nand update handler depends on MTD layer

[Lucas Stach]

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 arch/arm/mach-imx/Kconfig | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 39637bee8b6d..632fc203c661 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -109,12 +109,16 @@ config BAREBOX_UPDATE_IMX_EXTERNAL_NAND
 	bool
 	depends on ARCH_IMX_EXTERNAL_BOOT_NAND
 	depends on BAREBOX_UPDATE
+	depends on MTD
+	depends on MTD_WRITE
 	default y
 
 config BAREBOX_UPDATE_IMX6_NAND
 	bool
 	depends on ARCH_IMX6
 	depends on BAREBOX_UPDATE
+	depends on MTD
+	depends on MTD_WRITE
 	default y
 
 comment "Freescale i.MX System-on-Chip"
-- 
2.1.1


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

[PATCH 10/20] arm: imx: properly stub out NAND bbu handler

[Lucas Stach]

The nand handler is only built in if config
BAREBOX_UPDATE_IMX6_NAND is selected.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 arch/arm/mach-imx/include/mach/bbu.h | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/arch/arm/mach-imx/include/mach/bbu.h b/arch/arm/mach-imx/include/mach/bbu.h
index 74c334a075a7..5eb9a47363af 100644
--- a/arch/arm/mach-imx/include/mach/bbu.h
+++ b/arch/arm/mach-imx/include/mach/bbu.h
@@ -27,8 +27,6 @@ int imx6_bbu_internal_mmc_register_handler(const char *name, char *devicefile,
 int imx6_bbu_internal_spi_i2c_register_handler(const char *name, char *devicefile,
 		unsigned long flags);
 
-int imx6_bbu_nand_register_handler(const char *name, unsigned long flags);
-
 int imx_bbu_external_nor_register_handler(const char *name, char *devicefile,
 		unsigned long flags);
 
@@ -70,13 +68,17 @@ static inline int imx6_bbu_internal_spi_i2c_register_handler(const char *name, c
 	return -ENOSYS;
 }
 
-static inline int imx6_bbu_nand_register_handler(const char *name, unsigned long flags)
+static inline int imx_bbu_external_nor_register_handler(const char *name, char *devicefile,
+		unsigned long flags)
 {
 	return -ENOSYS;
 }
+#endif
 
-static inline int imx_bbu_external_nor_register_handler(const char *name, char *devicefile,
-		unsigned long flags)
+#if defined(CONFIG_BAREBOX_UPDATE_IMX6_NAND)
+int imx6_bbu_nand_register_handler(const char *name, unsigned long flags);
+#else
+static inline int imx6_bbu_nand_register_handler(const char *name, unsigned long flags)
 {
 	return -ENOSYS;
 }
-- 
2.1.1


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

Re: [PATCH 10/20] arm: imx: properly stub out NAND bbu handler

[Sascha Hauer]

On Mon, Nov 24, 2014 at 12:06:50PM +0100, Lucas Stach wrote:
> The nand handler is only built in if config
> BAREBOX_UPDATE_IMX6_NAND is selected.
> 
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>

We already have this fix in next from Andrey Smirnov. Will skip this.

Sascha

> ---
>  arch/arm/mach-imx/include/mach/bbu.h | 12 +++++++-----
>  1 file changed, 7 insertions(+), 5 deletions(-)
> 
> diff --git a/arch/arm/mach-imx/include/mach/bbu.h b/arch/arm/mach-imx/include/mach/bbu.h
> index 74c334a075a7..5eb9a47363af 100644
> --- a/arch/arm/mach-imx/include/mach/bbu.h
> +++ b/arch/arm/mach-imx/include/mach/bbu.h
> @@ -27,8 +27,6 @@ int imx6_bbu_internal_mmc_register_handler(const char *name, char *devicefile,
>  int imx6_bbu_internal_spi_i2c_register_handler(const char *name, char *devicefile,
>  		unsigned long flags);
>  
> -int imx6_bbu_nand_register_handler(const char *name, unsigned long flags);
> -
>  int imx_bbu_external_nor_register_handler(const char *name, char *devicefile,
>  		unsigned long flags);
>  
> @@ -70,13 +68,17 @@ static inline int imx6_bbu_internal_spi_i2c_register_handler(const char *name, c
>  	return -ENOSYS;
>  }
>  
> -static inline int imx6_bbu_nand_register_handler(const char *name, unsigned long flags)
> +static inline int imx_bbu_external_nor_register_handler(const char *name, char *devicefile,
> +		unsigned long flags)
>  {
>  	return -ENOSYS;
>  }
> +#endif
>  
> -static inline int imx_bbu_external_nor_register_handler(const char *name, char *devicefile,
> -		unsigned long flags)
> +#if defined(CONFIG_BAREBOX_UPDATE_IMX6_NAND)
> +int imx6_bbu_nand_register_handler(const char *name, unsigned long flags);
> +#else
> +static inline int imx6_bbu_nand_register_handler(const char *name, unsigned long flags)
>  {
>  	return -ENOSYS;
>  }
> -- 
> 2.1.1
> 
> 
> _______________________________________________
> 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

[PATCH 11/20] arm: phyflex-imx6: move common.h before other includes

[Lucas Stach]

Fixes: include/envfs.h:124:10: error: 'ENOSYS' undeclared

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 arch/arm/boards/phytec-phyflex-imx6/board.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boards/phytec-phyflex-imx6/board.c b/arch/arm/boards/phytec-phyflex-imx6/board.c
index 09a5c79a9ade..1d6602c0ef26 100644
--- a/arch/arm/boards/phytec-phyflex-imx6/board.c
+++ b/arch/arm/boards/phytec-phyflex-imx6/board.c
@@ -17,10 +17,10 @@
  *
  */
 
+#include <common.h>
 #include <envfs.h>
 #include <environment.h>
 #include <bootsource.h>
-#include <common.h>
 #include <gpio.h>
 #include <init.h>
 #include <of.h>
-- 
2.1.1


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

Re: [PATCH 11/20] arm: phyflex-imx6: move common.h before other includes

[Sascha Hauer]

On Mon, Nov 24, 2014 at 12:06:51PM +0100, Lucas Stach wrote:
> Fixes: include/envfs.h:124:10: error: 'ENOSYS' undeclared
> 
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> ---
>  arch/arm/boards/phytec-phyflex-imx6/board.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/boards/phytec-phyflex-imx6/board.c b/arch/arm/boards/phytec-phyflex-imx6/board.c
> index 09a5c79a9ade..1d6602c0ef26 100644
> --- a/arch/arm/boards/phytec-phyflex-imx6/board.c
> +++ b/arch/arm/boards/phytec-phyflex-imx6/board.c
> @@ -17,10 +17,10 @@
>   *
>   */
>  
> +#include <common.h>
>  #include <envfs.h>
>  #include <environment.h>
>  #include <bootsource.h>
> -#include <common.h>

Isn't the correct fix to include <errno.h> from <envfs.h> then?

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

[PATCH 12/20] video: ipuv3: select OFDEVICE for HDMI and LVDS

[Lucas Stach]

Both components need the OF display timings helpers.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 drivers/video/imx-ipu-v3/Kconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/video/imx-ipu-v3/Kconfig b/drivers/video/imx-ipu-v3/Kconfig
index 368167bfb63a..2ca9132f22ce 100644
--- a/drivers/video/imx-ipu-v3/Kconfig
+++ b/drivers/video/imx-ipu-v3/Kconfig
@@ -8,8 +8,10 @@ if DRIVER_VIDEO_IMX_IPUV3
 
 config DRIVER_VIDEO_IMX_IPUV3_LVDS
 	bool "IPUv3 LVDS support"
+	select OFDEVICE
 
 config DRIVER_VIDEO_IMX_IPUV3_HDMI
 	bool "IPUv3 HDMI support"
+	select OFDEVICE
 
 endif
-- 
2.1.1


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

[PATCH 13/20] mci: esdhc: add back PIO_TIMEOUT

[Lucas Stach]

This got lost during bd1bf53b34c
(mci: imx-esdhc: factor out common sdhci registers). Seems the PIO
option isn't too heavily used.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 drivers/mci/imx-esdhc.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/mci/imx-esdhc.h b/drivers/mci/imx-esdhc.h
index ea1cb318e52b..44aff9dc1e43 100644
--- a/drivers/mci/imx-esdhc.h
+++ b/drivers/mci/imx-esdhc.h
@@ -56,6 +56,8 @@
 #define ESDHC_HOSTCAPBLT_DMAS	0x00400000
 #define ESDHC_HOSTCAPBLT_HSS	0x00200000
 
+#define PIO_TIMEOUT		100000
+
 struct fsl_esdhc_cfg {
 	u32	esdhc_base;
 	u32	no_snoop;
-- 
2.1.1


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

[PATCH 14/20] arm: don't allow to select BUILTIN_DTB when building multiimage

[Lucas Stach]

It doesn't make sense to allow building in a single DTB into a
multiimage barebox, so we can spare the user this option.

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

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 2a00e5ef38ac..48b29da7276b 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -22,6 +22,7 @@ menu "System Type"
 config BUILTIN_DTB
 	bool "link a DTB into the barebox image"
 	depends on OFTREE
+	depends on !HAVE_PBL_MULTI_IMAGES
 
 config BUILTIN_DTB_NAME
 	string "DTB to build into the barebox image"
-- 
2.1.1


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

[PATCH 15/20] arm: fill BUILTIN_DTB_NAME for boards that still use this option

[Lucas Stach]

There are only a few users of BUILTIN_DTB left, but those should
alsways fill thr name properly. Avoids lots of failures in the
randconfig builds.

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

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 48b29da7276b..6e9e7154339a 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -27,6 +27,11 @@ config BUILTIN_DTB
 config BUILTIN_DTB_NAME
 	string "DTB to build into the barebox image"
 	depends on BUILTIN_DTB
+	default "canon-a1100" if MACH_CANON_A1100
+	default "imx51-genesi-efika-sb" if MACH_EFIKA_MX_SMARTBOOK
+	default "versatile-pb" if ARCH_VERSATILE_PB
+	default "virt2real" if MACH_VIRT2REAL
+	default "module-mb7707" if MACH_MB7707
 
 choice
 	prompt "ARM system type"
-- 
2.1.1


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

[PATCH 16/20] net: ethoc: depend on OPENRISC

[Lucas Stach]

This driver currently only works on OpenRISC, as it uses
the cache flush/invalidate functions of this arch.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
The situation with cache functions scatterd into different files
for the various arches is a mess currently. We should really aim
to unify this into a common dma-mapping.h, to make it easier for
driver writers.
---
 drivers/net/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 24b984462d15..0d32f952422c 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -97,6 +97,7 @@ config DRIVER_NET_EP93XX
 
 config DRIVER_NET_ETHOC
 	bool "OpenCores ethernet MAC driver"
+	depends on OPENRISC
 	depends on HAS_CACHE
 	select PHYLIB
 	help
-- 
2.1.1


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

Re: [PATCH 16/20] net: ethoc: depend on OPENRISC

[Sascha Hauer]

On Mon, Nov 24, 2014 at 12:06:56PM +0100, Lucas Stach wrote:
> This driver currently only works on OpenRISC, as it uses
> the cache flush/invalidate functions of this arch.
> 
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> ---
> The situation with cache functions scatterd into different files
> for the various arches is a mess currently. We should really aim
> to unify this into a common dma-mapping.h, to make it easier for
> driver writers.

Yeah, this is on my mental todo list for a while now. Unfortunately this
is a task with a high risk of regressions and only little reward. Also
it should be tested on a wide range of hardware.

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

[PATCH 17/20] blspec: depend on, not select flexible bootargs

[Lucas Stach]

Blspec is a consumer of the flexible bootargs mechanism, so it should
depend on it rather than select it.

Fixes:
warning: (BLSPEC && DEFAULT_ENVIRONMENT_GENERIC_NEW) selects FLEXIBLE_BOOTARGS
which has unmet direct dependencies (COMMAND_SUPPORT && CMD_GLOBAL)

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

diff --git a/common/Kconfig b/common/Kconfig
index a2cce391f461..6583aabc44d9 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -478,8 +478,8 @@ config TIMESTAMP
 
 config BLSPEC
 	depends on BLOCK
+	depends on FLEXIBLE_BOOTARGS
 	select OFTREE
-	select FLEXIBLE_BOOTARGS
 	bool
 	prompt "Support bootloader spec"
 	help
-- 
2.1.1


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

Re: [PATCH 17/20] blspec: depend on, not select flexible bootargs

[Sascha Hauer]

On Mon, Nov 24, 2014 at 12:06:57PM +0100, Lucas Stach wrote:
> Blspec is a consumer of the flexible bootargs mechanism, so it should
> depend on it rather than select it.
> 
> Fixes:
> warning: (BLSPEC && DEFAULT_ENVIRONMENT_GENERIC_NEW) selects FLEXIBLE_BOOTARGS
> which has unmet direct dependencies (COMMAND_SUPPORT && CMD_GLOBAL)
> 
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> ---
>  common/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/common/Kconfig b/common/Kconfig
> index a2cce391f461..6583aabc44d9 100644
> --- a/common/Kconfig
> +++ b/common/Kconfig
> @@ -478,8 +478,8 @@ config TIMESTAMP
>  
>  config BLSPEC
>  	depends on BLOCK
> +	depends on FLEXIBLE_BOOTARGS
>  	select OFTREE
> -	select FLEXIBLE_BOOTARGS

This effectively disables BLSPEC support in these configs:

arch/arm/configs/tegra_v7_defconfig:17:CONFIG_BLSPEC=y
arch/arm/configs/rpi_defconfig:14:CONFIG_BLSPEC=y
arch/arm/configs/imx_defconfig:22:CONFIG_BLSPEC=y
arch/arm/configs/imx_v7_defconfig:40:CONFIG_BLSPEC=y
arch/arm/configs/mvebu_defconfig:18:CONFIG_BLSPEC=y
arch/arm/configs/am335x_defconfig:25:CONFIG_BLSPEC=y
arch/arm/configs/tqma53_defconfig:19:CONFIG_BLSPEC=y

You have to add a CONFIG_FLEXIBLE_BOOTARGS=y in these files.

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

Re: [PATCH 17/20] blspec: depend on, not select flexible bootargs

[Lucas Stach]

Am Montag, den 24.11.2014, 13:59 +0100 schrieb Sascha Hauer:
> On Mon, Nov 24, 2014 at 12:06:57PM +0100, Lucas Stach wrote:
> > Blspec is a consumer of the flexible bootargs mechanism, so it should
> > depend on it rather than select it.
> > 
> > Fixes:
> > warning: (BLSPEC && DEFAULT_ENVIRONMENT_GENERIC_NEW) selects FLEXIBLE_BOOTARGS
> > which has unmet direct dependencies (COMMAND_SUPPORT && CMD_GLOBAL)
> > 
> > Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> > ---
> >  common/Kconfig | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/common/Kconfig b/common/Kconfig
> > index a2cce391f461..6583aabc44d9 100644
> > --- a/common/Kconfig
> > +++ b/common/Kconfig
> > @@ -478,8 +478,8 @@ config TIMESTAMP
> >  
> >  config BLSPEC
> >  	depends on BLOCK
> > +	depends on FLEXIBLE_BOOTARGS
> >  	select OFTREE
> > -	select FLEXIBLE_BOOTARGS
> 
> This effectively disables BLSPEC support in these configs:
> 
> arch/arm/configs/tegra_v7_defconfig:17:CONFIG_BLSPEC=y
> arch/arm/configs/rpi_defconfig:14:CONFIG_BLSPEC=y
> arch/arm/configs/imx_defconfig:22:CONFIG_BLSPEC=y
> arch/arm/configs/imx_v7_defconfig:40:CONFIG_BLSPEC=y
> arch/arm/configs/mvebu_defconfig:18:CONFIG_BLSPEC=y
> arch/arm/configs/am335x_defconfig:25:CONFIG_BLSPEC=y
> arch/arm/configs/tqma53_defconfig:19:CONFIG_BLSPEC=y
> 
> You have to add a CONFIG_FLEXIBLE_BOOTARGS=y in these files.
> 
Thanks for the pointer, I've looked into this and it seems this is only
necessary for the mvebu defconfig.

All other defconfigs include CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW
which still selects CONFIG_FLEXIBLE_BOOTARGS. Will fix with v2.

Regards,
Lucas
-- 
Pengutronix e.K.             | Lucas Stach                 |
Industrial Linux Solutions   | http://www.pengutronix.de/  |


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

[PATCH 18/20] common: menu needs PROCESS_ESCAPE_SEQUENCE

[Lucas Stach]

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 6583aabc44d9..562798063b81 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -414,6 +414,7 @@ config AUTO_COMPLETE
 config MENU
 	bool
 	prompt "Menu Framework"
+	select PROCESS_ESCAPE_SEQUENCE
 	help
 	  a menu framework that allow us to create list menu to simplify
 	  barebox and make it more user-frendly
-- 
2.1.1


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

[PATCH 19/20] usb: gadget: fastboot: select BANNER

[Lucas Stach]

Fastboot gadget needs the 'release_string' which is available only
if CONFIG_BANNER is set.

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

diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 65315e6f31fe..d75f54e67faf 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -45,6 +45,7 @@ config USB_GADGET_SERIAL
 
 config USB_GADGET_FASTBOOT
 	bool
+	select BANNER
 	prompt "Android Fastboot support"
 
 endif
-- 
2.1.1


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

[PATCH 20/20] lib: decompress_xz: fix function header to match prototype

[Lucas Stach]

Fixes:
lib/uncompress.c:124:10: warning: assignment from incompatible pointer type

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 include/linux/xz.h    | 8 ++++----
 lib/decompress_unxz.c | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/linux/xz.h b/include/linux/xz.h
index a3c2b7766ae1..d1afab056242 100644
--- a/include/linux/xz.h
+++ b/include/linux/xz.h
@@ -262,10 +262,10 @@ XZ_EXTERN void xz_crc32_init(void);
 XZ_EXTERN uint32_t xz_crc32(const uint8_t *buf, size_t size, uint32_t crc);
 #endif
 
-STATIC int decompress_unxz(unsigned char *in, long in_size,
-		     long (*fill)(void *dest, unsigned long size),
-		     long (*flush)(void *src, unsigned long size),
-		     unsigned char *out, long *in_used,
+STATIC int decompress_unxz(unsigned char *in, int in_size,
+		     int (*fill)(void *dest, unsigned int size),
+		     int (*flush)(void *src, unsigned int size),
+		     unsigned char *out, int *in_used,
 		     void (*error)(char *x));
 
 #endif
diff --git a/lib/decompress_unxz.c b/lib/decompress_unxz.c
index 0b6bc834ad56..1ddcee38ee89 100644
--- a/lib/decompress_unxz.c
+++ b/lib/decompress_unxz.c
@@ -227,10 +227,10 @@ static void memzero(void *buf, size_t size)
  * both input and output buffers are available as a single chunk, i.e. when
  * fill() and flush() won't be used.
  */
-STATIC int decompress_unxz(unsigned char *in, long in_size,
-		     long (*fill)(void *dest, unsigned long size),
-		     long (*flush)(void *src, unsigned long size),
-		     unsigned char *out, long *in_used,
+STATIC int decompress_unxz(unsigned char *in, int in_size,
+		     int (*fill)(void *dest, unsigned int size),
+		     int (*flush)(void *src, unsigned int size),
+		     unsigned char *out, int *in_used,
 		     void (*error)(char *x))
 {
 	struct xz_buf b;
-- 
2.1.1


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

Re: [PATCH 00/20] First batch of randconfig fixes

[Sascha Hauer]

On Mon, Nov 24, 2014 at 12:06:40PM +0100, Lucas Stach wrote:
> This series is the first batch of fixes for errors found by doing
> some randconfig builds. Seems we have a good way to go, currently
> *all* randconfig builds produced at least one error.

:(

> 
> Sascha, are you ok with applying such patches to master? That's the
> branch Sisyphus is currently using for doing those tests. If you would
> rather like those patches to go into -next please tell me, so I can
> adapt Sisyphus to build that in order to keep a resonably short loop
> between tests and fixes.

I'm generally ok with applying them to master for obvious fixes, but
sometimes the side effect might not be clear in which case I would
prefer applying them to next.

For now I'm applying the patches I haven't commented on to master.
Compile testing takes a while, so you still have time to protest ;)

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

Re: [PATCH 00/20] First batch of randconfig fixes

[Sascha Hauer]

On Mon, Nov 24, 2014 at 12:06:40PM +0100, Lucas Stach wrote:
> This series is the first batch of fixes for errors found by doing
> some randconfig builds. Seems we have a good way to go, currently
> *all* randconfig builds produced at least one error.

For added fun I have a Kconfig update in the pu/kconfig branch. The
kconfig version currently in barebox randconfig will always select
the first item for choice values. With this also choice values will
be randomized. I'm looking forward to the next ton of patches ;)

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