pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/sysutils
Module Name: pkgsrc
Committed By: mrg
Date: Sat Jun 8 12:25:05 UTC 2019
Modified Files:
pkgsrc/sysutils/u-boot: Makefile u-boot.mk
pkgsrc/sysutils/u-boot-rockpro64: Makefile distinfo
Added Files:
pkgsrc/sysutils/u-boot: u-boot-rockchip.mk
pkgsrc/sysutils/u-boot-rock64: DESCR MESSAGE Makefile PLIST distinfo
Log Message:
update pine64's rockpro64 to latest version from ayufan.
add u-boot package for rock64. originally this was the same
as the old rockpro64 and works fine on that the rev2.0 board,
but didn't on rev3.0. the updated version is still has a
problem, but at least gets further and has partition issues
instead of failing to talk to the sd at all. share a bunch
of the makefile with rockpro64.
for all u-boot, properly fix the subst for tools/dtoc/dtoc.
add both rock64 and rockpro64 to the u-boot meta package and
bump the pkg revision.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/sysutils/u-boot/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/u-boot/u-boot-rockchip.mk
cvs rdiff -u -r1.18 -r1.19 pkgsrc/sysutils/u-boot/u-boot.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/u-boot-rock64/DESCR \
pkgsrc/sysutils/u-boot-rock64/MESSAGE \
pkgsrc/sysutils/u-boot-rock64/Makefile \
pkgsrc/sysutils/u-boot-rock64/PLIST \
pkgsrc/sysutils/u-boot-rock64/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/u-boot-rockpro64/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/u-boot-rockpro64/distinfo
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/sysutils/u-boot/Makefile
diff -u pkgsrc/sysutils/u-boot/Makefile:1.15 pkgsrc/sysutils/u-boot/Makefile:1.16
--- pkgsrc/sysutils/u-boot/Makefile:1.15 Wed Jun 5 05:43:15 2019
+++ pkgsrc/sysutils/u-boot/Makefile Sat Jun 8 12:25:05 2019
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.15 2019/06/05 05:43:15 thorpej Exp $
+# $NetBSD: Makefile,v 1.16 2019/06/08 12:25:05 mrg Exp $
#
.include "../../sysutils/u-boot/u-boot-version.mk"
DISTNAME= u-boot-${UBOOT_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= meta-pkgs sysutils u-boot
MASTER_SITES= # empty
@@ -58,6 +58,8 @@ DEPENDS+= u-boot-pine-h64-[0-9]*:../../s
DEPENDS+= u-boot-pine64-[0-9]*:../../sysutils/u-boot-pine64
DEPENDS+= u-boot-pinebook-[0-9]*:../../sysutils/u-boot-pinebook
DEPENDS+= u-boot-pocketchip-[0-9]*:../../sysutils/u-boot-pocketchip
+DEPENDS+= u-boot-rock64-[0-9]*:../../sysutils/u-boot-rock64
+DEPENDS+= u-boot-rockpro64-[0-9]*:../../sysutils/u-boot-rockpro64
DEPENDS+= u-boot-sopine-baseboard-[0-9]*:../../sysutils/u-boot-sopine-baseboard
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/u-boot/u-boot.mk
diff -u pkgsrc/sysutils/u-boot/u-boot.mk:1.18 pkgsrc/sysutils/u-boot/u-boot.mk:1.19
--- pkgsrc/sysutils/u-boot/u-boot.mk:1.18 Sat Jun 8 10:01:22 2019
+++ pkgsrc/sysutils/u-boot/u-boot.mk Sat Jun 8 12:25:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: u-boot.mk,v 1.18 2019/06/08 10:01:22 mrg Exp $
+# $NetBSD: u-boot.mk,v 1.19 2019/06/08 12:25:05 mrg Exp $
.include "../../sysutils/u-boot/u-boot-version.mk"
@@ -23,13 +23,17 @@ USE_TOOLS+= bison gmake gsed pkg-config
PYTHON_FOR_BUILD_ONLY= yes
PYTHON_VERSIONS_ACCEPTED= 27
+SUBST_CLASSES+= pythonpath
+SUBST_STAGE.pythonpath= pre-configure
+SUBST_FILES.pythonpath= tools/dtoc/dtoc
+SUBST_SED.pythonpath= -e "s|/usr/bin/python|${PYTHONBIN}|g"
+
REPLACE_INTERPRETER+= python2
REPLACE.python2.old= python2
REPLACE.python2.new= ${PYTHONBIN}
REPLACE_FILES.python2= scripts/fill_scrapyard.py \
tools/binman/binman \
tools/binman/binman.py \
- tools/dtoc/dtoc \
tools/dtoc/dtoc.py \
tools/genboardscfg.py \
tools/moveconfig.py
Index: pkgsrc/sysutils/u-boot-rockpro64/Makefile
diff -u pkgsrc/sysutils/u-boot-rockpro64/Makefile:1.2 pkgsrc/sysutils/u-boot-rockpro64/Makefile:1.3
--- pkgsrc/sysutils/u-boot-rockpro64/Makefile:1.2 Sat Sep 1 12:04:56 2018
+++ pkgsrc/sysutils/u-boot-rockpro64/Makefile Sat Jun 8 12:25:05 2019
@@ -1,19 +1,13 @@
-# $NetBSD: Makefile,v 1.2 2018/09/01 12:04:56 tnn Exp $
+# $NetBSD: Makefile,v 1.3 2019/06/08 12:25:05 mrg Exp $
UBOOT_TARGET= rockpro64
UBOOT_CONFIG= rockpro64-rk3399_defconfig
UBOOT_BIN= idbloader.img rksd_loader.img u-boot.itb
-PKGREVISION= 1
-UBOOT_VERSION= ${GITHUB_TAG:C/-.*$//}
-MASTER_SITES= ${MASTER_SITE_GITHUB:=ayufan-rock64/}
-GITHUB_PROJECT= linux-u-boot
-GITHUB_TAG= 2017.09-rockchip-ayufan-1033-gdf02018479
-DISTNAME= ${GITHUB_TAG}
DISTINFO_FILE= ${.CURDIR}/../../sysutils/u-boot-rockpro64/distinfo
-PATCHDIR= ${.CURDIR}/../../sysutils/u-boot-rockpro64/patches
-DISTFILES= ${DEFAULT_DISTFILES}
-EXTRACT_SUFX= .tar.gz
+
+U_BOOT_IMAGE_TYPE= rk3399
+.include "../../sysutils/u-boot/u-boot-rockchip.mk"
# Boot Loader stage 3-1 (BL31) EL3 Runtime Firmware
# XXX LICENSE?
@@ -26,24 +20,4 @@ DDR_BIN= rk3399_ddr_800MHz_v1.14.bin
SITES.${DDR_BIN}= ${MASTER_SITE_GITHUB:=rockchip-linux/rkbin/raw/dbc8710a93406669fb2df2d57dc086228bf1979f/bin/rk33/}
DISTFILES+= ${DDR_BIN}
-# pkgsrc tries to run distfiles that end in .bin; handle manually
-EXTRACT_ONLY= ${DISTFILES:N*.bin}
-
-USE_TOOLS+= gawk
-MAKE_ENV+= BL31=${WRKDIR}/${BL31}
-
-post-extract:
- cp ${DISTDIR}/${DDR_BIN} ${WRKDIR}
-
-post-build:
-# build stage 3 package
- cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} u-boot.itb
-# build stage 1 loader
- ${WRKSRC}/tools/mkimage -n rk3399 -T rksd -d ${WRKDIR}/${DDR_BIN} ${WRKSRC}/idbloader.img
-# append stage2 loader
- cat ${WRKSRC}/spl/u-boot-spl.bin >> ${WRKSRC}/idbloader.img
-# wrap everything up into a single file that can be written to an SD card
- cp ${WRKSRC}/idbloader.img ${WRKSRC}/rksd_loader.img
- dd if=${WRKSRC}/u-boot.itb seek=448 conv=notrunc of=${WRKSRC}/rksd_loader.img
-
.include "../../sysutils/u-boot/u-boot-arm64.mk"
Index: pkgsrc/sysutils/u-boot-rockpro64/distinfo
diff -u pkgsrc/sysutils/u-boot-rockpro64/distinfo:1.1 pkgsrc/sysutils/u-boot-rockpro64/distinfo:1.2
--- pkgsrc/sysutils/u-boot-rockpro64/distinfo:1.1 Sat Sep 1 10:38:19 2018
+++ pkgsrc/sysutils/u-boot-rockpro64/distinfo Sat Jun 8 12:25:05 2019
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.1 2018/09/01 10:38:19 tnn Exp $
+$NetBSD: distinfo,v 1.2 2019/06/08 12:25:05 mrg Exp $
-SHA1 (2017.09-rockchip-ayufan-1033-gdf02018479.tar.gz) = 3632ed4d62f7ea93a8fe493ad54c4a3966eaa29a
-RMD160 (2017.09-rockchip-ayufan-1033-gdf02018479.tar.gz) = 003f868c14c9612a2a9c4391c0b1fd66c086ff18
-SHA512 (2017.09-rockchip-ayufan-1033-gdf02018479.tar.gz) = 0badfef6f1bdae898db0f0383af8578c17d83f2afe50ba487cdd49d6dbd8dfc531badc72d3802b3c2542a831198779e187fe3db71f17e9d5ebf10a8b8644428c
-Size (2017.09-rockchip-ayufan-1033-gdf02018479.tar.gz) = 15119423 bytes
+SHA1 (2017.09-rockchip-ayufan-1056-ge2de533f6c.tar.gz) = f8873a68c6a556e8f7482a19c7741cdd4d95055d
+RMD160 (2017.09-rockchip-ayufan-1056-ge2de533f6c.tar.gz) = 0afaecd18d5dd559bbf3e17f84c9095d3bac83a0
+SHA512 (2017.09-rockchip-ayufan-1056-ge2de533f6c.tar.gz) = f3e8e69f942977f04a9649a41e243cdf07098230488aa2b5c4a497766784ff9fe3a225e71d4446c1e94df11049775c06dc35061432f339583a2c63ca0053a259
+Size (2017.09-rockchip-ayufan-1056-ge2de533f6c.tar.gz) = 15125231 bytes
SHA1 (rk3399_bl31_v1.18.elf) = 598be4ce91f088fa11f37ba09b30db98f2e5dc43
RMD160 (rk3399_bl31_v1.18.elf) = 3505a2cc7685b8de0be1e88752e4ff42752f9bfc
SHA512 (rk3399_bl31_v1.18.elf) = a191b60146099f220154540802be3c42452e9b3e989123f492ef04c9742717f67a2018039cf8049c5af7214d12ff50ea992edcfcff3e09b0d48bcbc17fe0af6e
Added files:
Index: pkgsrc/sysutils/u-boot/u-boot-rockchip.mk
diff -u /dev/null pkgsrc/sysutils/u-boot/u-boot-rockchip.mk:1.1
--- /dev/null Sat Jun 8 12:25:06 2019
+++ pkgsrc/sysutils/u-boot/u-boot-rockchip.mk Sat Jun 8 12:25:05 2019
@@ -0,0 +1,39 @@
+# $NetBSD: u-boot-rockchip.mk,v 1.1 2019/06/08 12:25:05 mrg Exp $
+
+#
+# Common makefile fragment for rockchip based u-boot targets.
+#
+# Set these variables:
+#
+# U_BOOT_IMAGE_TYPE ("rk3399", "rk3328")
+#
+
+PKGREVISION= 2
+UBOOT_VERSION= ${GITHUB_TAG:C/-.*$//}
+MASTER_SITES= ${MASTER_SITE_GITHUB:=ayufan-rock64/}
+GITHUB_PROJECT= linux-u-boot
+GITHUB_TAG= 2017.09-rockchip-ayufan-1056-ge2de533f6c
+DISTNAME= ${GITHUB_TAG}
+PATCHDIR= ${.CURDIR}/../../sysutils/u-boot-rockpro64/patches
+DISTFILES= ${DEFAULT_DISTFILES}
+EXTRACT_SUFX= .tar.gz
+
+# pkgsrc tries to run distfiles that end in .bin; handle manually
+EXTRACT_ONLY= ${DISTFILES:N*.bin}
+
+USE_TOOLS+= gawk
+MAKE_ENV+= BL31=${WRKDIR}/${BL31}
+
+post-extract:
+ cp ${DISTDIR}/${DDR_BIN} ${WRKDIR}
+
+post-build:
+# build stage 3 package
+ cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} u-boot.itb
+# build stage 1 loader
+ ${WRKSRC}/tools/mkimage -n ${U_BOOT_IMAGE_TYPE} -T rksd -d ${WRKDIR}/${DDR_BIN} ${WRKSRC}/idbloader.img
+# append stage2 loader
+ cat ${WRKSRC}/spl/u-boot-spl.bin >> ${WRKSRC}/idbloader.img
+# wrap everything up into a single file that can be written to an SD card
+ cp ${WRKSRC}/idbloader.img ${WRKSRC}/rksd_loader.img
+ dd if=${WRKSRC}/u-boot.itb seek=448 conv=notrunc of=${WRKSRC}/rksd_loader.img
Index: pkgsrc/sysutils/u-boot-rock64/DESCR
diff -u /dev/null pkgsrc/sysutils/u-boot-rock64/DESCR:1.1
--- /dev/null Sat Jun 8 12:25:06 2019
+++ pkgsrc/sysutils/u-boot-rock64/DESCR Sat Jun 8 12:25:05 2019
@@ -0,0 +1,5 @@
+U-Boot is a bootloader for embedded boards based on PowerPC, ARM, MIPS and
+several other processors, which can be installed in a boot ROM and used to
+initialize and test the hardware or to download and run application code.
+
+This package provides U-Boot for the rk3328-based Rock64 from PINE64.
Index: pkgsrc/sysutils/u-boot-rock64/MESSAGE
diff -u /dev/null pkgsrc/sysutils/u-boot-rock64/MESSAGE:1.1
--- /dev/null Sat Jun 8 12:25:06 2019
+++ pkgsrc/sysutils/u-boot-rock64/MESSAGE Sat Jun 8 12:25:05 2019
@@ -0,0 +1,10 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2019/06/08 12:25:05 mrg Exp $
+
+Example command to install U-Boot to an empty SD card:
+
+# dd if=${LOCALBASE}/share/u-boot/rock64/rksd_loader.img seek=64 of=/dev/rld0d
+
+See also http://opensource.rock-chips.com/wiki_Boot_option
+
+===========================================================================
Index: pkgsrc/sysutils/u-boot-rock64/Makefile
diff -u /dev/null pkgsrc/sysutils/u-boot-rock64/Makefile:1.1
--- /dev/null Sat Jun 8 12:25:06 2019
+++ pkgsrc/sysutils/u-boot-rock64/Makefile Sat Jun 8 12:25:05 2019
@@ -0,0 +1,23 @@
+# $NetBSD: Makefile,v 1.1 2019/06/08 12:25:05 mrg Exp $
+
+UBOOT_TARGET= rock64
+UBOOT_CONFIG= rock64-rk3328_defconfig
+UBOOT_BIN= idbloader.img rksd_loader.img u-boot.itb
+
+DISTINFO_FILE= ${.CURDIR}/../../sysutils/u-boot-rock64/distinfo
+
+U_BOOT_IMAGE_TYPE= rk3328
+.include "../../sysutils/u-boot/u-boot-rockchip.mk"
+
+# Boot Loader stage 3-1 (BL31) EL3 Runtime Firmware
+# XXX LICENSE?
+BL31= rk322xh_bl31_v1.40.elf
+DISTFILES+= ${BL31}
+SITES.${BL31}= ${MASTER_SITE_GITHUB:=rockchip-linux/rkbin/raw/master/bin/rk33/}
+
+# DDR init binary
+DDR_BIN= rk3328_ddr_333MHz_v1.16.bin
+SITES.${DDR_BIN}= ${MASTER_SITE_GITHUB:=rockchip-linux/rkbin/raw/master/bin/rk33/}
+DISTFILES+= ${DDR_BIN}
+
+.include "../../sysutils/u-boot/u-boot-arm64.mk"
Index: pkgsrc/sysutils/u-boot-rock64/PLIST
diff -u /dev/null pkgsrc/sysutils/u-boot-rock64/PLIST:1.1
--- /dev/null Sat Jun 8 12:25:06 2019
+++ pkgsrc/sysutils/u-boot-rock64/PLIST Sat Jun 8 12:25:05 2019
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST,v 1.1 2019/06/08 12:25:05 mrg Exp $
+share/u-boot/rock64/idbloader.img
+share/u-boot/rock64/rksd_loader.img
+share/u-boot/rock64/u-boot.itb
Index: pkgsrc/sysutils/u-boot-rock64/distinfo
diff -u /dev/null pkgsrc/sysutils/u-boot-rock64/distinfo:1.1
--- /dev/null Sat Jun 8 12:25:06 2019
+++ pkgsrc/sysutils/u-boot-rock64/distinfo Sat Jun 8 12:25:05 2019
@@ -0,0 +1,16 @@
+$NetBSD: distinfo,v 1.1 2019/06/08 12:25:05 mrg Exp $
+
+SHA1 (2017.09-rockchip-ayufan-1056-ge2de533f6c.tar.gz) = f8873a68c6a556e8f7482a19c7741cdd4d95055d
+RMD160 (2017.09-rockchip-ayufan-1056-ge2de533f6c.tar.gz) = 0afaecd18d5dd559bbf3e17f84c9095d3bac83a0
+SHA512 (2017.09-rockchip-ayufan-1056-ge2de533f6c.tar.gz) = f3e8e69f942977f04a9649a41e243cdf07098230488aa2b5c4a497766784ff9fe3a225e71d4446c1e94df11049775c06dc35061432f339583a2c63ca0053a259
+Size (2017.09-rockchip-ayufan-1056-ge2de533f6c.tar.gz) = 15125231 bytes
+SHA1 (rk322xh_bl31_v1.40.elf) = c0652a4b116f611b9a3efb5aaa52685179a08ab1
+RMD160 (rk322xh_bl31_v1.40.elf) = 142ff45b52bdd8ea10d63b73c5dbb4bdb6cfc5d0
+SHA512 (rk322xh_bl31_v1.40.elf) = 47a401f3501dd88c037b5020be3e7020d5cc3b2b8a0961421dac215f3aa17594cc54ab4baaff8cd461ae8a68f20e19b99921694c2f563bd908370d823501c554
+Size (rk322xh_bl31_v1.40.elf) = 820268 bytes
+SHA1 (rk3328_ddr_333MHz_v1.16.bin) = 2c81c827f8e3a1c443c98cc880a0c9c1a26810de
+RMD160 (rk3328_ddr_333MHz_v1.16.bin) = 983c64ff2c76331bcfb44975641f3560c3c0d905
+SHA512 (rk3328_ddr_333MHz_v1.16.bin) = 29cd6bbd7a0cc78073a5d50cc02676a09ec56298236684142572c465c8c3baccf275d583dcbbe52e5b16929ae09dd4a9772ea96d67deedc904707d8e0ca98ee8
+Size (rk3328_ddr_333MHz_v1.16.bin) = 28532 bytes
+SHA1 (patch-arch_arm_cpu_armv8_Kconfig) = 375c79ebe0d593865fbaa7924c8446ea6712fca4
+SHA1 (patch-lib_bch.c) = 151e5f311742a7da919359950ccac2521bcfaaff
Home |
Main Index |
Thread Index |
Old Index