Module Name: src
Committed By: matt
Date: Thu Dec 6 17:14:24 UTC 2012
Modified Files:
src/sys/arch/evbarm/stand/boot2440 [matt-nb6-plus]: Makefile
src/sys/arch/evbarm/stand/gzboot/ADI_BRH_flash_0x00140000
[matt-nb6-plus]:
Makefile
src/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x01600000 [matt-nb6-plus]:
Makefile
src/sys/arch/evbarm/stand/gzboot/IQ80310_flash_0x00080000
[matt-nb6-plus]:
Makefile
src/sys/arch/evbarm/stand/gzboot/IQ80321_flash_0xf0080000
[matt-nb6-plus]:
Makefile
src/sys/arch/evbarm/stand/gzboot/TS7200_flash_0x60660000
[matt-nb6-plus]:
Makefile
Log Message:
Hardcode CPUFLAGS appropriately so that these are always built for the correct
cpu/architecture.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.4.1 src/sys/arch/evbarm/stand/boot2440/Makefile
cvs rdiff -u -r1.2 -r1.2.150.1 \
src/sys/arch/evbarm/stand/gzboot/ADI_BRH_flash_0x00140000/Makefile
cvs rdiff -u -r1.2 -r1.2.30.1 \
src/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x01600000/Makefile
cvs rdiff -u -r1.3 -r1.3.150.1 \
src/sys/arch/evbarm/stand/gzboot/IQ80310_flash_0x00080000/Makefile
cvs rdiff -u -r1.3 -r1.3.150.1 \
src/sys/arch/evbarm/stand/gzboot/IQ80321_flash_0xf0080000/Makefile
cvs rdiff -u -r1.2 -r1.2.120.1 \
src/sys/arch/evbarm/stand/gzboot/TS7200_flash_0x60660000/Makefile
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/evbarm/stand/boot2440/Makefile
diff -u src/sys/arch/evbarm/stand/boot2440/Makefile:1.2 src/sys/arch/evbarm/stand/boot2440/Makefile:1.2.4.1
--- src/sys/arch/evbarm/stand/boot2440/Makefile:1.2 Tue Jan 31 11:04:17 2012
+++ src/sys/arch/evbarm/stand/boot2440/Makefile Thu Dec 6 17:14:23 2012
@@ -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 @@ SRCS+= s3csdi.c vers.c
.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:"
Index: src/sys/arch/evbarm/stand/gzboot/ADI_BRH_flash_0x00140000/Makefile
diff -u src/sys/arch/evbarm/stand/gzboot/ADI_BRH_flash_0x00140000/Makefile:1.2 src/sys/arch/evbarm/stand/gzboot/ADI_BRH_flash_0x00140000/Makefile:1.2.150.1
--- src/sys/arch/evbarm/stand/gzboot/ADI_BRH_flash_0x00140000/Makefile:1.2 Tue Apr 29 05:36:20 2003
+++ src/sys/arch/evbarm/stand/gzboot/ADI_BRH_flash_0x00140000/Makefile Thu Dec 6 17:14:23 2012
@@ -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+= -DBECC_SUPPORT_V7
CPPFLAGS+= -DCONSPEED=57600
CPPFLAGS+= -DCONADDR=0x03000000UL
CPPFLAGS+= -DNS16550_FREQ=33300000
+CPUFLAGS= -mcpu=xscale
LDSCRIPT= ${.CURDIR}/ldscript
Index: src/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x01600000/Makefile
diff -u src/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x01600000/Makefile:1.2 src/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x01600000/Makefile:1.2.30.1
--- src/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x01600000/Makefile:1.2 Mon Nov 10 20:30:12 2008
+++ src/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x01600000/Makefile Thu Dec 6 17:14:23 2012
@@ -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+= -DCONSPEED=19200
CPPFLAGS+= -DCONADDR=0x42000000UL
CPPFLAGS+= -DNS16550_AX4
CPPFLAGS+= -DNS16550_FREQ=48000000
+CPUFLAGS= -march=armv4
LDSCRIPT= ${.CURDIR}/ldscript
Index: src/sys/arch/evbarm/stand/gzboot/IQ80310_flash_0x00080000/Makefile
diff -u src/sys/arch/evbarm/stand/gzboot/IQ80310_flash_0x00080000/Makefile:1.3 src/sys/arch/evbarm/stand/gzboot/IQ80310_flash_0x00080000/Makefile:1.3.150.1
--- src/sys/arch/evbarm/stand/gzboot/IQ80310_flash_0x00080000/Makefile:1.3 Tue Apr 29 05:38:52 2003
+++ src/sys/arch/evbarm/stand/gzboot/IQ80310_flash_0x00080000/Makefile Thu Dec 6 17:14:23 2012
@@ -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 @@ LOADADDR= 0xa0200000
CPPFLAGS+= -DCONSPEED=115200
CPPFLAGS+= -DCONADDR=0xfe810000UL
+CPUFLAGS= -mcpu=xscale
LDSCRIPT= ${.CURDIR}/ldscript
Index: src/sys/arch/evbarm/stand/gzboot/IQ80321_flash_0xf0080000/Makefile
diff -u src/sys/arch/evbarm/stand/gzboot/IQ80321_flash_0xf0080000/Makefile:1.3 src/sys/arch/evbarm/stand/gzboot/IQ80321_flash_0xf0080000/Makefile:1.3.150.1
--- src/sys/arch/evbarm/stand/gzboot/IQ80321_flash_0xf0080000/Makefile:1.3 Tue Apr 29 05:36:20 2003
+++ src/sys/arch/evbarm/stand/gzboot/IQ80321_flash_0xf0080000/Makefile Thu Dec 6 17:14:23 2012
@@ -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 @@ LOADADDR= 0xa0200000
CPPFLAGS+= -DCONSPEED=115200
CPPFLAGS+= -DCONADDR=0xfe800000UL
+CPUFLAGS= -mcpu=xscale
LDSCRIPT= ${.CURDIR}/ldscript
Index: src/sys/arch/evbarm/stand/gzboot/TS7200_flash_0x60660000/Makefile
diff -u src/sys/arch/evbarm/stand/gzboot/TS7200_flash_0x60660000/Makefile:1.2 src/sys/arch/evbarm/stand/gzboot/TS7200_flash_0x60660000/Makefile:1.2.120.1
--- src/sys/arch/evbarm/stand/gzboot/TS7200_flash_0x60660000/Makefile:1.2 Sun Dec 11 12:17:11 2005
+++ src/sys/arch/evbarm/stand/gzboot/TS7200_flash_0x60660000/Makefile Thu Dec 6 17:14:23 2012
@@ -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 @@ LOADADDR= 0x00200000
CPPFLAGS+= -DCONSPEED=115200
CPPFLAGS+= -DCONADDR=0x808c0000UL
+CPUFLAGS= -mcpu=arm9tdmi
LDSCRIPT= ${.CURDIR}/ldscript
