[src/trunk]: src There are other little endian arm machine_arches other than ...

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/59c16042a0c6
branches:  trunk
changeset: 784661:59c16042a0c6
user:      matt <matt%NetBSD.org@localhost>
date:      Tue Feb 05 07:27:02 2013 +0000

description:
There are other little endian arm machine_arches other than "arm"
Use MACHINE_CPU and TARGET_ENDIANNESS instead of MACHINE_ARCH

diffstat:

 external/bsd/elftosb/lib/Makefile               |  9 +++++++--
 external/bsd/elftosb/usr.sbin/elftosb/Makefile  |  8 ++++++--
 external/bsd/elftosb/usr.sbin/sbkeygen/Makefile |  9 +++++++--
 external/bsd/elftosb/usr.sbin/sbtool/Makefile   |  9 +++++++--
 sys/arch/evbarm/stand/Makefile                  |  6 ++++--
 sys/arch/evbarm/stand/gzboot/Makefile           |  6 ++++--
 tools/Makefile                                  |  7 +++++--
 7 files changed, 40 insertions(+), 14 deletions(-)

diffs (136 lines):

diff -r 338f9b463787 -r 59c16042a0c6 external/bsd/elftosb/lib/Makefile
--- a/external/bsd/elftosb/lib/Makefile Tue Feb 05 07:22:59 2013 +0000
+++ b/external/bsd/elftosb/lib/Makefile Tue Feb 05 07:27:02 2013 +0000
@@ -1,6 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2012/11/27 20:00:38 jkunz Exp $
+# $NetBSD: Makefile,v 1.5 2013/02/05 07:27:02 matt Exp $
+
+.include <bsd.endian.mk>
 
-.if (${MACHINE} == "evbarm") && (${MACHINE_ARCH} == "arm")
+.if ${MACHINE} == "evbarm" \
+    && ${MACHINE_CPU} == "arm" \
+    && ${TARGET_ENDIANNESS} == "1234"
+
 LIBISPRIVATE=  yes
 LIB=           elftosb
 SRCS=          AESKey.cpp \
diff -r 338f9b463787 -r 59c16042a0c6 external/bsd/elftosb/usr.sbin/elftosb/Makefile
--- a/external/bsd/elftosb/usr.sbin/elftosb/Makefile    Tue Feb 05 07:22:59 2013 +0000
+++ b/external/bsd/elftosb/usr.sbin/elftosb/Makefile    Tue Feb 05 07:27:02 2013 +0000
@@ -1,10 +1,14 @@
-# $NetBSD: Makefile,v 1.2 2012/11/27 20:00:38 jkunz Exp $
+# $NetBSD: Makefile,v 1.3 2013/02/05 07:27:03 matt Exp $
 
 .include <bsd.init.mk>
+.include <bsd.endian.mk>
 
 .PATH:         ${DIST}/elftosb2
 
-.if (${MACHINE} == "evbarm") && (${MACHINE_ARCH} == "arm")
+.if ${MACHINE} == "evbarm" \
+    && ${MACHINE_CPU} == "arm" \
+    && ${TARGET_ENDIANNESS} == "1234"
+
 PROG_CXX=      elftosb
 SRCS=          BootImageGenerator.cpp \
                ConversionController.cpp \
diff -r 338f9b463787 -r 59c16042a0c6 external/bsd/elftosb/usr.sbin/sbkeygen/Makefile
--- a/external/bsd/elftosb/usr.sbin/sbkeygen/Makefile   Tue Feb 05 07:22:59 2013 +0000
+++ b/external/bsd/elftosb/usr.sbin/sbkeygen/Makefile   Tue Feb 05 07:27:02 2013 +0000
@@ -1,12 +1,17 @@
-# $NetBSD: Makefile,v 1.2 2012/11/27 20:00:39 jkunz Exp $
+# $NetBSD: Makefile,v 1.3 2013/02/05 07:27:03 matt Exp $
 
 .include <bsd.init.mk>
+.include <bsd.endian.mk>
 
 .PATH:         ${DIST}/keygen
 
-.if (${MACHINE} == "evbarm") && (${MACHINE_ARCH} == "arm")
+.if ${MACHINE} == "evbarm" \
+    && ${MACHINE_CPU} == "arm" \
+    && ${TARGET_ENDIANNESS} == "1234"
+
 PROG_CXX=      sbkeygen
 SRCS=          keygen.cpp
