[U-Boot] [PATCH 0/5] Enable usage of SDP for i.MX6 Sabre Auto Boards

[U-Boot] [PATCH 0/5] Enable usage of SDP for i.MX6 Sabre Auto Boards

[Sjoerd Simons]

Being able to upload u-boot over USB is rather useful, so ideally this
functionality should be enabled by the default config for these boards.
Currently however no USB support is built into the SPL nor is SDP
enabled for i.MX6 Sabre Auto boards.

The first two patches in this series adjust the defconfig in a similar
way as Fabio has done in a recent patchset for Sabre SD. The first one
drops SPL DM support as there is no way to fit that *and* USB support in
at the moment, the second one adds missing pinctrl configuration for the
main u-boot binary.

The third patch enabled USB & SPL SDP support.

Patch four adds support for loading FIT images over SDP as that is what
is in use for the Sabre auto's main u-boot image. This is simply the
patch Frieder Schrempf submitted to the mainlinglist earlier, but made
to build on current git master. (Frieder could you be so kind to add
your SoB?).

The final patch fixes the u-boot image failing to start due to DM_VIDEO.

Patchset tested by using uuu with the following configuration:
```
uuu_version 1.2
SDP: boot -f  SPL
SDPU: write -f u-boot-dtb.img -addr 0x10000000
SDPU: jump -addr 0x10000000
SPDU: done
```

I suspect these patches are to late for 2019.07, especially since FIT
support in SDP would be a new feature? If so I'm happy to split this set
out of patches that should definatly land for 2019.07 (Making sabre auto
work) and submit the others for 2019.10


Frieder Schrempf (1):
  usb: gadget: f_sdp: Allow SPL to load and boot FIT via SDP

Sjoerd Simons (4):
  mx6sabreauto: Remove CONFIG_SPL_DM to decrease the SPL size
  mx6sabreauto: Select pinctrl driver
  mx6sabreauto: Enable SPL SDP support
  mx6sabreauto: set SYS_MALLOC_F for video

 common/spl/spl_sdp.c           | 11 +++++++--
 configs/mx6sabreauto_defconfig |  8 +++++--
 drivers/usb/gadget/f_sdp.c     | 41 +++++++++++++++++++++++++++++-----
 include/sdp.h                  |  4 +++-
 4 files changed, 53 insertions(+), 11 deletions(-)

-- 
2.20.1

[U-Boot] [PATCH 1/5] mx6sabreauto: Remove CONFIG_SPL_DM to decrease the SPL size

[Sjoerd Simons]

The i.mx6 SPL binary cannot be bigger then 68K, while with the current
defconfig for sabreauto it's only about 56K as soon as USB support gets
added the size will overflows.

Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

---

 configs/mx6sabreauto_defconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/configs/mx6sabreauto_defconfig b/configs/mx6sabreauto_defconfig
index d0f302e9d0..bf163a2a6e 100644
--- a/configs/mx6sabreauto_defconfig
+++ b/configs/mx6sabreauto_defconfig
@@ -55,7 +55,6 @@ CONFIG_MULTI_DTB_FIT=y
 CONFIG_SPL_MULTI_DTB_FIT=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-CONFIG_SPL_DM=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_SF=y
 CONFIG_DM_GPIO=y
-- 
2.20.1

[U-Boot] [PATCH 1/5] mx6sabreauto: Remove CONFIG_SPL_DM to decrease the SPL size

[Peng Fan]

> Subject: [PATCH 1/5] mx6sabreauto: Remove CONFIG_SPL_DM to decrease
> the SPL size
> 
> The i.mx6 SPL binary cannot be bigger then 68K, while with the current
> defconfig for sabreauto it's only about 56K as soon as USB support gets added
> the size will overflows.
> 
> Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
> 
> ---
> 
>  configs/mx6sabreauto_defconfig | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/configs/mx6sabreauto_defconfig
> b/configs/mx6sabreauto_defconfig index d0f302e9d0..bf163a2a6e 100644
> --- a/configs/mx6sabreauto_defconfig
> +++ b/configs/mx6sabreauto_defconfig
> @@ -55,7 +55,6 @@ CONFIG_MULTI_DTB_FIT=y
> CONFIG_SPL_MULTI_DTB_FIT=y  CONFIG_ENV_IS_IN_MMC=y
> CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
> -CONFIG_SPL_DM=y

The spl bin exceeds 68KB on this board?
If the intention of this patch is to fix regression,
`Reviewed-by: Peng Fan <peng.fan@nxp.com>`

