Fri Apr 12 07:08:18 2019 UTC ()
Backport a patch from u-boot mainline to support EFI GetVariable.
Add PKGREVISION to the UBOOT_VERSTION output
Bump PKGREVISION for all 2018.11 packages
(skrll)
diff -r1.20 -r1.21 pkgsrc/sysutils/u-boot/distinfo
diff -r1.13 -r1.14 pkgsrc/sysutils/u-boot/u-boot.mk
diff -r1.4 -r1.5 pkgsrc/sysutils/u-boot-a10-olinuxino-lime/Makefile
diff -r1.4 -r1.5 pkgsrc/sysutils/u-boot-bananapi/Makefile
diff -r1.4 -r1.5 pkgsrc/sysutils/u-boot-bananapi-m3/Makefile
diff -r1.2 -r1.3 pkgsrc/sysutils/u-boot-beagleboard/Makefile
diff -r1.3 -r1.4 pkgsrc/sysutils/u-boot-beagleboneblack/Makefile
diff -r1.2 -r1.3 pkgsrc/sysutils/u-boot-beaglebonewhite/Makefile
diff -r1.4 -r1.5 pkgsrc/sysutils/u-boot-chip/Makefile
diff -r1.4 -r1.5 pkgsrc/sysutils/u-boot-chip-pro/Makefile
diff -r1.4 -r1.5 pkgsrc/sysutils/u-boot-cubieboard2/Makefile
diff -r1.4 -r1.5 pkgsrc/sysutils/u-boot-cubieboard4/Makefile
diff -r1.4 -r1.5 pkgsrc/sysutils/u-boot-cubietruck/Makefile
diff -r1.2 -r1.3 pkgsrc/sysutils/u-boot-de0-nanosoc/Makefile
diff -r1.4 -r1.5 pkgsrc/sysutils/u-boot-hummingbird-a31/Makefile
diff -r1.5 -r1.6 pkgsrc/sysutils/u-boot-jetson-tk1/Makefile
diff -r1.6 -r1.7 pkgsrc/sysutils/u-boot-jetson-tx1/Makefile
diff -r1.4 -r1.5 pkgsrc/sysutils/u-boot-jetson-tx2/Makefile
diff -r1.2 -r1.3 pkgsrc/sysutils/u-boot-nanopi-m1/Makefile
diff -r1.5 -r1.6 pkgsrc/sysutils/u-boot-nanopi-neo/Makefile
diff -r1.7 -r1.8 pkgsrc/sysutils/u-boot-nanopi-neo-plus2/Makefile
diff -r1.6 -r1.7 pkgsrc/sysutils/u-boot-nanopi-neo2/Makefile
diff -r1.1 -r1.2 pkgsrc/sysutils/u-boot-odroid-c2/Makefile
diff -r1.2 -r1.3 pkgsrc/sysutils/u-boot-odroid-xu3/Makefile
diff -r1.6 -r1.7 pkgsrc/sysutils/u-boot-orangepi-2/Makefile
diff -r1.4 -r1.5 pkgsrc/sysutils/u-boot-orangepi-one/Makefile
diff -r1.6 -r1.7 pkgsrc/sysutils/u-boot-orangepi-plus2e/Makefile
diff -r1.2 -r1.3 pkgsrc/sysutils/u-boot-orangepi-zero/Makefile
diff -r1.3 -r1.4 pkgsrc/sysutils/u-boot-orangepi-zero-plus/Makefile
diff -r1.4 -r1.5 pkgsrc/sysutils/u-boot-pine-h64/Makefile
diff -r1.7 -r1.8 pkgsrc/sysutils/u-boot-pine64/Makefile
diff -r1.5 -r1.6 pkgsrc/sysutils/u-boot-pocketchip/Makefile
diff -r1.3 -r1.4 pkgsrc/sysutils/u-boot-sopine-baseboard/Makefile
diff -r0 -r1.1 pkgsrc/sysutils/u-boot/patches/patch-Makefile
diff -r0 -r1.1 pkgsrc/sysutils/u-boot/patches/patch-lib_efi__loader_efi__variable.c
--- pkgsrc/sysutils/u-boot/distinfo 2019/01/03 04:07:18 1.20
+++ pkgsrc/sysutils/u-boot/distinfo 2019/04/12 07:08:15 1.21
| @@ -1,15 +1,17 @@ | | | @@ -1,15 +1,17 @@ |
1 | $NetBSD: distinfo,v 1.20 2019/01/03 04:07:18 thorpej Exp $ | | 1 | $NetBSD: distinfo,v 1.21 2019/04/12 07:08:15 skrll Exp $ |
2 | | | 2 | |
3 | SHA1 (u-boot-2018.11.tar.bz2) = e58e86c633ad3e2613196e0c0b0a7760ae5966d6 | | 3 | SHA1 (u-boot-2018.11.tar.bz2) = e58e86c633ad3e2613196e0c0b0a7760ae5966d6 |
4 | RMD160 (u-boot-2018.11.tar.bz2) = f63c67750951d0e2883935a5d4cc3252f51a5453 | | 4 | RMD160 (u-boot-2018.11.tar.bz2) = f63c67750951d0e2883935a5d4cc3252f51a5453 |
5 | SHA512 (u-boot-2018.11.tar.bz2) = 1ea0bbb5f5e6d4c60b3a6bd345d1fa6e9da025daf36f47e8392bab34cb432c2e3633d903efb260f71fff87dffd6f2bf09ac900e96b3d4247073958d83b89ceff | | 5 | SHA512 (u-boot-2018.11.tar.bz2) = 1ea0bbb5f5e6d4c60b3a6bd345d1fa6e9da025daf36f47e8392bab34cb432c2e3633d903efb260f71fff87dffd6f2bf09ac900e96b3d4247073958d83b89ceff |
6 | Size (u-boot-2018.11.tar.bz2) = 13045125 bytes | | 6 | Size (u-boot-2018.11.tar.bz2) = 13045125 bytes |
| | | 7 | SHA1 (patch-Makefile) = 45f505041a586b75953c34c1ab6fffaa56b43601 |
7 | SHA1 (patch-arch_arm_cpu_armv8_Kconfig) = 63cbbf2e3cebd46793fc03cc8e62297f6dc01aa9 | | 8 | SHA1 (patch-arch_arm_cpu_armv8_Kconfig) = 63cbbf2e3cebd46793fc03cc8e62297f6dc01aa9 |
8 | SHA1 (patch-configs_jetson-tk1_defconfig) = e25d89b9440f9bb4486ac22fc47083ed24abdd95 | | 9 | SHA1 (patch-configs_jetson-tk1_defconfig) = e25d89b9440f9bb4486ac22fc47083ed24abdd95 |
9 | SHA1 (patch-configs_p2371-2180_defconfig) = 2a3f1ad4f9963af403c2c9f2f01b892bbe55188c | | 10 | SHA1 (patch-configs_p2371-2180_defconfig) = 2a3f1ad4f9963af403c2c9f2f01b892bbe55188c |
10 | SHA1 (patch-drivers_video_sunxi_sunxi__display.c) = 8e6a6a781cce25af5cba289fc2ca76e30b62aff6 | | 11 | SHA1 (patch-drivers_video_sunxi_sunxi__display.c) = 8e6a6a781cce25af5cba289fc2ca76e30b62aff6 |
11 | SHA1 (patch-include_configs_tegra-common-post.h) = dfc081d2a3f7cd32e340b03f6c77c629bffd29b4 | | 12 | SHA1 (patch-include_configs_tegra-common-post.h) = dfc081d2a3f7cd32e340b03f6c77c629bffd29b4 |
12 | SHA1 (patch-include_configs_tegra-common.h) = 4cda8f9df2c7fc2b9cd9d4139ec679a42648e4f8 | | 13 | SHA1 (patch-include_configs_tegra-common.h) = 4cda8f9df2c7fc2b9cd9d4139ec679a42648e4f8 |
13 | SHA1 (patch-include_image.h) = c9b134b2b5624a1e6c9f091a2192185b8d0f85fe | | 14 | SHA1 (patch-include_image.h) = c9b134b2b5624a1e6c9f091a2192185b8d0f85fe |
14 | SHA1 (patch-lib_bch.c) = b1f1c7418f1004c151b9e5e06ab7047a1736ae47 | | 15 | SHA1 (patch-lib_bch.c) = b1f1c7418f1004c151b9e5e06ab7047a1736ae47 |
| | | 16 | SHA1 (patch-lib_efi__loader_efi__variable.c) = 1955870b22e358a4bded9e85fd89c74419aeed0d |
15 | SHA1 (patch-tools_imx__cntr__image.sh) = 715647e3b77b505513ae79b4fe673f4f7f9bf042 | | 17 | SHA1 (patch-tools_imx__cntr__image.sh) = 715647e3b77b505513ae79b4fe673f4f7f9bf042 |
--- pkgsrc/sysutils/u-boot/u-boot.mk 2019/03/24 14:57:47 1.13
+++ pkgsrc/sysutils/u-boot/u-boot.mk 2019/04/12 07:08:15 1.14
| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
1 | # $NetBSD: u-boot.mk,v 1.13 2019/03/24 14:57:47 tnn Exp $ | | 1 | # $NetBSD: u-boot.mk,v 1.14 2019/04/12 07:08:15 skrll Exp $ |
2 | | | 2 | |
3 | .include "../../sysutils/u-boot/u-boot-version.mk" | | 3 | .include "../../sysutils/u-boot/u-boot-version.mk" |
4 | | | 4 | |
5 | PKGNAME= u-boot-${UBOOT_TARGET}-${UBOOT_VERSION} | | 5 | PKGNAME= u-boot-${UBOOT_TARGET}-${UBOOT_VERSION} |
6 | DISTNAME?= u-boot-${UBOOT_VERSION} | | 6 | DISTNAME?= u-boot-${UBOOT_VERSION} |
7 | DISTINFO_FILE?= ${.CURDIR}/../../sysutils/u-boot/distinfo | | 7 | DISTINFO_FILE?= ${.CURDIR}/../../sysutils/u-boot/distinfo |
8 | CATEGORIES= sysutils | | 8 | CATEGORIES= sysutils |
9 | EXTRACT_SUFX?= .tar.bz2 | | 9 | EXTRACT_SUFX?= .tar.bz2 |
10 | PATCHDIR?= ${.CURDIR}/../../sysutils/u-boot/patches | | 10 | PATCHDIR?= ${.CURDIR}/../../sysutils/u-boot/patches |
11 | | | 11 | |
12 | HOMEPAGE?= https://www.denx.de/wiki/U-Boot | | 12 | HOMEPAGE?= https://www.denx.de/wiki/U-Boot |
13 | MASTER_SITES?= ftp://ftp.denx.de/pub/u-boot/ | | 13 | MASTER_SITES?= ftp://ftp.denx.de/pub/u-boot/ |
14 | | | 14 | |
| @@ -21,26 +21,30 @@ LICENSE= gnu-gpl-v2 | | | @@ -21,26 +21,30 @@ LICENSE= gnu-gpl-v2 |
21 | USE_LANGUAGES= c c++ | | 21 | USE_LANGUAGES= c c++ |
22 | USE_TOOLS+= bison gmake gsed pkg-config | | 22 | USE_TOOLS+= bison gmake gsed pkg-config |
23 | PYTHON_FOR_BUILD_ONLY= yes | | 23 | PYTHON_FOR_BUILD_ONLY= yes |
24 | PYTHON_VERSIONS_ACCEPTED= 27 | | 24 | PYTHON_VERSIONS_ACCEPTED= 27 |
25 | | | 25 | |
26 | REPLACE_INTERPRETER+= python2 | | 26 | REPLACE_INTERPRETER+= python2 |
27 | REPLACE.python2.old= .*/usr/bin/env.*python2* | | 27 | REPLACE.python2.old= .*/usr/bin/env.*python2* |
28 | REPLACE.python2.new= ${PYTHONBIN} | | 28 | REPLACE.python2.new= ${PYTHONBIN} |
29 | REPLACE_FILES.python2= scripts/fill_scrapyard.py \ | | 29 | REPLACE_FILES.python2= scripts/fill_scrapyard.py \ |
30 | tools/binman/binman.py \ | | 30 | tools/binman/binman.py \ |
31 | tools/genboardscfg.py \ | | 31 | tools/genboardscfg.py \ |
32 | tools/moveconfig.py | | 32 | tools/moveconfig.py |
33 | | | 33 | |
| | | 34 | .if defined(PKGREVISION) && !empty(PKGREVISION) && (${PKGREVISION} != "0") |
| | | 35 | UBOOT_ENV+= UBOOT_PKGREVISION=nb${PKGREVISION} |
| | | 36 | .endif |
| | | 37 | |
34 | MAKE_ENV+= ${UBOOT_ENV} | | 38 | MAKE_ENV+= ${UBOOT_ENV} |
35 | | | 39 | |
36 | post-patch: | | 40 | post-patch: |
37 | .for opt in ${UBOOT_OPTIONS} | | 41 | .for opt in ${UBOOT_OPTIONS} |
38 | @echo "=> Adding ${opt} to configs/${UBOOT_CONFIG}" | | 42 | @echo "=> Adding ${opt} to configs/${UBOOT_CONFIG}" |
39 | @echo ${opt} >> ${WRKSRC}/configs/${UBOOT_CONFIG} | | 43 | @echo ${opt} >> ${WRKSRC}/configs/${UBOOT_CONFIG} |
40 | .endfor | | 44 | .endfor |
41 | | | 45 | |
42 | do-configure: | | 46 | do-configure: |
43 | cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${UBOOT_CONFIG} | | 47 | cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${UBOOT_CONFIG} |
44 | | | 48 | |
45 | do-build: | | 49 | do-build: |
46 | cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${_MAKE_JOBS} | | 50 | cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${_MAKE_JOBS} |
--- pkgsrc/sysutils/u-boot-a10-olinuxino-lime/Makefile 2018/12/31 15:06:44 1.4
+++ pkgsrc/sysutils/u-boot-a10-olinuxino-lime/Makefile 2019/04/12 07:08:16 1.5
| @@ -1,9 +1,9 @@ | | | @@ -1,9 +1,9 @@ |
1 | # $NetBSD: Makefile,v 1.4 2018/12/31 15:06:44 jmcneill Exp $ | | 1 | # $NetBSD: Makefile,v 1.5 2019/04/12 07:08:16 skrll Exp $ |
2 | | | 2 | |
3 | UBOOT_TARGET= a10-olinuxino-lime | | 3 | UBOOT_TARGET= a10-olinuxino-lime |
4 | UBOOT_CONFIG= A10-OLinuXino-Lime_defconfig | | 4 | UBOOT_CONFIG= A10-OLinuXino-Lime_defconfig |
5 | UBOOT_BIN= u-boot-sunxi-with-spl.bin | | 5 | UBOOT_BIN= u-boot-sunxi-with-spl.bin |
6 | | | 6 | |
7 | PKGREVISION= 1 | | 7 | PKGREVISION= 2 |
8 | | | 8 | |
9 | .include "../../sysutils/u-boot/u-boot-arm.mk" | | 9 | .include "../../sysutils/u-boot/u-boot-arm.mk" |
--- pkgsrc/sysutils/u-boot-bananapi/Makefile 2018/12/31 15:06:44 1.4
+++ pkgsrc/sysutils/u-boot-bananapi/Makefile 2019/04/12 07:08:16 1.5
| @@ -1,9 +1,9 @@ | | | @@ -1,9 +1,9 @@ |
1 | # $NetBSD: Makefile,v 1.4 2018/12/31 15:06:44 jmcneill Exp $ | | 1 | # $NetBSD: Makefile,v 1.5 2019/04/12 07:08:16 skrll Exp $ |
2 | | | 2 | |
3 | UBOOT_TARGET= bananapi | | 3 | UBOOT_TARGET= bananapi |
4 | UBOOT_CONFIG= Bananapi_defconfig | | 4 | UBOOT_CONFIG= Bananapi_defconfig |
5 | UBOOT_BIN= u-boot-sunxi-with-spl.bin | | 5 | UBOOT_BIN= u-boot-sunxi-with-spl.bin |
6 | | | 6 | |
7 | PKGREVISION= 1 | | 7 | PKGREVISION= 2 |
8 | | | 8 | |
9 | .include "../../sysutils/u-boot/u-boot-arm.mk" | | 9 | .include "../../sysutils/u-boot/u-boot-arm.mk" |
--- pkgsrc/sysutils/u-boot-bananapi-m3/Makefile 2018/12/31 15:06:44 1.4
+++ pkgsrc/sysutils/u-boot-bananapi-m3/Makefile 2019/04/12 07:08:16 1.5
| @@ -1,9 +1,9 @@ | | | @@ -1,9 +1,9 @@ |
1 | # $NetBSD: Makefile,v 1.4 2018/12/31 15:06:44 jmcneill Exp $ | | 1 | # $NetBSD: Makefile,v 1.5 2019/04/12 07:08:16 skrll Exp $ |
2 | | | 2 | |
3 | UBOOT_TARGET= bananapi-m3 | | 3 | UBOOT_TARGET= bananapi-m3 |
4 | UBOOT_CONFIG= Sinovoip_BPI_M3_defconfig | | 4 | UBOOT_CONFIG= Sinovoip_BPI_M3_defconfig |
5 | UBOOT_BIN= u-boot-sunxi-with-spl.bin | | 5 | UBOOT_BIN= u-boot-sunxi-with-spl.bin |
6 | | | 6 | |
7 | PKGREVISION= 1 | | 7 | PKGREVISION= 2 |
8 | | | 8 | |
9 | .include "../../sysutils/u-boot/u-boot-arm.mk" | | 9 | .include "../../sysutils/u-boot/u-boot-arm.mk" |
--- pkgsrc/sysutils/u-boot-beagleboard/Makefile 2018/12/31 15:06:44 1.2
+++ pkgsrc/sysutils/u-boot-beagleboard/Makefile 2019/04/12 07:08:16 1.3
| @@ -1,10 +1,10 @@ | | | @@ -1,10 +1,10 @@ |
1 | # $NetBSD: Makefile,v 1.2 2018/12/31 15:06:44 jmcneill Exp $ | | 1 | # $NetBSD: Makefile,v 1.3 2019/04/12 07:08:16 skrll Exp $ |
2 | | | 2 | |
3 | UBOOT_TARGET= beagleboard | | 3 | UBOOT_TARGET= beagleboard |
4 | UBOOT_CONFIG= omap3_beagle_defconfig | | 4 | UBOOT_CONFIG= omap3_beagle_defconfig |
5 | UBOOT_BIN= u-boot.img | | 5 | UBOOT_BIN= u-boot.img |
6 | UBOOT_BIN+= MLO | | 6 | UBOOT_BIN+= MLO |
7 | | | 7 | |
8 | PKGREVISION= 1 | | 8 | PKGREVISION= 2 |
9 | | | 9 | |
10 | .include "../../sysutils/u-boot/u-boot-arm.mk" | | 10 | .include "../../sysutils/u-boot/u-boot-arm.mk" |
--- pkgsrc/sysutils/u-boot-beagleboneblack/Makefile 2018/12/31 15:06:44 1.3
+++ pkgsrc/sysutils/u-boot-beagleboneblack/Makefile 2019/04/12 07:08:16 1.4
| @@ -1,10 +1,10 @@ | | | @@ -1,10 +1,10 @@ |
1 | # $NetBSD: Makefile,v 1.3 2018/12/31 15:06:44 jmcneill Exp $ | | 1 | # $NetBSD: Makefile,v 1.4 2019/04/12 07:08:16 skrll Exp $ |
2 | | | 2 | |
3 | UBOOT_TARGET= beagleboneblack | | 3 | UBOOT_TARGET= beagleboneblack |
4 | UBOOT_CONFIG= am335x_boneblack_defconfig | | 4 | UBOOT_CONFIG= am335x_boneblack_defconfig |
5 | UBOOT_BIN= u-boot.img | | 5 | UBOOT_BIN= u-boot.img |
6 | UBOOT_BIN+= MLO | | 6 | UBOOT_BIN+= MLO |
7 | | | 7 | |
8 | PKGREVISION= 1 | | 8 | PKGREVISION= 2 |
9 | | | 9 | |
10 | .include "../../sysutils/u-boot/u-boot-arm.mk" | | 10 | .include "../../sysutils/u-boot/u-boot-arm.mk" |
--- pkgsrc/sysutils/u-boot-beaglebonewhite/Makefile 2018/12/31 15:06:44 1.2
+++ pkgsrc/sysutils/u-boot-beaglebonewhite/Makefile 2019/04/12 07:08:16 1.3
| @@ -1,10 +1,10 @@ | | | @@ -1,10 +1,10 @@ |
1 | # $NetBSD: Makefile,v 1.2 2018/12/31 15:06:44 jmcneill Exp $ | | 1 | # $NetBSD: Makefile,v 1.3 2019/04/12 07:08:16 skrll Exp $ |
2 | | | 2 | |
3 | UBOOT_TARGET= beaglebonewhite | | 3 | UBOOT_TARGET= beaglebonewhite |
4 | UBOOT_CONFIG= am335x_evm_defconfig | | 4 | UBOOT_CONFIG= am335x_evm_defconfig |
5 | UBOOT_BIN= u-boot.img | | 5 | UBOOT_BIN= u-boot.img |
6 | UBOOT_BIN+= MLO | | 6 | UBOOT_BIN+= MLO |
7 | | | 7 | |
8 | PKGREVISION= 1 | | 8 | PKGREVISION= 2 |
9 | | | 9 | |
10 | .include "../../sysutils/u-boot/u-boot-arm.mk" | | 10 | .include "../../sysutils/u-boot/u-boot-arm.mk" |
--- pkgsrc/sysutils/u-boot-chip/Makefile 2018/12/31 15:06:44 1.4
+++ pkgsrc/sysutils/u-boot-chip/Makefile 2019/04/12 07:08:16 1.5
| @@ -1,9 +1,9 @@ | | | @@ -1,9 +1,9 @@ |
1 | # $NetBSD: Makefile,v 1.4 2018/12/31 15:06:44 jmcneill Exp $ | | 1 | # $NetBSD: Makefile,v 1.5 2019/04/12 07:08:16 skrll Exp $ |
2 | | | 2 | |
3 | UBOOT_TARGET= chip | | 3 | UBOOT_TARGET= chip |
4 | UBOOT_CONFIG= CHIP_defconfig | | 4 | UBOOT_CONFIG= CHIP_defconfig |
5 | UBOOT_BIN= u-boot-sunxi-with-spl.bin | | 5 | UBOOT_BIN= u-boot-sunxi-with-spl.bin |
6 | | | 6 | |
7 | PKGREVISION= 1 | | 7 | PKGREVISION= 2 |
8 | | | 8 | |
9 | .include "../../sysutils/u-boot/u-boot-arm.mk" | | 9 | .include "../../sysutils/u-boot/u-boot-arm.mk" |
--- pkgsrc/sysutils/u-boot-chip-pro/Makefile 2018/12/31 15:06:45 1.4
+++ pkgsrc/sysutils/u-boot-chip-pro/Makefile 2019/04/12 07:08:16 1.5
| @@ -1,9 +1,9 @@ | | | @@ -1,9 +1,9 @@ |
1 | # $NetBSD: Makefile,v 1.4 2018/12/31 15:06:45 jmcneill Exp $ | | 1 | # $NetBSD: Makefile,v 1.5 2019/04/12 07:08:16 skrll Exp $ |
2 | | | 2 | |
3 | UBOOT_TARGET= chip-pro | | 3 | UBOOT_TARGET= chip-pro |
4 | UBOOT_CONFIG= CHIP_pro_defconfig | | 4 | UBOOT_CONFIG= CHIP_pro_defconfig |
5 | UBOOT_BIN= u-boot-sunxi-with-spl.bin | | 5 | UBOOT_BIN= u-boot-sunxi-with-spl.bin |
6 | | | 6 | |
7 | PKGREVISION= 1 | | 7 | PKGREVISION= 2 |
8 | | | 8 | |
9 | .include "../../sysutils/u-boot/u-boot-arm.mk" | | 9 | .include "../../sysutils/u-boot/u-boot-arm.mk" |
--- pkgsrc/sysutils/u-boot-cubieboard2/Makefile 2018/12/31 15:06:45 1.4
+++ pkgsrc/sysutils/u-boot-cubieboard2/Makefile 2019/04/12 07:08:16 1.5
| @@ -1,9 +1,9 @@ | | | @@ -1,9 +1,9 @@ |
1 | # $NetBSD: Makefile,v 1.4 2018/12/31 15:06:45 jmcneill Exp $ | | 1 | # $NetBSD: Makefile,v 1.5 2019/04/12 07:08:16 skrll Exp $ |
2 | | | 2 | |
3 | UBOOT_TARGET= cubieboard2 | | 3 | UBOOT_TARGET= cubieboard2 |
4 | UBOOT_CONFIG= Cubieboard2_defconfig | | 4 | UBOOT_CONFIG= Cubieboard2_defconfig |
5 | UBOOT_BIN= u-boot-sunxi-with-spl.bin | | 5 | UBOOT_BIN= u-boot-sunxi-with-spl.bin |
6 | | | 6 | |
7 | PKGREVISION= 1 | | 7 | PKGREVISION= 2 |
8 | | | 8 | |
9 | .include "../../sysutils/u-boot/u-boot-arm.mk" | | 9 | .include "../../sysutils/u-boot/u-boot-arm.mk" |
--- pkgsrc/sysutils/u-boot-cubieboard4/Makefile 2018/12/31 15:06:45 1.4
+++ pkgsrc/sysutils/u-boot-cubieboard4/Makefile 2019/04/12 07:08:16 1.5
| @@ -1,9 +1,9 @@ | | | @@ -1,9 +1,9 @@ |
1 | # $NetBSD: Makefile,v 1.4 2018/12/31 15:06:45 jmcneill Exp $ | | 1 | # $NetBSD: Makefile,v 1.5 2019/04/12 07:08:16 skrll Exp $ |
2 | | | 2 | |
3 | UBOOT_TARGET= cubieboard4 | | 3 | UBOOT_TARGET= cubieboard4 |
4 | UBOOT_CONFIG= Cubieboard4_defconfig | | 4 | UBOOT_CONFIG= Cubieboard4_defconfig |
5 | UBOOT_BIN= u-boot-sunxi-with-spl.bin | | 5 | UBOOT_BIN= u-boot-sunxi-with-spl.bin |
6 | | | 6 | |
7 | PKGREVISION= 1 | | 7 | PKGREVISION= 2 |
8 | | | 8 | |
9 | .include "../../sysutils/u-boot/u-boot-arm.mk" | | 9 | .include "../../sysutils/u-boot/u-boot-arm.mk" |
--- pkgsrc/sysutils/u-boot-cubietruck/Makefile 2018/12/31 15:06:45 1.4
+++ pkgsrc/sysutils/u-boot-cubietruck/Makefile 2019/04/12 07:08:16 1.5
| @@ -1,9 +1,9 @@ | | | @@ -1,9 +1,9 @@ |
1 | # $NetBSD: Makefile,v 1.4 2018/12/31 15:06:45 jmcneill Exp $ | | 1 | # $NetBSD: Makefile,v 1.5 2019/04/12 07:08:16 skrll Exp $ |
2 | | | 2 | |
3 | UBOOT_TARGET= cubietruck | | 3 | UBOOT_TARGET= cubietruck |
4 | UBOOT_CONFIG= Cubietruck_defconfig | | 4 | UBOOT_CONFIG= Cubietruck_defconfig |
5 | UBOOT_BIN= u-boot-sunxi-with-spl.bin | | 5 | UBOOT_BIN= u-boot-sunxi-with-spl.bin |
6 | | | 6 | |
7 | PKGREVISION= 1 | | 7 | PKGREVISION= 2 |
8 | | | 8 | |
9 | .include "../../sysutils/u-boot/u-boot-arm.mk" | | 9 | .include "../../sysutils/u-boot/u-boot-arm.mk" |
--- pkgsrc/sysutils/u-boot-de0-nanosoc/Makefile 2018/12/31 15:06:45 1.2
+++ pkgsrc/sysutils/u-boot-de0-nanosoc/Makefile 2019/04/12 07:08:17 1.3
| @@ -1,9 +1,9 @@ | | | @@ -1,9 +1,9 @@ |
1 | # $NetBSD: Makefile,v 1.2 2018/12/31 15:06:45 jmcneill Exp $ | | 1 | # $NetBSD: Makefile,v 1.3 2019/04/12 07:08:17 skrll Exp $ |
2 | | | 2 | |
3 | UBOOT_TARGET= de0-nanosoc | | 3 | UBOOT_TARGET= de0-nanosoc |
4 | UBOOT_CONFIG= socfpga_de0_nano_soc_defconfig | | 4 | UBOOT_CONFIG= socfpga_de0_nano_soc_defconfig |
5 | UBOOT_BIN= u-boot-with-spl.sfp | | 5 | UBOOT_BIN= u-boot-with-spl.sfp |
6 | | | 6 | |
7 | PKGREVISION= 1 | | 7 | PKGREVISION= 2 |
8 | | | 8 | |
9 | .include "../../sysutils/u-boot/u-boot-arm.mk" | | 9 | .include "../../sysutils/u-boot/u-boot-arm.mk" |
--- pkgsrc/sysutils/u-boot-hummingbird-a31/Makefile 2018/12/31 15:06:45 1.4
+++ pkgsrc/sysutils/u-boot-hummingbird-a31/Makefile 2019/04/12 07:08:17 1.5
| @@ -1,9 +1,9 @@ | | | @@ -1,9 +1,9 @@ |
1 | # $NetBSD: Makefile,v 1.4 2018/12/31 15:06:45 jmcneill Exp $ | | 1 | # $NetBSD: Makefile,v 1.5 2019/04/12 07:08:17 skrll Exp $ |
2 | | | 2 | |
3 | UBOOT_TARGET= hummingbird-a31 | | 3 | UBOOT_TARGET= hummingbird-a31 |
4 | UBOOT_CONFIG= Hummingbird_A31_defconfig | | 4 | UBOOT_CONFIG= Hummingbird_A31_defconfig |
5 | UBOOT_BIN= u-boot-sunxi-with-spl.bin | | 5 | UBOOT_BIN= u-boot-sunxi-with-spl.bin |
6 | | | 6 | |
7 | PKGREVISION= 1 | | 7 | PKGREVISION= 2 |
8 | | | 8 | |
9 | .include "../../sysutils/u-boot/u-boot-arm.mk" | | 9 | .include "../../sysutils/u-boot/u-boot-arm.mk" |
--- pkgsrc/sysutils/u-boot-jetson-tk1/Makefile 2018/12/31 15:06:45 1.5
+++ pkgsrc/sysutils/u-boot-jetson-tk1/Makefile 2019/04/12 07:08:17 1.6
| @@ -1,9 +1,9 @@ | | | @@ -1,9 +1,9 @@ |
1 | # $NetBSD: Makefile,v 1.5 2018/12/31 15:06:45 jmcneill Exp $ | | 1 | # $NetBSD: Makefile,v 1.6 2019/04/12 07:08:17 skrll Exp $ |
2 | | | 2 | |
3 | UBOOT_TARGET= jetson-tk1 | | 3 | UBOOT_TARGET= jetson-tk1 |
4 | UBOOT_CONFIG= jetson-tk1_defconfig | | 4 | UBOOT_CONFIG= jetson-tk1_defconfig |
5 | UBOOT_BIN= u-boot u-boot-dtb.bin | | 5 | UBOOT_BIN= u-boot u-boot-dtb.bin |
6 | | | 6 | |
7 | PKGREVISION= 1 | | 7 | PKGREVISION= 2 |
8 | | | 8 | |
9 | .include "../../sysutils/u-boot/u-boot-arm.mk" | | 9 | .include "../../sysutils/u-boot/u-boot-arm.mk" |
--- pkgsrc/sysutils/u-boot-jetson-tx1/Makefile 2018/12/31 15:06:45 1.6
+++ pkgsrc/sysutils/u-boot-jetson-tx1/Makefile 2019/04/12 07:08:17 1.7
| @@ -1,12 +1,12 @@ | | | @@ -1,12 +1,12 @@ |
1 | # $NetBSD: Makefile,v 1.6 2018/12/31 15:06:45 jmcneill Exp $ | | 1 | # $NetBSD: Makefile,v 1.7 2019/04/12 07:08:17 skrll Exp $ |
2 | | | 2 | |
3 | UBOOT_TARGET= jetson-tx1 | | 3 | UBOOT_TARGET= jetson-tx1 |
4 | UBOOT_CONFIG= p2371-2180_defconfig | | 4 | UBOOT_CONFIG= p2371-2180_defconfig |
5 | UBOOT_BIN= u-boot u-boot-dtb.bin | | 5 | UBOOT_BIN= u-boot u-boot-dtb.bin |
6 | | | 6 | |
7 | PKGREVISION= 1 | | 7 | PKGREVISION= 2 |
8 | | | 8 | |
9 | # Switch to EL1 before booting kernel (required for 32-bit support) | | 9 | # Switch to EL1 before booting kernel (required for 32-bit support) |
10 | PKG_DEFAULT_OPTIONS+= el1 | | 10 | PKG_DEFAULT_OPTIONS+= el1 |
11 | | | 11 | |
12 | .include "../../sysutils/u-boot/u-boot-arm64.mk" | | 12 | .include "../../sysutils/u-boot/u-boot-arm64.mk" |
--- pkgsrc/sysutils/u-boot-jetson-tx2/Makefile 2018/12/31 15:06:45 1.4
+++ pkgsrc/sysutils/u-boot-jetson-tx2/Makefile 2019/04/12 07:08:17 1.5
| @@ -1,12 +1,12 @@ | | | @@ -1,12 +1,12 @@ |
1 | # $NetBSD: Makefile,v 1.4 2018/12/31 15:06:45 jmcneill Exp $ | | 1 | # $NetBSD: Makefile,v 1.5 2019/04/12 07:08:17 skrll Exp $ |
2 | | | 2 | |
3 | UBOOT_TARGET= jetson-tx2 | | 3 | UBOOT_TARGET= jetson-tx2 |
4 | UBOOT_CONFIG= p2771-0000-500_defconfig | | 4 | UBOOT_CONFIG= p2771-0000-500_defconfig |
5 | UBOOT_BIN= u-boot u-boot-dtb.bin | | 5 | UBOOT_BIN= u-boot u-boot-dtb.bin |
6 | | | 6 | |
7 | PKGREVISION= 1 | | 7 | PKGREVISION= 2 |
8 | | | 8 | |
9 | # Switch to EL1 before booting kernel (required for 32-bit support) | | 9 | # Switch to EL1 before booting kernel (required for 32-bit support) |
10 | PKG_DEFAULT_OPTIONS+= el1 | | 10 | PKG_DEFAULT_OPTIONS+= el1 |
11 | | | 11 | |
12 | .include "../../sysutils/u-boot/u-boot-arm64.mk" | | 12 | .include "../../sysutils/u-boot/u-boot-arm64.mk" |
--- pkgsrc/sysutils/u-boot-nanopi-m1/Makefile 2018/12/31 15:06:45 1.2
+++ pkgsrc/sysutils/u-boot-nanopi-m1/Makefile 2019/04/12 07:08:17 1.3
| @@ -1,9 +1,9 @@ | | | @@ -1,9 +1,9 @@ |
1 | # $NetBSD: Makefile,v 1.2 2018/12/31 15:06:45 jmcneill Exp $ | | 1 | # $NetBSD: Makefile,v 1.3 2019/04/12 07:08:17 skrll Exp $ |
2 | | | 2 | |
3 | UBOOT_TARGET= nanopi-m1 | | 3 | UBOOT_TARGET= nanopi-m1 |
4 | UBOOT_CONFIG= nanopi_m1_defconfig | | 4 | UBOOT_CONFIG= nanopi_m1_defconfig |
5 | UBOOT_BIN= u-boot-sunxi-with-spl.bin | | 5 | UBOOT_BIN= u-boot-sunxi-with-spl.bin |
6 | | | 6 | |
7 | PKGREVISION= 1 | | 7 | PKGREVISION= 2 |
8 | | | 8 | |
9 | .include "../../sysutils/u-boot/u-boot-arm.mk" | | 9 | .include "../../sysutils/u-boot/u-boot-arm.mk" |
--- pkgsrc/sysutils/u-boot-nanopi-neo/Makefile 2018/12/31 15:06:47 1.5
+++ pkgsrc/sysutils/u-boot-nanopi-neo/Makefile 2019/04/12 07:08:17 1.6
| @@ -1,9 +1,9 @@ | | | @@ -1,9 +1,9 @@ |
1 | # $NetBSD: Makefile,v 1.5 2018/12/31 15:06:47 jmcneill Exp $ | | 1 | # $NetBSD: Makefile,v 1.6 2019/04/12 07:08:17 skrll Exp $ |
2 | | | 2 | |
3 | UBOOT_TARGET= nanopi-neo | | 3 | UBOOT_TARGET= nanopi-neo |
4 | UBOOT_CONFIG= nanopi_neo_defconfig | | 4 | UBOOT_CONFIG= nanopi_neo_defconfig |
5 | UBOOT_BIN= u-boot-sunxi-with-spl.bin | | 5 | UBOOT_BIN= u-boot-sunxi-with-spl.bin |
6 | | | 6 | |
7 | PKGREVISION= 1 | | 7 | PKGREVISION= 2 |
8 | | | 8 | |
9 | .include "../../sysutils/u-boot/u-boot-arm.mk" | | 9 | .include "../../sysutils/u-boot/u-boot-arm.mk" |
--- pkgsrc/sysutils/u-boot-nanopi-neo-plus2/Makefile 2019/03/15 13:58:59 1.7
+++ pkgsrc/sysutils/u-boot-nanopi-neo-plus2/Makefile 2019/04/12 07:08:17 1.8
| @@ -1,19 +1,19 @@ | | | @@ -1,19 +1,19 @@ |
1 | # $NetBSD: Makefile,v 1.7 2019/03/15 13:58:59 martin Exp $ | | 1 | # $NetBSD: Makefile,v 1.8 2019/04/12 07:08:17 skrll Exp $ |
2 | | | 2 | |
3 | UBOOT_TARGET= nanopi-neo-plus2 | | 3 | UBOOT_TARGET= nanopi-neo-plus2 |
4 | UBOOT_CONFIG= nanopi_neo_plus2_defconfig | | 4 | UBOOT_CONFIG= nanopi_neo_plus2_defconfig |
5 | UBOOT_BIN= u-boot-sunxi-with-spl.bin | | 5 | UBOOT_BIN= u-boot-sunxi-with-spl.bin |
6 | | | 6 | |
7 | PKGREVISION= 2 | | 7 | PKGREVISION= 3 |
8 | | | 8 | |
9 | # Switch to EL1 before booting kernel (required for 32-bit support) | | 9 | # Switch to EL1 before booting kernel (required for 32-bit support) |
10 | #PKG_DEFAULT_OPTIONS+= el1 | | 10 | #PKG_DEFAULT_OPTIONS+= el1 |
11 | | | 11 | |
12 | post-extract: | | 12 | post-extract: |
13 | ${CP} ${PREFIX}/share/arm-trusted-firmware/sun50i_a64/bl31.bin ${WRKSRC} | | 13 | ${CP} ${PREFIX}/share/arm-trusted-firmware/sun50i_a64/bl31.bin ${WRKSRC} |
14 | | | 14 | |
15 | post-build: | | 15 | post-build: |
16 | ${CAT} ${WRKSRC}/spl/sunxi-spl.bin ${WRKSRC}/u-boot.itb > ${WRKSRC}/u-boot-sunxi-with-spl.bin | | 16 | ${CAT} ${WRKSRC}/spl/sunxi-spl.bin ${WRKSRC}/u-boot.itb > ${WRKSRC}/u-boot-sunxi-with-spl.bin |
17 | | | 17 | |
18 | .include "../../sysutils/arm-trusted-firmware-sun50i_a64/buildlink3.mk" | | 18 | .include "../../sysutils/arm-trusted-firmware-sun50i_a64/buildlink3.mk" |
19 | .include "../../sysutils/u-boot/u-boot-arm64.mk" | | 19 | .include "../../sysutils/u-boot/u-boot-arm64.mk" |
--- pkgsrc/sysutils/u-boot-nanopi-neo2/Makefile 2019/03/15 13:59:38 1.6
+++ pkgsrc/sysutils/u-boot-nanopi-neo2/Makefile 2019/04/12 07:08:17 1.7
| @@ -1,19 +1,19 @@ | | | @@ -1,19 +1,19 @@ |
1 | # $NetBSD: Makefile,v 1.6 2019/03/15 13:59:38 martin Exp $ | | 1 | # $NetBSD: Makefile,v 1.7 2019/04/12 07:08:17 skrll Exp $ |
2 | | | 2 | |
3 | UBOOT_TARGET= nanopi-neo2 | | 3 | UBOOT_TARGET= nanopi-neo2 |
4 | UBOOT_CONFIG= nanopi_neo2_defconfig | | 4 | UBOOT_CONFIG= nanopi_neo2_defconfig |
5 | UBOOT_BIN= u-boot-sunxi-with-spl.bin | | 5 | UBOOT_BIN= u-boot-sunxi-with-spl.bin |
6 | | | 6 | |
7 | PKGREVISION= 2 | | 7 | PKGREVISION= 3 |
8 | | | 8 | |
9 | # Switch to EL1 before booting kernel (required for 32-bit support) | | 9 | # Switch to EL1 before booting kernel (required for 32-bit support) |
10 | PKG_DEFAULT_OPTIONS+= el1 | | 10 | PKG_DEFAULT_OPTIONS+= el1 |
11 | | | 11 | |
12 | post-extract: | | 12 | post-extract: |
13 | ${CP} ${PREFIX}/share/arm-trusted-firmware/sun50i_a64/bl31.bin ${WRKSRC} | | 13 | ${CP} ${PREFIX}/share/arm-trusted-firmware/sun50i_a64/bl31.bin ${WRKSRC} |
14 | | | 14 | |
15 | post-build: | | 15 | post-build: |
16 | ${CAT} ${WRKSRC}/spl/sunxi-spl.bin ${WRKSRC}/u-boot.itb > ${WRKSRC}/u-boot-sunxi-with-spl.bin | | 16 | ${CAT} ${WRKSRC}/spl/sunxi-spl.bin ${WRKSRC}/u-boot.itb > ${WRKSRC}/u-boot-sunxi-with-spl.bin |
17 | | | 17 | |
18 | .include "../../sysutils/arm-trusted-firmware-sun50i_a64/buildlink3.mk" | | 18 | .include "../../sysutils/arm-trusted-firmware-sun50i_a64/buildlink3.mk" |
19 | .include "../../sysutils/u-boot/u-boot-arm64.mk" | | 19 | .include "../../sysutils/u-boot/u-boot-arm64.mk" |
--- pkgsrc/sysutils/u-boot-odroid-c2/Makefile 2019/01/22 17:17:55 1.1
+++ pkgsrc/sysutils/u-boot-odroid-c2/Makefile 2019/04/12 07:08:17 1.2
| @@ -1,7 +1,9 @@ | | | @@ -1,7 +1,9 @@ |
1 | # $NetBSD: Makefile,v 1.1 2019/01/22 17:17:55 martin Exp $ | | 1 | # $NetBSD: Makefile,v 1.2 2019/04/12 07:08:17 skrll Exp $ |
2 | | | 2 | |
3 | UBOOT_TARGET= odroid-c2 | | 3 | UBOOT_TARGET= odroid-c2 |
4 | UBOOT_CONFIG= odroid-c2_defconfig | | 4 | UBOOT_CONFIG= odroid-c2_defconfig |
5 | UBOOT_BIN= u-boot u-boot-dtb.bin | | 5 | UBOOT_BIN= u-boot u-boot-dtb.bin |
6 | | | 6 | |
| | | 7 | PKGREVISION= 1 |
| | | 8 | |
7 | .include "../../sysutils/u-boot/u-boot-arm64.mk" | | 9 | .include "../../sysutils/u-boot/u-boot-arm64.mk" |
--- pkgsrc/sysutils/u-boot-odroid-xu3/Makefile 2018/12/31 15:06:46 1.2
+++ pkgsrc/sysutils/u-boot-odroid-xu3/Makefile 2019/04/12 07:08:18 1.3
| @@ -1,9 +1,9 @@ | | | @@ -1,9 +1,9 @@ |
1 | # $NetBSD: Makefile,v 1.2 2018/12/31 15:06:46 jmcneill Exp $ | | 1 | # $NetBSD: Makefile,v 1.3 2019/04/12 07:08:18 skrll Exp $ |
2 | | | 2 | |
3 | UBOOT_TARGET= odroid-xu3 | | 3 | UBOOT_TARGET= odroid-xu3 |
4 | UBOOT_CONFIG= odroid-xu3_defconfig | | 4 | UBOOT_CONFIG= odroid-xu3_defconfig |
5 | UBOOT_BIN= u-boot u-boot-dtb.bin | | 5 | UBOOT_BIN= u-boot u-boot-dtb.bin |
6 | | | 6 | |
7 | PKGREVISION= 1 | | 7 | PKGREVISION= 2 |
8 | | | 8 | |
9 | .include "../../sysutils/u-boot/u-boot-arm.mk" | | 9 | .include "../../sysutils/u-boot/u-boot-arm.mk" |
--- pkgsrc/sysutils/u-boot-orangepi-2/Makefile 2018/12/31 15:06:46 1.6
+++ pkgsrc/sysutils/u-boot-orangepi-2/Makefile 2019/04/12 07:08:18 1.7
| @@ -1,9 +1,9 @@ | | | @@ -1,9 +1,9 @@ |
1 | # $NetBSD: Makefile,v 1.6 2018/12/31 15:06:46 jmcneill Exp $ | | 1 | # $NetBSD: Makefile,v 1.7 2019/04/12 07:08:18 skrll Exp $ |
2 | | | 2 | |
3 | UBOOT_TARGET= orangepi-2 | | 3 | UBOOT_TARGET= orangepi-2 |
4 | UBOOT_CONFIG= orangepi_2_defconfig | | 4 | UBOOT_CONFIG= orangepi_2_defconfig |
5 | UBOOT_BIN= u-boot-sunxi-with-spl.bin | | 5 | UBOOT_BIN= u-boot-sunxi-with-spl.bin |
6 | | | 6 | |
7 | PKGREVISION= 1 | | 7 | PKGREVISION= 2 |
8 | | | 8 | |
9 | .include "../../sysutils/u-boot/u-boot-arm.mk" | | 9 | .include "../../sysutils/u-boot/u-boot-arm.mk" |
--- pkgsrc/sysutils/u-boot-orangepi-one/Makefile 2018/12/31 15:06:46 1.4
+++ pkgsrc/sysutils/u-boot-orangepi-one/Makefile 2019/04/12 07:08:18 1.5
| @@ -1,9 +1,9 @@ | | | @@ -1,9 +1,9 @@ |
1 | # $NetBSD: Makefile,v 1.4 2018/12/31 15:06:46 jmcneill Exp $ | | 1 | # $NetBSD: Makefile,v 1.5 2019/04/12 07:08:18 skrll Exp $ |
2 | | | 2 | |
3 | UBOOT_TARGET= orangepi-one | | 3 | UBOOT_TARGET= orangepi-one |
4 | UBOOT_CONFIG= orangepi_one_defconfig | | 4 | UBOOT_CONFIG= orangepi_one_defconfig |
5 | UBOOT_BIN= u-boot-sunxi-with-spl.bin | | 5 | UBOOT_BIN= u-boot-sunxi-with-spl.bin |
6 | | | 6 | |
7 | PKGREVISION= 1 | | 7 | PKGREVISION= 2 |
8 | | | 8 | |
9 | .include "../../sysutils/u-boot/u-boot-arm.mk" | | 9 | .include "../../sysutils/u-boot/u-boot-arm.mk" |
--- pkgsrc/sysutils/u-boot-orangepi-plus2e/Makefile 2018/12/31 15:06:46 1.6
+++ pkgsrc/sysutils/u-boot-orangepi-plus2e/Makefile 2019/04/12 07:08:18 1.7
| @@ -1,9 +1,9 @@ | | | @@ -1,9 +1,9 @@ |
1 | # $NetBSD: Makefile,v 1.6 2018/12/31 15:06:46 jmcneill Exp $ | | 1 | # $NetBSD: Makefile,v 1.7 2019/04/12 07:08:18 skrll Exp $ |
2 | | | 2 | |
3 | UBOOT_TARGET= orangepi-plus2e | | 3 | UBOOT_TARGET= orangepi-plus2e |
4 | UBOOT_CONFIG= orangepi_plus2e_defconfig | | 4 | UBOOT_CONFIG= orangepi_plus2e_defconfig |
5 | UBOOT_BIN= u-boot-sunxi-with-spl.bin | | 5 | UBOOT_BIN= u-boot-sunxi-with-spl.bin |
6 | | | 6 | |
7 | PKGREVISION= 1 | | 7 | PKGREVISION= 2 |
8 | | | 8 | |
9 | .include "../../sysutils/u-boot/u-boot-arm.mk" | | 9 | .include "../../sysutils/u-boot/u-boot-arm.mk" |
--- pkgsrc/sysutils/u-boot-orangepi-zero/Makefile 2018/12/31 15:06:46 1.2
+++ pkgsrc/sysutils/u-boot-orangepi-zero/Makefile 2019/04/12 07:08:18 1.3
| @@ -1,9 +1,9 @@ | | | @@ -1,9 +1,9 @@ |
1 | # $NetBSD: Makefile,v 1.2 2018/12/31 15:06:46 jmcneill Exp $ | | 1 | # $NetBSD: Makefile,v 1.3 2019/04/12 07:08:18 skrll Exp $ |
2 | | | 2 | |
3 | UBOOT_TARGET= orangepi-zero | | 3 | UBOOT_TARGET= orangepi-zero |
4 | UBOOT_CONFIG= orangepi_zero_defconfig | | 4 | UBOOT_CONFIG= orangepi_zero_defconfig |
5 | UBOOT_BIN= u-boot-sunxi-with-spl.bin | | 5 | UBOOT_BIN= u-boot-sunxi-with-spl.bin |
6 | | | 6 | |
7 | PKGREVISION= 1 | | 7 | PKGREVISION= 2 |
8 | | | 8 | |
9 | .include "../../sysutils/u-boot/u-boot-arm.mk" | | 9 | .include "../../sysutils/u-boot/u-boot-arm.mk" |
--- pkgsrc/sysutils/u-boot-orangepi-zero-plus/Makefile 2019/03/15 13:59:58 1.3
+++ pkgsrc/sysutils/u-boot-orangepi-zero-plus/Makefile 2019/04/12 07:08:18 1.4
| @@ -1,19 +1,19 @@ | | | @@ -1,19 +1,19 @@ |
1 | # $NetBSD: Makefile,v 1.3 2019/03/15 13:59:58 martin Exp $ | | 1 | # $NetBSD: Makefile,v 1.4 2019/04/12 07:08:18 skrll Exp $ |
2 | | | 2 | |
3 | UBOOT_TARGET= orangepi-zero-plus | | 3 | UBOOT_TARGET= orangepi-zero-plus |
4 | UBOOT_CONFIG= orangepi_zero_plus_defconfig | | 4 | UBOOT_CONFIG= orangepi_zero_plus_defconfig |
5 | UBOOT_BIN= u-boot-sunxi-with-spl.bin | | 5 | UBOOT_BIN= u-boot-sunxi-with-spl.bin |
6 | | | 6 | |
7 | PKGREVISION= 2 | | 7 | PKGREVISION= 3 |
8 | | | 8 | |
9 | # Switch to EL1 before booting kernel (required for 32-bit support) | | 9 | # Switch to EL1 before booting kernel (required for 32-bit support) |
10 | PKG_DEFAULT_OPTIONS+= el1 | | 10 | PKG_DEFAULT_OPTIONS+= el1 |
11 | | | 11 | |
12 | post-extract: | | 12 | post-extract: |
13 | ${CP} ${PREFIX}/share/arm-trusted-firmware/sun50i_a64/bl31.bin ${WRKSRC} | | 13 | ${CP} ${PREFIX}/share/arm-trusted-firmware/sun50i_a64/bl31.bin ${WRKSRC} |
14 | | | 14 | |
15 | post-build: | | 15 | post-build: |
16 | ${CAT} ${WRKSRC}/spl/sunxi-spl.bin ${WRKSRC}/u-boot.itb > ${WRKSRC}/u-boot-sunxi-with-spl.bin | | 16 | ${CAT} ${WRKSRC}/spl/sunxi-spl.bin ${WRKSRC}/u-boot.itb > ${WRKSRC}/u-boot-sunxi-with-spl.bin |
17 | | | 17 | |
18 | .include "../../sysutils/arm-trusted-firmware-sun50i_a64/buildlink3.mk" | | 18 | .include "../../sysutils/arm-trusted-firmware-sun50i_a64/buildlink3.mk" |
19 | .include "../../sysutils/u-boot/u-boot-arm64.mk" | | 19 | .include "../../sysutils/u-boot/u-boot-arm64.mk" |
--- pkgsrc/sysutils/u-boot-pine-h64/Makefile 2018/12/31 15:06:46 1.4
+++ pkgsrc/sysutils/u-boot-pine-h64/Makefile 2019/04/12 07:08:18 1.5
| @@ -1,16 +1,16 @@ | | | @@ -1,16 +1,16 @@ |
1 | # $NetBSD: Makefile,v 1.4 2018/12/31 15:06:46 jmcneill Exp $ | | 1 | # $NetBSD: Makefile,v 1.5 2019/04/12 07:08:18 skrll Exp $ |
2 | | | 2 | |
3 | UBOOT_TARGET= pine-h64 | | 3 | UBOOT_TARGET= pine-h64 |
4 | UBOOT_CONFIG= pine_h64_defconfig | | 4 | UBOOT_CONFIG= pine_h64_defconfig |
5 | UBOOT_BIN= u-boot-sunxi-with-spl.bin | | 5 | UBOOT_BIN= u-boot-sunxi-with-spl.bin |
6 | | | 6 | |
7 | PKGREVISION= 1 | | 7 | PKGREVISION= 2 |
8 | | | 8 | |
9 | post-extract: | | 9 | post-extract: |
10 | ${CP} ${PREFIX}/share/arm-trusted-firmware/sun50i-h6/bl31.bin ${WRKSRC} | | 10 | ${CP} ${PREFIX}/share/arm-trusted-firmware/sun50i-h6/bl31.bin ${WRKSRC} |
11 | | | 11 | |
12 | post-build: | | 12 | post-build: |
13 | ${CAT} ${WRKSRC}/spl/sunxi-spl.bin ${WRKSRC}/u-boot.itb > ${WRKSRC}/u-boot-sunxi-with-spl.bin | | 13 | ${CAT} ${WRKSRC}/spl/sunxi-spl.bin ${WRKSRC}/u-boot.itb > ${WRKSRC}/u-boot-sunxi-with-spl.bin |
14 | | | 14 | |
15 | .include "../../sysutils/arm-trusted-firmware-sun50i-h6/buildlink3.mk" | | 15 | .include "../../sysutils/arm-trusted-firmware-sun50i-h6/buildlink3.mk" |
16 | .include "../../sysutils/u-boot/u-boot-arm64.mk" | | 16 | .include "../../sysutils/u-boot/u-boot-arm64.mk" |
--- pkgsrc/sysutils/u-boot-pine64/Makefile 2019/03/15 14:00:36 1.7
+++ pkgsrc/sysutils/u-boot-pine64/Makefile 2019/04/12 07:08:18 1.8
| @@ -1,19 +1,19 @@ | | | @@ -1,19 +1,19 @@ |
1 | # $NetBSD: Makefile,v 1.7 2019/03/15 14:00:36 martin Exp $ | | 1 | # $NetBSD: Makefile,v 1.8 2019/04/12 07:08:18 skrll Exp $ |
2 | | | 2 | |
3 | UBOOT_TARGET= pine64 | | 3 | UBOOT_TARGET= pine64 |
4 | UBOOT_CONFIG= pine64_plus_defconfig | | 4 | UBOOT_CONFIG= pine64_plus_defconfig |
5 | UBOOT_BIN= u-boot-sunxi-with-spl.bin | | 5 | UBOOT_BIN= u-boot-sunxi-with-spl.bin |
6 | | | 6 | |
7 | PKGREVISION= 2 | | 7 | PKGREVISION= 3 |
8 | | | 8 | |
9 | # Switch to EL1 before booting kernel (required for 32-bit support) | | 9 | # Switch to EL1 before booting kernel (required for 32-bit support) |
10 | PKG_DEFAULT_OPTIONS+= el1 | | 10 | PKG_DEFAULT_OPTIONS+= el1 |
11 | | | 11 | |
12 | post-extract: | | 12 | post-extract: |
13 | ${CP} ${PREFIX}/share/arm-trusted-firmware/sun50i_a64/bl31.bin ${WRKSRC} | | 13 | ${CP} ${PREFIX}/share/arm-trusted-firmware/sun50i_a64/bl31.bin ${WRKSRC} |
14 | | | 14 | |
15 | post-build: | | 15 | post-build: |
16 | ${CAT} ${WRKSRC}/spl/sunxi-spl.bin ${WRKSRC}/u-boot.itb > ${WRKSRC}/u-boot-sunxi-with-spl.bin | | 16 | ${CAT} ${WRKSRC}/spl/sunxi-spl.bin ${WRKSRC}/u-boot.itb > ${WRKSRC}/u-boot-sunxi-with-spl.bin |
17 | | | 17 | |
18 | .include "../../sysutils/arm-trusted-firmware-sun50i_a64/buildlink3.mk" | | 18 | .include "../../sysutils/arm-trusted-firmware-sun50i_a64/buildlink3.mk" |
19 | .include "../../sysutils/u-boot/u-boot-arm64.mk" | | 19 | .include "../../sysutils/u-boot/u-boot-arm64.mk" |
--- pkgsrc/sysutils/u-boot-pocketchip/Makefile 2018/12/31 15:06:46 1.5
+++ pkgsrc/sysutils/u-boot-pocketchip/Makefile 2019/04/12 07:08:18 1.6
| @@ -1,20 +1,20 @@ | | | @@ -1,20 +1,20 @@ |
1 | # $NetBSD: Makefile,v 1.5 2018/12/31 15:06:46 jmcneill Exp $ | | 1 | # $NetBSD: Makefile,v 1.6 2019/04/12 07:08:18 skrll Exp $ |
2 | | | 2 | |
3 | UBOOT_TARGET= pocketchip | | 3 | UBOOT_TARGET= pocketchip |
4 | UBOOT_CONFIG= CHIP_defconfig | | 4 | UBOOT_CONFIG= CHIP_defconfig |
5 | UBOOT_BIN= u-boot-sunxi-with-spl.bin | | 5 | UBOOT_BIN= u-boot-sunxi-with-spl.bin |
6 | | | 6 | |
7 | PKGREVISION= 1 | | 7 | PKGREVISION= 2 |
8 | | | 8 | |
9 | UBOOT_OPTIONS+= CONFIG_I2C1_ENABLE=y | | 9 | UBOOT_OPTIONS+= CONFIG_I2C1_ENABLE=y |
10 | UBOOT_OPTIONS+= CONFIG_AXP_GPIO=y | | 10 | UBOOT_OPTIONS+= CONFIG_AXP_GPIO=y |
11 | UBOOT_OPTIONS+= CONFIG_VIDEO=y | | 11 | UBOOT_OPTIONS+= CONFIG_VIDEO=y |
12 | UBOOT_OPTIONS+= CONFIG_VIDEO_VGA_VIA_LCD=y | | 12 | UBOOT_OPTIONS+= CONFIG_VIDEO_VGA_VIA_LCD=y |
13 | UBOOT_OPTIONS+= CONFIG_VIDEO_LCD_MODE=\"x:480,y:272,depth:18,pclk_khz:9000,le:10,ri:5,up:3,lo:8,hs:30,vs:5,sync:3,vmode:0\" | | 13 | UBOOT_OPTIONS+= CONFIG_VIDEO_LCD_MODE=\"x:480,y:272,depth:18,pclk_khz:9000,le:10,ri:5,up:3,lo:8,hs:30,vs:5,sync:3,vmode:0\" |
14 | UBOOT_OPTIONS+= CONFIG_VIDEO_LCD_POWER=\"AXP0-1\" | | 14 | UBOOT_OPTIONS+= CONFIG_VIDEO_LCD_POWER=\"AXP0-1\" |
15 | UBOOT_OPTIONS+= CONFIG_VIDEO_LCD_BL_EN=\"PD18\" | | 15 | UBOOT_OPTIONS+= CONFIG_VIDEO_LCD_BL_EN=\"PD18\" |
16 | UBOOT_OPTIONS+= CONFIG_VIDEO_LCD_BL_PWM=\"PB2\" | | 16 | UBOOT_OPTIONS+= CONFIG_VIDEO_LCD_BL_PWM=\"PB2\" |
17 | UBOOT_OPTIONS+= CONFIG_VIDEO_CHRONTEL_CH7033=y | | 17 | UBOOT_OPTIONS+= CONFIG_VIDEO_CHRONTEL_CH7033=y |
18 | UBOOT_OPTIONS+= CONFIG_VIDEO_CHRONTEL_CH7033_I2C_BUS=1 | | 18 | UBOOT_OPTIONS+= CONFIG_VIDEO_CHRONTEL_CH7033_I2C_BUS=1 |
19 | | | 19 | |
20 | .include "../../sysutils/u-boot/u-boot-arm.mk" | | 20 | .include "../../sysutils/u-boot/u-boot-arm.mk" |
--- pkgsrc/sysutils/u-boot-sopine-baseboard/Makefile 2019/03/15 14:01:00 1.3
+++ pkgsrc/sysutils/u-boot-sopine-baseboard/Makefile 2019/04/12 07:08:18 1.4
| @@ -1,21 +1,21 @@ | | | @@ -1,21 +1,21 @@ |
1 | # $NetBSD: Makefile,v 1.3 2019/03/15 14:01:00 martin Exp $ | | 1 | # $NetBSD: Makefile,v 1.4 2019/04/12 07:08:18 skrll Exp $ |
2 | | | 2 | |
3 | UBOOT_TARGET= sopine-baseboard | | 3 | UBOOT_TARGET= sopine-baseboard |
4 | UBOOT_CONFIG= sopine_baseboard_defconfig | | 4 | UBOOT_CONFIG= sopine_baseboard_defconfig |
5 | UBOOT_BIN= u-boot-sunxi-with-spl.bin | | 5 | UBOOT_BIN= u-boot-sunxi-with-spl.bin |
6 | UBOOT_ENV+= DEVICE_TREE=sun50i-a64-sopine-baseboard | | 6 | UBOOT_ENV+= DEVICE_TREE=sun50i-a64-sopine-baseboard |
7 | | | 7 | |
8 | PKGREVISION= 2 | | 8 | PKGREVISION= 3 |
9 | | | 9 | |
10 | # Switch to EL1 before booting kernel (required for 32-bit support) | | 10 | # Switch to EL1 before booting kernel (required for 32-bit support) |
11 | PKG_DEFAULT_OPTIONS+= el1 | | 11 | PKG_DEFAULT_OPTIONS+= el1 |
12 | | | 12 | |
13 | post-extract: | | 13 | post-extract: |
14 | ${CP} ${PREFIX}/share/arm-trusted-firmware/sun50i_a64/bl31.bin ${WRKSRC} | | 14 | ${CP} ${PREFIX}/share/arm-trusted-firmware/sun50i_a64/bl31.bin ${WRKSRC} |
15 | ${CP} ${WRKSRC}/arch/arm/dts/sun50i-a64-pine64-plus.dts \ | | 15 | ${CP} ${WRKSRC}/arch/arm/dts/sun50i-a64-pine64-plus.dts \ |
16 | ${WRKSRC}/arch/arm/dts/sun50i-a64-sopine-baseboard.dts | | 16 | ${WRKSRC}/arch/arm/dts/sun50i-a64-sopine-baseboard.dts |
17 | ${CAT} ${WRKSRC}/configs/${UBOOT_CONFIG} | \ | | 17 | ${CAT} ${WRKSRC}/configs/${UBOOT_CONFIG} | \ |
18 | ${SED} "s/sun50i-a64-pine64-plus/sun50i-a64-sopine-baseboard/" \ | | 18 | ${SED} "s/sun50i-a64-pine64-plus/sun50i-a64-sopine-baseboard/" \ |
19 | > ${WRKSRC}/configs/${UBOOT_CONFIG}.tmp && \ | | 19 | > ${WRKSRC}/configs/${UBOOT_CONFIG}.tmp && \ |
20 | ${MV} ${WRKSRC}/configs/${UBOOT_CONFIG}.tmp ${WRKSRC}/configs/${UBOOT_CONFIG} | | 20 | ${MV} ${WRKSRC}/configs/${UBOOT_CONFIG}.tmp ${WRKSRC}/configs/${UBOOT_CONFIG} |
21 | | | 21 | |
$NetBSD: patch-Makefile,v 1.1 2019/04/12 07:08:15 skrll Exp $
--- Makefile.orig 2018-11-14 16:10:06.000000000 +0000
+++ Makefile
@@ -1472,7 +1472,7 @@ prepare: prepare0
define filechk_version.h
(echo \#define PLAIN_VERSION \"$(UBOOTRELEASE)\"; \
- echo \#define U_BOOT_VERSION \"U-Boot \" PLAIN_VERSION; \
+ echo \#define U_BOOT_VERSION \"U-Boot \" PLAIN_VERSION \"$(UBOOT_PKGREVISION)\"; \
echo \#define CC_VERSION_STRING \"$$(LC_ALL=C $(CC) --version | head -n 1)\"; \
echo \#define LD_VERSION_STRING \"$$(LC_ALL=C $(LD) --version | head -n 1)\"; )
endef
$NetBSD: patch-lib_efi__loader_efi__variable.c,v 1.1 2019/04/12 07:08:15 skrll Exp $
--- lib/efi_loader/efi_variable.c.orig 2019-04-06 16:01:44.521947778 +0000
+++ lib/efi_loader/efi_variable.c
@@ -8,6 +8,10 @@
#include <malloc.h>
#include <charset.h>
#include <efi_loader.h>
+#include <hexdump.h>
+#include <environment.h>
+#include <search.h>
+#include <uuid.h>
#define READ_ONLY BIT(31)
@@ -98,6 +102,19 @@ static char *mem2hex(char *hexstr, const
return hexstr;
}
+/**
+ * efi_to_native() - convert the UEFI variable name and vendor GUID to U-Boot
+ * variable name
+ *
+ * The U-Boot variable name is a concatenation of prefix 'efi', the hexstring
+ * encoded vendor GUID, and the UTF-8 encoded UEFI variable name separated by
+ * underscores, e.g. 'efi_8be4df61-93ca-11d2-aa0d-00e098032b8c_BootOrder'.
+ *
+ * @native: pointer to pointer to U-Boot variable name
+ * @variable_name: UEFI variable name
+ * @vendor: vendor GUID
+ * Return: status code
+ */
static efi_status_t efi_to_native(char **native, const u16 *variable_name,
efi_guid_t *vendor)
{
@@ -116,6 +133,15 @@ static efi_status_t efi_to_native(char *
return EFI_SUCCESS;
}
+/**
+ * prefix() - skip over prefix
+ *
+ * Skip over a prefix string.
+ *
+ * @str: string with prefix
+ * @prefix: prefix string
+ * Return: string without prefix, or NULL if prefix not found
+ */
static const char *prefix(const char *str, const char *prefix)
{
size_t n = strlen(prefix);
@@ -124,7 +150,16 @@ static const char *prefix(const char *st
return NULL;
}
-/* parse attributes part of variable value, if present: */
+/**
+ * parse_attr() - decode attributes part of variable value
+ *
+ * Convert the string encoded attributes of a UEFI variable to a bit mask.
+ * TODO: Several attributes are not supported.
+ *
+ * @str: value of U-Boot variable
+ * @attrp: pointer to UEFI attributes
+ * Return: pointer to remainder of U-Boot variable value
+ */
static const char *parse_attr(const char *str, u32 *attrp)
{
u32 attr = 0;
@@ -162,7 +197,21 @@ static const char *parse_attr(const char
return str;
}
-/* http://wiki.phoenix.com/wiki/index.php/EFI_RUNTIME_SERVICES#GetVariable.28.29 */
+/**
+ * efi_efi_get_variable() - retrieve value of a UEFI variable
+ *
+ * This function implements the GetVariable runtime service.
+ *
+ * See the Unified Extensible Firmware Interface (UEFI) specification for
+ * details.
+ *
+ * @variable_name: name of the variable
+ * @vendor: vendor GUID
+ * @attributes: attributes of the variable
+ * @data_size: size of the buffer to which the variable value is copied
+ * @data: buffer to which the variable value is copied
+ * Return: status code
+ */
efi_status_t EFIAPI efi_get_variable(u16 *variable_name, efi_guid_t *vendor,
u32 *attributes, efi_uintn_t *data_size,
void *data)
@@ -241,17 +290,179 @@ efi_status_t EFIAPI efi_get_variable(u16
return EFI_EXIT(EFI_SUCCESS);
}
-/* http://wiki.phoenix.com/wiki/index.php/EFI_RUNTIME_SERVICES#GetNextVariableName.28.29 */
+static char *efi_variables_list;
+static char *efi_cur_variable;
+
+/**
+ * parse_uboot_variable() - parse a u-boot variable and get uefi-related
+ * information
+ * @variable: whole data of u-boot variable (ie. name=value)
+ * @variable_name_size: size of variable_name buffer in byte
+ * @variable_name: name of uefi variable in u16, null-terminated
+ * @vendor: vendor's guid
+ * @attributes: attributes
+ *
+ * A uefi variable is encoded into a u-boot variable as described above.
+ * This function parses such a u-boot variable and retrieve uefi-related
+ * information into respective parameters. In return, variable_name_size
+ * is the size of variable name including NULL.
+ *
+ * Return: EFI_SUCCESS if parsing is OK, EFI_NOT_FOUND when
+ the entire variable list has been returned,
+ otherwise non-zero status code
+ */
+static efi_status_t parse_uboot_variable(char *variable,
+ efi_uintn_t *variable_name_size,
+ u16 *variable_name,
+ const efi_guid_t *vendor,
+ u32 *attributes)
+{
+ char *guid, *name, *end, c;
+ unsigned long name_len;
+ u16 *p;
+
+ guid = strchr(variable, '_');
+ if (!guid)
+ return EFI_INVALID_PARAMETER;
+ guid++;
+ name = strchr(guid, '_');
+ if (!name)
+ return EFI_INVALID_PARAMETER;
+ name++;
+ end = strchr(name, '=');
+ if (!end)
+ return EFI_INVALID_PARAMETER;
+
+ name_len = end - name;
+ if (*variable_name_size < (name_len + 1)) {
+ *variable_name_size = name_len + 1;
+ return EFI_BUFFER_TOO_SMALL;
+ }
+ end++; /* point to value */
+
+ /* variable name */
+ p = variable_name;
+ utf8_utf16_strncpy(&p, name, name_len);
+ variable_name[name_len] = 0;
+ *variable_name_size = name_len + 1;
+
+ /* guid */
+ c = *(name - 1);
+ *(name - 1) = '\0'; /* guid need be null-terminated here */
+ uuid_str_to_bin(guid, (unsigned char *)vendor, UUID_STR_FORMAT_GUID);
+ *(name - 1) = c;
+
+ /* attributes */
+ parse_attr(end, attributes);
+
+ return EFI_SUCCESS;
+}
+
+/**
+ * efi_get_next_variable_name() - enumerate the current variable names
+ * @variable_name_size: size of variable_name buffer in byte
+ * @variable_name: name of uefi variable's name in u16
+ * @vendor: vendor's guid
+ *
+ * This function implements the GetNextVariableName service.
+ *
+ * See the Unified Extensible Firmware Interface (UEFI) specification for
+ * details: http://wiki.phoenix.com/wiki/index.php/
+ * EFI_RUNTIME_SERVICES#GetNextVariableName.28.29
+ *
+ * Return: status code
+ */
efi_status_t EFIAPI efi_get_next_variable_name(efi_uintn_t *variable_name_size,
- u16 *variable_name,
- efi_guid_t *vendor)
+ u16 *variable_name,
+ efi_guid_t *vendor)
{
+ char *native_name, *variable;
+ ssize_t name_len, list_len;
+ char regex[256];
+ char * const regexlist[] = {regex};
+ u32 attributes;
+ int i;
+ efi_status_t ret;
+
EFI_ENTRY("%p \"%ls\" %pUl", variable_name_size, variable_name, vendor);
- return EFI_EXIT(EFI_DEVICE_ERROR);
+ if (!variable_name_size || !variable_name || !vendor)
+ return EFI_EXIT(EFI_INVALID_PARAMETER);
+
+ if (variable_name[0]) {
+ /* check null-terminated string */
+ for (i = 0; i < *variable_name_size; i++)
+ if (!variable_name[i])
+ break;
+ if (i >= *variable_name_size)
+ return EFI_EXIT(EFI_INVALID_PARAMETER);
+
+ /* search for the last-returned variable */
+ ret = efi_to_native(&native_name, variable_name, vendor);
+ if (ret)
+ return EFI_EXIT(ret);
+
+ name_len = strlen(native_name);
+ for (variable = efi_variables_list; variable && *variable;) {
+ if (!strncmp(variable, native_name, name_len) &&
+ variable[name_len] == '=')
+ break;
+
+ variable = strchr(variable, '\n');
+ if (variable)
+ variable++;
+ }
+
+ free(native_name);
+ if (!(variable && *variable))
+ return EFI_EXIT(EFI_INVALID_PARAMETER);
+
+ /* next variable */
+ variable = strchr(variable, '\n');
+ if (variable)
+ variable++;
+ if (!(variable && *variable))
+ return EFI_EXIT(EFI_NOT_FOUND);
+ } else {
+ /*
+ *new search: free a list used in the previous search
+ */
+ free(efi_variables_list);
+ efi_variables_list = NULL;
+ efi_cur_variable = NULL;
+
+ snprintf(regex, 256, "efi_.*-.*-.*-.*-.*_.*");
+ list_len = hexport_r(&env_htab, '\n',
+ H_MATCH_REGEX | H_MATCH_KEY,
+ &efi_variables_list, 0, 1, regexlist);
+ /* 1 indicates that no match was found */
+ if (list_len <= 1)
+ return EFI_EXIT(EFI_NOT_FOUND);
+
+ variable = efi_variables_list;
+ }
+
+ ret = parse_uboot_variable(variable, variable_name_size, variable_name,
+ vendor, &attributes);
+
+ return EFI_EXIT(ret);
}
-/* http://wiki.phoenix.com/wiki/index.php/EFI_RUNTIME_SERVICES#SetVariable.28.29 */
+/**
+ * efi_efi_set_variable() - set value of a UEFI variable
+ *
+ * This function implements the SetVariable runtime service.
+ *
+ * See the Unified Extensible Firmware Interface (UEFI) specification for
+ * details.
+ *
+ * @variable_name: name of the variable
+ * @vendor: vendor GUID
+ * @attributes: attributes of the variable
+ * @data_size: size of the buffer with the variable value
+ * @data: buffer with the variable value
+ * Return: status code
+ */
efi_status_t EFIAPI efi_set_variable(u16 *variable_name, efi_guid_t *vendor,
u32 attributes, efi_uintn_t data_size,
void *data)