From: Tom Rini <trini@konsulko.com>
Date: Fri, 28 Jun 2019 12:00:22 +0000 (-0400)
Subject: Merge tag 'u-boot-imx-20190628' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
X-Git-Tag: v2019.07~16
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0352e878d2b80b2575e02310e891e936251b3992;hp=-c;p=platform%2Fkernel%2Fu-boot.git

Merge tag 'u-boot-imx-20190628' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

Fixes for 2019.07

- menlo board
- allow SDB on Sabre
- HAB for mx6sl
- apalis board
---

0352e878d2b80b2575e02310e891e936251b3992
diff --combined arch/arm/dts/Makefile
index 1d6367a,2271d78..7fbd0a1
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@@ -93,8 -93,7 +93,8 @@@ dtb-$(CONFIG_ROCKCHIP_RK3288) += 
  	rk3288-vyasa.dtb
  
  dtb-$(CONFIG_ROCKCHIP_RK3328) += \
 -	rk3328-evb.dtb
 +	rk3328-evb.dtb \
 +	rk3328-rock64.dtb
  
  dtb-$(CONFIG_ROCKCHIP_RK3368) += \
  	rk3368-lion.dtb \
@@@ -343,7 -342,6 +343,7 @@@ dtb-$(CONFIG_FSL_LSCH2) += fsl-ls1043a-
  	fsl-ls1046a-qds-duart.dtb \
  	fsl-ls1046a-qds-lpuart.dtb \
  	fsl-ls1046a-rdb.dtb \
 +	fsl-ls1046a-frwy.dtb \
  	fsl-ls1012a-qds.dtb \
  	fsl-ls1012a-rdb.dtb \
  	fsl-ls1012a-2g5rdb.dtb \
@@@ -537,7 -535,8 +537,8 @@@ dtb-$(CONFIG_VF610) += vf500-colibri.dt
  	vf610-bk4r1.dtb
  
  dtb-$(CONFIG_MX53) += imx53-cx9020.dtb \
- 	imx53-kp.dtb
+ 	imx53-kp.dtb \
+ 	imx53-m53menlo.dtb
  
  dtb-$(CONFIG_MX6Q) += \
  	imx6-apalis.dtb \
diff --combined common/spl/spl_sdp.c
index 7fc4404,51b245b..806bf13
--- a/common/spl/spl_sdp.c
+++ b/common/spl/spl_sdp.c
@@@ -17,11 -17,7 +17,11 @@@ static int spl_sdp_load_image(struct sp
  	const int controller_index = 0;
  
  	g_dnl_clear_detach();
 -	g_dnl_register("usb_dnl_sdp");
 +	ret = g_dnl_register("usb_dnl_sdp");
 +	if (ret) {
 +		pr_err("SDP dnl register failed: %d\n", ret);
 +		return ret;
 +	}
  
  	ret = sdp_init(controller_index);
  	if (ret) {
@@@ -29,10 -25,14 +29,14 @@@
  		return -ENODEV;
  	}
  
- 	/* This command typically does not return but jumps to an image */
- 	sdp_handle(controller_index);
- 	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 = spl_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);