Merge remote-tracking branch 'origin/master' into devel-11

3 files changed, 106 insertions, 2 deletions

diff --git a/usr.sbin/bsdinstall/partedit/gpart_ops.c b/usr.sbin/bsdinstall/partedit/gpart_ops.c
index 48bbb68..04c8cea 100644
--- a/usr.sbin/bsdinstall/partedit/gpart_ops.c
+++ b/usr.sbin/bsdinstall/partedit/gpart_ops.c
@@ -218,7 +218,7 @@ choose_part_type(const char *def_scheme)
 		{"BSD", "BSD Labels",
 		    "Bootable on most x86 systems", 0 },
 		{"GPT", "GUID Partition Table",
-		    "Bootable on most x86 systems", 0 },
+		    "Bootable on most x86 systems and EFI aware ARM64", 0 },
 		{"MBR", "DOS Partitions",
 		    "Bootable on most x86 systems", 0 },
 		{"PC98", "NEC PC9801 Partition Table",
diff --git a/usr.sbin/bsdinstall/partedit/partedit_arm64.c b/usr.sbin/bsdinstall/partedit/partedit_arm64.c
new file mode 100644
index 0000000..5c0fb03
--- /dev/null
+++ b/usr.sbin/bsdinstall/partedit/partedit_arm64.c
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2016 Cavium Inc.
+ * All rights reserved.
+ *
+ * Developed by Semihalf.
+ * Based on work by Nathan Whitehorn.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#include <sys/types.h>
+#include <string.h>
+
+#include "partedit.h"
+
+/* EFI partition size in KB */
+#define	EFI_BOOTPART_SIZE	(50 * 1024)
+#define	EFI_BOOTPART_PATH	"/boot/boot1.efifat"
+
+const char *
+default_scheme(void)
+{
+
+	return ("GPT");
+}
+
+int
+is_scheme_bootable(const char *part_type)
+{
+
+	if (strcmp(part_type, "GPT") == 0)
+		return (1);
+
+	return (0);
+}
+
+int
+is_fs_bootable(const char *part_type, const char *fs)
+{
+
+	if (strcmp(fs, "freebsd-ufs") == 0)
+		return (1);
+
+	return (0);
+}
+
+size_t
+bootpart_size(const char *scheme)
+{
+
+	/* We only support GPT with EFI */
+	if (strcmp(scheme, "GPT") != 0)
+		return (0);
+
+	return ((EFI_BOOTPART_SIZE) * 1024);
+}
+
+const char *
+bootpart_type(const char *scheme)
+{
+
+	/* Only EFI is supported as boot partition */
+	return ("efi");
+}
+
+const char *
+bootcode_path(const char *part_type)
+{
+
+	return (NULL);
+}
+
+const char *
+partcode_path(const char *part_type, const char *fs_type)
+{
+
+	if (strcmp(part_type, "GPT") == 0)
+		return (EFI_BOOTPART_PATH);
+
+	/* No boot partition data for non-GPT */
+	return (NULL);
+}
+
diff --git a/usr.sbin/bsdinstall/partedit/partedit_x86.c b/usr.sbin/bsdinstall/partedit/partedit_x86.c
index 6a60678..5616e58 100644
--- a/usr.sbin/bsdinstall/partedit/partedit_x86.c
+++ b/usr.sbin/bsdinstall/partedit/partedit_x86.c
@@ -99,7 +99,7 @@ bootpart_size(const char *scheme)
 	if (strcmp(x86_bootmethod(), "BIOS") == 0)
 		return (512*1024);
 	else 
-		return (800*1024);
+		return (200*1024*1024);
 
 	return (0);
 }