>  CONFIG_DFU_MMC=y
>  CONFIG_DFU_SF=y
>  CONFIG_DM_GPIO=y
> --
> 2.20.1

[U-Boot] [PATCH 2/5] mx6sabreauto: Select pinctrl driver

[Sjoerd Simons]

With the conversion to DM we should select the pinctrl driver.

Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
---

 configs/mx6sabreauto_defconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/configs/mx6sabreauto_defconfig b/configs/mx6sabreauto_defconfig
index bf163a2a6e..91ea1ca9e4 100644
--- a/configs/mx6sabreauto_defconfig
+++ b/configs/mx6sabreauto_defconfig
@@ -69,6 +69,8 @@ CONFIG_SF_DEFAULT_SPEED=20000000
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_MII=y
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_IMX6=y
 CONFIG_DM_REGULATOR=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
-- 
2.20.1

[U-Boot] [PATCH 2/5] mx6sabreauto: Select pinctrl driver

[Peng Fan]

> Subject: [PATCH 2/5] mx6sabreauto: Select pinctrl driver
> 
> With the conversion to DM we should select the pinctrl driver.
> 
> Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
> ---
> 
>  configs/mx6sabreauto_defconfig | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/configs/mx6sabreauto_defconfig
> b/configs/mx6sabreauto_defconfig index bf163a2a6e..91ea1ca9e4 100644
> --- a/configs/mx6sabreauto_defconfig
> +++ b/configs/mx6sabreauto_defconfig
> @@ -69,6 +69,8 @@ CONFIG_SF_DEFAULT_SPEED=20000000
> CONFIG_SPI_FLASH_STMICRO=y  CONFIG_PHYLIB=y  CONFIG_MII=y
> +CONFIG_PINCTRL=y
> +CONFIG_PINCTRL_IMX6=y
>  CONFIG_DM_REGULATOR=y
>  CONFIG_SPI=y
>  CONFIG_DM_SPI=y

Reviewed-by: Peng Fan <peng.fan@nxp.com>

> --
> 2.20.1

[U-Boot] [PATCH 2/5] mx6sabreauto: Select pinctrl driver

[Fabio Estevam]

Hi Sjoerd,

On Mon, Jun 3, 2019 at 4:01 PM Sjoerd Simons
<sjoerd.simons@collabora.co.uk> wrote:
>
> With the conversion to DM we should select the pinctrl driver.
>
> Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

I did the same for mx6sabresd initially, but then later I realized
that it would be better to fix this globally like this:
https://lists.denx.de/pipermail/u-boot/2019-May/370740.html

Hopefully Stefano can apply this version and then we can fix all i.MX
boards that were converted to DM automatically.

[U-Boot] [PATCH 2/5] mx6sabreauto: Select pinctrl driver

[Sjoerd Simons]

On Tue, 2019-06-04 at 11:15 -0300, Fabio Estevam wrote:
> Hi Sjoerd,
> 
> On Mon, Jun 3, 2019 at 4:01 PM Sjoerd Simons
> <sjoerd.simons@collabora.co.uk> wrote:
> > With the conversion to DM we should select the pinctrl driver.
> > 
> > Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
> 
> I did the same for mx6sabresd initially, but then later I realized
> that it would be better to fix this globally like this:
> https://lists.denx.de/pipermail/u-boot/2019-May/370740.html
> 
> Hopefully Stefano can apply this version and then we can fix all i.MX
> boards that were converted to DM automatically.

Agreed that is a better solution

-- 
Sjoerd Simons
Collabora Ltd.

[U-Boot] [PATCH 3/5] mx6sabreauto: Enable SPL SDP support

[Sjoerd Simons]

To allow loading u-boot over USB enable SPD support in the SPL.

Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
---

 configs/mx6sabreauto_defconfig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/configs/mx6sabreauto_defconfig b/configs/mx6sabreauto_defconfig
index 91ea1ca9e4..6903048d85 100644
--- a/configs/mx6sabreauto_defconfig
+++ b/configs/mx6sabreauto_defconfig
@@ -26,6 +26,9 @@ CONFIG_SPL_SEPARATE_BSS=y
 CONFIG_SPL_FIT_IMAGE_TINY=y
 CONFIG_SPL_FS_EXT4=y
 CONFIG_SPL_I2C_SUPPORT=y
+CONFIG_SPL_USB_HOST_SUPPORT=y
+CONFIG_SPL_USB_GADGET=y
+CONFIG_SPL_USB_SDP_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
-- 
2.20.1

[U-Boot] [PATCH 4/5] usb: gadget: f_sdp: Allow SPL to load and boot FIT via SDP

