kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

u-boot: include bsd.pkg.mk later

Browse source 
Ideally, this should happen in the main Makefiles and not in
an included file like this one, but the change for that is too big
for me for now and this fixes u-boot-pine64.
This commit is contained in:
wiz 2018-06-06 21:58:28 +00:00
parent 47d44d5e99
commit fe1370c778
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sysutils/u-boot/u-boot-arm.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: u-boot-arm.mk,v 1.1 2017/08/12 14:23:43 jmcneill Exp $ # $NetBSD: u-boot-arm.mk,v 1.2 2018/06/06 21:58:28 wiz Exp $
MAINTAINER= port-arm@NetBSD.org MAINTAINER= port-arm@NetBSD.org
BUILD_DEPENDS+= cross-arm-none-eabi-gcc-[0-9]*:../../cross/arm-none-eabi-gcc BUILD_DEPENDS+= cross-arm-none-eabi-gcc-[0-9]*:../../cross/arm-none-eabi-gcc
@ -6,3 +6,4 @@ BUILD_DEPENDS+= cross-arm-none-eabi-gcc-[0-9]*:../../cross/arm-none-eabi-gcc
UBOOT_ENV+= CROSS_COMPILE=${PREFIX}/cross-arm-none-eabi/bin/arm-none-eabi- UBOOT_ENV+= CROSS_COMPILE=${PREFIX}/cross-arm-none-eabi/bin/arm-none-eabi-
.include "u-boot.mk" .include "u-boot.mk"
.include "../../mk/bsd.pkg.mk"

6
sysutils/u-boot/u-boot-arm64.mk
View file

@ -1,10 +1,12 @@
# $NetBSD: u-boot-arm64.mk,v 1.2 2017/09/07 15:30:31 jmcneill Exp $ # $NetBSD: u-boot-arm64.mk,v 1.3 2018/06/06 21:58:28 wiz Exp $
MAINTAINER= port-arm@NetBSD.org MAINTAINER= port-arm@NetBSD.org
BUILD_DEPENDS+= cross-aarch64-none-elf-gcc-[0-9]*:../../cross/aarch64-none-elf-gcc BUILD_DEPENDS+= cross-aarch64-none-elf-gcc-[0-9]*:../../cross/aarch64-none-elf-gcc
UBOOT_ENV+= CROSS_COMPILE=${PREFIX}/cross-aarch64-none-elf/bin/aarch64-none-elf- UBOOT_ENV+= CROSS_COMPILE=${PREFIX}/cross-aarch64-none-elf/bin/aarch64-none-elf-
.include "u-boot.mk"
PKG_OPTIONS_VAR= PKG_OPTIONS.u-boot-${UBOOT_TARGET} PKG_OPTIONS_VAR= PKG_OPTIONS.u-boot-${UBOOT_TARGET}
PKG_SUPPORTED_OPTIONS= el1 PKG_SUPPORTED_OPTIONS= el1
@ -14,4 +16,4 @@ PKG_SUPPORTED_OPTIONS= el1
UBOOT_OPTIONS+= CONFIG_ARMV8_SWITCH_TO_EL1=y UBOOT_OPTIONS+= CONFIG_ARMV8_SWITCH_TO_EL1=y
.endif .endif
.include "u-boot.mk" .include "../../mk/bsd.pkg.mk"

3
sysutils/u-boot/u-boot.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: u-boot.mk,v 1.10 2018/05/31 20:25:15 wiz Exp $ # $NetBSD: u-boot.mk,v 1.11 2018/06/06 21:58:28 wiz Exp $
.include "../../sysutils/u-boot/u-boot-version.mk" .include "../../sysutils/u-boot/u-boot-version.mk"
@ -53,4 +53,3 @@ do-install:
.endfor .endfor
.include "../../lang/python/tool.mk" .include "../../lang/python/tool.mk"
.include "../../mk/bsd.pkg.mk"