diff options
Diffstat (limited to 'sysutils/u-boot-pine-h64')
-rw-r--r-- | sysutils/u-boot-pine-h64/Makefile | 13 | ||||
-rw-r--r-- | sysutils/u-boot-pine-h64/patches/patch-arch_arm_cpu_armv8_Kconfig | 15 | ||||
-rw-r--r-- | sysutils/u-boot-pine-h64/patches/patch-lib_bch.c | 26 |
3 files changed, 1 insertions, 53 deletions
diff --git a/sysutils/u-boot-pine-h64/Makefile b/sysutils/u-boot-pine-h64/Makefile index d9ce0c72010..8594f583ff2 100644 --- a/sysutils/u-boot-pine-h64/Makefile +++ b/sysutils/u-boot-pine-h64/Makefile @@ -1,25 +1,14 @@ -# $NetBSD: Makefile,v 1.2 2018/05/31 20:25:15 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2018/12/14 00:52:27 jmcneill Exp $ -UBOOT_VERSION= 2018.03rc1 UBOOT_TARGET= pine-h64 UBOOT_CONFIG= pine_h64_defconfig UBOOT_BIN= u-boot-sunxi-with-spl.bin -# Use Icenowy's fork of mainline U-Boot with Pine H64 support patched in -MASTER_SITES= ${MASTER_SITE_GITHUB:=Icenowy/} -GITHUB_PROJECT= u-boot -GITHUB_TAG= f4077661c6c0f3b92f26cb7c35432ad64615fe32 -DISTNAME= u-boot-${UBOOT_TARGET}-${UBOOT_VERSION} -EXTRACT_SUFX= .tar.gz - post-extract: ${CP} ${PREFIX}/share/arm-trusted-firmware/sun50i-h6/bl31.bin ${WRKSRC} post-build: ${CAT} ${WRKSRC}/spl/sunxi-spl.bin ${WRKSRC}/u-boot.itb > ${WRKSRC}/u-boot-sunxi-with-spl.bin -DISTINFO_FILE= ${.CURDIR}/../../sysutils/u-boot-pine-h64/distinfo -PATCHDIR= ${.CURDIR}/../../sysutils/u-boot-pine-h64/patches - .include "../../sysutils/arm-trusted-firmware-sun50i-h6/buildlink3.mk" .include "../../sysutils/u-boot/u-boot-arm64.mk" diff --git a/sysutils/u-boot-pine-h64/patches/patch-arch_arm_cpu_armv8_Kconfig b/sysutils/u-boot-pine-h64/patches/patch-arch_arm_cpu_armv8_Kconfig deleted file mode 100644 index c9c7df4f0f1..00000000000 --- a/sysutils/u-boot-pine-h64/patches/patch-arch_arm_cpu_armv8_Kconfig +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-arch_arm_cpu_armv8_Kconfig,v 1.1 2018/05/31 20:20:00 jmcneill Exp $ - ---- arch/arm/cpu/armv8/Kconfig.orig 2018-01-23 06:50:34.000000000 +0000 -+++ arch/arm/cpu/armv8/Kconfig -@@ -132,6 +132,10 @@ config ARMV8_PSCI_CPUS_PER_CLUSTER - A value 0 or no definition of it works for single cluster system. - System with multi-cluster should difine their own exact value. - -+config ARMV8_SWITCH_TO_EL1 -+ bool "Switch to EL1 before booting kernel" -+ default n -+ - if SYS_HAS_ARMV8_SECURE_BASE - - config ARMV8_SECURE_BASE diff --git a/sysutils/u-boot-pine-h64/patches/patch-lib_bch.c b/sysutils/u-boot-pine-h64/patches/patch-lib_bch.c deleted file mode 100644 index 8597cd7e3cc..00000000000 --- a/sysutils/u-boot-pine-h64/patches/patch-lib_bch.c +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-lib_bch.c,v 1.1 2018/05/31 20:20:00 jmcneill Exp $ - ---- lib/bch.c.orig 2018-01-23 06:50:34.000000000 +0000 -+++ lib/bch.c -@@ -61,8 +61,11 @@ - #include <linux/bitops.h> - #else - #include <errno.h> --#if defined(__FreeBSD__) -+#if defined(__FreeBSD__) || defined(__NetBSD__) - #include <sys/endian.h> -+#elif defined(__APPLE__) -+#include <machine/endian.h> -+#define htobe32 htonl - #else - #include <endian.h> - #endif -@@ -117,7 +120,7 @@ struct gf_poly_deg1 { - }; - - #ifdef USE_HOSTCC --#if !defined(__DragonFly__) && !defined(__FreeBSD__) -+#if !defined(__DragonFly__) && !defined(__FreeBSD__) && !defined(__APPLE__) - static int fls(int x) - { - int r = 32; |