[Sjoerd Simons]

From: Frieder Schrempf <frieder.schrempf@kontron.de>

Add support for loading u-boot FIT images over the USB SPD protocol in
the SPL

[Small fixes to build]
Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
---

 common/spl/spl_sdp.c       | 11 ++++++++--
 drivers/usb/gadget/f_sdp.c | 41 ++++++++++++++++++++++++++++++++------
 include/sdp.h              |  4 +++-
 3 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/common/spl/spl_sdp.c b/common/spl/spl_sdp.c
index 807256e908..dc57171966 100644
--- a/common/spl/spl_sdp.c
+++ b/common/spl/spl_sdp.c
@@ -26,9 +26,16 @@ static int spl_sdp_load_image(struct spl_image_info *spl_image,
 	}
 
 	/* This command typically does not return but jumps to an image */
-	sdp_handle(controller_index);
+	sdp_handle(controller_index, spl_image);
 	pr_err("SDP ended\n");
+	/*
+	 * This command either loads a legacy image, jumps and never returns,
+	 * or it loads a FIT image and returns it to be handled by the SPL
+	 * code.
+	 */
+	ret = sdp_handle(controller_index, spl_image);
+	debug("SDP ended\n");
 
-	return -EINVAL;
+	return ret;
 }
 SPL_LOAD_IMAGE_METHOD("USB SDP", 0, BOOT_DEVICE_BOARD, spl_sdp_load_image);
diff --git a/drivers/usb/gadget/f_sdp.c b/drivers/usb/gadget/f_sdp.c
index ae97ab2b49..2a23160d91 100644
--- a/drivers/usb/gadget/f_sdp.c
+++ b/drivers/usb/gadget/f_sdp.c
@@ -638,7 +638,18 @@ static u32 sdp_jump_imxheader(void *address)
 	return 0;
 }
 
-static void sdp_handle_in_ep(void)
+#ifdef CONFIG_SPL_LOAD_FIT
+static ulong sdp_fit_read(struct spl_load_info *load, ulong sector,
+			  ulong count, void *buf)
+{
+	debug("%s: sector %lx, count %lx, buf %lx\n",
+	      __func__, sector, count, (ulong)buf);
+	memcpy(buf, (void *)(load->dev + sector), count);
+	return count;
+}
+#endif
+
+static void sdp_handle_in_ep(struct spl_image_info *spl_image)
 {
 	u8 *data = sdp_func->in_req->buf;
 	u32 status;
@@ -689,11 +700,26 @@ static void sdp_handle_in_ep(void)
 
 		/* If imx header fails, try some U-Boot specific headers */
 		if (status) {
+			image_header_t *header =
+				sdp_ptr(sdp_func->jmp_address);
 #ifdef CONFIG_SPL_BUILD
+#ifdef CONFIG_SPL_LOAD_FIT
+			if (image_get_magic(header) == FDT_MAGIC) {
+				struct spl_load_info load;
+
+				debug("Found FIT\n");
+				load.dev = header;
+				load.bl_len = 1;
+				load.read = sdp_fit_read;
+				spl_load_simple_fit(spl_image, &load, 0,
+						    header);
+
+				return;
+			}
+#endif
 			/* In SPL, allow jumps to U-Boot images */
 			struct spl_image_info spl_image = {};
-			spl_parse_image_header(&spl_image,
-				(struct image_header *)sdp_func->jmp_address);
+			spl_parse_image_header(&spl_image, header);
 			jump_to_image_no_args(&spl_image);
 #else
 			/* In U-Boot, allow jumps to scripts */
@@ -715,19 +741,22 @@ static void sdp_handle_in_ep(void)
 	};
 }
 
-void sdp_handle(int controller_index)
+int sdp_handle(int controller_index, struct spl_image_info *spl_image)
 {
 	printf("SDP: handle requests...\n");
 	while (1) {
 		if (ctrlc()) {
 			puts("\rCTRL+C - Operation aborted.\n");
-			return;
+			return -EINVAL;
 		}
 
+		if (spl_image->flags & SPL_FIT_FOUND)
+			return 0;
+
 		WATCHDOG_RESET();
 		usb_gadget_handle_interrupts(controller_index);
 
-		sdp_handle_in_ep();
+		sdp_handle_in_ep(spl_image);
 	}
 }
 
diff --git a/include/sdp.h b/include/sdp.h
index f6252d027f..f30e2bca19 100644
--- a/include/sdp.h
+++ b/include/sdp.h
@@ -9,7 +9,9 @@
 #ifndef __SDP_H_
 #define __SDP_H_
 
