Index: head/etc/mtree/BSD.root.dist
===================================================================
--- head/etc/mtree/BSD.root.dist	(revision 344241)
+++ head/etc/mtree/BSD.root.dist	(revision 344242)
@@ -1,124 +1,126 @@
 # $FreeBSD$
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
 
 /set type=dir uname=root gname=wheel mode=0755
 .
     bin
     ..
     boot
         defaults
         ..
         dtb
             allwinner             tags=package=runtime
             ..
             overlays              tags=package=runtime
             ..
             rockchip              tags=package=runtime
             ..
         ..
         firmware
         ..
         lua
         ..
         kernel
         ..
         modules
         ..
+        uboot
+        ..
         zfs
         ..
     ..
     dev             mode=0555
     ..
     etc
         X11
         ..
         authpf
         ..
         autofs
         ..
         bluetooth
         ..
         cron.d
         ..
         defaults
         ..
         devd
         ..
         dma
         ..
         gss
         ..
         mail
         ..
         mtree
         ..
         newsyslog.conf.d
         ..
         ntp             mode=0700
         ..
         pam.d
         ..
         periodic
             daily
             ..
             monthly
             ..
             security
             ..
             weekly
             ..
         ..
         pkg
         ..
         ppp
         ..
         rc.conf.d
         ..
         rc.d
         ..
         security
         ..
         ssh
         ..
         ssl
         ..
         syslog.d
         ..
         zfs
         ..
     ..
     lib
         casper
         ..
         geom
         ..
         nvmecontrol
         ..
     ..
     libexec
         resolvconf
         ..
     ..
     media
     ..
     mnt
     ..
     net
     ..
     proc            mode=0555
     ..
     rescue
     ..
     root
     ..
     sbin
     ..
     tmp             mode=01777
     ..
     usr
     ..
     var
     ..
 ..
Index: head/stand/powerpc/uboot/Makefile
===================================================================
--- head/stand/powerpc/uboot/Makefile	(revision 344241)
+++ head/stand/powerpc/uboot/Makefile	(revision 344242)
@@ -1,33 +1,34 @@
 # $FreeBSD$
 
 LOADER_UFS_SUPPORT?=	yes
 LOADER_CD9660_SUPPORT?=	no
 LOADER_EXT2FS_SUPPORT?=	no
 LOADER_NET_SUPPORT?=	yes
 LOADER_NFS_SUPPORT?=	yes
 LOADER_TFTP_SUPPORT?=	no
 LOADER_GZIP_SUPPORT?=	no
 LOADER_BZIP2_SUPPORT?=	no
 
 .include <bsd.init.mk>
 
+BINDIR= 	/boot/uboot
 PROG=		ubldr
 NEWVERSWHAT=	"U-Boot loader" ${MACHINE_ARCH}
 INSTALLFLAGS=	-b
 
 # Architecture-specific loader code
 SRCS=		start.S conf.c vers.c ppc64_elf_freebsd.c
 SRCS+=		ucmpdi2.c
 
 # Always add MI sources
 .include	"${BOOTSRC}/loader.mk"
 .PATH:		${SYSDIR}/libkern
 
 LDFLAGS=	-nostdlib -static -T ${.CURDIR}/ldscript.powerpc
 
 .include	"${BOOTSRC}/uboot.mk"
 
 DPADD=		${LDR_INTERP} ${LIBUBOOT} ${LIBFDT} ${LIBUBOOT_FDT} ${LIBSA}
 LDADD=		${LDR_INTERP} ${LIBUBOOT} ${LIBFDT} ${LIBUBOOT_FDT} ${LIBSA}
 
 .include <bsd.prog.mk>
