Index: head/sysutils/u-boot-pine64/distinfo
===================================================================
--- head/sysutils/u-boot-pine64/distinfo	(revision 447308)
+++ head/sysutils/u-boot-pine64/distinfo	(nonexistent)
@@ -1,5 +0,0 @@
-TIMESTAMP = 1466481189
-SHA256 (u-boot-2016.05.tar.bz2) = 87d02275615aaf0cd007b54cbe9fbadceef2bee7c79e6c323ea1ae8956dcb171
-SIZE (u-boot-2016.05.tar.bz2) = 11325053
-SHA256 (firmware-pine64-20160329-6.1.src.rpm) = ab3eb03902f19778a8bc62a933a24ed67f4aeacff861272cc60896a2fd8a1f43
-SIZE (firmware-pine64-20160329-6.1.src.rpm) = 6977912

Property changes on: head/sysutils/u-boot-pine64/distinfo
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/sysutils/u-boot-pine64/files/patch-arm-trusted-firmware--Makefile
===================================================================
--- head/sysutils/u-boot-pine64/files/patch-arm-trusted-firmware--Makefile	(revision 447308)
+++ head/sysutils/u-boot-pine64/files/patch-arm-trusted-firmware--Makefile	(nonexistent)
@@ -1,13 +0,0 @@
---- arm-trusted-firmware/Makefile.orig	2016-03-24 04:57:16.613720732 -0500
-+++ arm-trusted-firmware/Makefile	2016-06-16 21:28:30.382863000 -0500
-@@ -421,10 +421,6 @@
- 	@echo
- 	@echo "Built $$@ successfully"
- 	@echo
--ifeq (bl31.bin,$(notdir ${BIN}))
--	$${Q}git show HEAD --pretty=format:"%H" | head -n 1 > cur.log
--	$${Q}./tools/add_hash_bl31.sh -f $$@ -m bl31
--endif
- 
- .PHONY : bl$(1)
- bl$(1) : $(BUILD_DIR) $(BIN) $(DUMP)