+#include <spl.h>
+
 int sdp_init(int controller_index);
-void sdp_handle(int controller_index);
+int sdp_handle(int controller_index, struct spl_image_info *spl_image);
 
 #endif /* __SDP_H_ */
-- 
2.20.1

[U-Boot] [PATCH 4/5] usb: gadget: f_sdp: Allow SPL to load and boot FIT via SDP

[Fabio Estevam]

Hi Sjoerd,

On Mon, Jun 3, 2019 at 4:02 PM Sjoerd Simons
<sjoerd.simons@collabora.co.uk> wrote:
>
> From: Frieder Schrempf <frieder.schrempf@kontron.de>
>
> Add support for loading u-boot FIT images over the USB SPD protocol in
> the SPL
>
> [Small fixes to build]

Applied this patch against U-Boot master and it still does not build
for me when using mx6sabresd_defconfig:

cmd/usb_gadget_sdp.c: In function ‘do_sdp’:
cmd/usb_gadget_sdp.c:35:2: error: too few arguments to function ‘sdp_handle’
  sdp_handle(controller_index);
  ^~~~~~~~~~
In file included from cmd/usb_gadget_sdp.c:11:0:
include/sdp.h:15:5: note: declared here
 int sdp_handle(int controller_index, struct spl_image_info *spl_image);
     ^~~~~~~~~~
scripts/Makefile.build:278: recipe for target 'cmd/usb_gadget_sdp.o' failed
make[1]: *** [cmd/usb_gadget_sdp.o] Error

[U-Boot] [PATCH 4/5] usb: gadget: f_sdp: Allow SPL to load and boot FIT via SDP

[Sjoerd Simons]

On Mon, 2019-06-03 at 16:17 -0300, Fabio Estevam wrote:
> Hi Sjoerd,
> 
> On Mon, Jun 3, 2019 at 4:02 PM Sjoerd Simons
> <sjoerd.simons@collabora.co.uk> wrote:
> > From: Frieder Schrempf <frieder.schrempf@kontron.de>
> > 
> > Add support for loading u-boot FIT images over the USB SPD protocol
> > in
> > the SPL
> > 
> > [Small fixes to build]
> 
> Applied this patch against U-Boot master and it still does not build
> for me when using mx6sabresd_defconfig:

