Module Name: src
Committed By: jkunz
Date: Tue Nov 27 20:00:39 UTC 2012
Modified Files:
src/external/bsd/elftosb/lib: Makefile
src/external/bsd/elftosb/usr.sbin/elftosb: Makefile
src/external/bsd/elftosb/usr.sbin/sbkeygen: Makefile
src/external/bsd/elftosb/usr.sbin/sbtool: Makefile
src/sys/arch/evbarm/stand: Makefile
src/tools: Makefile
Log Message:
According to the i.MX23 Reference Manual section 3.1, Page 3-3:
"The i.MX23 always operates in litle-endian mode."
So build elftosb and bootloader for this processor only for evbarm(-el).
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/elftosb/lib/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/elftosb/usr.sbin/elftosb/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/elftosb/usr.sbin/sbkeygen/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/elftosb/usr.sbin/sbtool/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/stand/Makefile
cvs rdiff -u -r1.160 -r1.161 src/tools/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/bsd/elftosb/lib/Makefile
diff -u src/external/bsd/elftosb/lib/Makefile:1.3 src/external/bsd/elftosb/lib/Makefile:1.4
--- src/external/bsd/elftosb/lib/Makefile:1.3 Fri Nov 16 05:39:25 2012
+++ src/external/bsd/elftosb/lib/Makefile Tue Nov 27 20:00:38 2012
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2012/11/16 05:39:25 christos Exp $
+# $NetBSD: Makefile,v 1.4 2012/11/27 20:00:38 jkunz Exp $
-.if (${MACHINE} == "evbarm")
+.if (${MACHINE} == "evbarm") && (${MACHINE_ARCH} == "arm")
LIBISPRIVATE= yes
LIB= elftosb
SRCS= AESKey.cpp \
Index: src/external/bsd/elftosb/usr.sbin/elftosb/Makefile
diff -u src/external/bsd/elftosb/usr.sbin/elftosb/Makefile:1.1 src/external/bsd/elftosb/usr.sbin/elftosb/Makefile:1.2
--- src/external/bsd/elftosb/usr.sbin/elftosb/Makefile:1.1 Thu Nov 15 19:49:16 2012
+++ src/external/bsd/elftosb/usr.sbin/elftosb/Makefile Tue Nov 27 20:00:38 2012
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2012/11/15 19:49:16 jkunz Exp $
+# $NetBSD: Makefile,v 1.2 2012/11/27 20:00:38 jkunz Exp $
.include <bsd.init.mk>
.PATH: ${DIST}/elftosb2
-.if (${MACHINE} == "evbarm")
+.if (${MACHINE} == "evbarm") && (${MACHINE_ARCH} == "arm")
PROG_CXX= elftosb
SRCS= BootImageGenerator.cpp \
ConversionController.cpp \
Index: src/external/bsd/elftosb/usr.sbin/sbkeygen/Makefile
diff -u src/external/bsd/elftosb/usr.sbin/sbkeygen/Makefile:1.1 src/external/bsd/elftosb/usr.sbin/sbkeygen/Makefile:1.2
--- src/external/bsd/elftosb/usr.sbin/sbkeygen/Makefile:1.1 Thu Nov 15 19:49:16 2012
+++ src/external/bsd/elftosb/usr.sbin/sbkeygen/Makefile Tue Nov 27 20:00:39 2012
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2012/11/15 19:49:16 jkunz Exp $
+# $NetBSD: Makefile,v 1.2 2012/11/27 20:00:39 jkunz Exp $
.include <bsd.init.mk>
.PATH: ${DIST}/keygen
-.if (${MACHINE} == "evbarm")
+.if (${MACHINE} == "evbarm") && (${MACHINE_ARCH} == "arm")
PROG_CXX= sbkeygen
SRCS= keygen.cpp
.endif
Index: src/external/bsd/elftosb/usr.sbin/sbtool/Makefile
diff -u src/external/bsd/elftosb/usr.sbin/sbtool/Makefile:1.1 src/external/bsd/elftosb/usr.sbin/sbtool/Makefile:1.2
--- src/external/bsd/elftosb/usr.sbin/sbtool/Makefile:1.1 Thu Nov 15 19:49:17 2012
+++ src/external/bsd/elftosb/usr.sbin/sbtool/Makefile Tue Nov 27 20:00:39 2012
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2012/11/15 19:49:17 jkunz Exp $
+# $NetBSD: Makefile,v 1.2 2012/11/27 20:00:39 jkunz Exp $
.include <bsd.init.mk>
.PATH: ${DIST}/sbtool
-.if (${MACHINE} == "evbarm")
+.if (${MACHINE} == "evbarm") && (${MACHINE_ARCH} == "arm")
PROG_CXX= sbtool
SRCS= EncoreBootImageReader.cpp sbtool.cpp
.endif
Index: src/sys/arch/evbarm/stand/Makefile
diff -u src/sys/arch/evbarm/stand/Makefile:1.3 src/sys/arch/evbarm/stand/Makefile:1.4
--- src/sys/arch/evbarm/stand/Makefile:1.3 Tue Nov 20 19:17:03 2012
+++ src/sys/arch/evbarm/stand/Makefile Tue Nov 27 20:00:39 2012
@@ -1,7 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2012/11/20 19:17:03 jkunz Exp $
+# $NetBSD: Makefile,v 1.4 2012/11/27 20:00:39 jkunz Exp $
SUBDIR+= gzboot
SUBDIR+= boot2440
+.if ${MACHINE_ARCH} == "arm"
+# According to the i.MX23 Reference Manual section 3.1, Page 3-3:
+# "The i.MX23 always operates in litle-endian mode."
SUBDIR+= bootimx23
+.endif
.include <bsd.subdir.mk>
Index: src/tools/Makefile
diff -u src/tools/Makefile:1.160 src/tools/Makefile:1.161
--- src/tools/Makefile:1.160 Mon Nov 26 16:57:25 2012
+++ src/tools/Makefile Tue Nov 27 20:00:39 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.160 2012/11/26 16:57:25 pooka Exp $
+# $NetBSD: Makefile,v 1.161 2012/11/27 20:00:39 jkunz Exp $
.include <bsd.own.mk>
@@ -154,7 +154,7 @@ SUBDIR+= amiga-txlt
SUBDIR+= hp300-mkboot
.endif
-.if ${MACHINE} == "evbarm"
+.if ${MACHINE} == "evbarm" && ${MACHINE_ARCH} == "arm"
SUBDIR+= elftosb
.endif
