Module Name: src
Committed By: yamt
Date: Thu May 22 15:44:51 UTC 2014
Modified Files:
src/external/bsd/elftosb [yamt-pagecache]: Makefile.inc
src/external/bsd/elftosb/dist/common [yamt-pagecache]:
EncoreBootImage.cpp Logging.cpp
src/external/bsd/elftosb/dist/elftosb2 [yamt-pagecache]: ElftosbAST.cpp
elftosb.cpp
src/external/bsd/elftosb/dist/keygen [yamt-pagecache]: keygen.cpp
src/external/bsd/elftosb/dist/sbtool [yamt-pagecache]: sbtool.cpp
src/external/bsd/elftosb/lib [yamt-pagecache]: Makefile
src/external/bsd/elftosb/usr.sbin/elftosb [yamt-pagecache]: Makefile
elftosb.8
src/external/bsd/elftosb/usr.sbin/sbkeygen [yamt-pagecache]: Makefile
sbkeygen.8
src/external/bsd/elftosb/usr.sbin/sbtool [yamt-pagecache]: Makefile
sbtool.8
Log Message:
sync with head.
for a reference, the tree before this commit was tagged
as yamt-pagecache-tag8.
this commit was splitted into small chunks to avoid
a limitation of cvs. ("Protocol error: too many arguments")
To generate a diff of this commit:
cvs rdiff -u -r1.1.4.2 -r1.1.4.3 src/external/bsd/elftosb/Makefile.inc
cvs rdiff -u -r1.1.4.2 -r1.1.4.3 \
src/external/bsd/elftosb/dist/common/EncoreBootImage.cpp \
src/external/bsd/elftosb/dist/common/Logging.cpp
cvs rdiff -u -r1.1.4.2 -r1.1.4.3 \
src/external/bsd/elftosb/dist/elftosb2/ElftosbAST.cpp \
src/external/bsd/elftosb/dist/elftosb2/elftosb.cpp
cvs rdiff -u -r1.1.4.2 -r1.1.4.3 \
src/external/bsd/elftosb/dist/keygen/keygen.cpp
cvs rdiff -u -r1.1.4.2 -r1.1.4.3 \
src/external/bsd/elftosb/dist/sbtool/sbtool.cpp
cvs rdiff -u -r1.4.2.2 -r1.4.2.3 src/external/bsd/elftosb/lib/Makefile
cvs rdiff -u -r1.2.2.2 -r1.2.2.3 \
src/external/bsd/elftosb/usr.sbin/elftosb/Makefile
cvs rdiff -u -r1.1.4.2 -r1.1.4.3 \
src/external/bsd/elftosb/usr.sbin/elftosb/elftosb.8
cvs rdiff -u -r1.2.2.2 -r1.2.2.3 \
src/external/bsd/elftosb/usr.sbin/sbkeygen/Makefile
cvs rdiff -u -r1.1.4.2 -r1.1.4.3 \
src/external/bsd/elftosb/usr.sbin/sbkeygen/sbkeygen.8
cvs rdiff -u -r1.2.2.2 -r1.2.2.3 \
src/external/bsd/elftosb/usr.sbin/sbtool/Makefile
cvs rdiff -u -r1.1.4.2 -r1.1.4.3 \
src/external/bsd/elftosb/usr.sbin/sbtool/sbtool.8
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/elftosb/Makefile.inc
diff -u src/external/bsd/elftosb/Makefile.inc:1.1.4.2 src/external/bsd/elftosb/Makefile.inc:1.1.4.3
--- src/external/bsd/elftosb/Makefile.inc:1.1.4.2 Wed Jan 16 05:27:44 2013
+++ src/external/bsd/elftosb/Makefile.inc Thu May 22 15:44:50 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1.4.2 2013/01/16 05:27:44 yamt Exp $
+# $NetBSD: Makefile.inc,v 1.1.4.3 2014/05/22 15:44:50 yamt Exp $
.include <bsd.own.mk>
@@ -18,6 +18,9 @@ CPPFLAGS+= -I${DIST}/elftosb2
CPPFLAGS+= -DLinux
CWARNFLAGS+= -Wno-multichar
+CWARNFLAGS.clang+= -Wno-switch -Wno-error=delete-non-virtual-dtor \
+ -Wno-bitwise-op-parentheses -Wno-parentheses \
+ -Wno-tautological-compare
LIBISCXX= yes
Index: src/external/bsd/elftosb/dist/common/EncoreBootImage.cpp
diff -u src/external/bsd/elftosb/dist/common/EncoreBootImage.cpp:1.1.4.2 src/external/bsd/elftosb/dist/common/EncoreBootImage.cpp:1.1.4.3
--- src/external/bsd/elftosb/dist/common/EncoreBootImage.cpp:1.1.4.2 Wed Jan 16 05:27:45 2013
+++ src/external/bsd/elftosb/dist/common/EncoreBootImage.cpp Thu May 22 15:44:51 2014
@@ -391,7 +391,7 @@ void EncoreBootImage::prepareImageHeader
//! \bug The timestamp might be off an hour.
uint64_t EncoreBootImage::getTimestamp()
{
-#if WIN32
+#if defined(WIN32) || defined(__CYGWIN__) || defined(__sun)
struct tm epoch = { 0, 0, 0, 1, 0, 100, 0, 0 }; // 00:00 1-1-2000
#else
struct tm epoch = { 0, 0, 0, 1, 0, 100, 0, 0, 1, 0, NULL }; // 00:00 1-1-2000
Index: src/external/bsd/elftosb/dist/common/Logging.cpp
diff -u src/external/bsd/elftosb/dist/common/Logging.cpp:1.1.4.2 src/external/bsd/elftosb/dist/common/Logging.cpp:1.1.4.3
--- src/external/bsd/elftosb/dist/common/Logging.cpp:1.1.4.2 Wed Jan 16 05:27:45 2013
+++ src/external/bsd/elftosb/dist/common/Logging.cpp Thu May 22 15:44:51 2014
@@ -86,6 +86,6 @@ void Log::log(Logger::log_level_t level,
void StdoutLogger::_log(const char * msg)
{
- printf(msg);
+ printf("%s", msg);
}
Index: src/external/bsd/elftosb/dist/elftosb2/ElftosbAST.cpp
diff -u src/external/bsd/elftosb/dist/elftosb2/ElftosbAST.cpp:1.1.4.2 src/external/bsd/elftosb/dist/elftosb2/ElftosbAST.cpp:1.1.4.3
--- src/external/bsd/elftosb/dist/elftosb2/ElftosbAST.cpp:1.1.4.2 Wed Jan 16 05:27:48 2013
+++ src/external/bsd/elftosb/dist/elftosb2/ElftosbAST.cpp Thu May 22 15:44:51 2014
@@ -1201,7 +1201,7 @@ void SectionMatchListASTNode::printTree(
}
printIndent(indent+1);
- printf("source: ", m_source->c_str());
+ printf("source: ");
if (m_source)
{
printf("%s\n", m_source->c_str());
@@ -1283,7 +1283,7 @@ void SymbolASTNode::printTree(int indent
printf("%s(", nodeName().c_str());
if (source)
{
- printf(source);
+ printf("%s", source);
}
else
{
@@ -1292,7 +1292,7 @@ void SymbolASTNode::printTree(int indent
printf(":");
if (symbol)
{
- printf(symbol);
+ printf("%s", symbol);
}
else
{
Index: src/external/bsd/elftosb/dist/elftosb2/elftosb.cpp
diff -u src/external/bsd/elftosb/dist/elftosb2/elftosb.cpp:1.1.4.2 src/external/bsd/elftosb/dist/elftosb2/elftosb.cpp:1.1.4.3
--- src/external/bsd/elftosb/dist/elftosb2/elftosb.cpp:1.1.4.2 Wed Jan 16 05:27:48 2013
+++ src/external/bsd/elftosb/dist/elftosb2/elftosb.cpp Thu May 22 15:44:51 2014
@@ -317,7 +317,7 @@ public:
void printUsage(Options & options)
{
options.usage(std::cout, "files...");
- printf(k_usageText, k_toolName);
+ printf("%s", k_usageText);
}
/*!
Index: src/external/bsd/elftosb/dist/keygen/keygen.cpp
diff -u src/external/bsd/elftosb/dist/keygen/keygen.cpp:1.1.4.2 src/external/bsd/elftosb/dist/keygen/keygen.cpp:1.1.4.3
--- src/external/bsd/elftosb/dist/keygen/keygen.cpp:1.1.4.2 Wed Jan 16 05:27:49 2013
+++ src/external/bsd/elftosb/dist/keygen/keygen.cpp Thu May 22 15:44:51 2014
@@ -177,7 +177,7 @@ public:
void printUsage(Options & options)
{
options.usage(std::cout, "key-files...");
- printf(k_usageText, k_toolName);
+ printf("%s", k_usageText);
}
/*!
Index: src/external/bsd/elftosb/dist/sbtool/sbtool.cpp
diff -u src/external/bsd/elftosb/dist/sbtool/sbtool.cpp:1.1.4.2 src/external/bsd/elftosb/dist/sbtool/sbtool.cpp:1.1.4.3
--- src/external/bsd/elftosb/dist/sbtool/sbtool.cpp:1.1.4.2 Wed Jan 16 05:27:49 2013
+++ src/external/bsd/elftosb/dist/sbtool/sbtool.cpp Thu May 22 15:44:51 2014
@@ -212,7 +212,7 @@ public:
void printUsage(Options & options)
{
options.usage(std::cout, "sb-file");
- printf(k_usageText, k_toolName);
+ printf("%s", k_usageText);
}
/*!
Index: src/external/bsd/elftosb/lib/Makefile
diff -u src/external/bsd/elftosb/lib/Makefile:1.4.2.2 src/external/bsd/elftosb/lib/Makefile:1.4.2.3
--- src/external/bsd/elftosb/lib/Makefile:1.4.2.2 Wed Jan 16 05:27:57 2013
+++ src/external/bsd/elftosb/lib/Makefile Thu May 22 15:44:51 2014
@@ -1,6 +1,10 @@
-# $NetBSD: Makefile,v 1.4.2.2 2013/01/16 05:27:57 yamt Exp $
+# $NetBSD: Makefile,v 1.4.2.3 2014/05/22 15:44:51 yamt Exp $
+
+.include <bsd.own.mk>
+.include <bsd.endian.mk>
+
+.if ${MACHINE_CPU} == "arm" && ${TARGET_ENDIANNESS} == "1234"
-.if (${MACHINE} == "evbarm") && (${MACHINE_ARCH} == "arm")
LIBISPRIVATE= yes
LIB= elftosb
SRCS= AESKey.cpp \
@@ -38,7 +42,6 @@ SRCS= AESKey.cpp \
stdafx.cpp
.include <bsd.lib.mk>
.else
-${.TARGETS}:
+.include <bsd.subdir.mk>
.endif
-
Index: src/external/bsd/elftosb/usr.sbin/elftosb/Makefile
diff -u src/external/bsd/elftosb/usr.sbin/elftosb/Makefile:1.2.2.2 src/external/bsd/elftosb/usr.sbin/elftosb/Makefile:1.2.2.3
--- src/external/bsd/elftosb/usr.sbin/elftosb/Makefile:1.2.2.2 Wed Jan 16 05:27:57 2013
+++ src/external/bsd/elftosb/usr.sbin/elftosb/Makefile Thu May 22 15:44:51 2014
@@ -1,10 +1,13 @@
-# $NetBSD: Makefile,v 1.2.2.2 2013/01/16 05:27:57 yamt Exp $
+# $NetBSD: Makefile,v 1.2.2.3 2014/05/22 15:44:51 yamt Exp $
.include <bsd.init.mk>
+.include <bsd.endian.mk>
+.include <bsd.own.mk>
.PATH: ${DIST}/elftosb2
-.if (${MACHINE} == "evbarm") && (${MACHINE_ARCH} == "arm")
+.if ${MACHINE_CPU} == "arm" && ${TARGET_ENDIANNESS} == "1234"
+
PROG_CXX= elftosb
SRCS= BootImageGenerator.cpp \
ConversionController.cpp \
Index: src/external/bsd/elftosb/usr.sbin/elftosb/elftosb.8
diff -u src/external/bsd/elftosb/usr.sbin/elftosb/elftosb.8:1.1.4.2 src/external/bsd/elftosb/usr.sbin/elftosb/elftosb.8:1.1.4.3
--- src/external/bsd/elftosb/usr.sbin/elftosb/elftosb.8:1.1.4.2 Wed Jan 16 05:27:57 2013
+++ src/external/bsd/elftosb/usr.sbin/elftosb/elftosb.8 Thu May 22 15:44:51 2014
@@ -1,4 +1,4 @@
-.\" $NetBSD: elftosb.8,v 1.1.4.2 2013/01/16 05:27:57 yamt Exp $
+.\" $NetBSD: elftosb.8,v 1.1.4.3 2014/05/22 15:44:51 yamt Exp $
.\"
.\" Copyright (c) 2012 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -25,42 +25,40 @@
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
.Dd November 3, 2012
-.Dt elftosb 1
+.Dt ELFTOSB 8
.Os
.Sh NAME
.Nm elftosb
.Nd generate secure boot images for Freescale processors
.Sh SYNOPSIS
.Nm
-.Oo Fl ? Ns \&| Ns Fl -help Oc
-.Oo Fl C|--component Ar version Oc
-.Oo Fl c|--command Ar file Oc
-.Oo Fl D|--define Ar const Oc
-.Oo Fl d|--debug Oc
-.Oo Fl f|--chip-family Ar family Oc
-.Oo Fl k|--key Ar file Oc
-.Oo Fl O|--option Ar option Oc
-.Oo Fl o|--output Ar file Oc
-.Oo Fl P|--product Ar version Oc
-.Oo Fl p|--search-path Ar path Oc
-.Oo Fl q|--quiet Oc
-.Oo Fl V|--verbose Oc
-.Oo Fl v|--version Oc
-.Oo Fl z|--zero-key Oc
+.Oo Fl ?, Fl Fl help Oc
+.Oo Fl C, Fl Fl component Ar version Oc
+.Oo Fl c, Fl Fl command Ar file Oc
+.Oo Fl D, Fl Fl define Ar const Oc
+.Oo Fl d, Fl Fl debug Oc
+.Oo Fl f, Fl Fl chip-family Ar family Oc
+.Oo Fl k, Fl Fl key Ar file Oc
+.Oo Fl O, Fl Fl option Ar option Oc
+.Oo Fl o, Fl Fl output Ar file Oc
+.Oo Fl P, Fl Fl product Ar version Oc
+.Oo Fl p, Fl Fl search-path Ar path Oc
+.Oo Fl q, Fl Fl quiet Oc
+.Oo Fl V, Fl Fl verbose Oc
+.Oo Fl v, Fl Fl version Oc
+.Oo Fl z, Fl Fl zero-key Oc
.Ar files...
-.Oc
-.Oc
.Sh DESCRIPTION
The
.Nm
-programm is used to create a digitaly signed sb boot file.
+programm is used to create a digitaly signed secure boot (sb) file.
This sb file can be booted by the first stage boot loader found in
Freescale i.MX23 and i.MX28 application processors.
-One or several ELF files and optionaly a key are taken as input and
+One or several ELF files and optionally a key are taken as input and
processed under the control of a command file to generate the sb file.
.Sh SEE ALSO
-.Xr sbkeygen 1
-.Xr sbtool 1
+.Xr sbkeygen 8 ,
+.Xr sbtool 8
.br
Freescale Application Note AN4555
.Sh COPYRIGHT
Index: src/external/bsd/elftosb/usr.sbin/sbkeygen/Makefile
diff -u src/external/bsd/elftosb/usr.sbin/sbkeygen/Makefile:1.2.2.2 src/external/bsd/elftosb/usr.sbin/sbkeygen/Makefile:1.2.2.3
--- src/external/bsd/elftosb/usr.sbin/sbkeygen/Makefile:1.2.2.2 Wed Jan 16 05:27:57 2013
+++ src/external/bsd/elftosb/usr.sbin/sbkeygen/Makefile Thu May 22 15:44:51 2014
@@ -1,12 +1,16 @@
-# $NetBSD: Makefile,v 1.2.2.2 2013/01/16 05:27:57 yamt Exp $
+# $NetBSD: Makefile,v 1.2.2.3 2014/05/22 15:44:51 yamt Exp $
.include <bsd.init.mk>
+.include <bsd.endian.mk>
+.include <bsd.own.mk>
.PATH: ${DIST}/keygen
-.if (${MACHINE} == "evbarm") && (${MACHINE_ARCH} == "arm")
+.if ${MACHINE_CPU} == "arm" && ${TARGET_ENDIANNESS} == "1234"
+
PROG_CXX= sbkeygen
SRCS= keygen.cpp
+
.endif
MAN= sbkeygen.8
Index: src/external/bsd/elftosb/usr.sbin/sbkeygen/sbkeygen.8
diff -u src/external/bsd/elftosb/usr.sbin/sbkeygen/sbkeygen.8:1.1.4.2 src/external/bsd/elftosb/usr.sbin/sbkeygen/sbkeygen.8:1.1.4.3
--- src/external/bsd/elftosb/usr.sbin/sbkeygen/sbkeygen.8:1.1.4.2 Wed Jan 16 05:27:57 2013
+++ src/external/bsd/elftosb/usr.sbin/sbkeygen/sbkeygen.8 Thu May 22 15:44:51 2014
@@ -1,4 +1,4 @@
-.\" $NetBSD: sbkeygen.8,v 1.1.4.2 2013/01/16 05:27:57 yamt Exp $
+.\" $NetBSD: sbkeygen.8,v 1.1.4.3 2014/05/22 15:44:51 yamt Exp $
.\"
.\" Copyright (c) 2012 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -25,41 +25,42 @@
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
.Dd November 3, 2012
-.Dt sbkeygen 1
+.Dt SBKEYGEN 8
.Os
.Sh NAME
.Nm sbkeygen
.Nd generate keys for use with
-.Xr elftosb 1
+.Xr elftosb 8
and
-.Xr sbtool 1
+.Xr sbtool 8
.Sh SYNOPSIS
.Nm
-.Oo Fl ? Ns \&| Ns Fl -help Oc
-.Oo Fl n|--number Ar int Oc
-.Oo Fl q|--quiet Oc
-.Oo Fl V|--verbose Oc
-.Oo Fl v|--version Oc
-.Ar key-files...
-.Oc
-.Oc
+.Oo Fl ?, Fl Fl help Oc
+.Oo Fl n, Fl Fl number Ar int Oc
+.Oo Fl q, Fl Fl quiet Oc
+.Oo Fl V, Fl Fl verbose Oc
+.Oo Fl v, Fl Fl version Oc
+.Ar key-files ...
.Sh DESCRIPTION
The
.Nm
programm is used to generate cryptographic keys for the
-.Xr elftosb 1
+.Xr elftosb 8
and
-.Xr sbtool 1
+.Xr sbtool 8
programms.
.Pp
The
.Nm
-programm is called keygen by Freescale. It was renamed to
+programm is called keygen by Freescale.
+It was renamed to
.Nm
-when imported into NetBSD to avoid the generic name keygen.
+when imported into
+.Nx
+to avoid the generic name keygen.
.Sh SEE ALSO
-.Xr elftosb 1
-.Xr sbtool 1
+.Xr elftosb 8 ,
+.Xr sbtool 8
.br
Freescale Application Note AN4555
.Sh COPYRIGHT
Index: src/external/bsd/elftosb/usr.sbin/sbtool/Makefile
diff -u src/external/bsd/elftosb/usr.sbin/sbtool/Makefile:1.2.2.2 src/external/bsd/elftosb/usr.sbin/sbtool/Makefile:1.2.2.3
--- src/external/bsd/elftosb/usr.sbin/sbtool/Makefile:1.2.2.2 Wed Jan 16 05:27:58 2013
+++ src/external/bsd/elftosb/usr.sbin/sbtool/Makefile Thu May 22 15:44:51 2014
@@ -1,12 +1,16 @@
-# $NetBSD: Makefile,v 1.2.2.2 2013/01/16 05:27:58 yamt Exp $
+# $NetBSD: Makefile,v 1.2.2.3 2014/05/22 15:44:51 yamt Exp $
.include <bsd.init.mk>
+.include <bsd.endian.mk>
+.include <bsd.own.mk>
.PATH: ${DIST}/sbtool
-.if (${MACHINE} == "evbarm") && (${MACHINE_ARCH} == "arm")
+.if ${MACHINE_CPU} == "arm" && ${TARGET_ENDIANNESS} == "1234"
+
PROG_CXX= sbtool
SRCS= EncoreBootImageReader.cpp sbtool.cpp
+
.endif
MAN= sbtool.8
Index: src/external/bsd/elftosb/usr.sbin/sbtool/sbtool.8
diff -u src/external/bsd/elftosb/usr.sbin/sbtool/sbtool.8:1.1.4.2 src/external/bsd/elftosb/usr.sbin/sbtool/sbtool.8:1.1.4.3
--- src/external/bsd/elftosb/usr.sbin/sbtool/sbtool.8:1.1.4.2 Wed Jan 16 05:27:58 2013
+++ src/external/bsd/elftosb/usr.sbin/sbtool/sbtool.8 Thu May 22 15:44:51 2014
@@ -1,4 +1,4 @@
-.\" $NetBSD: sbtool.8,v 1.1.4.2 2013/01/16 05:27:58 yamt Exp $
+.\" $NetBSD: sbtool.8,v 1.1.4.3 2014/05/22 15:44:51 yamt Exp $
.\"
.\" Copyright (c) 2012 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -25,33 +25,31 @@
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
.Dd November 3, 2012
-.Dt sbtool 1
+.Dt SBTOOL 8
.Os
.Sh NAME
.Nm sbtool
.Nd manipulate sb files
.Sh SYNOPSIS
.Nm
-.Oo Fl ? Ns \&| Ns Fl -help Oc
-.Oo Fl b|--binary Oc
-.Oo Fl d|--debug Oc
-.Oo Fl k|--key Ar file Oc
-.Oo Fl q|--quiet Oc
-.Oo Fl V|--verbose Oc
-.Oo Fl v|--version Oc
-.Oo Fl x|--extract value Oc
-.Oo Fl z|--zero-key Oc
+.Oo Fl ?, Fl Fl help Oc
+.Oo Fl b, Fl Fl binary Oc
+.Oo Fl d, Fl Fl debug Oc
+.Oo Fl k, Fl Fl key Ar file Oc
+.Oo Fl q, Fl Fl quiet Oc
+.Oo Fl V, Fl Fl verbose Oc
+.Oo Fl v, Fl Fl version Oc
+.Oo Fl x, Fl Fl extract value Oc
+.Oo Fl z, Fl Fl zero-key Oc
.Ar sb-file
-.Oc
-.Oc
.Sh DESCRIPTION
The
.Nm
programm is used to manipulate sb boot files for Freescale
i.MX23 and i.MX28 application processors.
.Sh SEE ALSO
-.Xr elftosb 1
-.Xr sbkeygen 1
+.Xr elftosb 8 ,
+.Xr sbkeygen 8
.br
Freescale Application Note AN4555
.Sh COPYRIGHT