Ah; that has CONFIG_CMD_USB_SDP which i didn't enable in the sabre auto
defconfig (and thus didn't notice the failure). Will fix that.

> cmd/usb_gadget_sdp.c: In function ‘do_sdp’:
> cmd/usb_gadget_sdp.c:35:2: error: too few arguments to function
> ‘sdp_handle’
>   sdp_handle(controller_index);
>   ^~~~~~~~~~
> In file included from cmd/usb_gadget_sdp.c:11:0:
> include/sdp.h:15:5: note: declared here
>  int sdp_handle(int controller_index, struct spl_image_info
> *spl_image);
>      ^~~~~~~~~~
> scripts/Makefile.build:278: recipe for target 'cmd/usb_gadget_sdp.o'
> failed
> make[1]: *** [cmd/usb_gadget_sdp.o] Error

-- 
Sjoerd Simons
Collabora Ltd.

[U-Boot] [PATCH 4/5] usb: gadget: f_sdp: Allow SPL to load and boot FIT via SDP

[Lukasz Majewski]

Hi Sjoerd,

> From: Frieder Schrempf <frieder.schrempf@kontron.de>
> 
> Add support for loading u-boot FIT images over the USB SPD protocol in
> the SPL
> 
> [Small fixes to build]
> Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

Reviewed-by: Lukasz Majewski <lukma@denx.de>

> ---
> 
>  common/spl/spl_sdp.c       | 11 ++++++++--
>  drivers/usb/gadget/f_sdp.c | 41
> ++++++++++++++++++++++++++++++++------ include/sdp.h              |
> 4 +++- 3 files changed, 47 insertions(+), 9 deletions(-)
> 
> diff --git a/common/spl/spl_sdp.c b/common/spl/spl_sdp.c
> index 807256e908..dc57171966 100644
> --- a/common/spl/spl_sdp.c
> +++ b/common/spl/spl_sdp.c
> @@ -26,9 +26,16 @@ static int spl_sdp_load_image(struct
> spl_image_info *spl_image, }
>  
>  	/* This command typically does not return but jumps to an
> image */
> -	sdp_handle(controller_index);
> +	sdp_handle(controller_index, spl_image);
>  	pr_err("SDP ended\n");
> +	/*
> +	 * This command either loads a legacy image, jumps and never
> returns,
> +	 * or it loads a FIT image and returns it to be handled by
> the SPL
> +	 * code.
> +	 */
> +	ret = sdp_handle(controller_index, spl_image);
> +	debug("SDP ended\n");
>  
> -	return -EINVAL;
> +	return ret;
>  }
>  SPL_LOAD_IMAGE_METHOD("USB SDP", 0, BOOT_DEVICE_BOARD,
> spl_sdp_load_image); diff --git a/drivers/usb/gadget/f_sdp.c
> b/drivers/usb/gadget/f_sdp.c index ae97ab2b49..2a23160d91 100644
> --- a/drivers/usb/gadget/f_sdp.c
> +++ b/drivers/usb/gadget/f_sdp.c
> @@ -638,7 +638,18 @@ static u32 sdp_jump_imxheader(void *address)
>  	return 0;
>  }
>  
> -static void sdp_handle_in_ep(void)
> +#ifdef CONFIG_SPL_LOAD_FIT
> +static ulong sdp_fit_read(struct spl_load_info *load, ulong sector,
> +			  ulong count, void *buf)
> +{
> +	debug("%s: sector %lx, count %lx, buf %lx\n",
> +	      __func__, sector, count, (ulong)buf);
> +	memcpy(buf, (void *)(load->dev + sector), count);
> +	return count;
> +}
> +#endif
> +
> +static void sdp_handle_in_ep(struct spl_image_info *spl_image)
>  {
>  	u8 *data = sdp_func->in_req->buf;
>  	u32 status;
> @@ -689,11 +700,26 @@ static void sdp_handle_in_ep(void)
>  
>  		/* If imx header fails, try some U-Boot specific
> headers */ if (status) {
> +			image_header_t *header =
> +				sdp_ptr(sdp_func->jmp_address);
>  #ifdef CONFIG_SPL_BUILD
> +#ifdef CONFIG_SPL_LOAD_FIT
> +			if (image_get_magic(header) == FDT_MAGIC) {
> +				struct spl_load_info load;
> +
> +				debug("Found FIT\n");
> +				load.dev = header;
> +				load.bl_len = 1;
> +				load.read = sdp_fit_read;
> +				spl_load_simple_fit(spl_image,
> &load, 0,
> +						    header);
> +
> +				return;
> +			}
> +#endif
>  			/* In SPL, allow jumps to U-Boot images */
>  			struct spl_image_info spl_image = {};
> -			spl_parse_image_header(&spl_image,
> -				(struct image_header
> *)sdp_func->jmp_address);
> +			spl_parse_image_header(&spl_image, header);
>  			jump_to_image_no_args(&spl_image);
>  #else
>  			/* In U-Boot, allow jumps to scripts */
> @@ -715,19 +741,22 @@ static void sdp_handle_in_ep(void)
>  	};
>  }
>  
> -void sdp_handle(int controller_index)
> +int sdp_handle(int controller_index, struct spl_image_info
> *spl_image) {
>  	printf("SDP: handle requests...\n");
>  	while (1) {
>  		if (ctrlc()) {
>  			puts("\rCTRL+C - Operation aborted.\n");
> -			return;
> +			return -EINVAL;
>  		}
>  
> +		if (spl_image->flags & SPL_FIT_FOUND)
> +			return 0;
> +
>  		WATCHDOG_RESET();
>  		usb_gadget_handle_interrupts(controller_index);
>  
> -		sdp_handle_in_ep();
> +		sdp_handle_in_ep(spl_image);
>  	}
>  }
>  
> diff --git a/include/sdp.h b/include/sdp.h
> index f6252d027f..f30e2bca19 100644
> --- a/include/sdp.h
> +++ b/include/sdp.h
> @@ -9,7 +9,9 @@
>  #ifndef __SDP_H_
>  #define __SDP_H_
>  
> +#include <spl.h>
> +
>  int sdp_init(int controller_index);
> -void sdp_handle(int controller_index);
> +int sdp_handle(int controller_index, struct spl_image_info
> *spl_image); 
>  #endif /* __SDP_H_ */




Best regards,

Lukasz Majewski

--

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190603/bd63a453/attachment.sig>

[U-Boot] [PATCH 4/5] usb: gadget: f_sdp: Allow SPL to load and boot FIT via SDP

[Schrempf Frieder]

Hi Sjoerd,

On 03.06.19 21:00, Sjoerd Simons wrote:
> From: Frieder Schrempf <frieder.schrempf@kontron.de>
> 
> Add support for loading u-boot FIT images over the USB SPD protocol in
> the SPL

