diff options
Diffstat (limited to 'sysutils/u-boot-rpi3')
7 files changed, 8 insertions, 58 deletions
diff --git a/sysutils/u-boot-rpi3/Makefile b/sysutils/u-boot-rpi3/Makefile index 8500c0258378..7d7c8624c4fd 100644 --- a/sysutils/u-boot-rpi3/Makefile +++ b/sysutils/u-boot-rpi3/Makefile @@ -2,7 +2,6 @@ MAINTAINER= uboot@FreeBSD.org MASTERDIR= ${.CURDIR}/../u-boot-master -PORTREVISION= 1 MODEL= rpi3 BOARD_CONFIG= rpi_3_defconfig @@ -12,5 +11,10 @@ UBOOT_ARCH= aarch64 DEPENDS= ${LOCALBASE}/share/rpi-firmware/bootcode.bin:sysutils/rpi-firmware EXTRA_PATCHES= ${.CURDIR}/files/ +PATCHFILES+= 937869/mbox/? \ + 939129/mbox/? + +CONFIG_FRAGMENT= ${.CURDIR}/files/rpi3_fragment +FRAGMENT_NAME= rpi3_fragment .include "${MASTERDIR}/Makefile" diff --git a/sysutils/u-boot-rpi3/files/patch-board_raspberrypi_rpi_rpi.c b/sysutils/u-boot-rpi3/files/patch-board_raspberrypi_rpi_rpi.c deleted file mode 100644 index 18891f4e6b64..000000000000 --- a/sysutils/u-boot-rpi3/files/patch-board_raspberrypi_rpi_rpi.c +++ /dev/null @@ -1,13 +0,0 @@ ---- 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); - } - - /* diff --git a/sysutils/u-boot-rpi3/files/patch-configs_rpi__3__defconfig b/sysutils/u-boot-rpi3/files/patch-configs_rpi__3__defconfig deleted file mode 100644 index 23982f82ab5f..000000000000 --- a/sysutils/u-boot-rpi3/files/patch-configs_rpi__3__defconfig +++ /dev/null @@ -1,14 +0,0 @@ ---- 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 diff --git a/sysutils/u-boot-rpi3/files/patch-drivers_usb_host_dwc2.c b/sysutils/u-boot-rpi3/files/patch-drivers_usb_host_dwc2.c deleted file mode 100644 index 59467ccd954e..000000000000 --- a/sysutils/u-boot-rpi3/files/patch-drivers_usb_host_dwc2.c +++ /dev/null @@ -1,10 +0,0 @@ ---- 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" }, - { } - }; diff --git a/sysutils/u-boot-rpi3/files/patch-drivers_video_bcm2835.c b/sysutils/u-boot-rpi3/files/patch-drivers_video_bcm2835.c deleted file mode 100644 index 9dd065272956..000000000000 --- a/sysutils/u-boot-rpi3/files/patch-drivers_video_bcm2835.c +++ /dev/null @@ -1,10 +0,0 @@ ---- 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" }, - { } - }; - diff --git a/sysutils/u-boot-rpi3/files/patch-include_configs_rpi.h b/sysutils/u-boot-rpi3/files/patch-include_configs_rpi.h deleted file mode 100644 index 97c875ebef0b..000000000000 --- a/sysutils/u-boot-rpi3/files/patch-include_configs_rpi.h +++ /dev/null @@ -1,10 +0,0 @@ ---- 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) diff --git a/sysutils/u-boot-rpi3/files/rpi3_fragment b/sysutils/u-boot-rpi3/files/rpi3_fragment new file mode 100644 index 000000000000..af01102588ee --- /dev/null +++ b/sysutils/u-boot-rpi3/files/rpi3_fragment @@ -0,0 +1,3 @@ +CONFIG_OF_EMBED=n +CONFIG_OF_BOARD=y +CONFIG_ENV_FAT_DEVICE_AND_PART="1:1" |