svn commit: r265172 - in projects/random_number_generator: . lib/libc/locale release/powerpc sbin/newfs_msdos sys/arm/conf sys/boot/userboot/userboot sys/cam/scsi sys/conf sys/tools/fdt usr.bin/mki...
Mark Murray
markm at FreeBSD.org
Thu May 1 07:06:13 UTC 2014
Author: markm
Date: Thu May 1 07:06:06 2014
New Revision: 265172
URL: http://svnweb.freebsd.org/changeset/base/265172
Log:
MFC - tracking commit.
Merging r265153 through r265171.
Added:
projects/random_number_generator/sys/arm/conf/VYBRID
- copied unchanged from r265171, head/sys/arm/conf/VYBRID
Deleted:
projects/random_number_generator/sys/arm/conf/VYBRID.common
projects/random_number_generator/sys/arm/conf/WANDBOARD.common
Modified:
projects/random_number_generator/Makefile
projects/random_number_generator/Makefile.inc1
projects/random_number_generator/lib/libc/locale/utf8.c
projects/random_number_generator/release/powerpc/make-memstick.sh
projects/random_number_generator/sbin/newfs_msdos/newfs_msdos.c
projects/random_number_generator/sys/arm/conf/ARNDALE
projects/random_number_generator/sys/arm/conf/BWCT
projects/random_number_generator/sys/arm/conf/COLIBRI-VF50
projects/random_number_generator/sys/arm/conf/COSMIC
projects/random_number_generator/sys/arm/conf/EB9200
projects/random_number_generator/sys/arm/conf/ETHERNUT5
projects/random_number_generator/sys/arm/conf/HL200
projects/random_number_generator/sys/arm/conf/HL201
projects/random_number_generator/sys/arm/conf/KB920X
projects/random_number_generator/sys/arm/conf/NSLU
projects/random_number_generator/sys/arm/conf/QILA9G20
projects/random_number_generator/sys/arm/conf/QUARTZ
projects/random_number_generator/sys/arm/conf/SAM9260EK
projects/random_number_generator/sys/arm/conf/SAM9X25EK
projects/random_number_generator/sys/arm/conf/SN9G45
projects/random_number_generator/sys/arm/conf/WANDBOARD-DUAL
projects/random_number_generator/sys/arm/conf/WANDBOARD-QUAD
projects/random_number_generator/sys/arm/conf/WANDBOARD-SOLO
projects/random_number_generator/sys/boot/userboot/userboot/conf.c
projects/random_number_generator/sys/boot/userboot/userboot/userboot_cons.c
projects/random_number_generator/sys/cam/scsi/scsi_da.c
projects/random_number_generator/sys/conf/files
projects/random_number_generator/sys/tools/fdt/make_dtb.sh
projects/random_number_generator/usr.bin/mkimg/apm.c
projects/random_number_generator/usr.sbin/kldxref/ef.c
Directory Properties:
projects/random_number_generator/ (props changed)
projects/random_number_generator/lib/libc/ (props changed)
projects/random_number_generator/sbin/ (props changed)
projects/random_number_generator/sys/ (props changed)
projects/random_number_generator/sys/amd64/conf/ (props changed)
projects/random_number_generator/sys/arm/conf/ (props changed)
projects/random_number_generator/sys/boot/ (props changed)
projects/random_number_generator/sys/conf/ (props changed)
projects/random_number_generator/sys/i386/conf/ (props changed)
projects/random_number_generator/sys/ia64/conf/ (props changed)
projects/random_number_generator/sys/mips/conf/ (props changed)
projects/random_number_generator/sys/pc98/conf/ (props changed)
projects/random_number_generator/sys/powerpc/conf/ (props changed)
projects/random_number_generator/sys/sparc64/conf/ (props changed)
Modified: projects/random_number_generator/Makefile
==============================================================================
--- projects/random_number_generator/Makefile Thu May 1 03:24:41 2014 (r265171)
+++ projects/random_number_generator/Makefile Thu May 1 07:06:06 2014 (r265172)
@@ -458,9 +458,15 @@ universe_kernels: universe_kernconfs
.if !defined(TARGET)
TARGET!= uname -m
.endif
+.if defined(MAKE_ALL_KERNELS)
+_THINNER=cat
+.else
+_THINNER=xargs grep -L "^.NO_UNIVERSE"
+.endif
KERNCONFS!= cd ${KERNSRCDIR}/${TARGET}/conf && \
find [A-Z0-9]*[A-Z0-9] -type f -maxdepth 0 \
- ! -name DEFAULTS ! -name NOTES
+ ! -name DEFAULTS ! -name NOTES | \
+ ${_THINNER}
universe_kernconfs:
.for kernel in ${KERNCONFS}
TARGET_ARCH_${kernel}!= cd ${KERNSRCDIR}/${TARGET}/conf && \
Modified: projects/random_number_generator/Makefile.inc1
==============================================================================
--- projects/random_number_generator/Makefile.inc1 Thu May 1 03:24:41 2014 (r265171)
+++ projects/random_number_generator/Makefile.inc1 Thu May 1 07:06:06 2014 (r265172)
@@ -1830,24 +1830,9 @@ DTBOUTPUTPATH= ${.CURDIR}
# Build 'standalone' Device Tree Blob
#
builddtb:
- @if [ "${FDT_DTS_FILE}" = "" ]; then \
- echo "ERROR: FDT_DTS_FILE must be specified!"; \
- exit 1; \
- fi; \
- if [ ! -f ${.CURDIR}/sys/boot/fdt/dts/${TARGET}/${FDT_DTS_FILE} ]; then \
- echo "ERROR: Specified DTS file (${FDT_DTS_FILE}) does not \
- exist!"; \
- exit 1; \
- fi; \
- if [ "${DTBOUTPUTPATH}" = "${.CURDIR}" ]; then \
- echo "WARNING: DTB will be placed in the current working \
- directory"; \
- fi
- @PATH=${TMPPATH} \
- MACHINE=${TARGET} \
+ @PATH=${TMPPATH} MACHINE=${TARGET} \
${.CURDIR}/sys/tools/fdt/make_dtb.sh ${.CURDIR}/sys \
- ${FDT_DTS_FILE} \
- ${DTBOUTPUTPATH}/`basename ${FDT_DTS_FILE} .dts`
+ "${FDT_DTS_FILE}" ${DTBOUTPUTPATH}
###############
Modified: projects/random_number_generator/lib/libc/locale/utf8.c
==============================================================================
--- projects/random_number_generator/lib/libc/locale/utf8.c Thu May 1 03:24:41 2014 (r265171)
+++ projects/random_number_generator/lib/libc/locale/utf8.c Thu May 1 07:06:06 2014 (r265172)
@@ -203,8 +203,7 @@ _UTF8_mbrtowc(wchar_t * __restrict pwc,
errno = EILSEQ;
return ((size_t)-1);
}
- if ((wch >= 0xd800 && wch <= 0xdfff) ||
- wch == 0xfffe || wch == 0xffff) {
+ if (wch >= 0xd800 && wch <= 0xdfff) {
/*
* Malformed input; invalid code points.
*/
Modified: projects/random_number_generator/release/powerpc/make-memstick.sh
==============================================================================
--- projects/random_number_generator/release/powerpc/make-memstick.sh Thu May 1 03:24:41 2014 (r265171)
+++ projects/random_number_generator/release/powerpc/make-memstick.sh Thu May 1 07:06:06 2014 (r265172)
@@ -41,38 +41,7 @@ if [ $? -ne 0 ]; then
fi
rm ${1}/etc/fstab
-#
-# Use $BLOCKSIZE for transfers to improve efficiency. When calculating
-# how many blocks to transfer "+ 2" is to account for truncation in the
-# division and to provide space for the label.
-#
-
-filesize=`stat -f "%z" ${tempfile}`
-blocks=$(($filesize / ${BLOCKSIZE} + 1728))
-dd if=/dev/zero of=${2} bs=${BLOCKSIZE} count=${blocks}
-if [ $? -ne 0 ]; then
- echo "creation of image file failed"
- exit 1
-fi
-
-unit=`mdconfig -a -t vnode -f ${2}`
-if [ $? -ne 0 ]; then
- echo "mdconfig failed"
- exit 1
-fi
-
-gpart create -s APM ${unit}
-gpart add -t freebsd-boot -s 800K ${unit}
-gpart bootcode -p ${1}/boot/boot1.hfs -i 1 ${unit}
-gpart add -t freebsd-ufs -l FreeBSD_Install ${unit}
-
-dd if=${tempfile} of=/dev/${unit}s3 bs=$BLOCKSIZE conv=sync
-if [ $? -ne 0 ]; then
- echo "copying filesystem into image file failed"
- exit 1
-fi
-
-mdconfig -d -u ${unit}
+mkimg -s apm -p freebsd-boot:=${1}/boot/boot1.hfs -p freebsd-ufs/FreeBSD_Install:=${tempfile} -o ${2}
rm -f ${tempfile}
Modified: projects/random_number_generator/sbin/newfs_msdos/newfs_msdos.c
==============================================================================
--- projects/random_number_generator/sbin/newfs_msdos/newfs_msdos.c Thu May 1 03:24:41 2014 (r265171)
+++ projects/random_number_generator/sbin/newfs_msdos/newfs_msdos.c Thu May 1 07:06:06 2014 (r265172)
@@ -51,50 +51,50 @@ static const char rcsid[] =
#include <time.h>
#include <unistd.h>
-#define MAXU16 0xffff /* maximum unsigned 16-bit quantity */
-#define BPN 4 /* bits per nibble */
-#define NPB 2 /* nibbles per byte */
-
-#define DOSMAGIC 0xaa55 /* DOS magic number */
-#define MINBPS 512 /* minimum bytes per sector */
-#define MAXSPC 128 /* maximum sectors per cluster */
-#define MAXNFT 16 /* maximum number of FATs */
-#define DEFBLK 4096 /* default block size */
-#define DEFBLK16 2048 /* default block size FAT16 */
-#define DEFRDE 512 /* default root directory entries */
-#define RESFTE 2 /* reserved FAT entries */
-#define MINCLS12 1U /* minimum FAT12 clusters */
-#define MINCLS16 0xff5U /* minimum FAT16 clusters */
-#define MINCLS32 0xfff5U /* minimum FAT32 clusters */
-#define MAXCLS12 0xff4U /* maximum FAT12 clusters */
-#define MAXCLS16 0xfff4U /* maximum FAT16 clusters */
-#define MAXCLS32 0xffffff4U /* maximum FAT32 clusters */
+#define MAXU16 0xffff /* maximum unsigned 16-bit quantity */
+#define BPN 4 /* bits per nibble */
+#define NPB 2 /* nibbles per byte */
+
+#define DOSMAGIC 0xaa55 /* DOS magic number */
+#define MINBPS 512 /* minimum bytes per sector */
+#define MAXSPC 128 /* maximum sectors per cluster */
+#define MAXNFT 16 /* maximum number of FATs */
+#define DEFBLK 4096 /* default block size */
+#define DEFBLK16 2048 /* default block size FAT16 */
+#define DEFRDE 512 /* default root directory entries */
+#define RESFTE 2 /* reserved FAT entries */
+#define MINCLS12 1U /* minimum FAT12 clusters */
+#define MINCLS16 0xff5U /* minimum FAT16 clusters */
+#define MINCLS32 0xfff5U /* minimum FAT32 clusters */
+#define MAXCLS12 0xff4U /* maximum FAT12 clusters */
+#define MAXCLS16 0xfff4U /* maximum FAT16 clusters */
+#define MAXCLS32 0xffffff4U /* maximum FAT32 clusters */
-#define mincls(fat) ((fat) == 12 ? MINCLS12 : \
+#define mincls(fat) ((fat) == 12 ? MINCLS12 : \
(fat) == 16 ? MINCLS16 : \
MINCLS32)
-#define maxcls(fat) ((fat) == 12 ? MAXCLS12 : \
+#define maxcls(fat) ((fat) == 12 ? MAXCLS12 : \
(fat) == 16 ? MAXCLS16 : \
MAXCLS32)
-#define mk1(p, x) \
+#define mk1(p, x) \
(p) = (u_int8_t)(x)
-#define mk2(p, x) \
+#define mk2(p, x) \
(p)[0] = (u_int8_t)(x), \
(p)[1] = (u_int8_t)((x) >> 010)
-#define mk4(p, x) \
+#define mk4(p, x) \
(p)[0] = (u_int8_t)(x), \
(p)[1] = (u_int8_t)((x) >> 010), \
(p)[2] = (u_int8_t)((x) >> 020), \
(p)[3] = (u_int8_t)((x) >> 030)
-#define argto1(arg, lo, msg) argtou(arg, lo, 0xff, msg)
-#define argto2(arg, lo, msg) argtou(arg, lo, 0xffff, msg)
-#define argto4(arg, lo, msg) argtou(arg, lo, 0xffffffff, msg)
-#define argtox(arg, lo, msg) argtou(arg, lo, UINT_MAX, msg)
+#define argto1(arg, lo, msg) argtou(arg, lo, 0xff, msg)
+#define argto2(arg, lo, msg) argtou(arg, lo, 0xffff, msg)
+#define argto4(arg, lo, msg) argtou(arg, lo, 0xffffffff, msg)
+#define argtox(arg, lo, msg) argtou(arg, lo, UINT_MAX, msg)
struct bs {
u_int8_t bsJump[3]; /* bootstrap entry point */
@@ -131,7 +131,7 @@ struct bsx {
u_int8_t exReserved1; /* reserved */
u_int8_t exBootSignature; /* extended boot signature */
u_int8_t exVolumeID[4]; /* volume ID number */
- u_int8_t exVolumeLabel[11]; /* volume label */
+ u_int8_t exVolumeLabel[11]; /* volume label */
u_int8_t exFileSysType[8]; /* file system type */
} __packed;
@@ -164,7 +164,7 @@ struct bpb {
u_int bpbBackup; /* backup boot sector */
};
-#define BPBGAP 0, 0, 0, 0, 0, 0
+#define BPBGAP 0, 0, 0, 0, 0, 0
static struct {
const char *name;
@@ -174,10 +174,10 @@ static struct {
{"180", {512, 1, 1, 2, 64, 360, 0xfc, 2, 9, 1, BPBGAP}},
{"320", {512, 2, 1, 2, 112, 640, 0xff, 1, 8, 2, BPBGAP}},
{"360", {512, 2, 1, 2, 112, 720, 0xfd, 2, 9, 2, BPBGAP}},
- {"640", {512, 2, 1, 2, 112, 1280, 0xfb, 2, 8, 2, BPBGAP}},
+ {"640", {512, 2, 1, 2, 112, 1280, 0xfb, 2, 8, 2, BPBGAP}},
{"720", {512, 2, 1, 2, 112, 1440, 0xf9, 3, 9, 2, BPBGAP}},
{"1200", {512, 1, 1, 2, 224, 2400, 0xf9, 7, 15, 2, BPBGAP}},
- {"1232", {1024,1, 1, 2, 192, 1232, 0xfe, 2, 8, 2, BPBGAP}},
+ {"1232", {1024,1, 1, 2, 192, 1232, 0xfe, 2, 8, 2, BPBGAP}},
{"1440", {512, 1, 1, 2, 224, 2880, 0xf0, 9, 18, 2, BPBGAP}},
{"2880", {512, 2, 1, 2, 240, 5760, 0xf0, 9, 36, 2, BPBGAP}}
};
@@ -1029,7 +1029,7 @@ usage(void)
fprintf(stderr,
"usage: newfs_msdos [ -options ] special [disktype]\n"
"where the options are:\n"
- "\t-@ create file system at specified offset\n"
+ "\t-@ create file system at specified offset\n"
"\t-B get bootstrap from file\n"
"\t-C create image file with specified size\n"
"\t-F FAT type (12, 16, or 32)\n"
Modified: projects/random_number_generator/sys/arm/conf/ARNDALE
==============================================================================
--- projects/random_number_generator/sys/arm/conf/ARNDALE Thu May 1 03:24:41 2014 (r265171)
+++ projects/random_number_generator/sys/arm/conf/ARNDALE Thu May 1 07:06:06 2014 (r265172)
@@ -17,6 +17,8 @@
#
# $FreeBSD$
+#NO_UNIVERSE
+
include "EXYNOS5250.common"
ident ARNDALE
Modified: projects/random_number_generator/sys/arm/conf/BWCT
==============================================================================
--- projects/random_number_generator/sys/arm/conf/BWCT Thu May 1 03:24:41 2014 (r265171)
+++ projects/random_number_generator/sys/arm/conf/BWCT Thu May 1 07:06:06 2014 (r265172)
@@ -17,6 +17,8 @@
#
# $FreeBSD$
+#NO_UNIVERSE
+
ident BWCT
options VERBOSE_INIT_ARM
Modified: projects/random_number_generator/sys/arm/conf/COLIBRI-VF50
==============================================================================
--- projects/random_number_generator/sys/arm/conf/COLIBRI-VF50 Thu May 1 03:24:41 2014 (r265171)
+++ projects/random_number_generator/sys/arm/conf/COLIBRI-VF50 Thu May 1 07:06:06 2014 (r265172)
@@ -17,7 +17,9 @@
#
# $FreeBSD$
-include "VYBRID.common"
+#NO_UNIVERSE
+
+include "VYBRID"
ident COLIBRI-VF50
#FDT
Modified: projects/random_number_generator/sys/arm/conf/COSMIC
==============================================================================
--- projects/random_number_generator/sys/arm/conf/COSMIC Thu May 1 03:24:41 2014 (r265171)
+++ projects/random_number_generator/sys/arm/conf/COSMIC Thu May 1 07:06:06 2014 (r265172)
@@ -17,7 +17,9 @@
#
# $FreeBSD$
-include "VYBRID.common"
+#NO_UNIVERSE
+
+include "VYBRID"
ident COSMIC
#FDT
Modified: projects/random_number_generator/sys/arm/conf/EB9200
==============================================================================
--- projects/random_number_generator/sys/arm/conf/EB9200 Thu May 1 03:24:41 2014 (r265171)
+++ projects/random_number_generator/sys/arm/conf/EB9200 Thu May 1 07:06:06 2014 (r265172)
@@ -12,6 +12,8 @@
#
# $FreeBSD$
+#NO_UNIVERSE
+
ident EB9200
include "../at91/std.eb9200"
Modified: projects/random_number_generator/sys/arm/conf/ETHERNUT5
==============================================================================
--- projects/random_number_generator/sys/arm/conf/ETHERNUT5 Thu May 1 03:24:41 2014 (r265171)
+++ projects/random_number_generator/sys/arm/conf/ETHERNUT5 Thu May 1 07:06:06 2014 (r265172)
@@ -17,6 +17,8 @@
#
# $FreeBSD$
+#NO_UNIVERSE
+
ident ETHERNUT5
include "../at91/std.ethernut5"
Modified: projects/random_number_generator/sys/arm/conf/HL200
==============================================================================
--- projects/random_number_generator/sys/arm/conf/HL200 Thu May 1 03:24:41 2014 (r265171)
+++ projects/random_number_generator/sys/arm/conf/HL200 Thu May 1 07:06:06 2014 (r265172)
@@ -17,6 +17,8 @@
#
# $FreeBSD$
+#NO_UNIVERSE
+
ident HL200
include "../at91/std.hl200"
Modified: projects/random_number_generator/sys/arm/conf/HL201
==============================================================================
--- projects/random_number_generator/sys/arm/conf/HL201 Thu May 1 03:24:41 2014 (r265171)
+++ projects/random_number_generator/sys/arm/conf/HL201 Thu May 1 07:06:06 2014 (r265172)
@@ -17,6 +17,8 @@
#
# $FreeBSD$
+#NO_UNIVERSE
+
ident HL201
include "../at91/std.hl201"
Modified: projects/random_number_generator/sys/arm/conf/KB920X
==============================================================================
--- projects/random_number_generator/sys/arm/conf/KB920X Thu May 1 03:24:41 2014 (r265171)
+++ projects/random_number_generator/sys/arm/conf/KB920X Thu May 1 07:06:06 2014 (r265172)
@@ -18,6 +18,8 @@
#
# $FreeBSD$
+#NO_UNIVERSE
+
ident KB920X
include "../at91/std.kb920x"
Modified: projects/random_number_generator/sys/arm/conf/NSLU
==============================================================================
--- projects/random_number_generator/sys/arm/conf/NSLU Thu May 1 03:24:41 2014 (r265171)
+++ projects/random_number_generator/sys/arm/conf/NSLU Thu May 1 07:06:06 2014 (r265172)
@@ -17,6 +17,8 @@
#
# $FreeBSD$
+#NO_UNIVERSE
+
ident NSLU
# XXX What is defined in std.avila does not exactly match the following:
Modified: projects/random_number_generator/sys/arm/conf/QILA9G20
==============================================================================
--- projects/random_number_generator/sys/arm/conf/QILA9G20 Thu May 1 03:24:41 2014 (r265171)
+++ projects/random_number_generator/sys/arm/conf/QILA9G20 Thu May 1 07:06:06 2014 (r265172)
@@ -18,6 +18,8 @@
#
# $FreeBSD$
+#NO_UNIVERSE
+
ident QILA9G20
include "../at91/std.qila9g20"
Modified: projects/random_number_generator/sys/arm/conf/QUARTZ
==============================================================================
--- projects/random_number_generator/sys/arm/conf/QUARTZ Thu May 1 03:24:41 2014 (r265171)
+++ projects/random_number_generator/sys/arm/conf/QUARTZ Thu May 1 07:06:06 2014 (r265172)
@@ -17,7 +17,9 @@
#
# $FreeBSD$
-include "VYBRID.common"
+#NO_UNIVERSE
+
+include "VYBRID"
ident QUARTZ
#FDT
Modified: projects/random_number_generator/sys/arm/conf/SAM9260EK
==============================================================================
--- projects/random_number_generator/sys/arm/conf/SAM9260EK Thu May 1 03:24:41 2014 (r265171)
+++ projects/random_number_generator/sys/arm/conf/SAM9260EK Thu May 1 07:06:06 2014 (r265172)
@@ -17,6 +17,8 @@
#
# $FreeBSD$
+#NO_UNIVERSE
+
ident SAM9260EK
include "../at91/std.sam9260ek"
Modified: projects/random_number_generator/sys/arm/conf/SAM9X25EK
==============================================================================
--- projects/random_number_generator/sys/arm/conf/SAM9X25EK Thu May 1 03:24:41 2014 (r265171)
+++ projects/random_number_generator/sys/arm/conf/SAM9X25EK Thu May 1 07:06:06 2014 (r265172)
@@ -17,7 +17,8 @@
#
# $FreeBSD$
-# NOUNIVERSE: disable building in make universe
+#NO_UNIVERSE
+
ident SAM9X25EK
include "../at91/std.sam9x25ek"
Modified: projects/random_number_generator/sys/arm/conf/SN9G45
==============================================================================
--- projects/random_number_generator/sys/arm/conf/SN9G45 Thu May 1 03:24:41 2014 (r265171)
+++ projects/random_number_generator/sys/arm/conf/SN9G45 Thu May 1 07:06:06 2014 (r265172)
@@ -17,6 +17,8 @@
#
# $FreeBSD$
+#NO_UNIVERSE
+
ident SN9G45
include "../at91/std.sn9g45"
Copied: projects/random_number_generator/sys/arm/conf/VYBRID (from r265171, head/sys/arm/conf/VYBRID)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/random_number_generator/sys/arm/conf/VYBRID Thu May 1 07:06:06 2014 (r265172, copy of r265171, head/sys/arm/conf/VYBRID)
@@ -0,0 +1,149 @@
+# Kernel configuration for Vybrid Family boards.
+#
+# For more information on this file, please read the config(5) manual page,
+# and/or the handbook section on Kernel Configuration Files:
+#
+# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
+#
+# The handbook is also available locally in /usr/share/doc/handbook
+# if you've installed the doc distribution, otherwise always see the
+# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the
+# latest information.
+#
+# An exhaustive list of options and more detailed explanations of the
+# device lines is also present in the ../../conf/NOTES and NOTES files.
+# If you are in doubt as to the purpose or necessity of a line, check first
+# in NOTES.
+#
+# $FreeBSD$
+
+ident VYBRID
+include "../freescale/vybrid/std.vybrid"
+
+makeoptions MODULES_OVERRIDE=""
+makeoptions WITHOUT_MODULES="ahc"
+
+makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
+makeoptions WERROR="-Werror"
+
+options HZ=100
+options SCHED_4BSD # 4BSD scheduler
+options INET # InterNETworking
+options INET6 # IPv6 communications protocols
+options FFS # Berkeley Fast Filesystem
+options SOFTUPDATES
+options UFS_ACL # Support for access control lists
+options UFS_DIRHASH # Improve performance on big directories
+options GEOM_PART_BSD # BSD partition scheme
+options GEOM_PART_MBR # MBR partition scheme
+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 NANDFS # NAND Filesystem
+options COMPAT_43 # Compatible with BSD 4.3 [KEEP THIS!]
+options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
+options KTRACE
+options SYSVSHM # SYSV-style shared memory
+options SYSVMSG # SYSV-style message queues
+options SYSVSEM # SYSV-style semaphores
+options _KPOSIX_PRIORITY_SCHEDULING # Posix P1003_1B real-time extensions
+options KBD_INSTALL_CDEV
+options PREEMPTION
+options FREEBSD_BOOT_LOADER
+options MUTEX_NOINLINE
+options RWLOCK_NOINLINE
+options NO_FFS_SNAPSHOT
+options NO_SWAPPING
+options VFP # vfp/neon
+
+# Debugging
+makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
+options BREAK_TO_DEBUGGER
+#options VERBOSE_SYSINIT # Enable verbose sysinit messages
+options KDB
+options DDB # Enable the kernel debugger
+#options INVARIANTS # Enable calls of extra sanity checking
+#options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS
+#options WITNESS # Enable checks to detect deadlocks and cycles
+#options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed
+#options DIAGNOSTIC
+
+# NFS support
+options NFSCL # Network Filesystem Client
+options NFSLOCKD # Network Lock Manager
+options NFS_ROOT # NFS usable as /, requires NFSCLIENT
+
+# Uncomment this for NFS root
+#options NFS_ROOT # NFS usable as /, requires NFSCL
+#options BOOTP_NFSROOT
+#options BOOTP_COMPAT
+#options BOOTP
+#options BOOTP_NFSV3
+#options BOOTP_WIRED_TO=ffec0
+
+device mmc # mmc/sd bus
+device mmcsd # mmc/sd flash cards
+device sdhci # generic sdhci
+
+#options ROOTDEVNAME=\"nfs:10.5.0.1:/tftpboot/cosmic\"
+#options ROOTDEVNAME=\"nandfs:/dev/gnand0s.root\"
+options ROOTDEVNAME=\"ufs:/dev/da0\"
+
+#options SMP
+
+# Pseudo devices
+
+device loop
+device random
+device pty
+device md
+device gpio
+
+# USB support
+options USB_HOST_ALIGN=32 # Align usb buffers to cache line size.
+device usb
+options USB_DEBUG
+#options USB_REQ_DEBUG
+#options USB_VERBOSE
+#device musb
+device ehci
+#device ohci
+
+device umass
+device scbus # SCSI bus (required for SCSI)
+device da # Direct Access (disks)
+device pass
+
+# SATA
+#device ata
+#device atadisk
+#device mvs
+
+device nand
+
+# Serial ports
+device uart
+
+# I2C (TWSI)
+device iic
+device iicbus
+
+# Ethernet
+device ether
+device ffec
+
+# USB ethernet support, requires miibus
+device miibus
+device axe # ASIX Electronics USB Ethernet
+device bpf # Berkeley packet filter
+
+device sound
+
+# Framebuffer
+device vt
+device kbdmux
+options SC_DFLT_FONT # compile font in
+makeoptions SC_DFLT_FONT=cp437
+device ukbd
Modified: projects/random_number_generator/sys/arm/conf/WANDBOARD-DUAL
==============================================================================
--- projects/random_number_generator/sys/arm/conf/WANDBOARD-DUAL Thu May 1 03:24:41 2014 (r265171)
+++ projects/random_number_generator/sys/arm/conf/WANDBOARD-DUAL Thu May 1 07:06:06 2014 (r265172)
@@ -17,6 +17,8 @@
#
# $FreeBSD$
+#NO_UNIVERSE
+
include "IMX6"
ident WANDBOARD-DUAL
Modified: projects/random_number_generator/sys/arm/conf/WANDBOARD-QUAD
==============================================================================
--- projects/random_number_generator/sys/arm/conf/WANDBOARD-QUAD Thu May 1 03:24:41 2014 (r265171)
+++ projects/random_number_generator/sys/arm/conf/WANDBOARD-QUAD Thu May 1 07:06:06 2014 (r265172)
@@ -17,6 +17,8 @@
#
# $FreeBSD$
+#NO_UNIVERSE
+
include "IMX6"
ident WANDBOARD-QUAD
Modified: projects/random_number_generator/sys/arm/conf/WANDBOARD-SOLO
==============================================================================
--- projects/random_number_generator/sys/arm/conf/WANDBOARD-SOLO Thu May 1 03:24:41 2014 (r265171)
+++ projects/random_number_generator/sys/arm/conf/WANDBOARD-SOLO Thu May 1 07:06:06 2014 (r265172)
@@ -17,6 +17,8 @@
#
# $FreeBSD$
+#NO_UNIVERSE
+
include "IMX6"
ident WANDBOARD-SOLO
Modified: projects/random_number_generator/sys/boot/userboot/userboot/conf.c
==============================================================================
--- projects/random_number_generator/sys/boot/userboot/userboot/conf.c Thu May 1 03:24:41 2014 (r265171)
+++ projects/random_number_generator/sys/boot/userboot/userboot/conf.c Thu May 1 07:06:06 2014 (r265172)
@@ -97,8 +97,10 @@ struct file_format *file_formats[] = {
* data structures from bootstrap.h as well.
*/
extern struct console userboot_console;
+extern struct console userboot_comconsole;
struct console *consoles[] = {
&userboot_console,
+ &userboot_comconsole,
NULL
};
Modified: projects/random_number_generator/sys/boot/userboot/userboot/userboot_cons.c
==============================================================================
--- projects/random_number_generator/sys/boot/userboot/userboot/userboot_cons.c Thu May 1 03:24:41 2014 (r265171)
+++ projects/random_number_generator/sys/boot/userboot/userboot/userboot_cons.c Thu May 1 07:06:06 2014 (r265172)
@@ -33,8 +33,12 @@ __FBSDID("$FreeBSD$");
int console;
+static struct console *userboot_comconsp;
+
static void userboot_cons_probe(struct console *cp);
static int userboot_cons_init(int);
+static void userboot_comcons_probe(struct console *cp);
+static int userboot_comcons_init(int);
static void userboot_cons_putchar(int);
static int userboot_cons_getchar(void);
static int userboot_cons_poll(void);
@@ -50,6 +54,21 @@ struct console userboot_console = {
userboot_cons_poll,
};
+/*
+ * Provide a simple alias to allow loader scripts to set the
+ * console to comconsole without resulting in an error
+ */
+struct console userboot_comconsole = {
+ "comconsole",
+ "comconsole",
+ 0,
+ userboot_comcons_probe,
+ userboot_comcons_init,
+ userboot_cons_putchar,
+ userboot_cons_getchar,
+ userboot_cons_poll,
+};
+
static void
userboot_cons_probe(struct console *cp)
{
@@ -65,6 +84,31 @@ userboot_cons_init(int arg)
}
static void
+userboot_comcons_probe(struct console *cp)
+{
+
+ /*
+ * Save the console pointer so the comcons_init routine
+ * can set the C_PRESENT* flags. They are not set
+ * here to allow the existing userboot console to
+ * be elected the default.
+ */
+ userboot_comconsp = cp;
+}
+
+static int
+userboot_comcons_init(int arg)
+{
+
+ /*
+ * Set the C_PRESENT* flags to allow the comconsole
+ * to be selected as the active console
+ */
+ userboot_comconsp->c_flags |= (C_PRESENTIN | C_PRESENTOUT);
+ return (0);
+}
+
+static void
userboot_cons_putchar(int c)
{
Modified: projects/random_number_generator/sys/cam/scsi/scsi_da.c
==============================================================================
--- projects/random_number_generator/sys/cam/scsi/scsi_da.c Thu May 1 03:24:41 2014 (r265171)
+++ projects/random_number_generator/sys/cam/scsi/scsi_da.c Thu May 1 07:06:06 2014 (r265172)
@@ -212,6 +212,7 @@ struct da_softc {
int trim_max_ranges;
int delete_running;
int delete_available; /* Delete methods possibly available */
+ u_int maxio;
uint32_t unmap_max_ranges;
uint32_t unmap_max_lba; /* Max LBAs in UNMAP req */
uint64_t ws_max_blks;
@@ -2135,11 +2136,12 @@ daregister(struct cam_periph *periph, vo
softc->disk->d_name = "da";
softc->disk->d_drv1 = periph;
if (cpi.maxio == 0)
- softc->disk->d_maxsize = DFLTPHYS; /* traditional default */
+ softc->maxio = DFLTPHYS; /* traditional default */
else if (cpi.maxio > MAXPHYS)
- softc->disk->d_maxsize = MAXPHYS; /* for safety */
+ softc->maxio = MAXPHYS; /* for safety */
else
- softc->disk->d_maxsize = cpi.maxio;
+ softc->maxio = cpi.maxio;
+ softc->disk->d_maxsize = softc->maxio;
softc->disk->d_unit = periph->unit_number;
softc->disk->d_flags = DISKFLAG_DIRECT_COMPLETION;
if ((softc->quirks & DA_Q_NO_SYNC_CACHE) == 0)
@@ -3276,14 +3278,6 @@ dadone(struct cam_periph *periph, union
(lbp->flags & SVPD_LBP_WS10));
dadeleteflag(softc, DA_DELETE_UNMAP,
(lbp->flags & SVPD_LBP_UNMAP));
-
- if (lbp->flags & SVPD_LBP_UNMAP) {
- free(lbp, M_SCSIDA);
- xpt_release_ccb(done_ccb);
- softc->state = DA_STATE_PROBE_BLK_LIMITS;
- xpt_schedule(periph, priority);
- return;
- }
} else {
int error;
error = daerror(done_ccb, CAM_RETRY_SELTO,
@@ -3309,7 +3303,7 @@ dadone(struct cam_periph *periph, union
free(lbp, M_SCSIDA);
xpt_release_ccb(done_ccb);
- softc->state = DA_STATE_PROBE_BDC;
+ softc->state = DA_STATE_PROBE_BLK_LIMITS;
xpt_schedule(periph, priority);
return;
}
@@ -3320,12 +3314,20 @@ dadone(struct cam_periph *periph, union
block_limits = (struct scsi_vpd_block_limits *)csio->data_ptr;
if ((csio->ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_CMP) {
+ uint32_t max_txfer_len = scsi_4btoul(
+ block_limits->max_txfer_len);
uint32_t max_unmap_lba_cnt = scsi_4btoul(
block_limits->max_unmap_lba_cnt);
uint32_t max_unmap_blk_cnt = scsi_4btoul(
block_limits->max_unmap_blk_cnt);
uint64_t ws_max_blks = scsi_8btou64(
block_limits->max_write_same_length);
+
+ if (max_txfer_len != 0) {
+ softc->disk->d_maxsize = MIN(softc->maxio,
+ (off_t)max_txfer_len * softc->params.secsize);
+ }
+
/*
* We should already support UNMAP but we check lba
* and block count to be sure
Modified: projects/random_number_generator/sys/conf/files
==============================================================================
--- projects/random_number_generator/sys/conf/files Thu May 1 03:24:41 2014 (r265171)
+++ projects/random_number_generator/sys/conf/files Thu May 1 07:06:06 2014 (r265172)
@@ -14,7 +14,7 @@ acpi_quirks.h optional acpi \
# from the specified source (DTS) file: <platform>.dts -> <platform>.dtb
#
fdt_dtb_file optional fdt fdt_dtb_static \
- compile-with "sh $S/tools/fdt/make_dtb.sh $S ${FDT_DTS_FILE} ${.CURDIR}/${FDT_DTS_FILE:R}.dtb" \
+ compile-with "sh $S/tools/fdt/make_dtb.sh $S ${FDT_DTS_FILE} ${.CURDIR}" \
no-obj no-implicit-rule before-depend \
clean "${FDT_DTS_FILE:R}.dtb"
fdt_static_dtb.h optional fdt fdt_dtb_static \
Modified: projects/random_number_generator/sys/tools/fdt/make_dtb.sh
==============================================================================
--- projects/random_number_generator/sys/tools/fdt/make_dtb.sh Thu May 1 03:24:41 2014 (r265171)
+++ projects/random_number_generator/sys/tools/fdt/make_dtb.sh Thu May 1 07:06:06 2014 (r265172)
@@ -4,8 +4,17 @@
# Script generates dtb file ($3) from dts source ($2) in build tree S ($1)
S=$1
-dts=$2
-dtb=$3
+dts="$2"
+dtb_path=$3
-cpp -x assembler-with-cpp -I $S/gnu/dts/include -I $S/boot/fdt/dts/${MACHINE} -I $S/gnu/dts/${MACHINE} -include $dts /dev/null |
+if [ -z "$dts" ]; then
+ echo "No DTS specified"
+ exit 1
+fi
+
+for d in ${dts}; do
+ dtb=${dtb_path}/`basename $d .dts`.dtb
+ echo "converting $d -> $dtb"
+ cpp -x assembler-with-cpp -I $S/gnu/dts/include -I $S/boot/fdt/dts/${MACHINE} -I $S/gnu/dts/${MACHINE} -include $d /dev/null |
dtc -O dtb -o $dtb -b 0 -p 1024 -i $S/boot/fdt/dts/${MACHINE} -i $S/gnu/dts/${MACHINE}
+done
Modified: projects/random_number_generator/usr.bin/mkimg/apm.c
==============================================================================
--- projects/random_number_generator/usr.bin/mkimg/apm.c Thu May 1 03:24:41 2014 (r265171)
+++ projects/random_number_generator/usr.bin/mkimg/apm.c Thu May 1 07:06:06 2014 (r265172)
@@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$");
static struct mkimg_alias apm_aliases[] = {
{ ALIAS_FREEBSD, ALIAS_PTR2TYPE(APM_ENT_TYPE_FREEBSD) },
+ { ALIAS_FREEBSD_BOOT, ALIAS_PTR2TYPE(APM_ENT_TYPE_APPLE_BOOT) },
{ ALIAS_FREEBSD_NANDFS, ALIAS_PTR2TYPE(APM_ENT_TYPE_FREEBSD_NANDFS) },
{ ALIAS_FREEBSD_SWAP, ALIAS_PTR2TYPE(APM_ENT_TYPE_FREEBSD_SWAP) },
{ ALIAS_FREEBSD_UFS, ALIAS_PTR2TYPE(APM_ENT_TYPE_FREEBSD_UFS) },
Modified: projects/random_number_generator/usr.sbin/kldxref/ef.c
==============================================================================
--- projects/random_number_generator/usr.sbin/kldxref/ef.c Thu May 1 03:24:41 2014 (r265171)
+++ projects/random_number_generator/usr.sbin/kldxref/ef.c Thu May 1 07:06:06 2014 (r265172)
@@ -47,6 +47,7 @@
#include "ef.h"
+#define MAXSEGS 2
struct ef_file {
char* ef_name;
struct elf_file *ef_efile;
@@ -68,7 +69,7 @@ struct ef_file {
Elf_Off ef_symoff;
Elf_Sym* ef_symtab;
int ef_nsegs;
- Elf_Phdr * ef_segs[2];
+ Elf_Phdr * ef_segs[MAXSEGS];
int ef_verbose;
Elf_Rel * ef_rel; /* relocation table */
int ef_relsz; /* number of entries */
@@ -580,12 +581,9 @@ ef_open(const char *filename, struct elf
ef_print_phdr(phdr);
switch (phdr->p_type) {
case PT_LOAD:
- if (nsegs == 2) {
- warnx("%s: too many sections",
- filename);
- break;
- }
- ef->ef_segs[nsegs++] = phdr;
+ if (nsegs < MAXSEGS)
+ ef->ef_segs[nsegs] = phdr;
+ nsegs++;
break;
case PT_PHDR:
break;
@@ -597,12 +595,15 @@ ef_open(const char *filename, struct elf
}
if (verbose > 1)
printf("\n");
- ef->ef_nsegs = nsegs;
if (phdyn == NULL) {
warnx("Skipping %s: not dynamically-linked",
filename);
break;
+ } else if (nsegs > MAXSEGS) {
+ warnx("%s: too many sections", filename);
+ break;
}
+ ef->ef_nsegs = nsegs;
if (ef_read_entry(ef, phdyn->p_offset,
phdyn->p_filesz, (void**)&ef->ef_dyn) != 0) {
printf("ef_read_entry failed\n");
More information about the svn-src-projects
mailing list