u-boot: Update to 2020.07

Remove upstreamed patches.
This commit is contained in:
Emmanuel Vadot 2020-07-08 17:18:56 +00:00
parent 92aa91e457
commit 0be75b47fa
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=541505
9 changed files with 9 additions and 59 deletions

View File

@ -24,7 +24,7 @@ BUILD_DEPENDS+= ${COMPILER}:devel/${COMPILER}
USES= bison gmake python:3.7+,build shebangfix tar:bz2
BINARY_ALIAS= bison=${LOCALBASE}/bin/bison dtc=${LOCALBASE}/bin/dtc sed=gsed python3=${PYTHON_CMD}
SHEBANG_FILES= tools/binman/binman.py arch/arm/mach-rockchip/make_fit_atf.py
SHEBANG_FILES= tools/binman/binman arch/arm/mach-rockchip/make_fit_atf.py
SSP_UNSAFE= yes
UBOOT_DIR= share/u-boot/${PORTNAME}${PKGNAMESUFFIX}
INST= ${PREFIX}/${UBOOT_DIR}
@ -108,7 +108,7 @@ UBOOT_METADATA_ARMADA38X_RAW_BS= 512
.if !defined(UBOOT_VERSION) && defined(UBOOT_VERSION_${FAMILY:tu})
UBOOT_VERSION=${UBOOT_VERSION_${FAMILY:tu}}
.endif
UBOOT_VERSION?= 2020.04
UBOOT_VERSION?= 2020.07
# If a slave port defines a PORTREVISION use it
.if defined(U_BOOT_SLAVE_PORTREVISION_${UBOOT_VERSION})

View File

@ -1,8 +1,6 @@
TIMESTAMP = 1587670026
SHA256 (u-boot/u-boot-2020.01.tar.bz2) = aa453c603208b1b27bd03525775a7f79b443adec577fdc6e8f06974025a135f1
SIZE (u-boot/u-boot-2020.01.tar.bz2) = 14716125
SHA256 (u-boot/u-boot-2020.04.tar.bz2) = fe732aaf037d9cc3c0909bad8362af366ae964bbdac6913a34081ff4ad565372
SIZE (u-boot/u-boot-2020.04.tar.bz2) = 15065656
TIMESTAMP = 1594110266
SHA256 (u-boot/u-boot-2020.07.tar.bz2) = c1f5bf9ee6bb6e648edbf19ce2ca9452f614b08a9f886f1a566aa42e8cf05f6a
SIZE (u-boot/u-boot-2020.07.tar.bz2) = 15338841
SHA256 (u-boot/939129/raw) = 2a4ebf283aec8e74ec77b3cb071c6883f73807454ca94fea78361c7391187b97
SIZE (u-boot/939129/raw) = 310
SHA256 (u-boot/1036621/raw) = 28dbd66d14fab9dc782ce091d3c132a226b8425f6503c329ee8a7031b79b52f7
@ -13,19 +11,3 @@ SHA256 (u-boot/1172554/raw) = d1a39d7d6487cfb481392e7ea4f0bf0d209c08e0c3426c29d7
SIZE (u-boot/1172554/raw) = 640
SHA256 (u-boot/1172555/raw) = 09d17a62fb6bc7c7ab73bfc7061fc5da2b5a32e7deb098c9f76aed8ff8991751
SIZE (u-boot/1172555/raw) = 568
SHA256 (u-boot/1245351/raw) = 02cec0ca1934ba64d010ec7f0453faa127b19aaae679d6bd9b946a3653837434
SIZE (u-boot/1245351/raw) = 707
SHA256 (u-boot/1245352/raw) = a4f48937cd9403b7f7708ba1fc5b9405da97bdedff25fdeb198ab613294e7d45
SIZE (u-boot/1245352/raw) = 465
SHA256 (u-boot/1273633/raw) = 707973b638d5d67f88566249bc109059e7c22fba33f7aa40b9eea3dda87370fe
SIZE (u-boot/1273633/raw) = 993
SHA256 (u-boot/1273674/raw) = 5124273a901a214cd6b8cd4a00355c292be82c7a228b4faf81d36085f8656956
SIZE (u-boot/1273674/raw) = 3331
SHA256 (u-boot/1273675/raw) = 304903e0318c63f2e69cf1e3a2e0dba8c33f1d3c2e6643c5599a182a84e829b2
SIZE (u-boot/1273675/raw) = 23966
SHA256 (u-boot/1273676/raw) = d95cba1b622c83da919beea4a048ce85100d1b8ec6416c9d230a9933beb340b1
SIZE (u-boot/1273676/raw) = 8535
SHA256 (u-boot/1273677/raw) = d65a7f197269499624901b6e34a9dbf2134892fc2d1f303190ecb43fdfbb5635
SIZE (u-boot/1273677/raw) = 587
SHA256 (u-boot/1273678/raw) = b29ec14ddbfc75acc631871cff70e1ec9fd5c037c4bf2a6930ed26c4ed8dabc2
SIZE (u-boot/1273678/raw) = 447

View File

@ -1,11 +0,0 @@
--- lib/rsa/rsa-sign.c.orig 2020-04-27 13:01:22.257655000 +0200
+++ lib/rsa/rsa-sign.c 2020-04-27 13:01:38.844321000 +0200
@@ -4,7 +4,7 @@
*/
#include "mkimage.h"
-#include <malloc.h>
+#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <image.h>

View File

@ -6,11 +6,4 @@ MODEL= pinebookpro
BOARD_CONFIG= pinebook-pro-rk3399_defconfig
FAMILY= rk3399
PATCHFILES+= 1273633/raw \
1273674/raw \
1273675/raw \
1273676/raw \
1273677/raw \
1273678/raw
.include "${MASTERDIR}/Makefile"

View File

@ -4,8 +4,6 @@ MASTERDIR= ${.CURDIR}/../u-boot-master
EXTRA_PATCHES= ${.CURDIR}/files/
PATCHFILES+= 939129/raw
# Allow variable reservation of lowest pages for increased PSCI stub size.
PATCHFILES+= 1245351/raw 1245352/raw
MODEL?= rpi3
BOARD_CONFIG?= rpi_3_defconfig

View File

@ -4,8 +4,6 @@ MASTERDIR= ${.CURDIR}/../u-boot-master
EXTRA_PATCHES= ${.CURDIR}/files/
PATCHFILES+= 939129/raw
# Allow variable reservation of lowest pages for increased PSCI stub size.
PATCHFILES+= 1245351/raw 1245352/raw
MODEL= rpi4
BOARD_CONFIG= rpi_4_defconfig

View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= u-boot-tools
DISTVERSION= 2020.04
DISTVERSION= 2020.07
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.denx.de/pub/u-boot/
DISTNAME= u-boot-${PORTVERSION}

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1593016469
SHA256 (u-boot-2020.04.tar.bz2) = fe732aaf037d9cc3c0909bad8362af366ae964bbdac6913a34081ff4ad565372
SIZE (u-boot-2020.04.tar.bz2) = 15065656
TIMESTAMP = 1594115686
SHA256 (u-boot-2020.07.tar.bz2) = c1f5bf9ee6bb6e648edbf19ce2ca9452f614b08a9f886f1a566aa42e8cf05f6a
SIZE (u-boot-2020.07.tar.bz2) = 15338841

View File

@ -1,10 +0,0 @@
--- lib/rsa/rsa-sign.c.orig 2020-06-27 12:26:29 UTC
+++ lib/rsa/rsa-sign.c
@@ -4,7 +4,6 @@
*/
#include "mkimage.h"
-#include <malloc.h>
#include <stdio.h>
#include <string.h>
#include <image.h>