+
 .endif
 
 MAN=           sbkeygen.8
diff -r 338f9b463787 -r 59c16042a0c6 external/bsd/elftosb/usr.sbin/sbtool/Makefile
--- a/external/bsd/elftosb/usr.sbin/sbtool/Makefile     Tue Feb 05 07:22:59 2013 +0000
+++ b/external/bsd/elftosb/usr.sbin/sbtool/Makefile     Tue Feb 05 07:27:02 2013 +0000
@@ -1,12 +1,17 @@
-# $NetBSD: Makefile,v 1.2 2012/11/27 20:00:39 jkunz Exp $
+# $NetBSD: Makefile,v 1.3 2013/02/05 07:27:03 matt Exp $
 
 .include <bsd.init.mk>
+.include <bsd.endian.mk>
 
 .PATH:         ${DIST}/sbtool
 
-.if (${MACHINE} == "evbarm") && (${MACHINE_ARCH} == "arm")
+.if ${MACHINE} == "evbarm" \
+    && ${MACHINE_CPU} == "arm" \
+    && ${TARGET_ENDIANNESS} == "1234"
+
 PROG_CXX=      sbtool
 SRCS=          EncoreBootImageReader.cpp sbtool.cpp
+
 .endif
 
 MAN=           sbtool.8
diff -r 338f9b463787 -r 59c16042a0c6 sys/arch/evbarm/stand/Makefile
--- a/sys/arch/evbarm/stand/Makefile    Tue Feb 05 07:22:59 2013 +0000
+++ b/sys/arch/evbarm/stand/Makefile    Tue Feb 05 07:27:02 2013 +0000
@@ -1,8 +1,10 @@
-#      $NetBSD: Makefile,v 1.4 2012/11/27 20:00:39 jkunz Exp $
+#      $NetBSD: Makefile,v 1.5 2013/02/05 07:28:19 matt Exp $
+
+.include <bsd.endian.mk>
 
 SUBDIR+= gzboot
 SUBDIR+= boot2440
-.if ${MACHINE_ARCH} == "arm"
+.if ${MACHINE_CPU} == "arm" && ${TARGET_ENDIANNESS} == "1234"
 # According to the i.MX23 Reference Manual section 3.1, Page 3-3:
 # "The i.MX23 always operates in litle-endian mode."
 SUBDIR+= bootimx23
diff -r 338f9b463787 -r 59c16042a0c6 sys/arch/evbarm/stand/gzboot/Makefile
--- a/sys/arch/evbarm/stand/gzboot/Makefile     Tue Feb 05 07:22:59 2013 +0000
+++ b/sys/arch/evbarm/stand/gzboot/Makefile     Tue Feb 05 07:27:02 2013 +0000
@@ -1,6 +1,8 @@
-#      $NetBSD: Makefile,v 1.10 2012/06/02 20:50:41 skrll Exp $
+#      $NetBSD: Makefile,v 1.11 2013/02/05 07:28:19 matt Exp $
 
-.if ${MACHINE_ARCH} == "arm"
+.include <bsd.endian.mk>
+
+.if ${MACHINE_CPU} == "arm" && ${TARGET_ENDIANNESS} == "1234"
 # Little endian platforms
 SUBDIR=  ADI_BRH_flash_0x00140000
 SUBDIR+= GEMINI_dram_0x01600000
diff -r 338f9b463787 -r 59c16042a0c6 tools/Makefile
--- a/tools/Makefile    Tue Feb 05 07:22:59 2013 +0000
+++ b/tools/Makefile    Tue Feb 05 07:27:02 2013 +0000
@@ -1,6 +1,7 @@
-#      $NetBSD: Makefile,v 1.166 2013/01/31 15:22:50 pooka Exp $
+#      $NetBSD: Makefile,v 1.167 2013/02/05 07:27:02 matt Exp $
 
 .include <bsd.own.mk>
+.include <bsd.endian.mk>
 
 # Make sure that the ordered build/install processing applies when using
 # plain make.
@@ -196,7 +197,9 @@
 SUBDIR+=       hp300-mkboot
 .endif
 
-.if ${MACHINE} == "evbarm" && ${MACHINE_ARCH} == "arm"
+.if ${MACHINE} == "evbarm" \
+    && ${MACHINE_CPU} == "arm" \
+    && ${TARGET_ENDIANNESS} == "1234"
 SUBDIR+=       elftosb
 .endif