Page MenuHomeFreeBSD
Files F150575047

D18709.diff
No OneTemporary
Actions

D18709.diff
View Options

Index: head/etc/mtree/BSD.root.dist
===================================================================
--- head/etc/mtree/BSD.root.dist
+++ head/etc/mtree/BSD.root.dist
@@ -26,6 +26,8 @@
..
modules
..
+ uboot
+ ..
zfs
..
..
Index: head/stand/powerpc/uboot/Makefile
===================================================================
--- head/stand/powerpc/uboot/Makefile
+++ head/stand/powerpc/uboot/Makefile
@@ -11,6 +11,7 @@
.include <bsd.init.mk>
+BINDIR= /boot/uboot
PROG= ubldr
NEWVERSWHAT= "U-Boot loader" ${MACHINE_ARCH}
INSTALLFLAGS= -b
Index: head/usr.sbin/bsdinstall/partedit/partedit_powerpc.c
===================================================================
--- head/usr.sbin/bsdinstall/partedit/partedit_powerpc.c
+++ head/usr.sbin/bsdinstall/partedit/partedit_powerpc.c
@@ -94,9 +94,10 @@
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 @@
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");

File Metadata

Mime Type
text/plain
Expires
Fri, Apr 3, 12:30 PM (20 h, 36 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30757547
Default Alt Text
D18709.diff (1 KB)

Event Timeline