Property changes on: head/sysutils/u-boot-pine64/files/patch-arm-trusted-firmware--Makefile
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/sysutils/u-boot-pine64/files/patch-lib_efi__loader_efi__disk.c
===================================================================
--- head/sysutils/u-boot-pine64/files/patch-lib_efi__loader_efi__disk.c	(revision 447308)
+++ head/sysutils/u-boot-pine64/files/patch-lib_efi__loader_efi__disk.c	(nonexistent)
@@ -1,103 +0,0 @@
---- lib/efi_loader/efi_disk.c.orig	2016-06-16 04:33:54 UTC
-+++ lib/efi_loader/efi_disk.c
-@@ -145,11 +145,13 @@ static void efi_disk_add_dev(char *name,
- 			     const struct block_drvr *cur_drvr,
- 			     const struct blk_desc *desc,
- 			     int dev_index,
--			     lbaint_t offset)
-+			     disk_partition_t *info,
-+			     int logical_partition)
- {
- 	struct efi_disk_obj *diskobj;
- 	struct efi_device_path_file_path *dp;
- 	int objlen = sizeof(*diskobj) + (sizeof(*dp) * 2);
-+	static int mediaid = 0;
- 
- 	diskobj = calloc(1, objlen);
- 
-@@ -162,14 +164,24 @@ static void efi_disk_add_dev(char *name,
- 	diskobj->ops = block_io_disk_template;
- 	diskobj->ifname = cur_drvr->name;
- 	diskobj->dev_index = dev_index;
--	diskobj->offset = offset;
-+	if (info)
-+		diskobj->offset = info->start;
- 
- 	/* Fill in EFI IO Media info (for read/write callbacks) */
- 	diskobj->media.removable_media = desc->removable;
- 	diskobj->media.media_present = 1;
--	diskobj->media.block_size = desc->blksz;
--	diskobj->media.io_align = desc->blksz;
--	diskobj->media.last_block = desc->lba;
-+	diskobj->media.media_id = mediaid++;
-+	if (logical_partition) {
-+		diskobj->media.logical_partition = 1;
-+		diskobj->media.block_size = info->blksz;
-+		diskobj->media.io_align = info->blksz;
-+		diskobj->media.last_block = info->size - 1;
-+	}
-+	else {
-+		diskobj->media.block_size = desc->blksz;
-+		diskobj->media.io_align = desc->blksz;
-+		diskobj->media.last_block = desc->lba;
-+	}
- 	diskobj->ops.media = &diskobj->media;
- 
- 	/* Fill in device path */
-@@ -204,7 +216,7 @@ static int efi_disk_create_eltorito(stru
- 	while (!part_get_info(desc, part, &info)) {
- 		snprintf(devname, sizeof(devname), "%s%d:%d", cur_drvr->name,
- 			 diskid, part);
--		efi_disk_add_dev(devname, cur_drvr, desc, diskid, info.start);
-+		efi_disk_add_dev(devname, cur_drvr, desc, diskid, &info, 0);
- 		part++;
- 		disks++;
- 	}
-@@ -213,6 +225,30 @@ static int efi_disk_create_eltorito(stru
- 	return disks;
- }
- 
-+static int efi_disk_create_mbr(struct blk_desc *desc,
-+				    const struct block_drvr *cur_drvr,
-+				    int diskid)
-+{
-+	int disks = 0;
-+	char devname[32] = { 0 }; /* dp->str is u16[32] long */
-+	disk_partition_t info;
-+	int part = 1;
-+
-+	if (desc->part_type != PART_TYPE_DOS)
-+		return 0;
-+
-+	while (!part_get_info(desc, part, &info)) {
-+		snprintf(devname, sizeof(devname), "%s%d:%d", cur_drvr->name,
-+			 diskid, part);
-+
-+		efi_disk_add_dev(devname, cur_drvr, desc, diskid, &info, 1);
-+		part++;
-+		disks++;
-+	}
-+
-+	return disks;
-+}
-+
- /*
-  * U-Boot doesn't have a list of all online disk devices. So when running our
-  * EFI payload, we scan through all of the potentially available ones and
-@@ -241,7 +277,7 @@ int efi_disk_register(void)
- 
- 			snprintf(devname, sizeof(devname), "%s%d",
- 				 cur_drvr->name, i);
--			efi_disk_add_dev(devname, cur_drvr, desc, i, 0);
-+			efi_disk_add_dev(devname, cur_drvr, desc, i, NULL, 0);
- 			disks++;
- 
- 			/*
-@@ -249,6 +285,7 @@ int efi_disk_register(void)
- 			 * in an EFI world, so let's create them here
- 			 */
- 			disks += efi_disk_create_eltorito(desc, cur_drvr, i);
-+			disks += efi_disk_create_mbr(desc, cur_drvr, i);
- 		}
- 	}
- 	printf("Found %d disks\n", disks);

Property changes on: head/sysutils/u-boot-pine64/files/patch-lib_efi__loader_efi__disk.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/sysutils/u-boot-pine64/files/patch-lib_efi__loader_efi__console.c
===================================================================
--- head/sysutils/u-boot-pine64/files/patch-lib_efi__loader_efi__console.c	(revision 447308)
+++ head/sysutils/u-boot-pine64/files/patch-lib_efi__loader_efi__console.c	(nonexistent)
@@ -1,12 +0,0 @@
---- lib/efi_loader/efi_console.c
-+++ lib/efi_loader/efi_console.c
-@@ -167,6 +167,9 @@ static efi_status_t EFIAPI efi_cout_query_mode(
- {
- 	EFI_ENTRY("%p, %ld, %p, %p", this, mode_number, columns, rows);
- 
-+	if (mode_number != 0)
-+		return EFI_EXIT(EFI_INVALID_PARAMETER);
-+
- 	if (!console_size_queried) {
- 		/* Ask the terminal about its size */
- 		int n[3];

Property changes on: head/sysutils/u-boot-pine64/files/patch-lib_efi__loader_efi__console.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property