[src/matt-nb6-plus]: src/sys/arch/evbarm/stand Hardcode CPUFLAGS appropriatel...

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

details:   https://anonhg.NetBSD.org/src/rev/a018dd6097f2
branches:  matt-nb6-plus
changeset: 774526:a018dd6097f2
user:      matt <matt%NetBSD.org@localhost>
date:      Thu Dec 06 17:14:23 2012 +0000

description:
Hardcode CPUFLAGS appropriately so that these are always built for the correct
cpu/architecture.

diffstat:

 sys/arch/evbarm/stand/boot2440/Makefile                        |  5 +++--
 sys/arch/evbarm/stand/gzboot/ADI_BRH_flash_0x00140000/Makefile |  3 ++-
 sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x01600000/Makefile   |  3 ++-
 sys/arch/evbarm/stand/gzboot/IQ80310_flash_0x00080000/Makefile |  3 ++-
 sys/arch/evbarm/stand/gzboot/IQ80321_flash_0xf0080000/Makefile |  3 ++-
 sys/arch/evbarm/stand/gzboot/TS7200_flash_0x60660000/Makefile  |  3 ++-
 6 files changed, 13 insertions(+), 7 deletions(-)

diffs (104 lines):

diff -r 7ae7bba92a50 -r a018dd6097f2 sys/arch/evbarm/stand/boot2440/Makefile
--- a/sys/arch/evbarm/stand/boot2440/Makefile   Thu Dec 06 17:13:31 2012 +0000
+++ b/sys/arch/evbarm/stand/boot2440/Makefile   Thu Dec 06 17:14:23 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2012/01/31 11:04:17 nisimura Exp $
+#      $NetBSD: Makefile,v 1.2.4.1 2012/12/06 17:14:23 matt Exp $
 
 S=             ${.CURDIR}/../../../..
 PROG=          bootmini2440
@@ -8,7 +8,8 @@
 .include <bsd.own.mk>
 
 CLEANFILES+=   vers.c ${PROG}.elf
-CFLAGS+=       -Wall -Wno-main -ffreestanding -march=armv4
+CFLAGS+=       -Wall -Wno-main -ffreestanding
+CPUFLAGS=      -march=armv4
 CPPFLAGS+=     -D_STANDALONE -DSUPPORT_DHCP 
 CPPFLAGS+=     -DDM9000MAC="0x08,0x08,0x11,0x18,0x12,0x27" 
 CPPFLAGS+=     -DDEFAULT_BOOTFILE="ld0a:netbsd;net:"
diff -r 7ae7bba92a50 -r a018dd6097f2 sys/arch/evbarm/stand/gzboot/ADI_BRH_flash_0x00140000/Makefile
--- a/sys/arch/evbarm/stand/gzboot/ADI_BRH_flash_0x00140000/Makefile    Thu Dec 06 17:13:31 2012 +0000
+++ b/sys/arch/evbarm/stand/gzboot/ADI_BRH_flash_0x00140000/Makefile    Thu Dec 06 17:14:23 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2003/04/29 05:36:20 thorpej Exp $
+#      $NetBSD: Makefile,v 1.2.150.1 2012/12/06 17:14:23 matt Exp $
 
 S=     ${.CURDIR}/../../../../..
 
@@ -11,6 +11,7 @@
 CPPFLAGS+= -DCONSPEED=57600
 CPPFLAGS+= -DCONADDR=0x03000000UL
 CPPFLAGS+= -DNS16550_FREQ=33300000
+CPUFLAGS= -mcpu=xscale
 
 LDSCRIPT= ${.CURDIR}/ldscript
 
diff -r 7ae7bba92a50 -r a018dd6097f2 sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x01600000/Makefile
--- a/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x01600000/Makefile      Thu Dec 06 17:13:31 2012 +0000
+++ b/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x01600000/Makefile      Thu Dec 06 17:14:23 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2008/11/10 20:30:12 cliff Exp $
+#      $NetBSD: Makefile,v 1.2.30.1 2012/12/06 17:14:23 matt Exp $
 
 S=     ${.CURDIR}/../../../../..
 
@@ -11,6 +11,7 @@
 CPPFLAGS+= -DCONADDR=0x42000000UL
 CPPFLAGS+= -DNS16550_AX4
 CPPFLAGS+= -DNS16550_FREQ=48000000
+CPUFLAGS= -march=armv4
 
 LDSCRIPT= ${.CURDIR}/ldscript
 
diff -r 7ae7bba92a50 -r a018dd6097f2 sys/arch/evbarm/stand/gzboot/IQ80310_flash_0x00080000/Makefile
--- a/sys/arch/evbarm/stand/gzboot/IQ80310_flash_0x00080000/Makefile    Thu Dec 06 17:13:31 2012 +0000
+++ b/sys/arch/evbarm/stand/gzboot/IQ80310_flash_0x00080000/Makefile    Thu Dec 06 17:14:23 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2003/04/29 05:38:52 thorpej Exp $
+#      $NetBSD: Makefile,v 1.3.150.1 2012/12/06 17:14:23 matt Exp $
 
 S=     ${.CURDIR}/../../../../..
 
@@ -9,6 +9,7 @@
 
 CPPFLAGS+= -DCONSPEED=115200
 CPPFLAGS+= -DCONADDR=0xfe810000UL
+CPUFLAGS= -mcpu=xscale
 
 LDSCRIPT= ${.CURDIR}/ldscript
 
diff -r 7ae7bba92a50 -r a018dd6097f2 sys/arch/evbarm/stand/gzboot/IQ80321_flash_0xf0080000/Makefile
--- a/sys/arch/evbarm/stand/gzboot/IQ80321_flash_0xf0080000/Makefile    Thu Dec 06 17:13:31 2012 +0000
+++ b/sys/arch/evbarm/stand/gzboot/IQ80321_flash_0xf0080000/Makefile    Thu Dec 06 17:14:23 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2003/04/29 05:36:20 thorpej Exp $
+#      $NetBSD: Makefile,v 1.3.150.1 2012/12/06 17:14:23 matt Exp $
 
 S=     ${.CURDIR}/../../../../..
 
@@ -9,6 +9,7 @@
 
 CPPFLAGS+= -DCONSPEED=115200
 CPPFLAGS+= -DCONADDR=0xfe800000UL
+CPUFLAGS= -mcpu=xscale
 
 LDSCRIPT= ${.CURDIR}/ldscript
 
diff -r 7ae7bba92a50 -r a018dd6097f2 sys/arch/evbarm/stand/gzboot/TS7200_flash_0x60660000/Makefile
--- a/sys/arch/evbarm/stand/gzboot/TS7200_flash_0x60660000/Makefile     Thu Dec 06 17:13:31 2012 +0000
+++ b/sys/arch/evbarm/stand/gzboot/TS7200_flash_0x60660000/Makefile     Thu Dec 06 17:14:23 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2005/12/11 12:17:11 christos Exp $
+#      $NetBSD: Makefile,v 1.2.120.1 2012/12/06 17:14:23 matt Exp $
 
 S=     ${.CURDIR}/../../../../..
 
@@ -9,6 +9,7 @@
 
 CPPFLAGS+= -DCONSPEED=115200
 CPPFLAGS+= -DCONADDR=0x808c0000UL
+CPUFLAGS= -mcpu=arm9tdmi
 
 LDSCRIPT= ${.CURDIR}/ldscript