diff options
| author | ian <ian@FreeBSD.org> | 2014-05-17 14:03:46 +0000 |
|---|---|---|
| committer | ian <ian@FreeBSD.org> | 2014-05-17 14:03:46 +0000 |
| commit | de23cf51fef18fa7f16e697bcc76c27ba58ead85 (patch) | |
| tree | dd389d5485c9ce3100caa10f2f5593d63231cb7f | |
| parent | 3724a25461e21d8b5d709b406746b7f9979f6c6f (diff) | |
| download | FreeBSD-src-de23cf51fef18fa7f16e697bcc76c27ba58ead85.zip FreeBSD-src-de23cf51fef18fa7f16e697bcc76c27ba58ead85.tar.gz | |
MFC 263199, 263207
Fix error mesasge in dtc.
Add tmpfs, mbr, and bsdlabel options back to wandboard kernel config.
| -rw-r--r-- | sys/arm/conf/WANDBOARD.common | 3 | ||||
| -rw-r--r-- | usr.bin/dtc/fdt.cc | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/sys/arm/conf/WANDBOARD.common b/sys/arm/conf/WANDBOARD.common index ab0337d..a9d4f83 100644 --- a/sys/arm/conf/WANDBOARD.common +++ b/sys/arm/conf/WANDBOARD.common @@ -35,10 +35,13 @@ options NFSCL # New Network Filesystem Client #options NFSD # New Network Filesystem Server options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCL +options TMPFS # Efficient memory filesystem options MSDOSFS # MSDOS Filesystem options CD9660 # ISO 9660 Filesystem #options PROCFS # Process filesystem (requires PSEUDOFS) options PSEUDOFS # Pseudo-filesystem framework +options GEOM_PART_BSD # BSD partition scheme +options GEOM_PART_MBR # MBR partition scheme options GEOM_PART_GPT # GUID Partition Tables. options GEOM_LABEL # Provides labelization options KTRACE # ktrace(1) support diff --git a/usr.bin/dtc/fdt.cc b/usr.bin/dtc/fdt.cc index 3a7554c..ee281bc 100644 --- a/usr.bin/dtc/fdt.cc +++ b/usr.bin/dtc/fdt.cc @@ -1374,7 +1374,7 @@ device_tree::parse_dts(const char *fn, FILE *depfile) (input.next_token(), input.consume_integer(len)))) { - input.parse_error("Expected /dts-v1/; version string"); + input.parse_error("Expected size on /memreserve/ node."); } input.next_token(); input.consume(';'); |