Index: head/usr.sbin/bsdinstall/partedit/partedit_powerpc.c
===================================================================
--- head/usr.sbin/bsdinstall/partedit/partedit_powerpc.c	(revision 344241)
+++ head/usr.sbin/bsdinstall/partedit/partedit_powerpc.c	(revision 344242)
@@ -1,143 +1,147 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
  * Copyright (c) 2011 Nathan Whitehorn
  * All rights reserved.
  *
  * 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 <sys/sysctl.h>
 #include <string.h>
 
 #include "partedit.h"
 
 static char platform[255] = "";
 
 const char *
 default_scheme(void) {
 	size_t platlen = sizeof(platform);
 	if (strlen(platform) == 0)
 		sysctlbyname("hw.platform", platform, &platlen, NULL, -1);
 
 	if (strcmp(platform, "powermac") == 0)
 		return ("APM");
 	if (strcmp(platform, "chrp") == 0 || strcmp(platform, "ps3") == 0 ||
 	    strcmp(platform, "mpc85xx") == 0)
 		return ("MBR");
 
 	/* Pick GPT as a generic default */
 	return ("GPT");
 }
 
 int
 is_scheme_bootable(const char *part_type) {
 	size_t platlen = sizeof(platform);
 	if (strlen(platform) == 0)
 		sysctlbyname("hw.platform", platform, &platlen, NULL, -1);
 
 	if (strcmp(platform, "powermac") == 0 && strcmp(part_type, "APM") == 0)
 		return (1);
 	if (strcmp(platform, "powernv") == 0 && strcmp(part_type, "GPT") == 0)
 		return (1);
 	if ((strcmp(platform, "chrp") == 0 || strcmp(platform, "ps3") == 0) &&
 	    (strcmp(part_type, "MBR") == 0 || strcmp(part_type, "BSD") == 0 ||
 	     strcmp(part_type, "GPT") == 0))
 		return (1);
 	if (strcmp(platform, "mpc85xx") == 0 && strcmp(part_type, "MBR") == 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 *part_type)
 {
 	size_t platlen = sizeof(platform);
 	if (strlen(platform) == 0)
 		sysctlbyname("hw.platform", platform, &platlen, NULL, -1);
 
 	if (strcmp(part_type, "APM") == 0)
 		return (800*1024);
 	if (strcmp(part_type, "BSD") == 0) /* Nothing for nested */
 		return (0);
 	if (strcmp(platform, "chrp") == 0)
 		return (800*1024);
-	if (strcmp(platform, "ps3") == 0 || strcmp(platform, "powernv") == 0 ||
-	    strcmp(platform, "mpc85xx") == 0)
+	if (strcmp(platform, "ps3") == 0 || strcmp(platform, "powernv") == 0)
 		return (512*1024*1024);
+	if (strcmp(platform, "mpc85xx") == 0)
+		return (16*1024*1024);
 	return (0);
 }
 
 const char *
 bootpart_type(const char *scheme, const char **mountpoint)
 {
 	size_t platlen = sizeof(platform);
 	if (strlen(platform) == 0)
 		sysctlbyname("hw.platform", platform, &platlen, NULL, -1);
 
 	if (strcmp(platform, "chrp") == 0)
 		return ("prep-boot");
 	if (strcmp(platform, "powermac") == 0)
 		return ("apple-boot");
-	if (strcmp(platform, "powernv") == 0 || strcmp(platform, "ps3") == 0 ||
-	    strcmp(platform, "mpc85xx") == 0) {
+	if (strcmp(platform, "powernv") == 0 || strcmp(platform, "ps3") == 0) {
 		*mountpoint = "/boot";
 		if (strcmp(scheme, "GPT") == 0)
 			return ("ms-basic-data");
 		else if (strcmp(scheme, "MBR") == 0)
 			return ("fat32");
+	}
+	if (strcmp(platform, "mpc85xx") == 0) {
+		*mountpoint = "/boot/uboot";
+		return ("fat16");
 	}
 
 	return ("freebsd-boot");
 }
 
 const char *
 bootcode_path(const char *part_type) {
 	return (NULL);
 }
 	
 const char *
 partcode_path(const char *part_type, const char *fs_type) {
 	size_t platlen = sizeof(platform);
 	if (strlen(platform) == 0)
 		sysctlbyname("hw.platform", platform, &platlen, NULL, -1);
 
 	if (strcmp(part_type, "APM") == 0)
 		return ("/boot/boot1.hfs");
 	if (strcmp(platform, "chrp") == 0)
 		return ("/boot/boot1.elf");
 	return (NULL);
 }