diff options
| author | tnn <tnn@pkgsrc.org> | 2020-04-06 15:06:17 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2020-04-06 15:06:17 +0000 |
| commit | 1ae6c67538bfa79807312e1f9dca869889378dc5 (patch) | |
| tree | 6760eba99e297e7a82449bb491892807d8db0860 /sysutils | |
| parent | 7c98721bf07b8b31f8169d75f688592c5e2ba796 (diff) | |
| download | pkgsrc-1ae6c67538bfa79807312e1f9dca869889378dc5.tar.gz | |
u-boot-rock64: reset PATCHDIR and restore the patches
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/u-boot-rock64/patches/patch-arch_arm_cpu_armv8_Kconfig | 15 | ||||
| -rw-r--r-- | sysutils/u-boot-rock64/patches/patch-lib_bch.c | 39 | ||||
| -rw-r--r-- | sysutils/u-boot-rock64/u-boot-rockchip.mk | 4 |
3 files changed, 56 insertions, 2 deletions
diff --git a/sysutils/u-boot-rock64/patches/patch-arch_arm_cpu_armv8_Kconfig b/sysutils/u-boot-rock64/patches/patch-arch_arm_cpu_armv8_Kconfig new file mode 100644 index 00000000000..b3f4dc41aa7 --- /dev/null +++ b/sysutils/u-boot-rock64/patches/patch-arch_arm_cpu_armv8_Kconfig @@ -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 diff --git a/sysutils/u-boot-rock64/patches/patch-lib_bch.c b/sysutils/u-boot-rock64/patches/patch-lib_bch.c new file mode 100644 index 00000000000..c07d04e04ff --- /dev/null +++ b/sysutils/u-boot-rock64/patches/patch-lib_bch.c @@ -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; diff --git a/sysutils/u-boot-rock64/u-boot-rockchip.mk b/sysutils/u-boot-rock64/u-boot-rockchip.mk index 69a1f8c56c9..51e69f350d3 100644 --- a/sysutils/u-boot-rock64/u-boot-rockchip.mk +++ b/sysutils/u-boot-rock64/u-boot-rockchip.mk @@ -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:=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 +PATCHDIR= ${.CURDIR}/../../sysutils/u-boot-rock64/patches DISTFILES= ${DEFAULT_DISTFILES} EXTRACT_SUFX= .tar.gz |