diff options
| author | gjb <gjb@FreeBSD.org> | 2015-07-10 22:10:00 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2015-07-10 22:10:00 +0000 |
| commit | 42ea6b1b275e51f8fbe35033240cd5d41fd5d226 (patch) | |
| tree | 93bf5821b1e6de34199f6e1c7093252dde57b393 /sys/arm | |
| parent | cb93732d0da15bbd8d0cdea54e2f34d19b5cd5b3 (diff) | |
| download | FreeBSD-src-42ea6b1b275e51f8fbe35033240cd5d41fd5d226.zip FreeBSD-src-42ea6b1b275e51f8fbe35033240cd5d41fd5d226.tar.gz | |
Fix two remaining issues with the arm UFS mount issue:
- Add the GEOM_PART_GPT option and enable MSDOSFS in the GUMSTIX
kernel. [1]
- Add GEOM_LABEL to the PANDABOARD kernel, that should have been
included included in r285132. I confused the kernel configuration
used for the WANDBOARD and PANDABOARD, which the former uses the
IMX6 kernel configuration, along with the CUBOX-HUMMINGBOARD.
This is a direct commit to stable/10, as was r285132.
[1] I do not actually have the GUMSTIX board, but I suspect it will
fail to boot in the same way as the others have been.
Approved by: re (kib)
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'sys/arm')
| -rw-r--r-- | sys/arm/conf/GUMSTIX | 3 | ||||
| -rw-r--r-- | sys/arm/conf/PANDABOARD | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sys/arm/conf/GUMSTIX b/sys/arm/conf/GUMSTIX index 05ac4a3..ce3c54a 100644 --- a/sys/arm/conf/GUMSTIX +++ b/sys/arm/conf/GUMSTIX @@ -47,11 +47,12 @@ options UFS_DIRHASH # Improve performance on big directories options NFSCL # New Network Filesystem Client #options NFSD # New Network Filesystem Server options NFS_ROOT # NFS usable as /, requires NFSCL +options GEOM_PART_GPT # GUID Partition Tables options GEOM_PART_BSD # BSD partition scheme options GEOM_PART_MBR # MBR partition scheme options GEOM_LABEL # Provides labelization options TMPFS # Efficient memory filesystem -#options MSDOSFS # MSDOS Filesystem +options MSDOSFS # MSDOS Filesystem #options CD9660 # ISO 9660 Filesystem #options PROCFS # Process filesystem (requires PSEUDOFS) options PSEUDOFS # Pseudo-filesystem framework diff --git a/sys/arm/conf/PANDABOARD b/sys/arm/conf/PANDABOARD index d62e7c9..b4ade48 100644 --- a/sys/arm/conf/PANDABOARD +++ b/sys/arm/conf/PANDABOARD @@ -52,6 +52,7 @@ options TMPFS # Efficient memory filesystem options GEOM_PART_GPT # GUID Partition Tables options GEOM_PART_BSD # BSD partition scheme options GEOM_PART_MBR # MBR partition scheme +options GEOM_LABEL # Provides labelization options COMPAT_43 # Compatible with BSD 4.3 [KEEP THIS!] options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options KTRACE # ktrace(1) support |
