[packages/uboot] up to 2021.04

[atler]

commit 3287943629de719f785752be46585c0214116d67
Author: Jan Palus <atler at pld-linux.org>
Date:   Tue Apr 6 11:42:54 2021 +0200

    up to 2021.04

 rk3399-Pinebook-pro-EDP-support.patch | 6 +++---
 uboot.spec                            | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/uboot.spec b/uboot.spec
index e2ba63b..604c9f8 100644
--- a/uboot.spec
+++ b/uboot.spec
@@ -1,12 +1,12 @@
 Summary:	Das U-Boot -- the Universal Boot Loader
 Summary(pl.UTF-8):	Das U-Boot - uniwersalny bootloader
 Name:		uboot
-Version:	2021.01
+Version:	2021.04
 Release:	1
 License:	GPL v2
 Group:		Applications/System
 Source0:	https://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2
-# Source0-md5:	a3206df1c1b97df7a4ddcdd17cb97d0c
+# Source0-md5:	1299c23ee4fde7e73a1b9f8f80fd28e0
 Patch0:		rpi-Enable-using-the-DT-provided-by-the-Raspberry-Pi.patch
 Patch1:		rk3399-Pinebook-pro-EDP-support.patch
 Patch2:		%{name}-pbp_usb_hang.patch
diff --git a/rk3399-Pinebook-pro-EDP-support.patch b/rk3399-Pinebook-pro-EDP-support.patch
index 1851fcd..ddc6854 100644
--- a/rk3399-Pinebook-pro-EDP-support.patch
+++ b/rk3399-Pinebook-pro-EDP-support.patch
@@ -165,7 +165,7 @@ Index: u-boot/drivers/video/rockchip/rk_vop.c
 +	}
 +	debug("vop_id=%d\n", vop_id);
  
- 	disp_uc_plat = dev_get_uclass_platdata(disp);
+ 	disp_uc_plat = dev_get_uclass_plat(disp);
  	debug("Found device '%s', disp_uc_priv=%p\n", disp->name, disp_uc_plat);
 
 From patchwork Fri Nov 20 13:24:23 2020
@@ -322,7 +322,7 @@ Index: u-boot/drivers/video/rockchip/rk_edp.c
  	writel(LDO_OUTPUT_V_SEL_145 | KVCO_DEFALUT | CHG_PUMP_CUR_SEL_5US |
  	       V2L_CUR_SEL_1MA, &regs->pll_reg_2);
 @@ -1029,6 +1052,8 @@ static int rk_edp_probe(struct udevice *
- 	struct display_plat *uc_plat = dev_get_uclass_platdata(dev);
+ 	struct display_plat *uc_plat = dev_get_uclass_plat(dev);
  	struct rk_edp_priv *priv = dev_get_priv(dev);
  	struct rk3288_edp *regs = priv->regs;
 +	struct rockchip_dp_data *edp_data = (struct rockchip_dp_data *)dev_get_driver_data(dev);
@@ -1164,7 +1164,7 @@ Index: u-boot/drivers/video/rockchip/rk_vop.c
 +#include <reset.h>
  #include <syscon.h>
  #include <video.h>
- #include <asm/gpio.h>
+ #include <asm/global_data.h>
 @@ -36,14 +38,16 @@ enum vop_pol {
  	DCLK_INVERT    = 3
  };
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/uboot.git/commitdiff/3287943629de719f785752be46585c0214116d67