svn commit: r344242 - in head: etc/mtree stand/powerpc/uboot usr.sbin/bsdinstall/partedit

[Justin Hibbits]

Author: jhibbits
Date: Mon Feb 18 01:57:47 2019
New Revision: 344242
URL: https://svnweb.freebsd.org/changeset/base/344242

Log:
  powerpc/boot: Move ubldr to /boot/uboot, and make this a separate filesystem
  
  Summary:
  Now that mpc85xx can boot via ubldr, move ubldr to a separate
  filesystem, mounted on /boot/uboot, so that a fresh install can boot correctly.
  
  Reviewed By: nwhitehorn
  Differential Revision: https://reviews.freebsd.org/D18709

Modified:
  head/etc/mtree/BSD.root.dist
  head/stand/powerpc/uboot/Makefile
  head/usr.sbin/bsdinstall/partedit/partedit_powerpc.c

Modified: head/etc/mtree/BSD.root.dist
==============================================================================
--- head/etc/mtree/BSD.root.dist	Sun Feb 17 23:48:51 2019	(r344241)
+++ head/etc/mtree/BSD.root.dist	Mon Feb 18 01:57:47 2019	(r344242)
@@ -26,6 +26,8 @@
         ..
         modules
         ..
+        uboot
+        ..
         zfs
         ..
     ..

Modified: head/stand/powerpc/uboot/Makefile
==============================================================================
--- head/stand/powerpc/uboot/Makefile	Sun Feb 17 23:48:51 2019	(r344241)
+++ head/stand/powerpc/uboot/Makefile	Mon Feb 18 01:57:47 2019	(r344242)
@@ -11,6 +11,7 @@ LOADER_BZIP2_SUPPORT?=	no
 
 .include <bsd.init.mk>
 
+BINDIR= 	/boot/uboot
 PROG=		ubldr
 NEWVERSWHAT=	"U-Boot loader" ${MACHINE_ARCH}
 INSTALLFLAGS=	-b

Modified: head/usr.sbin/bsdinstall/partedit/partedit_powerpc.c
==============================================================================
--- head/usr.sbin/bsdinstall/partedit/partedit_powerpc.c	Sun Feb 17 23:48:51 2019	(r344241)
+++ head/usr.sbin/bsdinstall/partedit/partedit_powerpc.c	Mon Feb 18 01:57:47 2019	(r344242)
@@ -94,9 +94,10 @@ bootpart_size(const char *part_type)
 		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);
 }
 
@@ -111,13 +112,16 @@ bootpart_type(const char *scheme, const char **mountpo
 		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");