From owner-svn-ports-head@freebsd.org Sun Apr 29 14:44:26 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5C182FAF149; Sun, 29 Apr 2018 14:44:26 +0000 (UTC) (envelope-from db@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0F1F88144B; Sun, 29 Apr 2018 14:44:26 +0000 (UTC) (envelope-from db@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E56E025B68; Sun, 29 Apr 2018 14:44:25 +0000 (UTC) (envelope-from db@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3TEiPFd011580; Sun, 29 Apr 2018 14:44:25 GMT (envelope-from db@FreeBSD.org) Received: (from db@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3TEiPvR011572; Sun, 29 Apr 2018 14:44:25 GMT (envelope-from db@FreeBSD.org) Message-Id: <201804291444.w3TEiPvR011572@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: db set sender to db@FreeBSD.org using -f From: Diane Bruce Date: Sun, 29 Apr 2018 14:44:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r468630 - in head/sysutils/u-boot-rpi3: . files X-SVN-Group: ports-head X-SVN-Commit-Author: db X-SVN-Commit-Paths: in head/sysutils/u-boot-rpi3: . files X-SVN-Commit-Revision: 468630 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Apr 2018 14:44:26 -0000 Author: db Date: Sun Apr 29 14:44:24 2018 New Revision: 468630 URL: https://svnweb.freebsd.org/changeset/ports/468630 Log: - due to a miscommunication the patch files were not added Added: head/sysutils/u-boot-rpi3/files/ head/sysutils/u-boot-rpi3/files/patch-board_raspberrypi_rpi_rpi.c (contents, props changed) head/sysutils/u-boot-rpi3/files/patch-configs_rpi__3__defconfig (contents, props changed) head/sysutils/u-boot-rpi3/files/patch-drivers_usb_host_dwc2.c (contents, props changed) head/sysutils/u-boot-rpi3/files/patch-drivers_video_bcm2835.c (contents, props changed) head/sysutils/u-boot-rpi3/files/patch-include_configs_rpi.h (contents, props changed) head/sysutils/u-boot-rpi3/files/patch-lib_efi__loader_efi__console.c (contents, props changed) Modified: head/sysutils/u-boot-rpi3/Makefile Modified: head/sysutils/u-boot-rpi3/Makefile ============================================================================== --- head/sysutils/u-boot-rpi3/Makefile Sun Apr 29 14:18:46 2018 (r468629) +++ head/sysutils/u-boot-rpi3/Makefile Sun Apr 29 14:44:24 2018 (r468630) @@ -2,6 +2,7 @@ MAINTAINER= uboot@FreeBSD.org MASTERDIR= ${.CURDIR}/../u-boot-master +PORTREVISION= 1 MODEL= rpi3 BOARD_CONFIG= rpi_3_defconfig @@ -9,5 +10,7 @@ FAMILY= rpi UBOOT_ARCH= aarch64 DEPENDS= ${LOCALBASE}/share/rpi-firmware/bootcode.bin:sysutils/rpi-firmware + +EXTRA_PATCHES= ${.CURDIR}/files/ .include "${MASTERDIR}/Makefile" Added: head/sysutils/u-boot-rpi3/files/patch-board_raspberrypi_rpi_rpi.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/u-boot-rpi3/files/patch-board_raspberrypi_rpi_rpi.c Sun Apr 29 14:44:24 2018 (r468630) @@ -0,0 +1,13 @@ +--- board/raspberrypi/rpi/rpi.c.orig 2018-03-13 12:02:19 UTC ++++ board/raspberrypi/rpi/rpi.c +@@ -273,6 +273,10 @@ static void set_fdt_addr(void) + return; + + env_set_hex("fdt_addr", fw_dtb_pointer); ++ /* ++ * Set fdtcontroladdr too so it can be picked up by boot script ++ */ ++ env_set_hex("fdtcontroladdr", fw_dtb_pointer); + } + + /* Added: head/sysutils/u-boot-rpi3/files/patch-configs_rpi__3__defconfig ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/u-boot-rpi3/files/patch-configs_rpi__3__defconfig Sun Apr 29 14:44:24 2018 (r468630) @@ -0,0 +1,14 @@ +--- configs/rpi_3_defconfig.orig 2018-03-13 12:02:19 UTC ++++ configs/rpi_3_defconfig +@@ -13,9 +13,9 @@ CONFIG_SYS_PROMPT="U-Boot> " + CONFIG_CMD_GPIO=y + CONFIG_CMD_MMC=y + CONFIG_CMD_USB=y +-CONFIG_OF_EMBED=y ++CONFIG_OF_BOARD=y + CONFIG_ENV_FAT_INTERFACE="mmc" +-CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" ++CONFIG_ENV_FAT_DEVICE_AND_PART="1:1" + CONFIG_DM_KEYBOARD=y + CONFIG_DM_MMC=y + CONFIG_MMC_SDHCI=y Added: head/sysutils/u-boot-rpi3/files/patch-drivers_usb_host_dwc2.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/u-boot-rpi3/files/patch-drivers_usb_host_dwc2.c Sun Apr 29 14:44:24 2018 (r468630) @@ -0,0 +1,10 @@ +--- drivers/usb/host/dwc2.c.orig 2018-03-13 12:02:19 UTC ++++ drivers/usb/host/dwc2.c +@@ -1283,6 +1283,7 @@ struct dm_usb_ops dwc2_usb_ops = { + + static const struct udevice_id dwc2_usb_ids[] = { + { .compatible = "brcm,bcm2835-usb" }, ++ { .compatible = "brcm,bcm2708-usb" }, + { .compatible = "snps,dwc2" }, + { } + }; Added: head/sysutils/u-boot-rpi3/files/patch-drivers_video_bcm2835.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/u-boot-rpi3/files/patch-drivers_video_bcm2835.c Sun Apr 29 14:44:24 2018 (r468630) @@ -0,0 +1,10 @@ +--- drivers/video/bcm2835.c.orig 2018-03-13 12:02:19 UTC ++++ drivers/video/bcm2835.c +@@ -49,6 +49,7 @@ static int bcm2835_video_probe(struct udevice *dev) + + static const struct udevice_id bcm2835_video_ids[] = { + { .compatible = "brcm,bcm2835-hdmi" }, ++ { .compatible = "brcm,bcm2708-fb" }, + { } + }; + Added: head/sysutils/u-boot-rpi3/files/patch-include_configs_rpi.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/u-boot-rpi3/files/patch-include_configs_rpi.h Sun Apr 29 14:44:24 2018 (r468630) @@ -0,0 +1,10 @@ +--- include/configs/rpi.h.orig 2018-03-13 12:02:19 UTC ++++ include/configs/rpi.h +@@ -133,6 +133,7 @@ + + #define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 0) \ ++ func(MMC, mmc, 1) \ + func(USB, usb, 0) \ + func(PXE, pxe, na) \ + func(DHCP, dhcp, na) Added: head/sysutils/u-boot-rpi3/files/patch-lib_efi__loader_efi__console.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/u-boot-rpi3/files/patch-lib_efi__loader_efi__console.c Sun Apr 29 14:44:24 2018 (r468630) @@ -0,0 +1,13 @@ +--- lib/efi_loader/efi_console.c.orig 2018-03-13 12:02:19 UTC ++++ lib/efi_loader/efi_console.c +@@ -547,8 +547,8 @@ int efi_console_register(void) + printf("ERROR: Failed to register console event\n"); + return r; + } +- /* 5000 ns cycle is sufficient for 2 MBaud */ +- r = efi_set_timer(console_timer_event, EFI_TIMER_PERIODIC, 50); ++ /* 100 ms */ ++ r = efi_set_timer(console_timer_event, EFI_TIMER_PERIODIC, 100*1000*10); + if (r != EFI_SUCCESS) + printf("ERROR: Failed to set console timer\n"); + return r;