pull in various patches for pinebook pro that:

- turn on the power led
- reduce a timeout slightly
- possibly enable usb boot (untested)
- possibly enable sd boot from emmc uboot (untested)

from Emmanuel Vadot <manu@freebsd.org> and dhivael <dhivael.git@eno.space>
and some minor massaging from myself.


(mrg)

#	$NetBSD: u-boot-rockchip.mk,v 1.1 2020/01/14 08:44:03 mrg 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/u-boot/u-boot-arm64.mk"
.include "../../sysutils/arm-trusted-firmware-${U_BOOT_IMAGE_TYPE}/buildlink3.mk"

$NetBSD: patch-arch_arm_mach-rockchip_rk3399_rk3399.c,v 1.1 2020/01/14 08:44:03 mrg Exp $

adjusted by mrg to restrict to CONFIG_TARGET_PINEBOOK_PRO_RK3399.


Author: dhivael <dhivael.git@eno.space>
Date:   Sat Jan 11 15:04:46 2020 +0100

    rk3399: light pinebook power and standby leds during early boot
    
    this is a hack, but it works for now.


--- arch/arm/mach-rockchip/rk3399/rk3399.c.orig	2019-12-16 04:39:56.000000000 -0800
+++ arch/arm/mach-rockchip/rk3399/rk3399.c	2020-01-13 23:15:15.174280309 -0800
@@ -15,6 +15,8 @@
 #include <asm/arch-rockchip/grf_rk3399.h>
 #include <asm/arch-rockchip/hardware.h>
 #include <power/regulator.h>
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/pinctrl/rockchip.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -117,6 +119,9 @@
 	struct rk3399_pmugrf_regs * const pmugrf = (void *)PMUGRF_BASE;
 	struct rockchip_gpio_regs * const gpio = (void *)GPIO0_BASE;
 #endif
+#ifdef CONFIG_TARGET_PINEBOOK_PRO_RK3399
+	struct rockchip_gpio_regs * const gpio = (void *)GPIO0_BASE;
+#endif
 
 #if defined(CONFIG_DEBUG_UART_BASE) && (CONFIG_DEBUG_UART_BASE == 0xff180000)
 	/* Enable early UART0 on the RK3399 */
@@ -149,6 +154,16 @@
 	spl_gpio_set_pull(&pmugrf->gpio0_p, GPIO(BANK_B, 4), GPIO_PULL_NORMAL);
 #endif /* CONFIG_TARGET_CHROMEBOOK_BOB */
 
+#ifdef CONFIG_TARGET_PINEBOOK_PRO_RK3399
+	{
+		// set GPIO0_A2/B3 to GPIO_ACTIVE_HIGH
+		// set GPIO0_A2/B3 to OUTPUT
+		int mask = (1UL << RK_PA2) | (1UL << RK_PB3);
+		setbits_le32(&gpio->swport_dr, mask);
+		setbits_le32(&gpio->swport_ddr, mask);
+	}
+#endif
+
 	/* Enable early UART2 channel C on the RK3399 */
 	rk_clrsetreg(&grf->gpio4c_iomux,
 		     GRF_GPIO4C3_SEL_MASK,

$NetBSD: patch-configs_rock64-rk3328_defconfig,v 1.1 2020/01/14 08:44:03 mrg Exp $

Put u-boot at 256KB.

--- configs/rock64-rk3328_defconfig.orig	2019-12-16 04:39:56.000000000 -0800
+++ configs/rock64-rk3328_defconfig	2020-01-09 12:47:03.348721688 -0800
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_TEXT_BASE=0x00200000
+CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x200
 CONFIG_ROCKCHIP_RK3328=y
 CONFIG_TPL_ROCKCHIP_COMMON_BOARD=y
 CONFIG_TPL_LIBCOMMON_SUPPORT=y

$NetBSD: patch-configs_rockpro64-rk3399_defconfig,v 1.1 2020/01/14 08:44:03 mrg Exp $

Put u-boot at 256KB.

--- configs/rockpro64-rk3399_defconfig.orig	2019-12-16 04:39:56.000000000 -0800
+++ configs/rockpro64-rk3399_defconfig	2020-01-09 12:44:48.889763217 -0800
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_TEXT_BASE=0x00200000
+CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x200
 CONFIG_ROCKCHIP_RK3399=y
 CONFIG_ENV_OFFSET=0x3F8000
 CONFIG_TARGET_ROCKPRO64_RK3399=y

$NetBSD: patch-include_configs_rockchip-common.h,v 1.1 2020/01/14 08:44:03 mrg Exp $

Author: dhivael <dhivael.git@eno.space>
Date:   Sat Jan 11 15:04:04 2020 +0100

    rockchip: move usb0 after mmc1 in default boot order
	
    now that we support booting from USB we should prefer USB boot over eMMC
    boot. we still try to boot from SD cards first.

commit 908d441fefc2203affe1bb0d79f75f611888fc1f
Author: dhivael <dhivael.git@eno.space>
Date:   Sat Jan 11 15:04:04 2020 +0100

    rockchip: move usb0 after mmc1 in default boot order
    
    now that we support booting from USB we should prefer USB boot over eMMC
    boot. we still try to boot from SD cards first.


--- include/configs/rockchip-common.h.orig	2019-12-16 04:39:56.000000000 -0800
+++ include/configs/rockchip-common.h	2020-01-13 23:17:05.743249968 -0800
@@ -13,11 +13,10 @@
 
 /* First try to boot from SD (index 0), then eMMC (index 1) */
 #if CONFIG_IS_ENABLED(CMD_MMC)
-	#define BOOT_TARGET_MMC(func) \
-		func(MMC, mmc, 0) \
-		func(MMC, mmc, 1)
+	#define BOOT_TARGET_MMC(func, idx) \
+		func(MMC, mmc, idx)
 #else
-	#define BOOT_TARGET_MMC(func)
+	#define BOOT_TARGET_MMC(func, idx)
 #endif
 
 #if CONFIG_IS_ENABLED(CMD_USB)
@@ -39,8 +38,9 @@
 #endif
 
 #define BOOT_TARGET_DEVICES(func) \
-	BOOT_TARGET_MMC(func) \
+	BOOT_TARGET_MMC(func, 1) \
 	BOOT_TARGET_USB(func) \
+	BOOT_TARGET_MMC(func, 0) \
 	BOOT_TARGET_PXE(func) \
 	BOOT_TARGET_DHCP(func)