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 15 Jun 2021 07:37:26 -0000 @@ -0,0 +1,14 @@ +$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-common_usb.c) = 7a9b28b995ee14d5a16a6d29fe7512beb4646215 +SHA1 (patch-configs_pinebook-pro-rk3399_defconfig) = 9c50749da5b2aea601a2e4e89a091c0ddfdabbd2 +SHA1 (patch-configs_rock64-rk3328_defconfig) = 59076a9934c1ec0a492d600b3179209769753fd1 +SHA1 (patch-configs_rockpro64-rk3399_defconfig) = a1d92a0daa4de233bd94b4cdf62a8c8f7b061cda +SHA1 (patch-include_configs_rockchip-common.h) = 8d2fcde173fd6f5c2b27c8fe6eb9994b2b40e099 +SHA1 (patch-include_configs_rockpro64_rk3399.h) = c101d5f42b83a34f20bb702768513662d7c401d6 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 15 Jun 2021 07:37:26 -0000 @@ -0,0 +1,14 @@ +$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-common_usb.c) = 7a9b28b995ee14d5a16a6d29fe7512beb4646215 +SHA1 (patch-configs_pinebook-pro-rk3399_defconfig) = 9c50749da5b2aea601a2e4e89a091c0ddfdabbd2 +SHA1 (patch-configs_rock64-rk3328_defconfig) = 59076a9934c1ec0a492d600b3179209769753fd1 +SHA1 (patch-configs_rockpro64-rk3399_defconfig) = a1d92a0daa4de233bd94b4cdf62a8c8f7b061cda +SHA1 (patch-include_configs_rockchip-common.h) = 8d2fcde173fd6f5c2b27c8fe6eb9994b2b40e099 +SHA1 (patch-include_configs_rockpro64_rk3399.h) = c101d5f42b83a34f20bb702768513662d7c401d6 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 -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 15 Jun 2021 07:37:26 -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 15 Jun 2021 07:37:26 -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 15 Jun 2021 07:37:26 -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-common_usb.c =================================================================== RCS file: u-boot/patches-2021.04/patch-common_usb.c diff -N u-boot/patches-2021.04/patch-common_usb.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ u-boot/patches-2021.04/patch-common_usb.c 15 Jun 2021 07:37:26 -0000 @@ -0,0 +1,30 @@ +$NetBSD$ + +Disable USB. Hangs in usb_stop() / 'usb stop', if started. + +--- common/usb.c.orig 2021-04-26 17:53:51.000000000 -0700 ++++ common/usb.c 2021-05-23 01:27:04.407279225 -0700 +@@ -134,6 +134,15 @@ + { + int i; + ++#if 1 ++ /* ++ * XXXMRG ++ * ++ * This hangs when called either from EFI's ExitBootServices() or ++ * explicit call to usb_stop(), say "usb stop" from the command prompt. ++ */ ++ printf("Not doing usb_stop().\n"); ++#else + if (usb_started) { + asynch_allowed = 1; + usb_started = 0; +@@ -144,6 +153,7 @@ + printf("failed to stop USB controller %d\n", i); + } + } ++#endif + + return 0; + } 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 15 Jun 2021 07:37:26 -0000 @@ -0,0 +1,24 @@ +$NetBSD$ + +Load u-boot from 256KB. +Set boot-delay to 2 seconds. + +--- configs/pinebook-pro-rk3399_defconfig.orig 2021-04-26 17:53:51.000000000 -0700 ++++ configs/pinebook-pro-rk3399_defconfig 2021-05-09 03:19:32.650095319 -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_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 15 Jun 2021 07:37:26 -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 15 Jun 2021 07:37:26 -0000 @@ -0,0 +1,27 @@ +$NetBSD$ + +Load u-boot from 256KB. +Enable AHCI and Silicon Image PCIe SATA controllers. + +--- configs/rockpro64-rk3399_defconfig.orig 2021-04-26 17:53:51.000000000 -0700 ++++ configs/rockpro64-rk3399_defconfig 2021-05-22 16:09:08.812523859 -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 +@@ -62,6 +63,12 @@ + CONFIG_DEBUG_UART_SHIFT=2 + CONFIG_ROCKCHIP_SPI=y + CONFIG_SYSRESET=y ++CONFIG_AHCI=y ++CONFIG_AHCI_PCI=y ++CONFIG_SATA=y ++CONFIG_SATA_SIL=y ++CONFIG_SCSI=y ++CONFIG_DM_SCSI=y + CONFIG_USB=y + CONFIG_USB_XHCI_HCD=y + CONFIG_USB_XHCI_DWC3=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 15 Jun 2021 07:37:26 -0000 @@ -0,0 +1,53 @@ +$NetBSD$ + +Add SCSI/AHCI support. +Default to booting from SD, USB, EMMC, NVME, SCSI, PXE, DHCP and then SF. + +--- include/configs/rockchip-common.h.orig 2021-04-26 17:53:51.000000000 -0700 ++++ include/configs/rockchip-common.h 2021-06-03 08:24:37.400358135 -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) +@@ -53,18 +52,27 @@ + #define BOOT_TARGET_SF(func) + #endif + ++#if CONFIG_IS_ENABLED(CMD_SCSI) ++ #define BOOT_TARGET_SCSI(func) func(SCSI, scsi, 0) ++#else ++ #define BOOT_TARGET_SCSI(func) ++#endif ++ + #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_SCSI(func) \ + BOOT_TARGET_PXE(func) \ + BOOT_TARGET_DHCP(func) \ + BOOT_TARGET_SF(func) + #else + #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) + #endif Index: u-boot/patches-2021.04/patch-include_configs_rockpro64_rk3399.h =================================================================== RCS file: u-boot/patches-2021.04/patch-include_configs_rockpro64_rk3399.h diff -N u-boot/patches-2021.04/patch-include_configs_rockpro64_rk3399.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ u-boot/patches-2021.04/patch-include_configs_rockpro64_rk3399.h 15 Jun 2021 07:37:26 -0000 @@ -0,0 +1,20 @@ +$NetBSD$ + +Add CONFIG_SCSI support. + +--- include/configs/rockpro64_rk3399.h.orig 2021-04-26 17:53:51.000000000 -0700 ++++ include/configs/rockpro64_rk3399.h 2021-05-22 16:57:19.869714755 -0700 +@@ -17,4 +17,13 @@ + + #define CONFIG_USB_OHCI_NEW + #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2 ++ ++#ifdef CONFIG_SCSI ++#define CONFIG_SCSI_AHCI ++#define CONFIG_SYS_SCSI_MAX_DEVICE 4 ++#define CONFIG_SYS_SCSI_MAX_SCSI_ID 4 ++#define CONFIG_SYS_SCSI_MAX_LUN 1 ++#define CONFIG_SYS_SATA_MAX_DEVICE 4 ++#endif ++ + #endif 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 15 Jun 2021 07:37:26 -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 15 Jun 2021 07:37:26 -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-common_usb.c =================================================================== RCS file: u-boot/patches-2021.07-rc1/patch-common_usb.c diff -N u-boot/patches-2021.07-rc1/patch-common_usb.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ u-boot/patches-2021.07-rc1/patch-common_usb.c 15 Jun 2021 07:37:26 -0000 @@ -0,0 +1,30 @@ +$NetBSD$ + +Disable USB. Hangs in usb_stop() / 'usb stop', if started. + +--- common/usb.c.orig 2021-04-26 17:53:51.000000000 -0700 ++++ common/usb.c 2021-05-23 01:27:04.407279225 -0700 +@@ -134,6 +134,15 @@ + { + int i; + ++#if 1 ++ /* ++ * XXXMRG ++ * ++ * This hangs when called either from EFI's ExitBootServices() or ++ * explicit call to usb_stop(), say "usb stop" from the command prompt. ++ */ ++ printf("Not doing usb_stop().\n"); ++#else + if (usb_started) { + asynch_allowed = 1; + usb_started = 0; +@@ -144,6 +153,7 @@ + printf("failed to stop USB controller %d\n", i); + } + } ++#endif + + return 0; + } 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 15 Jun 2021 07:37:26 -0000 @@ -0,0 +1,24 @@ +$NetBSD$ + +Load u-boot from 256KB. +Set boot-delay to 2 seconds. + +--- configs/pinebook-pro-rk3399_defconfig.orig 2021-04-26 17:53:51.000000000 -0700 ++++ configs/pinebook-pro-rk3399_defconfig 2021-05-09 03:19:32.650095319 -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_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 15 Jun 2021 07:37:26 -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 15 Jun 2021 07:37:26 -0000 @@ -0,0 +1,27 @@ +$NetBSD$ + +Load u-boot from 256KB. +Enable AHCI and Silicon Image PCIe SATA controllers. + +--- configs/rockpro64-rk3399_defconfig.orig 2021-04-26 17:53:51.000000000 -0700 ++++ configs/rockpro64-rk3399_defconfig 2021-05-22 16:09:08.812523859 -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 +@@ -62,6 +63,12 @@ + CONFIG_DEBUG_UART_SHIFT=2 + CONFIG_ROCKCHIP_SPI=y + CONFIG_SYSRESET=y ++CONFIG_AHCI=y ++CONFIG_AHCI_PCI=y ++CONFIG_SATA=y ++CONFIG_SATA_SIL=y ++CONFIG_SCSI=y ++CONFIG_DM_SCSI=y + CONFIG_USB=y + CONFIG_USB_XHCI_HCD=y + CONFIG_USB_XHCI_DWC3=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 15 Jun 2021 07:37:26 -0000 @@ -0,0 +1,53 @@ +$NetBSD$ + +Add SCSI/AHCI support. +Default to booting from SD, USB, EMMC, NVME, SCSI, PXE, DHCP and then SF. + +--- include/configs/rockchip-common.h.orig 2021-04-26 17:53:51.000000000 -0700 ++++ include/configs/rockchip-common.h 2021-06-03 08:24:37.400358135 -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) +@@ -53,18 +52,27 @@ + #define BOOT_TARGET_SF(func) + #endif + ++#if CONFIG_IS_ENABLED(CMD_SCSI) ++ #define BOOT_TARGET_SCSI(func) func(SCSI, scsi, 0) ++#else ++ #define BOOT_TARGET_SCSI(func) ++#endif ++ + #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_SCSI(func) \ + BOOT_TARGET_PXE(func) \ + BOOT_TARGET_DHCP(func) \ + BOOT_TARGET_SF(func) + #else + #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) + #endif Index: u-boot/patches-2021.07-rc1/patch-include_configs_rockpro64_rk3399.h =================================================================== RCS file: u-boot/patches-2021.07-rc1/patch-include_configs_rockpro64_rk3399.h diff -N u-boot/patches-2021.07-rc1/patch-include_configs_rockpro64_rk3399.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ u-boot/patches-2021.07-rc1/patch-include_configs_rockpro64_rk3399.h 15 Jun 2021 07:37:26 -0000 @@ -0,0 +1,20 @@ +$NetBSD$ + +Add CONFIG_SCSI support. + +--- include/configs/rockpro64_rk3399.h.orig 2021-04-26 17:53:51.000000000 -0700 ++++ include/configs/rockpro64_rk3399.h 2021-05-22 16:57:19.869714755 -0700 +@@ -17,4 +17,13 @@ + + #define CONFIG_USB_OHCI_NEW + #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2 ++ ++#ifdef CONFIG_SCSI ++#define CONFIG_SCSI_AHCI ++#define CONFIG_SYS_SCSI_MAX_DEVICE 4 ++#define CONFIG_SYS_SCSI_MAX_SCSI_ID 4 ++#define CONFIG_SYS_SCSI_MAX_LUN 1 ++#define CONFIG_SYS_SATA_MAX_DEVICE 4 ++#endif ++ + #endif Index: u-boot-pinebook-pro/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/sysutils/u-boot-pinebook-pro/Makefile,v retrieving revision 1.10 diff -p -u -r1.10 Makefile --- u-boot-pinebook-pro/Makefile 18 Apr 2021 08:54:56 -0000 1.10 +++ u-boot-pinebook-pro/Makefile 15 Jun 2021 07:37:26 -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-rockpro64/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/sysutils/u-boot-rockpro64/Makefile,v retrieving revision 1.11 diff -p -u -r1.11 Makefile --- u-boot-rockpro64/Makefile 18 Apr 2021 07:30:28 -0000 1.11 +++ u-boot-rockpro64/Makefile 15 Jun 2021 07:37:26 -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-rock64/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/sysutils/u-boot-rock64/Makefile,v retrieving revision 1.9 diff -p -u -r1.9 Makefile --- u-boot-rock64/Makefile 26 Apr 2021 00:35:03 -0000 1.9 +++ u-boot-rock64/Makefile 15 Jun 2021 07:37:26 -0000 @@ -1,33 +1,12 @@ -# $NetBSD: Makefile,v 1.9 2021/04/26 00:35:03 mrg Exp $ +# $NetBSD: Makefile,v 1.11 2021/04/18 07:30:28 mrg Exp $ -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 +UBOOT_VERSION?= 2021.07-rc1 -U_BOOT_IMAGE_TYPE= rk3328 -.include "../../sysutils/u-boot-rock64/u-boot-rockchip.mk" - -# Boot Loader stage 3-1 (BL31) EL3 Runtime Firmware -# XXX LICENSE? -BL31= rk322xh_bl31_v1.41.elf -DISTFILES+= ${BL31} -SITES.${BL31}= ${MASTER_SITE_GITHUB:=rockchip-linux/rkbin/raw/fc322b129b4438307ac18cbdc73c38400c7b33d9/bin/rk33/} - -# DDR init binary -DDR_BIN= rk3328_ddr_333MHz_v1.16.bin -SITES.${DDR_BIN}= ${MASTER_SITE_GITHUB:=rockchip-linux/rkbin/raw/6ee03f14441f4f2812c713e1027b88e3a24c546b/bin/rk33/} -DISTFILES+= ${DDR_BIN} - -REPLACE_PYTHON+= tools/dtoc/dtoc.py -PYTHON_FOR_BUILD_ONLY= yes - -# SyntaxError: Missing parentheses in call to 'print'. Did you mean print(result)? -PYTHON_VERSIONS_ACCEPTED= 27 - -.include "../../lang/python/application.mk" -.include "../../sysutils/u-boot/u-boot-arm64.mk" +.include "../../sysutils/u-boot/u-boot-rockchip.mk" Index: u-boot-rock64/distinfo =================================================================== RCS file: u-boot-rock64/distinfo diff -N u-boot-rock64/distinfo --- u-boot-rock64/distinfo 21 Jul 2019 15:17:12 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,16 +0,0 @@ -$NetBSD: distinfo,v 1.3 2019/07/21 15:17:12 tnn Exp $ - -SHA1 (2017.09-rockchip-ayufan-1063-g29843fbd42.tar.gz) = 139aa96fa9359840677eb25d5e137829138434e5 -RMD160 (2017.09-rockchip-ayufan-1063-g29843fbd42.tar.gz) = 252993f382144312cfa1d5803167d967a1e5f4c3 -SHA512 (2017.09-rockchip-ayufan-1063-g29843fbd42.tar.gz) = 8fe62ade5bb4a5de71282e7d65c22349d38c2f4f3f08482e9b132de139dc4f6e8361059ad2c09cffaf4e96fbcf00665b5490bfbaa2d5f8e705c92fa963d8320f -Size (2017.09-rockchip-ayufan-1063-g29843fbd42.tar.gz) = 15126203 bytes -SHA1 (rk322xh_bl31_v1.41.elf) = 5c45cb78a65fb584e7ddadc9b35f57c10008db1f -RMD160 (rk322xh_bl31_v1.41.elf) = 9f2c3fc2c892da279dac99e0386f0ab4ce96de36 -SHA512 (rk322xh_bl31_v1.41.elf) = 9238601bf06ba64b558589c769bd8f8c435d658b7a9ee8b05f68093f9266cff3ea97a6ad2c1a17cb0a6c54067e3886b52617c9855eecd455def6369e8dbc24c5 -Size (rk322xh_bl31_v1.41.elf) = 773001 bytes -SHA1 (rk3328_ddr_333MHz_v1.16.bin) = 2c81c827f8e3a1c443c98cc880a0c9c1a26810de -RMD160 (rk3328_ddr_333MHz_v1.16.bin) = 983c64ff2c76331bcfb44975641f3560c3c0d905 -SHA512 (rk3328_ddr_333MHz_v1.16.bin) = 29cd6bbd7a0cc78073a5d50cc02676a09ec56298236684142572c465c8c3baccf275d583dcbbe52e5b16929ae09dd4a9772ea96d67deedc904707d8e0ca98ee8 -Size (rk3328_ddr_333MHz_v1.16.bin) = 28532 bytes -SHA1 (patch-arch_arm_cpu_armv8_Kconfig) = 375c79ebe0d593865fbaa7924c8446ea6712fca4 -SHA1 (patch-lib_bch.c) = 151e5f311742a7da919359950ccac2521bcfaaff Index: u-boot-rock64/u-boot-rockchip.mk =================================================================== RCS file: u-boot-rock64/u-boot-rockchip.mk diff -N u-boot-rock64/u-boot-rockchip.mk --- u-boot-rock64/u-boot-rockchip.mk 6 Apr 2020 15:06:17 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,42 +0,0 @@ -# $NetBSD: u-boot-rockchip.mk,v 1.2 2020/04/06 15:06:17 tnn Exp $ -# -# used by sysutils/u-boot-rock64/Makefile - -# Common makefile fragment for rockchip based u-boot targets. -# -# Set these variables: -# -# U_BOOT_IMAGE_TYPE ("rk3399", "rk3328") -# - -UBOOT_VERSION= ${GITHUB_TAG:C/-.*$//} -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-rock64/patches -DISTFILES= ${DEFAULT_DISTFILES} -EXTRACT_SUFX= .tar.gz - -# pkgsrc tries to run distfiles that end in .bin; handle manually -EXTRACT_ONLY= ${DISTFILES:N*.bin} - -USE_TOOLS+= gawk -MAKE_ENV+= BL31=${WRKDIR}/${BL31} - -post-extract: - cp ${DISTDIR}/${DDR_BIN} ${WRKDIR} - -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 -# 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 - 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