CVS commit: pkgsrc/sysutils/u-boot-rock64

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Mon Apr  6 15:06:18 UTC 2020

Modified Files:
        pkgsrc/sysutils/u-boot-rock64: u-boot-rockchip.mk
Added Files:
        pkgsrc/sysutils/u-boot-rock64/patches: patch-arch_arm_cpu_armv8_Kconfig
            patch-lib_bch.c

Log Message:
u-boot-rock64: reset PATCHDIR and restore the patches


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/u-boot-rock64/u-boot-rockchip.mk
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/u-boot-rock64/patches/patch-arch_arm_cpu_armv8_Kconfig \
    pkgsrc/sysutils/u-boot-rock64/patches/patch-lib_bch.c

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-rock64/u-boot-rockchip.mk
diff -u pkgsrc/sysutils/u-boot-rock64/u-boot-rockchip.mk:1.1 pkgsrc/sysutils/u-boot-rock64/u-boot-rockchip.mk:1.2
--- pkgsrc/sysutils/u-boot-rock64/u-boot-rockchip.mk:1.1        Thu Apr  2 09:09:05 2020
+++ pkgsrc/sysutils/u-boot-rock64/u-boot-rockchip.mk    Mon Apr  6 15:06:17 2020
@@ -1,4 +1,4 @@
-#      $NetBSD: u-boot-rockchip.mk,v 1.1 2020/04/02 09:09:05 tnn Exp $
+#      $NetBSD: u-boot-rockchip.mk,v 1.2 2020/04/06 15:06:17 tnn Exp $
 #
 # used by sysutils/u-boot-rock64/Makefile
 
@@ -14,7 +14,7 @@ MASTER_SITES= ${MASTER_SITE_GITHUB:=ayuf
 GITHUB_PROJECT=        linux-u-boot
 GITHUB_TAG=    2017.09-rockchip-ayufan-1063-g29843fbd42
 DISTNAME=      ${GITHUB_TAG}
-PATCHDIR=      ${.CURDIR}/../../sysutils/u-boot-rockpro64/patches
+PATCHDIR=      ${.CURDIR}/../../sysutils/u-boot-rock64/patches
 DISTFILES=     ${DEFAULT_DISTFILES}
 EXTRACT_SUFX=  .tar.gz
 

Added files:

Index: pkgsrc/sysutils/u-boot-rock64/patches/patch-arch_arm_cpu_armv8_Kconfig
diff -u /dev/null pkgsrc/sysutils/u-boot-rock64/patches/patch-arch_arm_cpu_armv8_Kconfig:1.1
--- /dev/null   Mon Apr  6 15:06:18 2020
+++ pkgsrc/sysutils/u-boot-rock64/patches/patch-arch_arm_cpu_armv8_Kconfig      Mon Apr  6 15:06:18 2020
@@ -0,0 +1,15 @@
+$NetBSD: patch-arch_arm_cpu_armv8_Kconfig,v 1.1 2020/04/06 15:06:18 tnn Exp $
+
+--- arch/arm/cpu/armv8/Kconfig.orig    2018-08-06 22:28:00.000000000 +0000
++++ arch/arm/cpu/armv8/Kconfig
+@@ -130,6 +130,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
Index: pkgsrc/sysutils/u-boot-rock64/patches/patch-lib_bch.c
diff -u /dev/null pkgsrc/sysutils/u-boot-rock64/patches/patch-lib_bch.c:1.1
--- /dev/null   Mon Apr  6 15:06:18 2020
+++ pkgsrc/sysutils/u-boot-rock64/patches/patch-lib_bch.c       Mon Apr  6 15:06:18 2020
@@ -0,0 +1,39 @@
+$NetBSD: patch-lib_bch.c,v 1.1 2020/04/06 15:06:18 tnn Exp $
+
+u-boot: fix build on macos
+
+--- lib/bch.c.orig     2018-08-06 22:28:00.000000000 +0000
++++ lib/bch.c
+@@ -61,8 +61,10 @@
+ #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>
+ #else
+ #include <endian.h>
+ #endif
+@@ -71,7 +73,11 @@
+ #include <string.h>
+ 
+ #undef cpu_to_be32
++#if defined(__APPLE__)
++#define cpu_to_be32 htonl
++#else
+ #define cpu_to_be32 htobe32
++#endif
+ #define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d))
+ #define kmalloc(size, flags)  malloc(size)
+ #define kzalloc(size, flags)  calloc(1, size)
+@@ -117,7 +123,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;