? difz Index: u-boot/distinfo-2021.04 =================================================================== RCS file: u-boot/distinfo-2021.04 diff -N u-boot/distinfo-2021.04 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ u-boot/distinfo-2021.04 9 May 2021 08:53:14 -0000 @@ -0,0 +1,12 @@ +$NetBSD$ + +SHA1 (u-boot-2021.04.tar.bz2) = a69cf9cf8ddda0935b0bfed86e90fde1124f133d +RMD160 (u-boot-2021.04.tar.bz2) = 4834e300f5490a0af08209018aac25a1b3a8d5cb +SHA512 (u-boot-2021.04.tar.bz2) = c24835a520bfd528032614576ca552e55e6de129372e72e22e80e0d45dc5c1c75aa4aad80e856d5bbd7146ec092cac52a6f352253cf3fdf9fe536f5e87782803 +Size (u-boot-2021.04.tar.bz2) = 16673334 bytes +SHA1 (patch-arch_arm_mach-rockchip_rk3399_rk3399.c) = caa4068c635eaef5997501e154ec5cb11dcbf490 +SHA1 (patch-board_pine64_pinebook-pro-rk3399_pinebook-pro-rk3399.c) = 49954716240e93b33e13288f92b14f527ba15bdf +SHA1 (patch-configs_pinebook-pro-rk3399_defconfig) = ee38d77380cce5191eabd12398988b2efee982bf +SHA1 (patch-configs_rock64-rk3328_defconfig) = 59076a9934c1ec0a492d600b3179209769753fd1 +SHA1 (patch-configs_rockpro64-rk3399_defconfig) = f4ec41e7ce2ac56fe38051225dd8dab0889e898b +SHA1 (patch-include_configs_rockchip-common.h) = 1b251e62d5e4d297b03c0f1f7414a83a39449fb9 Index: u-boot/distinfo-2021.07-rc1 =================================================================== RCS file: u-boot/distinfo-2021.07-rc1 diff -N u-boot/distinfo-2021.07-rc1 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ u-boot/distinfo-2021.07-rc1 9 May 2021 08:53:14 -0000 @@ -0,0 +1,12 @@ +$NetBSD$ + +SHA1 (u-boot-2021.07-rc1.tar.bz2) = 22ea41675544bb0b243f7b400f8065e4f4a606a4 +RMD160 (u-boot-2021.07-rc1.tar.bz2) = 08d212f554ba472c392e3b9732d361923d985564 +SHA512 (u-boot-2021.07-rc1.tar.bz2) = 82d4eaa4cf6bd949ea6ea22910f81ed5a1e4a7f1b23c4ddfba52ac965930e4c53899115788d9d9f0ecf959170fa1cc5ed396ba4e37c8b23336ef89146bf627cd +Size (u-boot-2021.07-rc1.tar.bz2) = 17087350 bytes +SHA1 (patch-arch_arm_mach-rockchip_rk3399_rk3399.c) = caa4068c635eaef5997501e154ec5cb11dcbf490 +SHA1 (patch-board_pine64_pinebook-pro-rk3399_pinebook-pro-rk3399.c) = 49954716240e93b33e13288f92b14f527ba15bdf +SHA1 (patch-configs_pinebook-pro-rk3399_defconfig) = ee38d77380cce5191eabd12398988b2efee982bf +SHA1 (patch-configs_rock64-rk3328_defconfig) = 59076a9934c1ec0a492d600b3179209769753fd1 +SHA1 (patch-configs_rockpro64-rk3399_defconfig) = f4ec41e7ce2ac56fe38051225dd8dab0889e898b +SHA1 (patch-include_configs_rockchip-common.h) = 1b251e62d5e4d297b03c0f1f7414a83a39449fb9 Index: u-boot/u-boot-rockchip.mk =================================================================== RCS file: /cvsroot/pkgsrc/sysutils/u-boot/u-boot-rockchip.mk,v retrieving revision 1.10 diff -p -u -u -r1.10 u-boot-rockchip.mk --- u-boot/u-boot-rockchip.mk 18 Apr 2021 07:30:28 -0000 1.10 +++ u-boot/u-boot-rockchip.mk 9 May 2021 08:53:14 -0000 @@ -8,12 +8,12 @@ # # Set these variables: # -# U_BOOT_IMAGE_TYPE ("rk3399", "rk3328") +# UBOOT_IMAGE_TYPE ("rk3399", "rk3328") # -UBOOT_VERSION?= 2020.01-rc5 +UBOOT_VERSION?= 2021.04 -MAKE_ENV+= BL31=${PREFIX}/share/arm-trusted-firmware/${U_BOOT_IMAGE_TYPE}/bl31.elf +MAKE_ENV+= BL31=${PREFIX}/share/arm-trusted-firmware/${UBOOT_IMAGE_TYPE}/bl31.elf post-build: # wrap everything up into a single file that can be written to an SD card @@ -27,5 +27,5 @@ post-build: 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 -.include "../../sysutils/arm-trusted-firmware-${U_BOOT_IMAGE_TYPE}/buildlink3.mk" +.include "../../sysutils/arm-trusted-firmware-${UBOOT_IMAGE_TYPE}/buildlink3.mk" .include "../../sysutils/u-boot/u-boot-arm64.mk" Index: u-boot/patches-2021.04/patch-arch_arm_mach-rockchip_rk3399_rk3399.c =================================================================== RCS file: u-boot/patches-2021.04/patch-arch_arm_mach-rockchip_rk3399_rk3399.c diff -N u-boot/patches-2021.04/patch-arch_arm_mach-rockchip_rk3399_rk3399.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ u-boot/patches-2021.04/patch-arch_arm_mach-rockchip_rk3399_rk3399.c 9 May 2021 08:53:14 -0000 @@ -0,0 +1,52 @@ +$NetBSD$ + +adjusted by mrg to restrict to CONFIG_TARGET_PINEBOOK_PRO_RK3399. + + +Author: dhivael +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 2021-04-05 08:03:29.000000000 -0700 ++++ arch/arm/mach-rockchip/rk3399/rk3399.c 2021-05-08 00:46:34.547804408 -0700 +@@ -20,6 +20,8 @@ + #include + #include + #include ++#include ++#include + + DECLARE_GLOBAL_DATA_PTR; + +@@ -122,6 +124,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 */ +@@ -154,6 +159,17 @@ + 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, Index: u-boot/patches-2021.04/patch-board_pine64_pinebook-pro-rk3399_pinebook-pro-rk3399.c =================================================================== RCS file: u-boot/patches-2021.04/patch-board_pine64_pinebook-pro-rk3399_pinebook-pro-rk3399.c diff -N u-boot/patches-2021.04/patch-board_pine64_pinebook-pro-rk3399_pinebook-pro-rk3399.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ u-boot/patches-2021.04/patch-board_pine64_pinebook-pro-rk3399_pinebook-pro-rk3399.c 9 May 2021 08:53:14 -0000 @@ -0,0 +1,60 @@ +$NetBSD$ + +Fix panel reset. + + +From 352cb7b28bf4a16330f148043e8d10b0141bbfcb Mon Sep 17 00:00:00 2001 +From: Arnaud Patard +Date: Wed, 8 Jul 2020 21:43:36 -0400 +Subject: [PATCH 4/4] PBP: Fix panel reset + +On warm reset, the pinebook pro panel is not working correctly. +The issue is not yet debugged so, for now, this hack seems to be +enough. It toggles the GPIO1_C6 gpio [ LCDVCC_EN signal in the +schematics ] used by the vcc3v3_panel regulator. + +There's no gpio_request, since the gpio is already in use at this +stage, so it can only fail. + +Origin: http://people.hupstream.com/~rtp/pbp/20200706/patches/hack-reset.patch + + +--- board/pine64/pinebook-pro-rk3399/pinebook-pro-rk3399.c.orig 2021-04-26 17:53:51.000000000 -0700 ++++ board/pine64/pinebook-pro-rk3399/pinebook-pro-rk3399.c 2021-05-08 15:36:55.355143117 -0700 +@@ -7,13 +7,15 @@ + #include + #include + #include ++#include ++#include + #include + #include + #include ++#include + #include + #include + #include +- + #define GRF_IO_VSEL_BT565_SHIFT 0 + #define PMUGRF_CON0_VSEL_SHIFT 8 + +@@ -59,6 +61,7 @@ + const u32 cpuid_length = 0x10; + u8 cpuid[cpuid_length]; + int ret; ++ unsigned int gpio; + + setup_iodomain(); + +@@ -70,6 +73,11 @@ + if (ret) + return ret; + ++ gpio_lookup_name("B22", NULL, NULL, &gpio); ++ gpio_direction_output(gpio, 0); ++ udelay(500000); ++ gpio_direction_output(gpio, 1); ++ + return ret; + } + #endif Index: u-boot/patches-2021.04/patch-configs_pinebook-pro-rk3399_defconfig =================================================================== RCS file: u-boot/patches-2021.04/patch-configs_pinebook-pro-rk3399_defconfig diff -N u-boot/patches-2021.04/patch-configs_pinebook-pro-rk3399_defconfig --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ u-boot/patches-2021.04/patch-configs_pinebook-pro-rk3399_defconfig 9 May 2021 08:53:14 -0000 @@ -0,0 +1,26 @@ +$NetBSD$ + +Load u-boot from 256KB. +Set boot-delay to 2 seconds. +Disable USB. Hangs in usb_stop() / 'usb stop', if started. + +--- configs/pinebook-pro-rk3399_defconfig.orig 2021-04-05 08:03:29.000000000 -0700 ++++ configs/pinebook-pro-rk3399_defconfig 2021-05-08 00:27:28.657300682 -0700 +@@ -3,6 +3,7 @@ + CONFIG_SYS_TEXT_BASE=0x00200000 + CONFIG_NR_DRAM_BANKS=1 + CONFIG_ENV_SIZE=0x8000 ++CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x200 + CONFIG_ROCKCHIP_RK3399=y + CONFIG_TARGET_PINEBOOK_PRO_RK3399=y + CONFIG_DEBUG_UART_BASE=0xFF1A0000 +@@ -11,7 +12,7 @@ + CONFIG_SPL_SPI_SUPPORT=y + CONFIG_DEFAULT_DEVICE_TREE="rk3399-pinebook-pro" + CONFIG_DEBUG_UART=y +-CONFIG_BOOTDELAY=3 ++CONFIG_BOOTDELAY=2 +-CONFIG_USE_PREBOOT=y ++CONFIG_USE_PREBOOT=n + CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-pinebook-pro.dtb" + CONFIG_DISPLAY_BOARDINFO_LATE=y Index: u-boot/patches-2021.04/patch-configs_rock64-rk3328_defconfig =================================================================== RCS file: u-boot/patches-2021.04/patch-configs_rock64-rk3328_defconfig diff -N u-boot/patches-2021.04/patch-configs_rock64-rk3328_defconfig --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ u-boot/patches-2021.04/patch-configs_rock64-rk3328_defconfig 9 May 2021 08:53:14 -0000 @@ -0,0 +1,13 @@ +$NetBSD$ + +Load u-boot from 256KB. + +--- configs/rock64-rk3328_defconfig.orig 2021-04-05 08:03:29.000000000 -0700 ++++ configs/rock64-rk3328_defconfig 2021-05-08 00:27:17.257028102 -0700 +@@ -1,5 +1,6 @@ + CONFIG_ARM=y + CONFIG_ARCH_ROCKCHIP=y ++CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x200 + CONFIG_SYS_TEXT_BASE=0x00200000 + CONFIG_SPL_GPIO_SUPPORT=y + CONFIG_NR_DRAM_BANKS=1 Index: u-boot/patches-2021.04/patch-configs_rockpro64-rk3399_defconfig =================================================================== RCS file: u-boot/patches-2021.04/patch-configs_rockpro64-rk3399_defconfig diff -N u-boot/patches-2021.04/patch-configs_rockpro64-rk3399_defconfig --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ u-boot/patches-2021.04/patch-configs_rockpro64-rk3399_defconfig 9 May 2021 08:53:14 -0000 @@ -0,0 +1,23 @@ +$NetBSD$ + +Load u-boot from 256KB. +Disable USB. Hangs in usb_stop() / 'usb stop', if started. + +--- configs/rockpro64-rk3399_defconfig.orig 2021-04-05 08:03:29.000000000 -0700 ++++ configs/rockpro64-rk3399_defconfig 2021-05-09 00:27:50.218620480 -0700 +@@ -1,5 +1,6 @@ + CONFIG_ARM=y + CONFIG_ARCH_ROCKCHIP=y ++CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x200 + CONFIG_SYS_TEXT_BASE=0x00200000 + CONFIG_NR_DRAM_BANKS=1 + CONFIG_ENV_SIZE=0x8000 +@@ -12,7 +13,7 @@ + CONFIG_SPL_SPI_SUPPORT=y + CONFIG_DEFAULT_DEVICE_TREE="rk3399-rockpro64" + CONFIG_DEBUG_UART=y +-CONFIG_USE_PREBOOT=y ++CONFIG_USE_PREBOOT=n + CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rockpro64.dtb" + CONFIG_DISPLAY_BOARDINFO_LATE=y + CONFIG_MISC_INIT_R=y Index: u-boot/patches-2021.04/patch-include_configs_rockchip-common.h =================================================================== RCS file: u-boot/patches-2021.04/patch-include_configs_rockchip-common.h diff -N u-boot/patches-2021.04/patch-include_configs_rockchip-common.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ u-boot/patches-2021.04/patch-include_configs_rockchip-common.h 9 May 2021 08:53:14 -0000 @@ -0,0 +1,34 @@ +$NetBSD$ + +Default to booting from SD, USB, EMMC, NVME, PXE, DHCP and then SF. + +--- include/configs/rockchip-common.h.orig 2021-04-05 08:03:29.000000000 -0700 ++++ include/configs/rockchip-common.h 2021-05-08 00:30:46.829012464 -0700 +@@ -16,11 +16,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_NVME) +@@ -55,9 +54,10 @@ + + #ifdef CONFIG_ROCKCHIP_RK3399 + #define BOOT_TARGET_DEVICES(func) \ +- BOOT_TARGET_MMC(func) \ +- BOOT_TARGET_NVME(func) \ ++ BOOT_TARGET_MMC(func, 1) \ + BOOT_TARGET_USB(func) \ ++ BOOT_TARGET_MMC(func, 0) \ ++ BOOT_TARGET_NVME(func) \ + BOOT_TARGET_PXE(func) \ + BOOT_TARGET_DHCP(func) \ + BOOT_TARGET_SF(func) Index: u-boot/patches-2021.07-rc1/patch-arch_arm_mach-rockchip_rk3399_rk3399.c =================================================================== RCS file: u-boot/patches-2021.07-rc1/patch-arch_arm_mach-rockchip_rk3399_rk3399.c diff -N u-boot/patches-2021.07-rc1/patch-arch_arm_mach-rockchip_rk3399_rk3399.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ u-boot/patches-2021.07-rc1/patch-arch_arm_mach-rockchip_rk3399_rk3399.c 9 May 2021 08:53:14 -0000 @@ -0,0 +1,52 @@ +$NetBSD$ + +adjusted by mrg to restrict to CONFIG_TARGET_PINEBOOK_PRO_RK3399. + + +Author: dhivael +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 2021-04-05 08:03:29.000000000 -0700 ++++ arch/arm/mach-rockchip/rk3399/rk3399.c 2021-05-08 00:46:34.547804408 -0700 +@@ -20,6 +20,8 @@ + #include + #include + #include ++#include ++#include + + DECLARE_GLOBAL_DATA_PTR; + +@@ -122,6 +124,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 */ +@@ -154,6 +159,17 @@ + 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, Index: u-boot/patches-2021.07-rc1/patch-board_pine64_pinebook-pro-rk3399_pinebook-pro-rk3399.c =================================================================== RCS file: u-boot/patches-2021.07-rc1/patch-board_pine64_pinebook-pro-rk3399_pinebook-pro-rk3399.c diff -N u-boot/patches-2021.07-rc1/patch-board_pine64_pinebook-pro-rk3399_pinebook-pro-rk3399.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ u-boot/patches-2021.07-rc1/patch-board_pine64_pinebook-pro-rk3399_pinebook-pro-rk3399.c 9 May 2021 08:53:14 -0000 @@ -0,0 +1,60 @@ +$NetBSD$ + +Fix panel reset. + + +From 352cb7b28bf4a16330f148043e8d10b0141bbfcb Mon Sep 17 00:00:00 2001 +From: Arnaud Patard +Date: Wed, 8 Jul 2020 21:43:36 -0400 +Subject: [PATCH 4/4] PBP: Fix panel reset + +On warm reset, the pinebook pro panel is not working correctly. +The issue is not yet debugged so, for now, this hack seems to be +enough. It toggles the GPIO1_C6 gpio [ LCDVCC_EN signal in the +schematics ] used by the vcc3v3_panel regulator. + +There's no gpio_request, since the gpio is already in use at this +stage, so it can only fail. + +Origin: http://people.hupstream.com/~rtp/pbp/20200706/patches/hack-reset.patch + + +--- board/pine64/pinebook-pro-rk3399/pinebook-pro-rk3399.c.orig 2021-04-26 17:53:51.000000000 -0700 ++++ board/pine64/pinebook-pro-rk3399/pinebook-pro-rk3399.c 2021-05-08 15:36:55.355143117 -0700 +@@ -7,13 +7,15 @@ + #include + #include + #include ++#include ++#include + #include + #include + #include ++#include + #include + #include + #include +- + #define GRF_IO_VSEL_BT565_SHIFT 0 + #define PMUGRF_CON0_VSEL_SHIFT 8 + +@@ -59,6 +61,7 @@ + const u32 cpuid_length = 0x10; + u8 cpuid[cpuid_length]; + int ret; ++ unsigned int gpio; + + setup_iodomain(); + +@@ -70,6 +73,11 @@ + if (ret) + return ret; + ++ gpio_lookup_name("B22", NULL, NULL, &gpio); ++ gpio_direction_output(gpio, 0); ++ udelay(500000); ++ gpio_direction_output(gpio, 1); ++ + return ret; + } + #endif Index: u-boot/patches-2021.07-rc1/patch-configs_pinebook-pro-rk3399_defconfig =================================================================== RCS file: u-boot/patches-2021.07-rc1/patch-configs_pinebook-pro-rk3399_defconfig diff -N u-boot/patches-2021.07-rc1/patch-configs_pinebook-pro-rk3399_defconfig --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ u-boot/patches-2021.07-rc1/patch-configs_pinebook-pro-rk3399_defconfig 9 May 2021 08:53:14 -0000 @@ -0,0 +1,26 @@ +$NetBSD$ + +Load u-boot from 256KB. +Set boot-delay to 2 seconds. +Disable USB. Hangs in usb_stop() / 'usb stop', if started. + +--- configs/pinebook-pro-rk3399_defconfig.orig 2021-04-05 08:03:29.000000000 -0700 ++++ configs/pinebook-pro-rk3399_defconfig 2021-05-08 00:27:28.657300682 -0700 +@@ -3,6 +3,7 @@ + CONFIG_SYS_TEXT_BASE=0x00200000 + CONFIG_NR_DRAM_BANKS=1 + CONFIG_ENV_SIZE=0x8000 ++CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x200 + CONFIG_ROCKCHIP_RK3399=y + CONFIG_TARGET_PINEBOOK_PRO_RK3399=y + CONFIG_DEBUG_UART_BASE=0xFF1A0000 +@@ -11,7 +12,7 @@ + CONFIG_SPL_SPI_SUPPORT=y + CONFIG_DEFAULT_DEVICE_TREE="rk3399-pinebook-pro" + CONFIG_DEBUG_UART=y +-CONFIG_BOOTDELAY=3 ++CONFIG_BOOTDELAY=2 +-CONFIG_USE_PREBOOT=y ++CONFIG_USE_PREBOOT=n + CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-pinebook-pro.dtb" + CONFIG_DISPLAY_BOARDINFO_LATE=y Index: u-boot/patches-2021.07-rc1/patch-configs_rock64-rk3328_defconfig =================================================================== RCS file: u-boot/patches-2021.07-rc1/patch-configs_rock64-rk3328_defconfig diff -N u-boot/patches-2021.07-rc1/patch-configs_rock64-rk3328_defconfig --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ u-boot/patches-2021.07-rc1/patch-configs_rock64-rk3328_defconfig 9 May 2021 08:53:14 -0000 @@ -0,0 +1,13 @@ +$NetBSD$ + +Load u-boot from 256KB. + +--- configs/rock64-rk3328_defconfig.orig 2021-04-05 08:03:29.000000000 -0700 ++++ configs/rock64-rk3328_defconfig 2021-05-08 00:27:17.257028102 -0700 +@@ -1,5 +1,6 @@ + CONFIG_ARM=y + CONFIG_ARCH_ROCKCHIP=y ++CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x200 + CONFIG_SYS_TEXT_BASE=0x00200000 + CONFIG_SPL_GPIO_SUPPORT=y + CONFIG_NR_DRAM_BANKS=1 Index: u-boot/patches-2021.07-rc1/patch-configs_rockpro64-rk3399_defconfig =================================================================== RCS file: u-boot/patches-2021.07-rc1/patch-configs_rockpro64-rk3399_defconfig diff -N u-boot/patches-2021.07-rc1/patch-configs_rockpro64-rk3399_defconfig --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ u-boot/patches-2021.07-rc1/patch-configs_rockpro64-rk3399_defconfig 9 May 2021 08:53:14 -0000 @@ -0,0 +1,23 @@ +$NetBSD$ + +Load u-boot from 256KB. +Disable USB. Hangs in usb_stop() / 'usb stop', if started. + +--- configs/rockpro64-rk3399_defconfig.orig 2021-04-05 08:03:29.000000000 -0700 ++++ configs/rockpro64-rk3399_defconfig 2021-05-09 00:27:50.218620480 -0700 +@@ -1,5 +1,6 @@ + CONFIG_ARM=y + CONFIG_ARCH_ROCKCHIP=y ++CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x200 + CONFIG_SYS_TEXT_BASE=0x00200000 + CONFIG_NR_DRAM_BANKS=1 + CONFIG_ENV_SIZE=0x8000 +@@ -12,7 +13,7 @@ + CONFIG_SPL_SPI_SUPPORT=y + CONFIG_DEFAULT_DEVICE_TREE="rk3399-rockpro64" + CONFIG_DEBUG_UART=y +-CONFIG_USE_PREBOOT=y ++CONFIG_USE_PREBOOT=n + CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rockpro64.dtb" + CONFIG_DISPLAY_BOARDINFO_LATE=y + CONFIG_MISC_INIT_R=y Index: u-boot/patches-2021.07-rc1/patch-include_configs_rockchip-common.h =================================================================== RCS file: u-boot/patches-2021.07-rc1/patch-include_configs_rockchip-common.h diff -N u-boot/patches-2021.07-rc1/patch-include_configs_rockchip-common.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ u-boot/patches-2021.07-rc1/patch-include_configs_rockchip-common.h 9 May 2021 08:53:14 -0000 @@ -0,0 +1,34 @@ +$NetBSD$ + +Default to booting from SD, USB, EMMC, NVME, PXE, DHCP and then SF. + +--- include/configs/rockchip-common.h.orig 2021-04-05 08:03:29.000000000 -0700 ++++ include/configs/rockchip-common.h 2021-05-08 00:30:46.829012464 -0700 +@@ -16,11 +16,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_NVME) +@@ -55,9 +54,10 @@ + + #ifdef CONFIG_ROCKCHIP_RK3399 + #define BOOT_TARGET_DEVICES(func) \ +- BOOT_TARGET_MMC(func) \ +- BOOT_TARGET_NVME(func) \ ++ BOOT_TARGET_MMC(func, 1) \ + BOOT_TARGET_USB(func) \ ++ BOOT_TARGET_MMC(func, 0) \ ++ BOOT_TARGET_NVME(func) \ + BOOT_TARGET_PXE(func) \ + BOOT_TARGET_DHCP(func) \ + BOOT_TARGET_SF(func) Index: u-boot-pinebook-pro/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/sysutils/u-boot-pinebook-pro/Makefile,v retrieving revision 1.10 diff -p -u -u -r1.10 Makefile --- u-boot-pinebook-pro/Makefile 18 Apr 2021 08:54:56 -0000 1.10 +++ u-boot-pinebook-pro/Makefile 9 May 2021 08:53:14 -0000 @@ -1,17 +1,11 @@ # $NetBSD: Makefile,v 1.10 2021/04/18 08:54:56 mrg Exp $ -PKGREVISION= 5 - UBOOT_TARGET= pinebook-pro -UBOOT_CONFIG= pinebook_pro-rk3399_defconfig +UBOOT_CONFIG= pinebook-pro-rk3399_defconfig UBOOT_BIN= idbloader.img rksd_loader.img rkspi_loader.img u-boot.itb +UBOOT_IMAGE_TYPE= rk3399 UBOOT_INSTALLBOOT_PLIST= installboot.plist -U_BOOT_IMAGE_TYPE= rk3399 - -# 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 .include "../../sysutils/u-boot/u-boot-rockchip.mk" Index: u-boot-pinebook-pro/distinfo =================================================================== RCS file: u-boot-pinebook-pro/distinfo diff -N u-boot-pinebook-pro/distinfo --- u-boot-pinebook-pro/distinfo 14 Jan 2020 08:44:03 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,20 +0,0 @@ -$NetBSD: distinfo,v 1.3 2020/01/14 08:44:03 mrg Exp $ - -SHA1 (u-boot-2020.01-rc5.tar.bz2) = 464dec492bd12bf561468b5560d5465bee708de1 -RMD160 (u-boot-2020.01-rc5.tar.bz2) = 2fd9b608a182a783e7e1e07003d2303376de7b4f -SHA512 (u-boot-2020.01-rc5.tar.bz2) = f39ef40e4a8a030a779d1732bb588fba808140c91d4d92b6228f752b58ecbbdb90a4b8feae1646a42c64ba044d6c503228f877b33e221330b3f96f3c9006d60a -Size (u-boot-2020.01-rc5.tar.bz2) = 14703368 bytes -SHA1 (patch-arch_arm_dts_Makefile) = b0f39f16c87b51490fcc5f27dc2b720c2b5a5076 -SHA1 (patch-arch_arm_dts_rk3399-pinebook-pro-u-boot.dtsi) = 50e461b2da4b763a853fa66e90fe39465d8f65cc -SHA1 (patch-arch_arm_dts_rk3399-pinebook-pro.dts) = d5e240e5a6c79fbc33ab838bf33c356adc7a5b55 -SHA1 (patch-arch_arm_mach-rockchip_rk3399_Kconfig) = 5db42b2120030bd6deae15bad020bc216283606e -SHA1 (patch-arch_arm_mach-rockchip_rk3399_rk3399.c) = 109ab42dd22ffb23d19f2cf77bc8bb113749d867 -SHA1 (patch-board_pine64_pinebook_pro_rk3399_Kconfig) = 50f0a64ec93446bc962712643b6d9734321be0ff -SHA1 (patch-board_pine64_pinebook_pro_rk3399_MAINTAINERS) = 81933bcfb75ec0a28f92d7c9823982dae075b699 -SHA1 (patch-board_pine64_pinebook_pro_rk3399_Makefile) = 9dca0a93221ae2a7fa6a6a1794e22750ab105e07 -SHA1 (patch-board_pine64_pinebook_pro_rk3399_pinebook-pro-rk3399.c) = f06846db31ce5f07f9aa77019efb5b6ca6dc8966 -SHA1 (patch-configs-pinebook_pro-rk3399_defconfig) = 0dbc684b30470f96d10db914e9c3631948be5528 -SHA1 (patch-configs_rock64-rk3328_defconfig) = a32cd0e440b0bfd0b8bb00d463eac3b3c99ce9d0 -SHA1 (patch-configs_rockpro64-rk3399_defconfig) = 0775662b76d8875845d75294e43a2897fad6740e -SHA1 (patch-include-configs-pinebook_pro_rk3399.h) = a8edaa170fb6403a912d6ddda11e3e37c8b2442c -SHA1 (patch-include_configs_rockchip-common.h) = c619b01d9f1303ed2105b2673122be10b6d141aa Index: u-boot-rock64/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/sysutils/u-boot-rock64/Makefile,v retrieving revision 1.9 diff -p -u -u -r1.9 Makefile --- u-boot-rock64/Makefile 26 Apr 2021 00:35:03 -0000 1.9 +++ u-boot-rock64/Makefile 9 May 2021 08:53:14 -0000 @@ -4,12 +4,12 @@ PKGREVISION= 7 UBOOT_TARGET= rock64 UBOOT_CONFIG= rock64-rk3328_defconfig UBOOT_BIN= idbloader.img rksd_loader.img rkspi_loader.img u-boot.itb +UBOOT_IMAGE_TYPE= rk3328 UBOOT_INSTALLBOOT_PLIST= installboot.plist DISTINFO_FILE= ${.CURDIR}/../../sysutils/u-boot-rock64/distinfo -U_BOOT_IMAGE_TYPE= rk3328 .include "../../sysutils/u-boot-rock64/u-boot-rockchip.mk" # Boot Loader stage 3-1 (BL31) EL3 Runtime Firmware Index: u-boot-rock64/u-boot-rockchip.mk =================================================================== RCS file: /cvsroot/pkgsrc/sysutils/u-boot-rock64/u-boot-rockchip.mk,v retrieving revision 1.2 diff -p -u -u -r1.2 u-boot-rockchip.mk --- u-boot-rock64/u-boot-rockchip.mk 6 Apr 2020 15:06:17 -0000 1.2 +++ u-boot-rock64/u-boot-rockchip.mk 9 May 2021 08:53:14 -0000 @@ -6,7 +6,7 @@ # # Set these variables: # -# U_BOOT_IMAGE_TYPE ("rk3399", "rk3328") +# UBOOT_IMAGE_TYPE ("rk3399", "rk3328") # UBOOT_VERSION= ${GITHUB_TAG:C/-.*$//} @@ -31,7 +31,7 @@ post-build: # build stage 3 package cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} u-boot.itb # build stage 1 loader - ${WRKSRC}/tools/mkimage -n ${U_BOOT_IMAGE_TYPE} -T rksd -d ${WRKDIR}/${DDR_BIN} ${WRKSRC}/idbloader.img + ${WRKSRC}/tools/mkimage -n ${UBOOT_IMAGE_TYPE} -T rksd -d ${WRKDIR}/${DDR_BIN} ${WRKSRC}/idbloader.img # append stage2 loader cat ${WRKSRC}/spl/u-boot-spl.bin >> ${WRKSRC}/idbloader.img # wrap everything up into a single file that can be written to an SD card Index: u-boot-rockpro64/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/sysutils/u-boot-rockpro64/Makefile,v retrieving revision 1.11 diff -p -u -u -r1.11 Makefile --- u-boot-rockpro64/Makefile 18 Apr 2021 07:30:28 -0000 1.11 +++ u-boot-rockpro64/Makefile 9 May 2021 08:53:14 -0000 @@ -3,13 +3,10 @@ UBOOT_TARGET= rockpro64 UBOOT_CONFIG= rockpro64-rk3399_defconfig UBOOT_BIN= idbloader.img rksd_loader.img rkspi_loader.img u-boot.itb +UBOOT_IMAGE_TYPE= rk3399 UBOOT_INSTALLBOOT_PLIST= installboot.plist -U_BOOT_IMAGE_TYPE= rk3399 - -# 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 +UBOOT_VERSION?= 2021.07-rc1 .include "../../sysutils/u-boot/u-boot-rockchip.mk" Index: u-boot-rockpro64-ayufan/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/sysutils/u-boot-rockpro64-ayufan/Makefile,v retrieving revision 1.3 diff -p -u -u -r1.3 Makefile --- u-boot-rockpro64-ayufan/Makefile 18 Apr 2021 07:30:28 -0000 1.3 +++ u-boot-rockpro64-ayufan/Makefile 9 May 2021 08:53:14 -0000 @@ -3,11 +3,10 @@ UBOOT_TARGET= rockpro64 UBOOT_CONFIG= rockpro64-rk3399_defconfig UBOOT_BIN= idbloader.img rksd_loader.img rkspi_loader.img u-boot.itb +UBOOT_IMAGE_TYPE= rk3399 UBOOT_INSTALLBOOT_PLIST= installboot.plist -U_BOOT_IMAGE_TYPE= rk3399 - DISTINFO_FILE= ${.CURDIR}/../../sysutils/u-boot-rockpro64-ayufan/distinfo PATCHDIR= ${.CURDIR}/../../sysutils/u-boot-rockpro64-ayufan/patches