I always get confused by this acronym too, but *SPD* is the Social 
Democratic Party of Germany, currently in a deep crisis after the recent 
election and after their leader resigned from all offices two days ago.

And *SDP* is the Serial Download Protocol ;)

> 
> [Small fixes to build]
> Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

Signed-off-by: Frieder Schrempf <frieder.schrempf@kontron.de>

Thanks a lot for preparing the patch and sending it!

Regards,
Frieder

> ---
> 
>   common/spl/spl_sdp.c       | 11 ++++++++--
>   drivers/usb/gadget/f_sdp.c | 41 ++++++++++++++++++++++++++++++++------
>   include/sdp.h              |  4 +++-
>   3 files changed, 47 insertions(+), 9 deletions(-)
> 
> diff --git a/common/spl/spl_sdp.c b/common/spl/spl_sdp.c
> index 807256e908..dc57171966 100644
> --- a/common/spl/spl_sdp.c
> +++ b/common/spl/spl_sdp.c
> @@ -26,9 +26,16 @@ static int spl_sdp_load_image(struct spl_image_info *spl_image,
>   	}
>   
>   	/* This command typically does not return but jumps to an image */
> -	sdp_handle(controller_index);
> +	sdp_handle(controller_index, spl_image);
>   	pr_err("SDP ended\n");
> +	/*
> +	 * This command either loads a legacy image, jumps and never returns,
> +	 * or it loads a FIT image and returns it to be handled by the SPL
> +	 * code.
> +	 */
> +	ret = sdp_handle(controller_index, spl_image);
> +	debug("SDP ended\n");
>   
> -	return -EINVAL;
> +	return ret;
>   }
>   SPL_LOAD_IMAGE_METHOD("USB SDP", 0, BOOT_DEVICE_BOARD, spl_sdp_load_image);
> diff --git a/drivers/usb/gadget/f_sdp.c b/drivers/usb/gadget/f_sdp.c
> index ae97ab2b49..2a23160d91 100644
> --- a/drivers/usb/gadget/f_sdp.c
> +++ b/drivers/usb/gadget/f_sdp.c
> @@ -638,7 +638,18 @@ static u32 sdp_jump_imxheader(void *address)
>   	return 0;
>   }
>   
> -static void sdp_handle_in_ep(void)
> +#ifdef CONFIG_SPL_LOAD_FIT
> +static ulong sdp_fit_read(struct spl_load_info *load, ulong sector,
> +			  ulong count, void *buf)
> +{
> +	debug("%s: sector %lx, count %lx, buf %lx\n",
> +	      __func__, sector, count, (ulong)buf);
> +	memcpy(buf, (void *)(load->dev + sector), count);
> +	return count;
> +}
> +#endif
> +
> +static void sdp_handle_in_ep(struct spl_image_info *spl_image)
>   {
>   	u8 *data = sdp_func->in_req->buf;
>   	u32 status;
> @@ -689,11 +700,26 @@ static void sdp_handle_in_ep(void)
>   
>   		/* If imx header fails, try some U-Boot specific headers */
>   		if (status) {
> +			image_header_t *header =
> +				sdp_ptr(sdp_func->jmp_address);
>   #ifdef CONFIG_SPL_BUILD
> +#ifdef CONFIG_SPL_LOAD_FIT
> +			if (image_get_magic(header) == FDT_MAGIC) {
> +				struct spl_load_info load;
> +
> +				debug("Found FIT\n");
> +				load.dev = header;
> +				load.bl_len = 1;
> +				load.read = sdp_fit_read;
> +				spl_load_simple_fit(spl_image, &load, 0,
> +						    header);
> +
> +				return;
> +			}
> +#endif
>   			/* In SPL, allow jumps to U-Boot images */
>   			struct spl_image_info spl_image = {};
> -			spl_parse_image_header(&spl_image,
> -				(struct image_header *)sdp_func->jmp_address);
> +			spl_parse_image_header(&spl_image, header);
>   			jump_to_image_no_args(&spl_image);
>   #else
>   			/* In U-Boot, allow jumps to scripts */
> @@ -715,19 +741,22 @@ static void sdp_handle_in_ep(void)
>   	};
>   }
>   
> -void sdp_handle(int controller_index)
> +int sdp_handle(int controller_index, struct spl_image_info *spl_image)
>   {
>   	printf("SDP: handle requests...\n");
>   	while (1) {
>   		if (ctrlc()) {
>   			puts("\rCTRL+C - Operation aborted.\n");
> -			return;
> +			return -EINVAL;
>   		}
>   
> +		if (spl_image->flags & SPL_FIT_FOUND)
> +			return 0;
> +
>   		WATCHDOG_RESET();
>   		usb_gadget_handle_interrupts(controller_index);
>   
> -		sdp_handle_in_ep();
> +		sdp_handle_in_ep(spl_image);
>   	}
>   }
>   
> diff --git a/include/sdp.h b/include/sdp.h
> index f6252d027f..f30e2bca19 100644
> --- a/include/sdp.h
> +++ b/include/sdp.h
> @@ -9,7 +9,9 @@
>   #ifndef __SDP_H_
>   #define __SDP_H_
>   
> +#include <spl.h>
> +
>   int sdp_init(int controller_index);
> -void sdp_handle(int controller_index);
> +int sdp_handle(int controller_index, struct spl_image_info *spl_image);
>   
>   #endif /* __SDP_H_ */
> 

