CVS import: xsrc/external/mit/freetype/dist
Module Name:xsrc Committed By: snj Date: Thu Mar 12 07:49:37 UTC 2015 Update of /cvsroot/xsrc/external/mit/freetype/dist In directory ivanova.netbsd.org:/tmp/cvs-serv5409 Log Message: initial import of freetype-2.5.5 Status: Vendor Tag: xorg Release Tags: freetype-2-5-5 U xsrc/external/mit/freetype/dist/configure U xsrc/external/mit/freetype/dist/ChangeLog U xsrc/external/mit/freetype/dist/ChangeLog.24 U xsrc/external/mit/freetype/dist/ChangeLog.23 U xsrc/external/mit/freetype/dist/Makefile U xsrc/external/mit/freetype/dist/Jamrules U xsrc/external/mit/freetype/dist/version.sed U xsrc/external/mit/freetype/dist/modules.cfg U xsrc/external/mit/freetype/dist/ChangeLog.22 U xsrc/external/mit/freetype/dist/Jamfile U xsrc/external/mit/freetype/dist/README U xsrc/external/mit/freetype/dist/CMakeLists.txt U xsrc/external/mit/freetype/dist/vms_make.com U xsrc/external/mit/freetype/dist/autogen.sh U xsrc/external/mit/freetype/dist/ChangeLog.20 U xsrc/external/mit/freetype/dist/README.git U xsrc/external/mit/freetype/dist/ChangeLog.21 U xsrc/external/mit/freetype/dist/docs/TODO U xsrc/external/mit/freetype/dist/docs/INSTALL.UNIX U xsrc/external/mit/freetype/dist/docs/FTL.TXT U xsrc/external/mit/freetype/dist/docs/formats.txt U xsrc/external/mit/freetype/dist/docs/CUSTOMIZE U xsrc/external/mit/freetype/dist/docs/INSTALL.CROSS U xsrc/external/mit/freetype/dist/docs/VERSION.DLL U xsrc/external/mit/freetype/dist/docs/release U xsrc/external/mit/freetype/dist/docs/INSTALL.VMS U xsrc/external/mit/freetype/dist/docs/INSTALL.ANY U xsrc/external/mit/freetype/dist/docs/raster.txt U xsrc/external/mit/freetype/dist/docs/PROBLEMS U xsrc/external/mit/freetype/dist/docs/INSTALL.MAC U xsrc/external/mit/freetype/dist/docs/freetype-config.1 U xsrc/external/mit/freetype/dist/docs/CHANGES U xsrc/external/mit/freetype/dist/docs/LICENSE.TXT U xsrc/external/mit/freetype/dist/docs/CMAKE U xsrc/external/mit/freetype/dist/docs/GPLv2.TXT U xsrc/external/mit/freetype/dist/docs/INSTALL.GNU U xsrc/external/mit/freetype/dist/docs/MAKEPP U xsrc/external/mit/freetype/dist/docs/DEBUG U xsrc/external/mit/freetype/dist/docs/INSTALL U xsrc/external/mit/freetype/dist/docs/reference/ft2-raster.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-header_inclusion.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-index.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-computations.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-auto_hinter.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-ot_validation.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-user_allocation.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-system_interface.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-truetype_engine.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-gzip.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-bzip2.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-lzw.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-gx_validation.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-incremental.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-basic_types.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-list_processing.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-header_file_macros.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-sfnt_names.html U xsrc/external/mit/freetype/dist/docs/reference/README U xsrc/external/mit/freetype/dist/docs/reference/ft2-font_formats.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-lcd_filtering.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-version.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-glyph_management.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-type1_tables.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-cid_fonts.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-base_interface.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-pfr_fonts.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-glyph_variants.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-tt_driver.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-module_management.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-toc.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-winfnt_fonts.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-multiple_masters.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-cache_subsystem.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-quick_advance.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-truetype_tables.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-cff_driver.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-sizes_management.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-glyph_stroker.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-bdf_fonts.html U
CVS commit: xsrc/external/mit/freetype/dist
Module Name:xsrc
Committed By: snj
Date: Thu Mar 12 07:54:44 UTC 2015
Modified Files:
xsrc/external/mit/freetype/dist/builds/unix: freetype-config.in
xsrc/external/mit/freetype/dist/src/gzip: ftgzip.c
xsrc/external/mit/freetype/dist/src/sfnt: ttcmap.c
xsrc/external/mit/freetype/dist/src/smooth: ftsmooth.c
Log Message:
merge freetype 2.5.5, and bring back a change to freetype-config.in that
got lost in a merge a while back:
actually add the calculated rpath to the list of emitted --libs output.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/freetype/dist/builds/unix/freetype-config.in
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/freetype/dist/src/gzip/ftgzip.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/freetype/dist/src/sfnt/ttcmap.c
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/freetype/dist/src/smooth/ftsmooth.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/freetype/dist/builds/unix/freetype-config.in
diff -u xsrc/external/mit/freetype/dist/builds/unix/freetype-config.in:1.5 xsrc/external/mit/freetype/dist/builds/unix/freetype-config.in:1.6
--- xsrc/external/mit/freetype/dist/builds/unix/freetype-config.in:1.5 Thu Mar 20 08:35:39 2014
+++ xsrc/external/mit/freetype/dist/builds/unix/freetype-config.in Thu Mar 12 07:54:44 2015
@@ -18,6 +18,7 @@ exec_prefix_set=no
includedir=%includedir%
libdir=%libdir%
enable_shared=%build_libtool_libs%
+hardcode_libdir_flag_spec=%hardcode_libdir_flag_spec%
usage()
{
@@ -146,7 +147,7 @@ if test $echo_libs = yes ; then
if test $enable_shared = yes ; then
eval rpath=\$hardcode_libdir_flag_spec\
fi
- libs=%LIBS_CONFIG%
+ libs=-lfreetype
staticlibs=%LIBSSTATIC_CONFIG%
if test $show_static = yes ; then
libs=$staticlibs
Index: xsrc/external/mit/freetype/dist/src/gzip/ftgzip.c
diff -u xsrc/external/mit/freetype/dist/src/gzip/ftgzip.c:1.7 xsrc/external/mit/freetype/dist/src/gzip/ftgzip.c:1.8
--- xsrc/external/mit/freetype/dist/src/gzip/ftgzip.c:1.7 Thu Mar 20 08:35:40 2014
+++ xsrc/external/mit/freetype/dist/src/gzip/ftgzip.c Thu Mar 12 07:54:44 2015
@@ -8,7 +8,7 @@
/* parse compressed PCF fonts, as found with many X11 server */
/* distributions. */
/* */
-/* Copyright 2002-2006, 2009-2013 by */
+/* Copyright 2002-2006, 2009-2014 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -208,8 +208,8 @@
/* head[0] head[1] are the magic numbers;*/
/* head[2] is the method, and head[3] the flags */
-if ( head[0] != 0x1f ||
- head[1] != 0x8b ||
+if ( head[0] != 0x1F ||
+ head[1] != 0x8B ||
head[2] != Z_DEFLATED||
(head[3] FT_GZIP_RESERVED) )
{
@@ -603,10 +603,18 @@
FT_Stream source )
{
FT_Error error;
-FT_Memorymemory = source-memory;
+FT_Memorymemory;
FT_GZipFile zip = NULL;
+if ( !stream || !source )
+{
+ error = FT_THROW( Invalid_Stream_Handle );
+ goto Exit;
+}
+
+memory = source-memory;
+
/*
* check the header right now; this prevents allocating un-necessary
* objects when we don't need them
@@ -700,6 +708,11 @@
int err;
+/* check for `input' delayed to `inflate' */
+
+if ( !memory || ! output_len || !output )
+ return FT_THROW( Invalid_Argument );
+
/* this function is modeled after zlib's `uncompress' function */
stream.next_in = (Bytef*)input;
Index: xsrc/external/mit/freetype/dist/src/sfnt/ttcmap.c
diff -u xsrc/external/mit/freetype/dist/src/sfnt/ttcmap.c:1.5 xsrc/external/mit/freetype/dist/src/sfnt/ttcmap.c:1.6
--- xsrc/external/mit/freetype/dist/src/sfnt/ttcmap.c:1.5 Thu Mar 20 08:35:40 2014
+++ xsrc/external/mit/freetype/dist/src/sfnt/ttcmap.c Thu Mar 12 07:54:44 2015
@@ -845,9 +845,6 @@
p = table + 2; /* skip format */
length = TT_NEXT_USHORT( p );
-if ( length 16 )
- FT_INVALID_TOO_SHORT;
-
/* in certain fonts, the `length' field is invalid and goes */
/* out of bound. We try to correct this here...*/
if ( table + length valid-limit )
@@ -858,6 +855,9 @@
length = (FT_UInt)( valid-limit - table );
}
+if ( length 16 )
+ FT_INVALID_TOO_SHORT;
+
p= table + 6;
num_segs = TT_NEXT_USHORT( p ); /* read segCountX2 */
@@ -1669,7 +1669,8 @@
p = is32 + 8192;
CVS commit: src/external/mit/xorg/lib/freetype/freetype
Module Name:src
Committed By: snj
Date: Thu Mar 12 08:01:45 UTC 2015
Modified Files:
src/external/mit/xorg/lib/freetype/freetype: Makefile
Log Message:
bring back rpath fixup that was lost in revision 1.11
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 \
src/external/mit/xorg/lib/freetype/freetype/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/freetype/freetype/Makefile
diff -u src/external/mit/xorg/lib/freetype/freetype/Makefile:1.18 src/external/mit/xorg/lib/freetype/freetype/Makefile:1.19
--- src/external/mit/xorg/lib/freetype/freetype/Makefile:1.18 Mon Feb 9 16:27:29 2015
+++ src/external/mit/xorg/lib/freetype/freetype/Makefile Thu Mar 12 08:01:45 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2015/02/09 16:27:29 ryoon Exp $
+# $NetBSD: Makefile,v 1.19 2015/03/12 08:01:45 snj Exp $
.include bsd.own.mk
@@ -33,6 +33,7 @@ CONFIG_SUBST= ${TOOL_SED} \
-e 's,%LIBS_CONFIG%,-lfreetype -lz -lbz2,' \
-e 's,%LIBSSTATIC_CONFIG%,-lfreetype -lz -lbz2,' \
-e 's,%build_libtool_libs%,yes,' \
+ -e 's@%hardcode_libdir_flag_spec%@-Wl,-rpath,${X11USRLIBDIR}@' \
-e 's,%FT2_EXTRA_LIBS%,,' \
-e 's,%LIBZ%,-lz,' \
-e 's,%LIBBZ2%,-lbz2,' \
CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: macallan Date: Tue Mar 10 18:20:20 UTC 2015 Modified Files: src/sys/arch/evbmips/conf: CI20 Log Message: add dme at apbus ( onboard ethernet ) To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbmips/conf/CI20 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbmips/conf/CI20 diff -u src/sys/arch/evbmips/conf/CI20:1.9 src/sys/arch/evbmips/conf/CI20:1.10 --- src/sys/arch/evbmips/conf/CI20:1.9 Sun Mar 8 17:15:58 2015 +++ src/sys/arch/evbmips/conf/CI20 Tue Mar 10 18:20:20 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CI20,v 1.9 2015/03/08 17:15:58 macallan Exp $ +# $NetBSD: CI20,v 1.10 2015/03/10 18:20:20 macallan Exp $ # # MIPS Creator CI20 # @@ -7,7 +7,7 @@ include arch/evbmips/conf/std.ingenic #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident CI20-$Revision: 1.9 $ +#ident CI20-$Revision: 1.10 $ maxusers 32 @@ -153,13 +153,18 @@ usb* at ohci? #ehci* at apbus? addr 0x1349 #usb* at ehci? -uhub* at usb? -uhub* at uhub? port ? +# onboard ethernet +dme* at apbus? addr 0x1600 + #jzgpio* at apbus? addr ? #gpio* at jzgpio? # no RTC! so fake with a stub (required to prevent evbmips panic) +# USB stuff +uhub* at usb? +uhub* at uhub? port ? + # USB HID device uhidev* at uhub? port ? configuration ? interface ?
CVS commit: src
Module Name:src
Committed By: snj
Date: Thu Mar 12 07:58:05 UTC 2015
Modified Files:
src/distrib/sets/lists/xbase: shl.mi
src/distrib/sets/lists/xdebug: shl.mi
src/external/mit/xorg/lib/freetype: Makefile shlib_version
Log Message:
update for freetype 2.5.5
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.20 -r1.21 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.14 -r1.15 src/external/mit/xorg/lib/freetype/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/freetype/shlib_version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/xbase/shl.mi
diff -u src/distrib/sets/lists/xbase/shl.mi:1.59 src/distrib/sets/lists/xbase/shl.mi:1.60
--- src/distrib/sets/lists/xbase/shl.mi:1.59 Mon Feb 23 00:09:30 2015
+++ src/distrib/sets/lists/xbase/shl.mi Thu Mar 12 07:58:05 2015
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.59 2015/02/23 00:09:30 jmcneill Exp $
+# $NetBSD: shl.mi,v 1.60 2015/03/12 07:58:05 snj Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -323,7 +323,7 @@
./usr/X11R7/lib/libfontenc.so.2.0 -unknown- xorg
./usr/X11R7/lib/libfreetype.so -unknown- xorg
./usr/X11R7/lib/libfreetype.so.17 -unknown- xorg
-./usr/X11R7/lib/libfreetype.so.17.2.11 -unknown- xorg
+./usr/X11R7/lib/libfreetype.so.17.4.11 -unknown- xorg
./usr/X11R7/lib/libgbm.so -unknown- xorg
./usr/X11R7/lib/libgbm.so.1 -unknown- xorg
./usr/X11R7/lib/libgbm.so.1.0 -unknown- xorg
Index: src/distrib/sets/lists/xdebug/shl.mi
diff -u src/distrib/sets/lists/xdebug/shl.mi:1.20 src/distrib/sets/lists/xdebug/shl.mi:1.21
--- src/distrib/sets/lists/xdebug/shl.mi:1.20 Mon Feb 23 13:01:35 2015
+++ src/distrib/sets/lists/xdebug/shl.mi Thu Mar 12 07:58:05 2015
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.20 2015/02/23 13:01:35 martin Exp $
+# $NetBSD: shl.mi,v 1.21 2015/03/12 07:58:05 snj Exp $
./usr/libdata/debug/usr/X11R6/lib/libFS.so.6.0.debug -unknown- x11,debug
./usr/libdata/debug/usr/X11R6/lib/libGL.so.1.2.debug -unknown- x11,debug
./usr/libdata/debug/usr/X11R6/lib/libGLU.so.1.3.debug -unknown- x11,debug
@@ -104,7 +104,7 @@
./usr/libdata/debug/usr/X11R7/lib/libexpat.so.2.0.debug -obsolete- obsolete
./usr/libdata/debug/usr/X11R7/lib/libfontconfig.so.2.2.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libfontenc.so.2.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libfreetype.so.17.2.11.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/libfreetype.so.17.4.11.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libglapi.so.0.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libgbm.so.1.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libglut.so.4.0.debug -unknown- xorg,debug
Index: src/external/mit/xorg/lib/freetype/Makefile
diff -u src/external/mit/xorg/lib/freetype/Makefile:1.14 src/external/mit/xorg/lib/freetype/Makefile:1.15
--- src/external/mit/xorg/lib/freetype/Makefile:1.14 Mon Feb 9 16:27:29 2015
+++ src/external/mit/xorg/lib/freetype/Makefile Thu Mar 12 07:58:04 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2015/02/09 16:27:29 ryoon Exp $
+# $NetBSD: Makefile,v 1.15 2015/03/12 07:58:04 snj Exp $
.include bsd.own.mk
@@ -96,7 +96,7 @@ LIBDPLIBS= \
PKGCONFIG= freetype2
PKGDIST.freetype2= ${.CURDIR}
-PKGCONFIG_VERSION.freetype2= 17.2.11
+PKGCONFIG_VERSION.freetype2= 17.4.11
.include bsd.x11.mk
.include bsd.lib.mk
Index: src/external/mit/xorg/lib/freetype/shlib_version
diff -u src/external/mit/xorg/lib/freetype/shlib_version:1.7 src/external/mit/xorg/lib/freetype/shlib_version:1.8
--- src/external/mit/xorg/lib/freetype/shlib_version:1.7 Thu Mar 20 08:57:48 2014
+++ src/external/mit/xorg/lib/freetype/shlib_version Thu Mar 12 07:58:04 2015
@@ -1,5 +1,5 @@
-# $NetBSD: shlib_version,v 1.7 2014/03/20 08:57:48 mrg Exp $
+# $NetBSD: shlib_version,v 1.8 2015/03/12 07:58:04 snj Exp $
#
major=17
-minor=2
+minor=4
teeny=11
CVS commit: src/usr.sbin/rpcbind
Module Name:src Committed By: christos Date: Wed Mar 11 15:57:13 UTC 2015 Modified Files: src/usr.sbin/rpcbind: util.c Log Message: CID 1018907: Freeifaddrs To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/usr.sbin/rpcbind/util.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/rpcbind/util.c diff -u src/usr.sbin/rpcbind/util.c:1.17 src/usr.sbin/rpcbind/util.c:1.18 --- src/usr.sbin/rpcbind/util.c:1.17 Sat Oct 19 13:16:25 2013 +++ src/usr.sbin/rpcbind/util.c Wed Mar 11 11:57:12 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: util.c,v 1.17 2013/10/19 17:16:25 christos Exp $ */ +/* $NetBSD: util.c,v 1.18 2015/03/11 15:57:12 christos Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -360,6 +360,7 @@ network_init() if (debugging) perror(setsockopt v6 multicast); } + freeifaddrs(ifp); #endif /* close(s); */
CVS commit: src/usr.sbin/sysinst/arch/evbarm
Module Name:src
Committed By: joerg
Date: Thu Mar 12 11:32:16 UTC 2015
Modified Files:
src/usr.sbin/sysinst/arch/evbarm: md.c
Log Message:
Boot partition as FAT32 doesn't really make sense, so don't force
the MBR to lie and allow FAT16 too.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/evbarm/md.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/arch/evbarm/md.c
diff -u src/usr.sbin/sysinst/arch/evbarm/md.c:1.2 src/usr.sbin/sysinst/arch/evbarm/md.c:1.3
--- src/usr.sbin/sysinst/arch/evbarm/md.c:1.2 Sun Aug 3 16:09:39 2014
+++ src/usr.sbin/sysinst/arch/evbarm/md.c Thu Mar 12 11:32:16 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.2 2014/08/03 16:09:39 martin Exp $ */
+/* $NetBSD: md.c,v 1.3 2015/03/12 11:32:16 joerg Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -266,7 +266,8 @@ md_check_mbr(mbr_info_t *mbri)
for (ext = mbri; ext; ext = ext-extended) {
part = ext-mbr.mbr_parts;
for (i=0, hasboot=0; i MBR_PART_COUNT; part++, i++) {
-if (part-mbrp_type != MBR_PTYPE_FAT32L)
+if (part-mbrp_type != MBR_PTYPE_FAT16L
+part-mbrp_type != MBR_PTYPE_FAT32L)
continue;
hasboot = 1;
break;
@@ -300,7 +301,8 @@ md_mbr_use_wholedisk(mbr_info_t *mbri)
/* raspi code */
if (boardtype == BOARD_TYPE_RPI) {
part = mbrs-mbr_parts[0];
- if (part[0].mbrp_type != MBR_PTYPE_FAT32L) {
+ if (part[0].mbrp_type != MBR_PTYPE_FAT16L
+ part[0].mbrp_type != MBR_PTYPE_FAT32L) {
/* It's hopelessly corrupt, punt for now */
msg_display(MSG_nomsdospart);
process_menu(MENU_ok, NULL);
CVS commit: src/usr.bin/sed
Module Name:src
Committed By: christos
Date: Thu Mar 12 12:40:41 UTC 2015
Modified Files:
src/usr.bin/sed: compile.c extern.h main.c process.c
Log Message:
The latest refactoring changes broke sed -i:
cd /tmp; echo foo test; sed -i.orig s,fo,ba, test
Back them out until they are fixed.
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/usr.bin/sed/compile.c
cvs rdiff -u -r1.19 -r1.20 src/usr.bin/sed/extern.h
cvs rdiff -u -r1.33 -r1.34 src/usr.bin/sed/main.c
cvs rdiff -u -r1.51 -r1.52 src/usr.bin/sed/process.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/sed/compile.c
diff -u src/usr.bin/sed/compile.c:1.45 src/usr.bin/sed/compile.c:1.46
--- src/usr.bin/sed/compile.c:1.45 Sat Feb 28 19:51:08 2015
+++ src/usr.bin/sed/compile.c Thu Mar 12 08:40:41 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: compile.c,v 1.45 2015/03/01 00:51:08 asau Exp $ */
+/* $NetBSD: compile.c,v 1.46 2015/03/12 12:40:41 christos Exp $ */
/*-
* Copyright (c) 1992 Diomidis Spinellis.
@@ -38,7 +38,7 @@
#endif
#include sys/cdefs.h
-__RCSID($NetBSD: compile.c,v 1.45 2015/03/01 00:51:08 asau Exp $);
+__RCSID($NetBSD: compile.c,v 1.46 2015/03/12 12:40:41 christos Exp $);
#ifdef __FBSDID
__FBSDID($FreeBSD: head/usr.bin/sed/compile.c 259132 2013-12-09 18:57:20Z eadler $);
#endif
@@ -73,8 +73,6 @@ static struct labhash {
int lh_ref;
} *labels[LHSZ];
-static char *cu_fgets(char *, int, int *);
-
static char *compile_addr(char *, struct s_addr *);
static char *compile_ccl(char **, char *);
static char *compile_delimited(char *, char *, int);
@@ -93,14 +91,6 @@ static void fixuplabel(struct s_comman
static void uselabel(void);
/*
- * Current file and line number; line numbers restart across compilation
- * units, but span across input files. The latter is optional if editing
- * in place.
- */
-static const char *fname; /* File name. */
-static u_long linenum;
-
-/*
* Command specification. This is used to drive the command parser.
*/
struct s_format {
@@ -154,6 +144,9 @@ compile(void)
*compile_stream(prog) = NULL;
fixuplabel(prog, NULL);
uselabel();
+ if (appendnum 0)
+ appends = xmalloc(sizeof(struct s_appends) * appendnum);
+ match = xmalloc((maxnsub + 1) * sizeof(regmatch_t));
}
#define EATSPACE() do { \
@@ -952,99 +945,3 @@ uselabel(void)
}
}
}
-
-/*
- * Like fgets, but go through the chain of compilation units chaining them
- * together. Empty strings and files are ignored.
- */
-char *
-cu_fgets(char *buf, int n, int *more)
-{
- static enum {ST_EOF, ST_FILE, ST_STRING} state = ST_EOF;
- static FILE *f; /* Current open file */
- static char *s; /* Current pointer inside string */
- static char string_ident[30];
- char *p;
-
-again:
- switch (state) {
- case ST_EOF:
- if (script == NULL) {
- if (more != NULL)
-*more = 0;
- return (NULL);
- }
- linenum = 0;
- switch (script-type) {
- case CU_FILE:
- if ((f = fopen(script-s, r)) == NULL)
-err(1, %s, script-s);
- fname = script-s;
- state = ST_FILE;
- goto again;
- case CU_STRING:
- if (((size_t)snprintf(string_ident,
- sizeof(string_ident), \%s\, script-s)) =
- sizeof(string_ident) - 1)
-(void)strcpy(string_ident +
-sizeof(string_ident) - 6, ...\);
- fname = string_ident;
- s = script-s;
- state = ST_STRING;
- goto again;
- }
- case ST_FILE:
- if ((p = fgets(buf, n, f)) != NULL) {
- linenum++;
- if (linenum == 1 buf[0] == '#' buf[1] == 'n')
-nflag = 1;
- if (more != NULL)
-*more = !feof(f);
- return (p);
- }
- script = script-next;
- (void)fclose(f);
- state = ST_EOF;
- goto again;
- case ST_STRING:
- if (linenum == 0 s[0] == '#' s[1] == 'n')
- nflag = 1;
- p = buf;
- for (;;) {
- if (n-- = 1) {
-*p = '\0';
-linenum++;
-if (more != NULL)
- *more = 1;
-return (buf);
- }
- switch (*s) {
- case '\0':
-state = ST_EOF;
-if (s == script-s) {
- script = script-next;
- goto again;
-} else {
- script = script-next;
- *p = '\0';
- linenum++;
- if (more != NULL)
- *more = 0;
- return (buf);
-}
- case '\n':
-*p++ = '\n';
-*p = '\0';
-s++;
-linenum++;
-if (more != NULL)
- *more = 0;
-return (buf);
- default:
-*p++ = *s++;
- }
- }
- }
- /* NOTREACHED */
- return (NULL);
-}
Index: src/usr.bin/sed/extern.h
diff -u src/usr.bin/sed/extern.h:1.19 src/usr.bin/sed/extern.h:1.20
--- src/usr.bin/sed/extern.h:1.19 Sat Feb 28 20:07:46 2015
+++ src/usr.bin/sed/extern.h Thu Mar 12 08:40:41 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.19 2015/03/01 01:07:46 asau Exp $ */
+/* $NetBSD: extern.h,v 1.20 2015/03/12 12:40:41 christos Exp $ */
/*-
* Copyright (c) 1992 Diomidis Spinellis.
@@ -36,34 +36,25 @@
* $FreeBSD: head/usr.bin/sed/extern.h 170608 2007-06-12 12:05:24Z yar $
*/
-/*
- * Linked list of units
CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm
Module Name:src
Committed By: joerg
Date: Thu Mar 12 12:46:15 UTC 2015
Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: ghash-armv4.S
Log Message:
Use unified ARM syntax.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ghash-armv4.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ghash-armv4.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ghash-armv4.S:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ghash-armv4.S:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ghash-armv4.S:1.1 Tue Mar 10 13:28:47 2015
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ghash-armv4.S Thu Mar 12 12:46:15 2015
@@ -74,7 +74,7 @@ gcm_ghash_4bit:
eor r5,r5,r6,lsl#28
ldrh r8,[sp,r12] @ rem_4bit[rem]
eor r6,r10,r6,lsr#4
- ldrplb r12,[r2,r3]
+ ldrbpl r12,[r2,r3]
eor r6,r6,r7,lsl#28
eor r7,r11,r7,lsr#4
@@ -84,7 +84,7 @@ gcm_ghash_4bit:
add r14,r14,r14
ldmia r11,{r8-r11} @ load Htbl[nhi]
eor r4,r8,r4,lsr#4
- ldrplb r8,[r0,r3]
+ ldrbpl r8,[r0,r3]
eor r4,r4,r5,lsl#28
eor r5,r9,r5,lsr#4
ldrh r9,[sp,r14]
@@ -130,7 +130,7 @@ gcm_ghash_4bit:
strb r10,[r0,#8+1]
strb r11,[r0,#8]
#endif
- ldrneb r12,[r2,#15]
+ ldrbne r12,[r2,#15]
#if __ARM_ARCH__=7 defined(__ARMEL__)
rev r6,r6
str r6,[r0,#4]
@@ -217,7 +217,7 @@ gcm_gmult_4bit:
eor r5,r5,r6,lsl#28
ldrh r8,[r2,r12] @ rem_4bit[rem]
eor r6,r10,r6,lsr#4
- ldrplb r12,[r0,r3]
+ ldrbpl r12,[r0,r3]
eor r6,r6,r7,lsl#28
eor r7,r11,r7,lsr#4
CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm
Module Name:src Committed By: joerg Date: Thu Mar 12 12:46:41 UTC 2015 Modified Files: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: armv4-gf2m.S Log Message: Drop redundant modifier to allow build with LLVM IAS. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4-gf2m.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4-gf2m.S diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4-gf2m.S:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4-gf2m.S:1.2 --- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4-gf2m.S:1.1 Tue Mar 10 13:28:47 2015 +++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4-gf2m.S Thu Mar 12 12:46:41 2015 @@ -143,8 +143,8 @@ bn_GF2m_mul_2x2: .align 5 .LNEON: ldr r12, [sp] @ 5th argument - vmov.32 d26, r2, r1 - vmov.32 d27, r12, r3 + vmov d26, r2, r1 + vmov d27, r12, r3 vmov.i64 d28, #0x vmov.i64 d29, #0x vmov.i64 d30, #0x
CVS commit: src/usr.sbin/makemandb
Module Name:src
Committed By: joerg
Date: Thu Mar 12 14:57:19 UTC 2015
Modified Files:
src/usr.sbin/makemandb: makemandb.c
Log Message:
MDOC_MAX is a valid token if the type is text. Adjust.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/usr.sbin/makemandb/makemandb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/makemandb/makemandb.c
diff -u src/usr.sbin/makemandb/makemandb.c:1.27 src/usr.sbin/makemandb/makemandb.c:1.28
--- src/usr.sbin/makemandb/makemandb.c:1.27 Wed Mar 4 02:02:15 2015
+++ src/usr.sbin/makemandb/makemandb.c Thu Mar 12 14:57:18 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: makemandb.c,v 1.27 2015/03/04 02:02:15 christos Exp $ */
+/* $NetBSD: makemandb.c,v 1.28 2015/03/12 14:57:18 joerg Exp $ */
/*
* Copyright (c) 2011 Abhinav Upadhyay er.abhinav.upadh...@gmail.com
* Copyright (c) 2011 Kristaps Dzonsons krist...@bsd.lv
@@ -17,7 +17,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: makemandb.c,v 1.27 2015/03/04 02:02:15 christos Exp $);
+__RCSID($NetBSD: makemandb.c,v 1.28 2015/03/12 14:57:18 joerg Exp $);
#include sys/stat.h
#include sys/types.h
@@ -981,7 +981,7 @@ pmdoc_Nd(const struct mdoc_node *n, mand
char *temp;
char *nd_text;
- if (n == NULL || n-tok == MDOC_MAX)
+ if (n == NULL || (n-type != MDOC_TEXT n-tok == MDOC_MAX))
return;
if (n-type == MDOC_TEXT) {
@@ -1098,7 +1098,7 @@ pmdoc_Pp(const struct mdoc_node *n, mand
static void
pmdoc_Sh(const struct mdoc_node *n, mandb_rec *rec)
{
- if (n == NULL || n-tok == MDOC_MAX)
+ if (n == NULL || (n-type != MDOC_TEXT n-tok == MDOC_MAX))
return;
int xr_found = 0;
CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm
Module Name:src Committed By: martin Date: Fri Mar 13 05:29:26 UTC 2015 Modified Files: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: ghash-armv4.S Log Message: Explicitly mark as using unified syntax To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ghash-armv4.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ghash-armv4.S diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ghash-armv4.S:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ghash-armv4.S:1.3 --- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ghash-armv4.S:1.2 Thu Mar 12 12:46:15 2015 +++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ghash-armv4.S Fri Mar 13 05:29:26 2015 @@ -1,6 +1,7 @@ #include arm_arch.h #include arm_asm.h +.syntax unified .text .code 32
CVS commit: src/sys/dev
Module Name:src
Committed By: christos
Date: Thu Mar 12 15:33:10 UTC 2015
Modified Files:
src/sys/dev: bio.c biovar.h
src/sys/dev/ic: cac.c ciss.c mfi.c
src/sys/dev/pci: arcmsr.c mpii.c
Log Message:
Dedup the conversion of bioc_disk and bioc_vol to envsys_data_t
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/bio.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/biovar.h
cvs rdiff -u -r1.54 -r1.55 src/sys/dev/ic/cac.c
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/ic/ciss.c
cvs rdiff -u -r1.55 -r1.56 src/sys/dev/ic/mfi.c
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/pci/arcmsr.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/pci/mpii.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/bio.c
diff -u src/sys/dev/bio.c:1.11 src/sys/dev/bio.c:1.12
--- src/sys/dev/bio.c:1.11 Fri Jul 25 04:10:35 2014
+++ src/sys/dev/bio.c Thu Mar 12 11:33:10 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: bio.c,v 1.11 2014/07/25 08:10:35 dholland Exp $ */
+/* $NetBSD: bio.c,v 1.12 2015/03/12 15:33:10 christos Exp $ */
/* $OpenBSD: bio.c,v 1.9 2007/03/20 02:35:55 marco Exp $ */
/*
@@ -28,7 +28,7 @@
/* A device controller ioctl tunnelling device. */
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bio.c,v 1.11 2014/07/25 08:10:35 dholland Exp $);
+__KERNEL_RCSID(0, $NetBSD: bio.c,v 1.12 2015/03/12 15:33:10 christos Exp $);
#include opt_compat_netbsd.h
@@ -45,6 +45,7 @@ __KERNEL_RCSID(0, $NetBSD: bio.c,v 1.11
#include sys/kauth.h
#include dev/biovar.h
+#include dev/sysmon/sysmonvar.h
struct bio_mapping {
LIST_ENTRY(bio_mapping) bm_link;
@@ -302,3 +303,64 @@ bio_delegate_ioctl(void *cookie, u_long
return bm-bm_ioctl(bm-bm_dev, cmd, addr);
}
+
+void
+bio_disk_to_envsys(envsys_data_t *edata, const struct bioc_disk *bd)
+{
+ switch (bd-bd_status) {
+ case BIOC_SDONLINE:
+ edata-value_cur = ENVSYS_DRIVE_ONLINE;
+ edata-state = ENVSYS_SVALID;
+ break;
+ case BIOC_SDOFFLINE:
+ edata-value_cur = ENVSYS_DRIVE_OFFLINE;
+ edata-state = ENVSYS_SCRITICAL;
+ break;
+ default:
+ edata-value_cur = ENVSYS_DRIVE_FAIL;
+ edata-state = ENVSYS_SCRITICAL;
+ break;
+ }
+}
+
+void
+bio_vol_to_envsys(envsys_data_t *edata, const struct bioc_vol *bv)
+{
+ switch (bv-bv_status) {
+ case BIOC_SVOFFLINE:
+ edata-value_cur = ENVSYS_DRIVE_OFFLINE;
+ edata-state = ENVSYS_SCRITICAL;
+ break;
+ case BIOC_SVDEGRADED:
+ edata-value_cur = ENVSYS_DRIVE_PFAIL;
+ edata-state = ENVSYS_SCRITICAL;
+ break;
+ case BIOC_SVBUILDING:
+ edata-value_cur = ENVSYS_DRIVE_BUILD;
+ edata-state = ENVSYS_SVALID;
+ break;
+ case BIOC_SVMIGRATING:
+ edata-value_cur = ENVSYS_DRIVE_MIGRATING;
+ edata-state = ENVSYS_SVALID;
+ break;
+ case BIOC_SVCHECKING:
+ edata-value_cur = ENVSYS_DRIVE_CHECK;
+ edata-state = ENVSYS_SVALID;
+ break;
+ case BIOC_SVREBUILD:
+ edata-value_cur = ENVSYS_DRIVE_REBUILD;
+ edata-state = ENVSYS_SCRITICAL;
+ break;
+ case BIOC_SVSCRUB:
+ case BIOC_SVONLINE:
+ edata-value_cur = ENVSYS_DRIVE_ONLINE;
+ edata-state = ENVSYS_SVALID;
+ break;
+ case BIOC_SVINVALID:
+ /* FALLTHROUGH */
+ default:
+ edata-value_cur = ENVSYS_DRIVE_EMPTY; /* unknown state */
+ edata-state = ENVSYS_SINVALID;
+ break;
+ }
+}
Index: src/sys/dev/biovar.h
diff -u src/sys/dev/biovar.h:1.8 src/sys/dev/biovar.h:1.9
--- src/sys/dev/biovar.h:1.8 Thu May 7 08:15:33 2009
+++ src/sys/dev/biovar.h Thu Mar 12 11:33:10 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: biovar.h,v 1.8 2009/05/07 12:15:33 cegger Exp $ */
+/* $NetBSD: biovar.h,v 1.9 2015/03/12 15:33:10 christos Exp $ */
/* $OpenBSD: biovar.h,v 1.26 2007/03/19 03:02:08 marco Exp $ */
/*
@@ -256,4 +256,8 @@ struct bioc_volops {
int bc_volid; /* volume id to be created/removed */
};
+struct envsys_data;
+void bio_disk_to_envsys(struct envsys_data *, const struct bioc_disk *);
+void bio_vol_to_envsys(struct envsys_data *, const struct bioc_vol *) ;
+
#endif /* ! _DEV_BIOVAR_H_ */
Index: src/sys/dev/ic/cac.c
diff -u src/sys/dev/ic/cac.c:1.54 src/sys/dev/ic/cac.c:1.55
--- src/sys/dev/ic/cac.c:1.54 Sat Oct 27 13:18:19 2012
+++ src/sys/dev/ic/cac.c Thu Mar 12 11:33:10 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cac.c,v 1.54 2012/10/27 17:18:19 chs Exp $ */
+/* $NetBSD: cac.c,v 1.55 2015/03/12 15:33:10 christos Exp $ */
/*-
* Copyright (c) 2000, 2006, 2007 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cac.c,v 1.54 2012/10/27 17:18:19 chs Exp $);
+__KERNEL_RCSID(0, $NetBSD: cac.c,v 1.55 2015/03/12 15:33:10 christos Exp $);
#include bio.h
@@ -723,40 +723,10 @@ cac_sensor_refresh(struct sysmon_envsys
memset(bv, 0, sizeof(bv));
bv.bv_volid = edata-sensor;
s = splbio();
- if (cac_ioctl_vol(sc, bv)) {
- splx(s);
- return;
- }
+ if (cac_ioctl_vol(sc, bv))
+ bv.bv_status = BIOC_SVINVALID;
splx(s);
- switch(bv.bv_status) {
- case BIOC_SVOFFLINE:
- edata-value_cur = ENVSYS_DRIVE_FAIL;
- edata-state =
CVS commit: src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/clock
Module Name:src Committed By: christos Date: Thu Mar 12 15:09:05 UTC 2015 Modified Files: src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/clock: nouveau_subdev_clock_nv50.c Log Message: fix gcc is stupid. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/clock/nouveau_subdev_clock_nv50.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/clock/nouveau_subdev_clock_nv50.c diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/clock/nouveau_subdev_clock_nv50.c:1.2 src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/clock/nouveau_subdev_clock_nv50.c:1.3 --- src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/clock/nouveau_subdev_clock_nv50.c:1.2 Wed Feb 25 12:29:43 2015 +++ src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/clock/nouveau_subdev_clock_nv50.c Thu Mar 12 11:09:04 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: nouveau_subdev_clock_nv50.c,v 1.2 2015/02/25 17:29:43 riastradh Exp $ */ +/* $NetBSD: nouveau_subdev_clock_nv50.c,v 1.3 2015/03/12 15:09:04 christos Exp $ */ /* * Copyright 2012 Red Hat Inc. @@ -25,7 +25,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: nouveau_subdev_clock_nv50.c,v 1.2 2015/02/25 17:29:43 riastradh Exp $); +__KERNEL_RCSID(0, $NetBSD: nouveau_subdev_clock_nv50.c,v 1.3 2015/03/12 15:09:04 christos Exp $); #include subdev/bios.h #include subdev/bios/pll.h @@ -119,7 +119,7 @@ read_pll_src(struct nv50_clock_priv *pri BUG_ON(1); M = 0; /* XXX GCC is stupid */ N = 0; /* XXX GCC is stupid */ - N = P; /* XXX GCC is stupid */ + P = 0; /* XXX GCC is stupid */ } if (M)
CVS commit: src/sys/kern
Module Name:src
Committed By: christos
Date: Thu Mar 12 15:06:28 UTC 2015
Modified Files:
src/sys/kern: init_sysent.c syscalls.c systrace_args.c
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.292 -r1.293 src/sys/kern/init_sysent.c
cvs rdiff -u -r1.281 -r1.282 src/sys/kern/syscalls.c
cvs rdiff -u -r1.1 -r1.2 src/sys/kern/systrace_args.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/init_sysent.c
diff -u src/sys/kern/init_sysent.c:1.292 src/sys/kern/init_sysent.c:1.293
--- src/sys/kern/init_sysent.c:1.292 Sat Mar 7 16:50:30 2015
+++ src/sys/kern/init_sysent.c Thu Mar 12 11:06:28 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: init_sysent.c,v 1.292 2015/03/07 21:50:30 christos Exp $ */
+/* $NetBSD: init_sysent.c,v 1.293 2015/03/12 15:06:28 christos Exp $ */
/*
* System call switch table.
@@ -8,7 +8,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: init_sysent.c,v 1.292 2015/03/07 21:50:30 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: init_sysent.c,v 1.293 2015/03/12 15:06:28 christos Exp $);
#include opt_modular.h
#include opt_ntp.h
@@ -126,7 +126,6 @@ struct sysent sysent[] = {
.sy_call = (sy_call_t *)sys_exit
}, /* 1 = exit */
{
-
.sy_call = (sy_call_t *)sys_fork
}, /* 2 = fork */
{
@@ -210,7 +209,6 @@ struct sysent sysent[] = {
.sy_call = (sy_call_t *)sys_nomodule
}, /* 19 = compat_43_olseek */
{
-
.sy_call = (sy_call_t *)sys_getpid_with_ppid
}, /* 20 = getpid */
{
@@ -228,11 +226,9 @@ struct sysent sysent[] = {
.sy_call = (sy_call_t *)sys_setuid
}, /* 23 = setuid */
{
-
.sy_call = (sy_call_t *)sys_getuid_with_euid
}, /* 24 = getuid */
{
-
.sy_call = (sy_call_t *)sys_geteuid
}, /* 25 = geteuid */
{
@@ -285,7 +281,6 @@ struct sysent sysent[] = {
.sy_call = (sy_call_t *)sys_fchflags
}, /* 35 = fchflags */
{
-
.sy_call = (sy_call_t *)sys_sync
}, /* 36 = sync */
{
@@ -298,7 +293,6 @@ struct sysent sysent[] = {
.sy_call = (sy_call_t *)sys_nomodule
}, /* 38 = compat_43_stat43 */
{
-
.sy_call = (sy_call_t *)sys_getppid
}, /* 39 = getppid */
{
@@ -311,11 +305,9 @@ struct sysent sysent[] = {
.sy_call = (sy_call_t *)sys_dup
}, /* 41 = dup */
{
-
.sy_call = (sy_call_t *)sys_pipe
}, /* 42 = pipe */
{
-
.sy_call = (sy_call_t *)sys_getegid
}, /* 43 = getegid */
{
@@ -334,7 +326,6 @@ struct sysent sysent[] = {
.sy_call = (sy_call_t *)sys_nomodule
}, /* 46 = compat_13_sigaction13 */
{
-
.sy_call = (sy_call_t *)sys_getgid_with_egid
}, /* 47 = getgid */
{
@@ -357,7 +348,6 @@ struct sysent sysent[] = {
.sy_call = (sy_call_t *)sys_acct
}, /* 51 = acct */
{
-
.sy_call = (sy_call_t *)sys_nomodule
}, /* 52 = compat_13_sigpending13 */
{
@@ -414,7 +404,6 @@ struct sysent sysent[] = {
.sy_call = (sy_call_t *)sys_nomodule
}, /* 63 = compat_43_ogetkerninfo */
{
-
.sy_call = (sy_call_t *)sys_nomodule
}, /* 64 = compat_43_ogetpagesize */
{
@@ -423,7 +412,6 @@ struct sysent sysent[] = {
.sy_call = (sy_call_t *)sys_nomodule
}, /* 65 = compat_12_msync */
{
-
.sy_call = (sy_call_t *)sys_vfork
}, /* 66 = vfork */
{
@@ -486,7 +474,6 @@ struct sysent sysent[] = {
.sy_call = (sy_call_t *)sys_setgroups
}, /* 80 = setgroups */
{
-
.sy_call = (sy_call_t *)sys_getpgrp
}, /* 81 = getpgrp */
{
@@ -499,7 +486,6 @@ struct sysent sysent[] = {
.sy_call = (sy_call_t *)sys_nomodule
}, /* 83 = compat_50_setitimer */
{
-
.sy_call = (sy_call_t *)sys_nomodule
}, /* 84 = compat_43_owait */
{
@@ -523,7 +509,6 @@ struct sysent sysent[] = {
.sy_call = (sy_call_t *)sys_nomodule
}, /* 88 = compat_43_osethostname */
{
-
.sy_call = (sy_call_t *)sys_nomodule
}, /* 89 = compat_43_ogetdtablesize */
{
@@ -759,7 +744,6 @@ struct sysent sysent[] = {
.sy_call = (sy_call_t *)sys_nomodule
}, /* 141 = compat_43_ogetpeername */
{
-
.sy_call = (sy_call_t *)sys_nomodule
}, /* 142 = compat_43_ogethostid */
{
@@ -781,7 +765,6 @@ struct sysent sysent[] = {
.sy_call = (sy_call_t *)sys_nomodule
}, /* 146 = compat_43_okillpg */
{
-
.sy_call = (sy_call_t *)sys_setsid
}, /* 147 = setsid */
{
@@ -790,7 +773,6 @@ struct sysent sysent[] = {
.sy_call = (sy_call_t *)sys_nomodule
}, /* 148 = compat_50_quotactl */
{
-
.sy_call = (sy_call_t *)sys_nomodule
}, /* 149 = compat_43_oquota */
{
@@ -1263,7 +1245,6 @@ struct sysent sysent[] = {
.sy_call = (sy_call_t *)sys_mlockall
}, /* 242 = mlockall */
{
-
.sy_call = (sy_call_t *)sys_munlockall
}, /* 243 = munlockall */
{
@@ -1445,7 +1426,6 @@ struct sysent sysent[] = {
.sy_call = (sy_call_t *)sys___sigaltstack14
}, /* 281 = __sigaltstack14 */
{
-
.sy_call = (sy_call_t *)sys___vfork14
}, /* 282 = __vfork14 */
{
@@ -1573,7 +1553,6 @@ struct sysent
CVS commit: src/sys/sys
Module Name:src
Committed By: christos
Date: Thu Mar 12 15:28:16 UTC 2015
Modified Files:
src/sys/sys: bswap.h
Log Message:
Remove __OPTIMIZE__ requirement to expand the byte swap macros. Back in
2006 this change was reverted because some of the arch-specific libraries
were broken, and this was hiding this fact. Now, we have code like
static const struct in_addr inmask32 = {.s_addr = INADDR_BROADCAST};
which breaks gcc when compiling without optimization since it does not see
that the expression is constant.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/sys/bswap.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/sys/bswap.h
diff -u src/sys/sys/bswap.h:1.18 src/sys/sys/bswap.h:1.19
--- src/sys/sys/bswap.h:1.18 Thu Feb 26 10:01:53 2015
+++ src/sys/sys/bswap.h Thu Mar 12 11:28:16 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: bswap.h,v 1.18 2015/02/26 15:01:53 joerg Exp $ */
+/* $NetBSD: bswap.h,v 1.19 2015/03/12 15:28:16 christos Exp $ */
/* Written by Manuel Bouyer. Public domain */
@@ -22,7 +22,7 @@ uint32_t bswap32(uint32_t) __RENAME(__bs
uint64_t bswap64(uint64_t) __constfunc;
__END_DECLS
-#if defined(__GNUC__) defined(__OPTIMIZE__) !defined(__lint__)
+#if defined(__GNUC__) !defined(__lint__)
/* machine/byte_swap.h might have defined inline versions */
#ifndef __BYTE_SWAP_U64_VARIABLE
@@ -72,7 +72,7 @@ __END_DECLS
__CAST(uint16_t, __builtin_constant_p((x)) ? \
__byte_swap_u16_constant(x) : __BYTE_SWAP_U16_VARIABLE(x))
-#endif /* __GNUC__ __OPTIMIZE__ */
+#endif /* __GNUC__ !__lint__ */
#endif /* !_LOCORE */
#endif /* !_SYS_BSWAP_H_ */
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: snj Date: Thu Mar 12 19:20:58 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: 588 To generate a diff of this commit: cvs rdiff -u -r1.1.2.226 -r1.1.2.227 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.226 src/doc/CHANGES-7.0:1.1.2.227 --- src/doc/CHANGES-7.0:1.1.2.226 Wed Mar 11 20:27:04 2015 +++ src/doc/CHANGES-7.0 Thu Mar 12 19:20:58 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.226 2015/03/11 20:27:04 snj Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.227 2015/03/12 19:20:58 snj Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -18513,3 +18513,8 @@ sys/arch/evbarm/rpi/rpi_start.S 1.13 Add support for RPI2. On [skrll, ticket #582] +distrib/i386/installimage/Makefile 1.7 + + Bump i386 install iamge size limit. + [bouyer, ticket #588] +
CVS commit: src/sys/arch/arm/cortex
Module Name:src
Committed By: skrll
Date: Thu Mar 12 21:05:07 UTC 2015
Modified Files:
src/sys/arch/arm/cortex: gic.c
Log Message:
G/C armgic_last_priority
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/cortex/gic.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/cortex/gic.c
diff -u src/sys/arch/arm/cortex/gic.c:1.14 src/sys/arch/arm/cortex/gic.c:1.15
--- src/sys/arch/arm/cortex/gic.c:1.14 Tue Mar 3 21:53:12 2015
+++ src/sys/arch/arm/cortex/gic.c Thu Mar 12 21:05:07 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: gic.c,v 1.14 2015/03/03 21:53:12 jmcneill Exp $ */
+/* $NetBSD: gic.c,v 1.15 2015/03/12 21:05:07 skrll Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -34,7 +34,7 @@
#define _INTR_PRIVATE
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: gic.c,v 1.14 2015/03/03 21:53:12 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: gic.c,v 1.15 2015/03/12 21:05:07 skrll Exp $);
#include sys/param.h
#include sys/bus.h
@@ -181,8 +181,6 @@ armgic_block_irqs(struct pic_softc *pic,
gicd_write(sc, GICD_ICENABLERn(group), irq_mask);
}
-static uint32_t armgic_last_priority;
-
static void
armgic_set_priority(struct pic_softc *pic, int ipl)
{
@@ -190,7 +188,6 @@ armgic_set_priority(struct pic_softc *pi
const uint32_t priority = armgic_ipl_to_priority(ipl);
gicc_write(sc, GICC_PMR, priority);
- armgic_last_priority = priority;
}
#ifdef __HAVE_PIC_FAST_SOFTINTS
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: christos
Date: Thu Mar 12 19:56:51 UTC 2015
Modified Files:
src/sys/dev/ic: ciss.c
Log Message:
use hardclock_ticks; pointed out by hannken.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/ic/ciss.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/ciss.c
diff -u src/sys/dev/ic/ciss.c:1.34 src/sys/dev/ic/ciss.c:1.35
--- src/sys/dev/ic/ciss.c:1.34 Thu Mar 12 14:53:22 2015
+++ src/sys/dev/ic/ciss.c Thu Mar 12 15:56:51 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ciss.c,v 1.34 2015/03/12 18:53:22 christos Exp $ */
+/* $NetBSD: ciss.c,v 1.35 2015/03/12 19:56:51 christos Exp $ */
/* $OpenBSD: ciss.c,v 1.68 2013/05/30 16:15:02 deraadt Exp $ */
/*
@@ -19,7 +19,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ciss.c,v 1.34 2015/03/12 18:53:22 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: ciss.c,v 1.35 2015/03/12 19:56:51 christos Exp $);
#include bio.h
@@ -505,7 +505,7 @@ ciss_wait(struct ciss_softc *sc, struct
tohz = mstohz(ms);
if (tohz == 0)
tohz = 1;
- etick = tick + tohz;
+ etick = hardclock_ticks + tohz;
for (;;) {
ccb-ccb_state = CISS_CCB_POLL;
@@ -521,7 +521,7 @@ ciss_wait(struct ciss_softc *sc, struct
ciss_done(ccb);
return 0;
}
- tohz = etick - tick;
+ tohz = etick - hardclock_ticks;
if (tohz = 0)
return EWOULDBLOCK;
CISS_DPRINTF(CISS_D_CMD, (T));
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: christos
Date: Thu Mar 12 18:53:22 UTC 2015
Modified Files:
src/sys/dev/ic: ciss.c
Log Message:
Untangle the poll/wait/timeout code in ciss_cmd() Tested on a DL-360.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/ic/ciss.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/ciss.c
diff -u src/sys/dev/ic/ciss.c:1.33 src/sys/dev/ic/ciss.c:1.34
--- src/sys/dev/ic/ciss.c:1.33 Thu Mar 12 11:33:10 2015
+++ src/sys/dev/ic/ciss.c Thu Mar 12 14:53:22 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ciss.c,v 1.33 2015/03/12 15:33:10 christos Exp $ */
+/* $NetBSD: ciss.c,v 1.34 2015/03/12 18:53:22 christos Exp $ */
/* $OpenBSD: ciss.c,v 1.68 2013/05/30 16:15:02 deraadt Exp $ */
/*
@@ -19,7 +19,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ciss.c,v 1.33 2015/03/12 15:33:10 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: ciss.c,v 1.34 2015/03/12 18:53:22 christos Exp $);
#include bio.h
@@ -437,6 +437,97 @@ cissminphys(struct buf *bp)
minphys(bp);
}
+static struct ciss_ccb *
+ciss_poll1(struct ciss_softc *sc)
+{
+ struct ciss_ccb *ccb;
+ uint32_t id;
+
+ if (!(bus_space_read_4(sc-sc_iot, sc-sc_ioh, CISS_ISR) sc-iem)) {
+ CISS_DPRINTF(CISS_D_CMD, (N));
+ return NULL;
+ }
+
+ if (sc-cfg.methods CISS_METH_FIFO64) {
+ if (bus_space_read_4(sc-sc_iot, sc-sc_ioh, CISS_OUTQ64_HI) ==
+ 0x) {
+ CISS_DPRINTF(CISS_D_CMD, (Q));
+ return NULL;
+ }
+ id = bus_space_read_4(sc-sc_iot, sc-sc_ioh, CISS_OUTQ64_LO);
+ } else if (sc-cfg.methods CISS_METH_FIFO64_RRO) {
+ id = bus_space_read_4(sc-sc_iot, sc-sc_ioh, CISS_OUTQ64_LO);
+ if (id == 0x) {
+ CISS_DPRINTF(CISS_D_CMD, (Q));
+ return NULL;
+ }
+ (void)bus_space_read_4(sc-sc_iot, sc-sc_ioh, CISS_OUTQ64_HI);
+ } else {
+ id = bus_space_read_4(sc-sc_iot, sc-sc_ioh, CISS_OUTQ);
+ if (id == 0x) {
+ CISS_DPRINTF(CISS_D_CMD, (Q));
+ return NULL;
+ }
+ }
+
+ CISS_DPRINTF(CISS_D_CMD, (got=0x%x , id));
+ ccb = (struct ciss_ccb *) ((char *)sc-ccbs + (id 2) * sc-ccblen);
+ ccb-ccb_cmd.id = htole32(id);
+ ccb-ccb_cmd.id_hi = htole32(0);
+ return ccb;
+}
+
+static int
+ciss_poll(struct ciss_softc *sc, struct ciss_ccb *ccb, int ms)
+{
+ struct ciss_ccb *ccb1;
+
+ ms /= 10;
+
+ while (ms-- 0) {
+ DELAY(10);
+ ccb1 = ciss_poll1(sc);
+ if (ccb1 == NULL)
+ continue;
+ ciss_done(ccb1);
+ if (ccb1 == ccb)
+ return 0;
+ }
+
+ return ETIMEDOUT;
+}
+
+static int
+ciss_wait(struct ciss_softc *sc, struct ciss_ccb *ccb, int ms)
+{
+ int tohz, etick;
+
+ tohz = mstohz(ms);
+ if (tohz == 0)
+ tohz = 1;
+ etick = tick + tohz;
+
+ for (;;) {
+ ccb-ccb_state = CISS_CCB_POLL;
+ CISS_DPRINTF(CISS_D_CMD, (cv_timedwait(%d) , tohz));
+ mutex_enter(sc-sc_mutex);
+ if (cv_timedwait(sc-sc_condvar, sc-sc_mutex, tohz)
+ == EWOULDBLOCK) {
+ mutex_exit(sc-sc_mutex);
+ return EWOULDBLOCK;
+ }
+ mutex_exit(sc-sc_mutex);
+ if (ccb-ccb_state == CISS_CCB_ONQ) {
+ ciss_done(ccb);
+ return 0;
+ }
+ tohz = etick - tick;
+ if (tohz = 0)
+ return EWOULDBLOCK;
+ CISS_DPRINTF(CISS_D_CMD, (T));
+ }
+}
+
/*
* submit a command and optionally wait for completition.
* wait arg abuses XS_CTL_POLL|XS_CTL_NOSLEEP flags to request
@@ -448,11 +539,9 @@ ciss_cmd(struct ciss_ccb *ccb, int flags
{
struct ciss_softc *sc = ccb-ccb_sc;
struct ciss_cmd *cmd = ccb-ccb_cmd;
- struct ciss_ccb *ccb1;
bus_dmamap_t dmap = ccb-ccb_dmamap;
- u_int32_t id;
u_int64_t addr;
- int i, tohz, error = 0;
+ int i, error = 0;
if (ccb-ccb_state != CISS_CCB_READY) {
printf(%s: ccb %d not ready state=0x%x\n, device_xname(sc-sc_dev),
@@ -527,83 +616,18 @@ ciss_cmd(struct ciss_ccb *ccb, int flags
ccb-ccb_cmdpa);
if (wait XS_CTL_POLL) {
- int etick;
+ int ms;
CISS_DPRINTF(CISS_D_CMD, (waiting ));
- i = ccb-ccb_xs? ccb-ccb_xs-timeout : 6;
- tohz = (i / 1000) * hz + (i % 1000) * (hz / 1000);
- if (tohz == 0)
- tohz = 1;
- for (i *= 100, etick = tick + tohz; i--; ) {
- if (!(wait XS_CTL_NOSLEEP)) {
-ccb-ccb_state = CISS_CCB_POLL;
-CISS_DPRINTF(CISS_D_CMD, (cv_timedwait(%d) , tohz));
-mutex_enter(sc-sc_mutex);
-if (cv_timedwait(sc-sc_condvar,
-sc-sc_mutex, tohz) == EWOULDBLOCK) {
- mutex_exit(sc-sc_mutex);
- break;
-}
-mutex_exit(sc-sc_mutex);
-if (ccb-ccb_state != CISS_CCB_ONQ) {
- tohz = etick - tick;
- if (tohz = 0)
- break;
- CISS_DPRINTF(CISS_D_CMD, (T));
- continue;
-}
-ccb1 = ccb;
- } else {
-DELAY(10);
-
-if (!(bus_space_read_4(sc-sc_iot, sc-sc_ioh,
-CISS_ISR) sc-iem)) {
- CISS_DPRINTF(CISS_D_CMD, (N));
- continue;
-}
-
-if (sc-cfg.methods CISS_METH_FIFO64) {
- if (bus_space_read_4(sc-sc_iot,
- sc-sc_ioh,
- CISS_OUTQ64_HI) == 0x) {
- CISS_DPRINTF(CISS_D_CMD, (Q));
- continue;
- }
- id =
CVS commit: [netbsd-7] src/distrib/i386/installimage
Module Name:src
Committed By: snj
Date: Thu Mar 12 19:06:22 UTC 2015
Modified Files:
src/distrib/i386/installimage [netbsd-7]: Makefile
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #588):
distrib/i386/installimage/Makefile: revision 1.7
match amd64, we ran out of space.
To generate a diff of this commit:
cvs rdiff -u -r1.4.2.1 -r1.4.2.2 src/distrib/i386/installimage/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/i386/installimage/Makefile
diff -u src/distrib/i386/installimage/Makefile:1.4.2.1 src/distrib/i386/installimage/Makefile:1.4.2.2
--- src/distrib/i386/installimage/Makefile:1.4.2.1 Tue Feb 3 08:05:50 2015
+++ src/distrib/i386/installimage/Makefile Thu Mar 12 19:06:22 2015
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4.2.1 2015/02/03 08:05:50 bouyer Exp $
+# $NetBSD: Makefile,v 1.4.2.2 2015/03/12 19:06:22 snj Exp $
.include bsd.own.mk
INSTIMGBASE= NetBSD-${DISTRIBVER}-i386-install # gives ${IMGBASE}.img
BOOTDISK= sd0 # for USB flash etc.
-INSTIMAGEMB?= 520 # for all installation binaries
+INSTIMAGEMB?= 550 # for all installation binaries
PRIMARY_BOOT= bootxx_ffsv1
SECONDARY_BOOT= boot
CVS commit: [netbsd-7] src
Module Name:src Committed By: snj Date: Wed Mar 11 20:22:56 UTC 2015 Modified Files: src/distrib/utils/embedded/conf [netbsd-7]: rpi.conf src/etc/etc.evbarm [netbsd-7]: Makefile.inc src/sys/arch/arm/broadcom [netbsd-7]: bcm2835_intr.c bcm2835_obio.c bcm2835_space.c bcm2835reg.h bcm2835var.h files.bcm2835 src/sys/arch/arm/cortex [netbsd-7]: a9_mpsubr.S armperiph.c gtmr.c gtmr_var.h mpcore_var.h src/sys/arch/arm/include [netbsd-7]: cpu.h src/sys/arch/evbarm/conf [netbsd-7]: RPI mk.rpi std.rpi src/sys/arch/evbarm/rpi [netbsd-7]: genassym.cf rpi.h rpi_machdep.c rpi_start.S Added Files: src/sys/arch/evbarm/conf [netbsd-7]: RPI2 RPI2_INSTALL src/sys/arch/evbarm/rpi [netbsd-7]: rpi2_start.S Log Message: Pull up following revision(s) (requested by skrll in ticket #582): distrib/utils/embedded/conf/rpi.conf: revision 1.27 etc/etc.evbarm/Makefile.inc: revision 1.70 sys/arch/arm/broadcom/bcm2835_intr.c: revision 1.5-1.7 sys/arch/arm/broadcom/bcm2835_obio.c: revision 1.23, 1.24 sys/arch/arm/broadcom/bcm2835_space.c: revision 1.8 sys/arch/arm/broadcom/bcm2835reg.h: revision 1.14 sys/arch/arm/broadcom/bcm2835var.h: revision 1.2 sys/arch/arm/broadcom/files.bcm2835: revision 1.24 sys/arch/arm/cortex/a9_mpsubr.S: revision 1.30 sys/arch/arm/cortex/armperiph.c: revision 1.8, 1.9 sys/arch/arm/cortex/gtmr.c: revision 1.9 sys/arch/arm/cortex/gtmr_var.h: revision 1.5 sys/arch/arm/cortex/mpcore_var.h: revision 1.3 sys/arch/arm/include/cpu.h: revision 1.84 sys/arch/evbarm/conf/RPI2: revision 1.1, 1.2 sys/arch/evbarm/conf/RPI2_INSTALL: revision 1.1 sys/arch/evbarm/conf/RPI: revision 1.59, 1.60 sys/arch/evbarm/conf/mk.rpi: revision 1.4 sys/arch/evbarm/conf/std.rpi: revisions 1.16-1.19 via patch sys/arch/evbarm/rpi/genassym.cf: revision 1.2 sys/arch/evbarm/rpi/rpi.h: revision 1.4 sys/arch/evbarm/rpi/rpi2_start.S: revision 1.1 sys/arch/evbarm/rpi/rpi_machdep.c: revision 1.57, 1.58 via patch sys/arch/evbarm/rpi/rpi_start.S: revision 1.13 Move some options into std.rpi -- Add __HAVE_MM_MD_CACHE_ALIASING Pull up following revision(s) (requested by skrll in ticket #582): Fix TPIDRPRW_IS_CURLWP builds. -- A MULTIPROCESSOR kernel requires TPIDRPRW_IS_CURCPU. -- Use TPIDRPRW_IS_CURLWP as it's a slight code reduction and performance improvement. Initial RPI2 support - it doesn't work yet. The generic timer gets messed up somehow. This commit changes the KVA layout of the RPI. -- Make this compile where gtmr isn't used. -- Spin up the non-boot CPUs, but don't allow cpu_boot_secondary_processors to see them for now. RPI2 nows works well with only the boot cpu. -- Appease a KASSERT - will be remove when MULTIPROCESSOR RPI2 is fixed. -- Add RPI2 to kernels build for both earmv[67]. Use the earmv6 built kernels to create an image that can be used on both RPI and RPI2 -- Add an RPI2_INSTALL To generate a diff of this commit: cvs rdiff -u -r1.24.4.2 -r1.24.4.3 src/distrib/utils/embedded/conf/rpi.conf cvs rdiff -u -r1.63.2.2 -r1.63.2.3 src/etc/etc.evbarm/Makefile.inc cvs rdiff -u -r1.3.12.1 -r1.3.12.2 src/sys/arch/arm/broadcom/bcm2835_intr.c cvs rdiff -u -r1.20.2.1 -r1.20.2.2 src/sys/arch/arm/broadcom/bcm2835_obio.c cvs rdiff -u -r1.6 -r1.6.10.1 src/sys/arch/arm/broadcom/bcm2835_space.c cvs rdiff -u -r1.10.12.2 -r1.10.12.3 src/sys/arch/arm/broadcom/bcm2835reg.h cvs rdiff -u -r1.1 -r1.1.18.1 src/sys/arch/arm/broadcom/bcm2835var.h cvs rdiff -u -r1.21.2.2 -r1.21.2.3 src/sys/arch/arm/broadcom/files.bcm2835 cvs rdiff -u -r1.18.2.1 -r1.18.2.2 src/sys/arch/arm/cortex/a9_mpsubr.S cvs rdiff -u -r1.4 -r1.4.10.1 src/sys/arch/arm/cortex/armperiph.c cvs rdiff -u -r1.8 -r1.8.2.1 src/sys/arch/arm/cortex/gtmr.c cvs rdiff -u -r1.4 -r1.4.6.1 src/sys/arch/arm/cortex/gtmr_var.h cvs rdiff -u -r1.2 -r1.2.10.1 src/sys/arch/arm/cortex/mpcore_var.h cvs rdiff -u -r1.83 -r1.83.4.1 src/sys/arch/arm/include/cpu.h cvs rdiff -u -r1.46.2.5 -r1.46.2.6 src/sys/arch/evbarm/conf/RPI cvs rdiff -u -r0 -r1.2.2.2 src/sys/arch/evbarm/conf/RPI2 cvs rdiff -u -r0 -r1.1.2.2 src/sys/arch/evbarm/conf/RPI2_INSTALL cvs rdiff -u -r1.3 -r1.3.12.1 src/sys/arch/evbarm/conf/mk.rpi cvs rdiff -u -r1.14 -r1.14.2.1 src/sys/arch/evbarm/conf/std.rpi cvs rdiff -u -r1.1 -r1.1.18.1 src/sys/arch/evbarm/rpi/genassym.cf cvs rdiff -u -r1.3 -r1.3.2.1 src/sys/arch/evbarm/rpi/rpi.h cvs rdiff -u -r0 -r1.1.2.2 src/sys/arch/evbarm/rpi/rpi2_start.S cvs rdiff -u -r1.43.2.3 -r1.43.2.4 src/sys/arch/evbarm/rpi/rpi_machdep.c cvs rdiff -u -r1.12 -r1.12.2.1 src/sys/arch/evbarm/rpi/rpi_start.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/utils/embedded/conf/rpi.conf diff -u
