pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/sysutils move u-boot-pinebook-pro/u-boot-rockchip.mk t...
details: https://anonhg.NetBSD.org/pkgsrc/rev/5ba224e166d7
branches: trunk
changeset: 414788:5ba224e166d7
user: tnn <tnn%pkgsrc.org@localhost>
date: Thu Apr 02 09:12:54 2020 +0000
description:
move u-boot-pinebook-pro/u-boot-rockchip.mk to u-boot/u-boot-rockchip.mk
diffstat:
sysutils/u-boot-pinebook-pro/Makefile | 4 +-
sysutils/u-boot-pinebook-pro/u-boot-rockchip.mk | 46 ----------------------
sysutils/u-boot-rockpro64/Makefile | 23 +----------
sysutils/u-boot/u-boot-rockchip.mk | 51 +++++++++++++-----------
4 files changed, 31 insertions(+), 93 deletions(-)
diffs (172 lines):
diff -r 007ad9fc6ba9 -r 5ba224e166d7 sysutils/u-boot-pinebook-pro/Makefile
--- a/sysutils/u-boot-pinebook-pro/Makefile Thu Apr 02 09:09:05 2020 +0000
+++ b/sysutils/u-boot-pinebook-pro/Makefile Thu Apr 02 09:12:54 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2020/02/23 01:01:11 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2020/04/02 09:12:54 tnn Exp $
PKGREVISION= 5
@@ -10,4 +10,4 @@
U_BOOT_IMAGE_TYPE= rk3399
-.include "../../sysutils/u-boot-pinebook-pro/u-boot-rockchip.mk"
+.include "../../sysutils/u-boot/u-boot-rockchip.mk"
diff -r 007ad9fc6ba9 -r 5ba224e166d7 sysutils/u-boot-pinebook-pro/u-boot-rockchip.mk
--- a/sysutils/u-boot-pinebook-pro/u-boot-rockchip.mk Thu Apr 02 09:09:05 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-# $NetBSD: u-boot-rockchip.mk,v 1.2 2020/01/23 18:26:35 jakllsch Exp $
-#
-# should be used by sysutils/u-boot-rock64/Makefile
-# used by sysutils/u-boot-rockpro64/Makefile
-# used by sysutils/u-boot-pinebook-pro/Makefile
-
-# Common makefile fragment for rockchip based u-boot targets.
-#
-# Set these variables:
-#
-# U_BOOT_IMAGE_TYPE ("rk3399", "rk3328")
-#
-
-UBOOT_VERSION?= 2020.01-rc5
-
-# Patches kept in pinebook-pro; first worked there.
-DISTINFO_FILE?= ${.CURDIR}/../../sysutils/u-boot-pinebook-pro/distinfo
-PATCHDIR?= ${.CURDIR}/../../sysutils/u-boot-pinebook-pro/patches
-
-MAKE_ENV+= BL31=${PREFIX}/share/arm-trusted-firmware/${U_BOOT_IMAGE_TYPE}/bl31.elf
-
-post-build:
-# 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
-# build SPI NOR flash image. See dev-ayufan/build.mk.
- set -e; b=0; while [ "$$b" != 128 ]; do \
- dd bs=2k count=1; \
- dd if=/dev/zero bs=2k count=1; \
- b=$$(expr $$b + 1); \
- done < ${WRKSRC}/idbloader.img > ${WRKSRC}/rkspi_loader.img 2> /dev/null
- dd if=${WRKSRC}/u-boot.itb seek=1024 conv=notrunc of=${WRKSRC}/rkspi_loader.img
-
-SUBST_CLASSES+= makefitpath
-SUBST_STAGE.makefitpath= pre-configure
-SUBST_FILES.makefitpath= arch/arm/mach-rockchip/make_fit_atf.py
-SUBST_SED.makefitpath= -e "s| python3| python|g"
-
-PYTHON_VERSIONS_ACCEPTED+= 37 38
-REPLACE_INTERPRETER+= python3
-REPLACE.python3.old= python3
-REPLACE.python3.new= ${PYTHON3BIN}
-REPLACE_FILES.python2= arch/arm/mach-rockchip/make_fit_atf.py
-
-.include "../../sysutils/arm-trusted-firmware-${U_BOOT_IMAGE_TYPE}/buildlink3.mk"
-.include "../../sysutils/u-boot/u-boot-arm64.mk"
diff -r 007ad9fc6ba9 -r 5ba224e166d7 sysutils/u-boot-rockpro64/Makefile
--- a/sysutils/u-boot-rockpro64/Makefile Thu Apr 02 09:09:05 2020 +0000
+++ b/sysutils/u-boot-rockpro64/Makefile Thu Apr 02 09:12:54 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2020/04/02 09:06:28 tnn Exp $
+# $NetBSD: Makefile,v 1.10 2020/04/02 09:12:54 tnn Exp $
UBOOT_TARGET= rockpro64
UBOOT_CONFIG= rockpro64-rk3399_defconfig
@@ -8,23 +8,4 @@
U_BOOT_IMAGE_TYPE= rk3399
-# Boot Loader stage 3-1 (BL31) EL3 Runtime Firmware
-# XXX LICENSE?
-#BL31= rk3399_bl31_v1.29.elf # if you bump this, adjust pre-build target!
-#DISTFILES+= ${BL31}
-#SITES.${BL31}= ${MASTER_SITE_GITHUB:=rockchip-linux/rkbin/raw/0b8a4e66958b5d3d87fc61fc4bd8e069c79e931a/bin/rk33/}
-
-# DDR init binary
-#DDR_BIN= rk3399_ddr_800MHz_v1.23.bin
-#SITES.${DDR_BIN}= ${MASTER_SITE_GITHUB:=rockchip-linux/rkbin/raw/016471bcfb1a0b1e1269895cb7b6f534813edfdc/bin/rk33/}
-#DISTFILES+= ${DDR_BIN}
-
-#pre-build:
-# patch the first instruction of cortex_a72_reset_func, replacing:
-# mrs x0, s3_1_c15_c2_0
-# with:
-# orr x0, xzr, #0x100000000
-# This enables workaround for A72 errata #859971.
-# ${AWK} 'BEGIN {printf("%c%c%c%c",224,3,96,178);exit;}' | dd conv=notrunc bs=1 seek=145568 of=${WRKDIR}/${BL31}
-
-.include "../../sysutils/u-boot-pinebook-pro/u-boot-rockchip.mk"
+.include "../../sysutils/u-boot/u-boot-rockchip.mk"
diff -r 007ad9fc6ba9 -r 5ba224e166d7 sysutils/u-boot/u-boot-rockchip.mk
--- a/sysutils/u-boot/u-boot-rockchip.mk Thu Apr 02 09:09:05 2020 +0000
+++ b/sysutils/u-boot/u-boot-rockchip.mk Thu Apr 02 09:12:54 2020 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: u-boot-rockchip.mk,v 1.5 2019/09/15 15:50:21 tnn Exp $
+# $NetBSD: u-boot-rockchip.mk,v 1.6 2020/04/02 09:12:54 tnn Exp $
#
-# used by sysutils/u-boot-rock64/Makefile
+# should be used by sysutils/u-boot-rock64/Makefile
# used by sysutils/u-boot-rockpro64/Makefile
+# used by sysutils/u-boot-pinebook-pro/Makefile
# Common makefile fragment for rockchip based u-boot targets.
#
@@ -10,34 +11,36 @@
# U_BOOT_IMAGE_TYPE ("rk3399", "rk3328")
#
-UBOOT_VERSION= ${GITHUB_TAG:C/-.*$//}
-MASTER_SITES= ${MASTER_SITE_GITHUB:=ayufan-rock64/}
-GITHUB_PROJECT= linux-u-boot
-GITHUB_TAG= 2017.09-rockchip-ayufan-1063-g29843fbd42
-DISTNAME= ${GITHUB_TAG}
-PATCHDIR= ${.CURDIR}/../../sysutils/u-boot-rockpro64/patches
-DISTFILES= ${DEFAULT_DISTFILES}
-EXTRACT_SUFX= .tar.gz
+UBOOT_VERSION?= 2020.01-rc5
-# pkgsrc tries to run distfiles that end in .bin; handle manually
-EXTRACT_ONLY= ${DISTFILES:N*.bin}
+# Patches kept in pinebook-pro; first worked there.
+DISTINFO_FILE?= ${.CURDIR}/../../sysutils/u-boot-pinebook-pro/distinfo
+PATCHDIR?= ${.CURDIR}/../../sysutils/u-boot-pinebook-pro/patches
-USE_TOOLS+= gawk
-MAKE_ENV+= BL31=${WRKDIR}/${BL31}
-
-post-extract:
- cp ${DISTDIR}/${DDR_BIN} ${WRKDIR}
+MAKE_ENV+= BL31=${PREFIX}/share/arm-trusted-firmware/${U_BOOT_IMAGE_TYPE}/bl31.elf
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
# build SPI NOR flash image. See dev-ayufan/build.mk.
- set -e; b=0; while [ "$$b" != 128 ]; do dd bs=2k count=1; dd if=/dev/zero bs=2k count=1; b=$$(expr $$b + 1); done < ${WRKSRC}/idbloader.img > ${WRKSRC}/rkspi_loader.img 2> /dev/null
+ set -e; b=0; while [ "$$b" != 128 ]; do \
+ dd bs=2k count=1; \
+ dd if=/dev/zero bs=2k count=1; \
+ b=$$(expr $$b + 1); \
+ done < ${WRKSRC}/idbloader.img > ${WRKSRC}/rkspi_loader.img 2> /dev/null
dd if=${WRKSRC}/u-boot.itb seek=1024 conv=notrunc of=${WRKSRC}/rkspi_loader.img
+
+SUBST_CLASSES+= makefitpath
+SUBST_STAGE.makefitpath= pre-configure
+SUBST_FILES.makefitpath= arch/arm/mach-rockchip/make_fit_atf.py
+SUBST_SED.makefitpath= -e "s| python3| python|g"
+
+PYTHON_VERSIONS_ACCEPTED+= 37 38
+REPLACE_INTERPRETER+= python3
+REPLACE.python3.old= python3
+REPLACE.python3.new= ${PYTHON3BIN}
+REPLACE_FILES.python2= arch/arm/mach-rockchip/make_fit_atf.py
+
+.include "../../sysutils/arm-trusted-firmware-${U_BOOT_IMAGE_TYPE}/buildlink3.mk"
+.include "../../sysutils/u-boot/u-boot-arm64.mk"
Home |
Main Index |
Thread Index |
Old Index