[U-Boot] [PATCH 4/5] usb: gadget: f_sdp: Allow SPL to load and boot FIT via SDP

[Fabio Estevam]

Hi Frieder,

On Tue, Jun 4, 2019 at 4:09 AM Schrempf Frieder
<frieder.schrempf@kontron.de> wrote:

> Signed-off-by: Frieder Schrempf <frieder.schrempf@kontron.de>
>
> Thanks a lot for preparing the patch and sending it!

As I reported yesterday to Sjoerd, this patch needs some adjustment as
it breaks mx6sabresd_defconfig.

Thanks

[U-Boot] [PATCH 5/5] mx6sabreauto: set SYS_MALLOC_F for video

[Sjoerd Simons]

Sabre Auto boards currently hang with:
```
U-Boot 2019.07-rc3-00057-gc41940c406 (Jun 03 2019 - 14:42:41 +0200)

CPU:   Freescale i.MX6QP rev1.0 996 MHz (running at 792 MHz)
CPU:   Automotive temperature grade (-40C to 125C)Reset cause: WDOG
Model: Freescale i.MX6 Quad Plus SABRE Automotive Board
Board: MX6Q-Sabreauto revA
I2C:   ready
DRAM:  2 GiB
Video device 'ipu at 2400000' cannot allocate frame buffer memory -ensure the device is set up before relocation
Error binding driver 'ipuv3_video': -28
Video device 'ipu at 2800000' cannot allocate frame buffer memory -ensure the device is set up before relocation
Error binding driver 'ipuv3_video': -28
Some drivers failed to bind
Error binding driver 'generic_simple_bus': -28
Some drivers failed to bind
initcall sequence 8ffe00b8 failed at call 1780e93b (err=-28)
```

Set SYS_MALLOC_F_LEN to reserve_video to work.

This is similar to the change Peng Fan did for mx6sabresd (9002e735e717)

Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

---

 configs/mx6sabreauto_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/mx6sabreauto_defconfig b/configs/mx6sabreauto_defconfig
index 6903048d85..558b1cd996 100644
--- a/configs/mx6sabreauto_defconfig
+++ b/configs/mx6sabreauto_defconfig
@@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x17800000
 CONFIG_SPL_GPIO_SUPPORT=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
+CONFIG_SYS_MALLOC_F_LEN=0x4000
 CONFIG_TARGET_MX6SABREAUTO=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
@@ -11,7 +12,6 @@ CONFIG_NR_DRAM_BANKS=1
 CONFIG_SPL=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_NXP_BOARD_REVISION=y
-# CONFIG_SYS_MALLOC_F is not set
 CONFIG_FIT=y
 CONFIG_SPL_FIT_PRINT=y
 CONFIG_SPL_LOAD_FIT=y
-- 
2.20.1

[U-Boot] [PATCH 5/5] mx6sabreauto: set SYS_MALLOC_F for video

[Peng Fan]

