Module Name: src
Committed By: matt
Date: Wed Dec 12 15:08:45 UTC 2012
Modified Files:
src/sys/arch/evbarm/stand/gzboot/ADI_BRH_flash_0x00140000: Makefile
src/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x01600000: Makefile
src/sys/arch/evbarm/stand/gzboot/IQ80310_flash_0x00080000: Makefile
src/sys/arch/evbarm/stand/gzboot/IQ80321_flash_0xf0080000: Makefile
src/sys/arch/evbarm/stand/gzboot/TS7200_flash_0x60660000: Makefile
Log Message:
Fix CPUFLAGS to the correct value so a passed down CPUFLAGS doesn't result
in broken images.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/sys/arch/evbarm/stand/gzboot/ADI_BRH_flash_0x00140000/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x01600000/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/sys/arch/evbarm/stand/gzboot/IQ80310_flash_0x00080000/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/sys/arch/evbarm/stand/gzboot/IQ80321_flash_0xf0080000/Makefile
cvs rdiff -u -r1.2 -r1.3 \
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/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.3
--- 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 Wed Dec 12 15:08:44 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/04/29 05:36:20 thorpej Exp $
+# $NetBSD: Makefile,v 1.3 2012/12/12 15:08:44 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.3 src/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x01600000/Makefile:1.4
--- src/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x01600000/Makefile:1.3 Mon Aug 6 02:14:15 2012
+++ src/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x01600000/Makefile Wed Dec 12 15:08:44 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/08/06 02:14:15 matt Exp $
+# $NetBSD: Makefile,v 1.4 2012/12/12 15:08:44 matt Exp $
S= ${.CURDIR}/../../../../..
@@ -12,7 +12,7 @@ CPPFLAGS+= -DCONADDR=0x42000000UL
CPPFLAGS+= -DNS16550_AX4
CPPFLAGS+= -DNS16550_FREQ=48000000
-CPUFLAGS+= -march=armv4
+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.4
--- 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 Wed Dec 12 15:08:44 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/04/29 05:38:52 thorpej Exp $
+# $NetBSD: Makefile,v 1.4 2012/12/12 15:08:44 matt Exp $
S= ${.CURDIR}/../../../../..
@@ -10,6 +10,8 @@ LOADADDR= 0xa0200000
CPPFLAGS+= -DCONSPEED=115200
CPPFLAGS+= -DCONADDR=0xfe810000UL
+CPUFLAGS= -mcpu=xscale
+
LDSCRIPT= ${.CURDIR}/ldscript
SRCS+= iq80310.c ns16550.c i80312_mem.c
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.4
--- 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 Wed Dec 12 15:08:44 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/04/29 05:36:20 thorpej Exp $
+# $NetBSD: Makefile,v 1.4 2012/12/12 15:08:44 matt Exp $
S= ${.CURDIR}/../../../../..
@@ -10,6 +10,8 @@ LOADADDR= 0xa0200000
CPPFLAGS+= -DCONSPEED=115200
CPPFLAGS+= -DCONADDR=0xfe800000UL
+CPUFLAGS= -mcpu=xscale
+
LDSCRIPT= ${.CURDIR}/ldscript
SRCS+= iq80321.c ns16550.c i80321_mem.c
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.3
--- 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 Wed Dec 12 15:08:45 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/12/11 12:17:11 christos Exp $
+# $NetBSD: Makefile,v 1.3 2012/12/12 15:08:45 matt Exp $
S= ${.CURDIR}/../../../../..
@@ -10,6 +10,8 @@ LOADADDR= 0x00200000
CPPFLAGS+= -DCONSPEED=115200
CPPFLAGS+= -DCONADDR=0x808c0000UL
+CPUFLAGS= -mcpu=arm9tdmi
+
LDSCRIPT= ${.CURDIR}/ldscript
SRCS+= ts7200.c epcom.c
