diff options
| author | Justin Hibbits <jhibbits@FreeBSD.org> | 2019-02-18 01:57:47 +0000 |
|---|---|---|
| committer | Justin Hibbits <jhibbits@FreeBSD.org> | 2019-02-18 01:57:47 +0000 |
| commit | bc4d122db033e9ff27fd230159e7e903634cf0bb (patch) | |
| tree | 4cb6d5c07165ab6863a040c9d02a1d271fc9bff1 | |
| parent | 7827bb1c2c17f886f675b4b49becf1a60f5a9f5f (diff) | |
Notes
| -rw-r--r-- | etc/mtree/BSD.root.dist | 2 | ||||
| -rw-r--r-- | stand/powerpc/uboot/Makefile | 1 | ||||
| -rw-r--r-- | usr.sbin/bsdinstall/partedit/partedit_powerpc.c | 12 |
3 files changed, 11 insertions, 4 deletions
diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist index c154a2fbcf868..371530eb04907 100644 --- a/etc/mtree/BSD.root.dist +++ b/etc/mtree/BSD.root.dist @@ -26,6 +26,8 @@ .. modules .. + uboot + .. zfs .. .. diff --git a/stand/powerpc/uboot/Makefile b/stand/powerpc/uboot/Makefile index ccffd0ec1467a..9124507397ad4 100644 --- a/stand/powerpc/uboot/Makefile +++ b/stand/powerpc/uboot/Makefile @@ -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 diff --git a/usr.sbin/bsdinstall/partedit/partedit_powerpc.c b/usr.sbin/bsdinstall/partedit/partedit_powerpc.c index d18f2b77857db..5a3041df5b0c7 100644 --- a/usr.sbin/bsdinstall/partedit/partedit_powerpc.c +++ b/usr.sbin/bsdinstall/partedit/partedit_powerpc.c @@ -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,14 +112,17 @@ bootpart_type(const char *scheme, const char **mountpoint) 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"); } |