> Subject: [PATCH 5/5] mx6sabreauto: set SYS_MALLOC_F for video
> 
> Sabre Auto boards currently hang with:
> ```
> U-Boot 2019.07-rc3-00057-gc41940c406 (Jun 03 2019 - 14:42:41 +0200)
> 
> CPU:   Freescale i.MX6QP rev1.0 996 MHz (running at 792 MHz)
> CPU:   Automotive temperature grade (-40C to 125C)Reset cause: WDOG
> Model: Freescale i.MX6 Quad Plus SABRE Automotive Board
> Board: MX6Q-Sabreauto revA
> I2C:   ready
> DRAM:  2 GiB
> Video device 'ipu at 2400000' cannot allocate frame buffer memory -ensure
> the device is set up before relocation Error binding driver 'ipuv3_video': -28
> Video device 'ipu at 2800000' cannot allocate frame buffer memory -ensure
> the device is set up before relocation Error binding driver 'ipuv3_video': -28
> Some drivers failed to bind Error binding driver 'generic_simple_bus': -28
> Some drivers failed to bind initcall sequence 8ffe00b8 failed at call 1780e93b
> (err=-28) ```
> 
> Set SYS_MALLOC_F_LEN to reserve_video to work.
> 
> This is similar to the change Peng Fan did for mx6sabresd (9002e735e717)
> 
> Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
> 
> ---
> 
>  configs/mx6sabreauto_defconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/configs/mx6sabreauto_defconfig
> b/configs/mx6sabreauto_defconfig index 6903048d85..558b1cd996 100644
> --- a/configs/mx6sabreauto_defconfig
> +++ b/configs/mx6sabreauto_defconfig
> @@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x17800000
> CONFIG_SPL_GPIO_SUPPORT=y  CONFIG_SPL_LIBCOMMON_SUPPORT=y
> CONFIG_SPL_LIBGENERIC_SUPPORT=y
> +CONFIG_SYS_MALLOC_F_LEN=0x4000
>  CONFIG_TARGET_MX6SABREAUTO=y
>  CONFIG_SPL_MMC_SUPPORT=y
>  CONFIG_SPL_SERIAL_SUPPORT=y
> @@ -11,7 +12,6 @@ CONFIG_NR_DRAM_BANKS=1  CONFIG_SPL=y
> CONFIG_SPL_LIBDISK_SUPPORT=y  CONFIG_NXP_BOARD_REVISION=y -#
> CONFIG_SYS_MALLOC_F is not set  CONFIG_FIT=y
> CONFIG_SPL_FIT_PRINT=y  CONFIG_SPL_LOAD_FIT=y
> --

Reviewed-by: Peng Fan <peng.fan@nxp.com>

> 2.20.1

[U-Boot] [PATCH 0/5] Enable usage of SDP for i.MX6 Sabre Auto Boards

[Lukasz Majewski]

Hi Sjoerd,

> Being able to upload u-boot over USB is rather useful, so ideally this
> functionality should be enabled by the default config for these
> boards. Currently however no USB support is built into the SPL nor is
> SDP enabled for i.MX6 Sabre Auto boards.
> 
> The first two patches in this series adjust the defconfig in a similar
> way as Fabio has done in a recent patchset for Sabre SD. The first one
> drops SPL DM support as there is no way to fit that *and* USB support
> in at the moment, the second one adds missing pinctrl configuration
> for the main u-boot binary.
> 
> The third patch enabled USB & SPL SDP support.
> 
> Patch four adds support for loading FIT images over SDP as that is
> what is in use for the Sabre auto's main u-boot image. This is simply
> the patch Frieder Schrempf submitted to the mainlinglist earlier, but
> made to build on current git master. (Frieder could you be so kind to
> add your SoB?).
> 
> The final patch fixes the u-boot image failing to start due to
> DM_VIDEO.
> 
> Patchset tested by using uuu with the following configuration:
> ```
> uuu_version 1.2
> SDP: boot -f  SPL
> SDPU: write -f u-boot-dtb.img -addr 0x10000000
> SDPU: jump -addr 0x10000000
> SPDU: done
> ```
> 
> I suspect these patches are to late for 2019.07, especially since FIT
> support in SDP would be a new feature? If so I'm happy to split this
> set out of patches that should definatly land for 2019.07 (Making
> sabre auto work) and submit the others for 2019.10

I think that Fabio and Stefano would have a final opinion, but IMHO,
it would be best if you would split those patches.

> 
> 
> Frieder Schrempf (1):
>   usb: gadget: f_sdp: Allow SPL to load and boot FIT via SDP
> 
> Sjoerd Simons (4):
>   mx6sabreauto: Remove CONFIG_SPL_DM to decrease the SPL size
>   mx6sabreauto: Select pinctrl driver
>   mx6sabreauto: Enable SPL SDP support
>   mx6sabreauto: set SYS_MALLOC_F for video
> 
>  common/spl/spl_sdp.c           | 11 +++++++--
>  configs/mx6sabreauto_defconfig |  8 +++++--
>  drivers/usb/gadget/f_sdp.c     | 41
> +++++++++++++++++++++++++++++----- include/sdp.h                  |
> 4 +++- 4 files changed, 53 insertions(+), 11 deletions(-)
> 




Best regards,

Lukasz Majewski

--

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190603/699137ce/attachment.sig>