CVS commit: src/sys/arch/mips/conf
Module Name:src Committed By: simonb Date: Tue May 25 09:19:28 UTC 2021 Modified Files: src/sys/arch/mips/conf: files.mips Log Message: Alignment nit. To generate a diff of this commit: cvs rdiff -u -r1.83 -r1.84 src/sys/arch/mips/conf/files.mips 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/mips/conf/files.mips diff -u src/sys/arch/mips/conf/files.mips:1.83 src/sys/arch/mips/conf/files.mips:1.84 --- src/sys/arch/mips/conf/files.mips:1.83 Tue Mar 23 13:22:40 2021 +++ src/sys/arch/mips/conf/files.mips Tue May 25 09:19:28 2021 @@ -1,4 +1,4 @@ -# $NetBSD: files.mips,v 1.83 2021/03/23 13:22:40 simonb Exp $ +# $NetBSD: files.mips,v 1.84 2021/05/25 09:19:28 simonb Exp $ # defflag opt_cputype.h NOFPU FPEMUL @@ -75,7 +75,7 @@ file arch/mips/mips/cache_ls2.c mips3_l file arch/mips/mips/cache_r4k.c mips3 | mips4 file arch/mips/mips/cache_r5k.c mips3 | mips4 file arch/mips/mips/cache_r5k_subr.S mips3 | mips4 -file arch/mips/mips/cache_r10k.c (mips3|mips4) & enable_mips4_cache_r10k +file arch/mips/mips/cache_r10k.c (mips3|mips4) & enable_mips4_cache_r10k file arch/mips/mips/cache_octeon.c mips64_octeon file arch/mips/mips/cache_mipsNN.c mips32|mips32r2|mips64|mips64r2 file arch/mips/mips/cache_r4k_pcache16.S mips3|mips4|mips32|mips32r2|mips64|mips64r2
CVS commit: src/sys/arch/mips/conf
Module Name:src Committed By: simonb Date: Tue May 11 09:21:25 UTC 2021 Modified Files: src/sys/arch/mips/conf: std.octeon Log Message: Revert rev 1.5 - put the NOFPU option back. Older cnMIPS cores don't have an FPU. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/mips/conf/std.octeon 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/mips/conf/std.octeon diff -u src/sys/arch/mips/conf/std.octeon:1.5 src/sys/arch/mips/conf/std.octeon:1.6 --- src/sys/arch/mips/conf/std.octeon:1.5 Sun Apr 18 12:05:29 2021 +++ src/sys/arch/mips/conf/std.octeon Tue May 11 09:21:24 2021 @@ -1,4 +1,4 @@ -# $NetBSD: std.octeon,v 1.5 2021/04/18 12:05:29 simonb Exp $ +# $NetBSD: std.octeon,v 1.6 2021/05/11 09:21:24 simonb Exp $ machine evbmips mips include "conf/std" # MI standard options @@ -10,6 +10,7 @@ options MIPS3_ENABLE_CLOCK_INTR makeoptions LP64="yes" options MIPS64R2 +options NOFPU # No FPU options EXEC_ELF32 # exec ELF32 binaries options EXEC_ELF64 # exec ELF64 binaries options COMPAT_NETBSD32
CVS commit: src/sys/arch/mips/conf
Module Name:src
Committed By: christos
Date: Mon Apr 26 00:28:01 UTC 2021
Modified Files:
src/sys/arch/mips/conf: Makefile.mips
Log Message:
Produce elf32 images for mipsn64eb too
To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/sys/arch/mips/conf/Makefile.mips
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/mips/conf/Makefile.mips
diff -u src/sys/arch/mips/conf/Makefile.mips:1.71 src/sys/arch/mips/conf/Makefile.mips:1.72
--- src/sys/arch/mips/conf/Makefile.mips:1.71 Sun Apr 25 19:24:00 2021
+++ src/sys/arch/mips/conf/Makefile.mips Sun Apr 25 20:28:01 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.mips,v 1.71 2021/04/25 23:24:00 christos Exp $
+# $NetBSD: Makefile.mips,v 1.72 2021/04/26 00:28:01 christos Exp $
# Makefile for NetBSD
#
@@ -58,7 +58,7 @@ CFLAGS+= ${GP} -mno-abicalls -msoft-floa
CFLAGS+= -msym32 -mabi=64
AFLAGS+= -msym32 -mabi=64
.endif
-.if ${MACHINE_ARCH} == "mips64eb"
+.if !empty(MACHINE_ARCH:Mmips*64eb)
LDFLAGS+= -Wl,-m,elf64btsmip
LINKFORMAT+= -m elf64btsmip
SYSTEM_LD_TAIL_EXTRA+= \
CVS commit: src/sys/arch/mips/conf
Module Name:src
Committed By: christos
Date: Sun Apr 25 23:24:00 UTC 2021
Modified Files:
src/sys/arch/mips/conf: Makefile.mips
Log Message:
use ${MACHINE_MIPS64}
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/mips/conf/Makefile.mips
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/mips/conf/Makefile.mips
diff -u src/sys/arch/mips/conf/Makefile.mips:1.70 src/sys/arch/mips/conf/Makefile.mips:1.71
--- src/sys/arch/mips/conf/Makefile.mips:1.70 Tue Jan 1 14:41:04 2019
+++ src/sys/arch/mips/conf/Makefile.mips Sun Apr 25 19:24:00 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.mips,v 1.70 2019/01/01 19:41:04 christos Exp $
+# $NetBSD: Makefile.mips,v 1.71 2021/04/25 23:24:00 christos Exp $
# Makefile for NetBSD
#
@@ -54,7 +54,7 @@ AFLAGS.fp.S+= -Wa,-mhard-float
CFLAGS+= ${GP} -mno-abicalls -msoft-float -ffixed-24
.if defined(LP64) && ${LP64} == "yes"
-.if ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el"
+.if ${MACHINE_MIPS64}
CFLAGS+= -msym32 -mabi=64
AFLAGS+= -msym32 -mabi=64
.endif
@@ -65,7 +65,7 @@ SYSTEM_LD_TAIL_EXTRA+= \
;echo ${OBJCOPY} -O elf32-ntradbigmips $@ $@.elf32; \
${OBJCOPY} -O elf32-ntradbigmips $@ $@.elf32
.endif
-.if ${MACHINE_ARCH} == "mips64el"
+.if !empty(MACHINE_ARCH:Mmips*64el)
LDFLAGS+= -Wl,-m,elf64ltsmip
LINKFORMAT+= -m elf64ltsmip
SYSTEM_LD_TAIL_EXTRA+= \
@@ -96,7 +96,7 @@ locore_machdep.o: ${THISMIPS}/${MACHINE}
##
## (5) link settings
##
-.if ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el"
+.if ${MACHINE_MIPS64}
TEXTADDR?= ${DEFTEXTADDR:C/0x8/0x8/}
.else
TEXTADDR?= ${DEFTEXTADDR}
CVS commit: src/sys/arch/mips/conf
Module Name:src Committed By: simonb Date: Sun Apr 18 12:05:29 UTC 2021 Modified Files: src/sys/arch/mips/conf: std.octeon Log Message: Delete the NOFPU option. These CPUs do have an FPU. Allows o32 binaries to work now. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mips/conf/std.octeon 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/mips/conf/std.octeon diff -u src/sys/arch/mips/conf/std.octeon:1.4 src/sys/arch/mips/conf/std.octeon:1.5 --- src/sys/arch/mips/conf/std.octeon:1.4 Mon Jun 1 22:55:12 2015 +++ src/sys/arch/mips/conf/std.octeon Sun Apr 18 12:05:29 2021 @@ -1,4 +1,4 @@ -# $NetBSD: std.octeon,v 1.4 2015/06/01 22:55:12 matt Exp $ +# $NetBSD: std.octeon,v 1.5 2021/04/18 12:05:29 simonb Exp $ machine evbmips mips include "conf/std" # MI standard options @@ -10,7 +10,6 @@ options MIPS3_ENABLE_CLOCK_INTR makeoptions LP64="yes" options MIPS64R2 -options NOFPU # No FPU options EXEC_ELF32 # exec ELF32 binaries options EXEC_ELF64 # exec ELF64 binaries options COMPAT_NETBSD32
CVS commit: src/sys/arch/mips/conf
Module Name:src Committed By: simonb Date: Tue Mar 23 11:41:53 UTC 2021 Modified Files: src/sys/arch/mips/conf: files.mips Log Message: Remove duplicate out-of-place comment. To generate a diff of this commit: cvs rdiff -u -r1.81 -r1.82 src/sys/arch/mips/conf/files.mips 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/mips/conf/files.mips diff -u src/sys/arch/mips/conf/files.mips:1.81 src/sys/arch/mips/conf/files.mips:1.82 --- src/sys/arch/mips/conf/files.mips:1.81 Wed Oct 21 13:31:51 2020 +++ src/sys/arch/mips/conf/files.mips Tue Mar 23 11:41:53 2021 @@ -1,4 +1,4 @@ -# $NetBSD: files.mips,v 1.81 2020/10/21 13:31:51 christos Exp $ +# $NetBSD: files.mips,v 1.82 2021/03/23 11:41:53 simonb Exp $ # defflag opt_cputype.h NOFPU FPEMUL @@ -106,8 +106,6 @@ file arch/mips/mips/netbsd32_machdep_13. file arch/mips/mips/netbsd32_machdep_16.c compat_netbsd32 & compat_16 include "compat/netbsd32/files.netbsd32" -# Binary compatibility with previous NetBSD releases (COMPAT_XX) - # Ultrix Binary Compatibility (COMPAT_ULTRIX) include "compat/ultrix/files.ultrix"
CVS commit: src/sys/arch/mips/conf
Module Name:src Committed By: skrll Date: Sun Aug 9 08:49:00 UTC 2020 Modified Files: src/sys/arch/mips/conf: files.mips Log Message: More whitespace To generate a diff of this commit: cvs rdiff -u -r1.77 -r1.78 src/sys/arch/mips/conf/files.mips 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/mips/conf/files.mips diff -u src/sys/arch/mips/conf/files.mips:1.77 src/sys/arch/mips/conf/files.mips:1.78 --- src/sys/arch/mips/conf/files.mips:1.77 Sun Aug 9 08:48:25 2020 +++ src/sys/arch/mips/conf/files.mips Sun Aug 9 08:49:00 2020 @@ -1,4 +1,4 @@ -# $NetBSD: files.mips,v 1.77 2020/08/09 08:48:25 skrll Exp $ +# $NetBSD: files.mips,v 1.78 2020/08/09 08:49:00 skrll Exp $ # defflag opt_cputype.h NOFPU FPEMUL @@ -19,7 +19,7 @@ defflag opt_cputype.h MIPS64_XLP MIPS64 defflag opt_mips_cache.h MIPS3_NO_PV_UNCACHED defflag opt_mips_cache.h ENABLE_MIPS4_CACHE_R10K -defflag opt_mips3_wired.h ENABLE_MIPS3_WIRED_MAP +defflag opt_mips3_wired.h ENABLE_MIPS3_WIRED_MAP defflag opt_ddb.h DDB_TRACE
CVS commit: src/sys/arch/mips/conf
Module Name:src Committed By: skrll Date: Sun Aug 9 08:48:25 UTC 2020 Modified Files: src/sys/arch/mips/conf: files.mips Log Message: defflag foo on each line to make searching easier. sort some lines and fix some indentation while I'm here. To generate a diff of this commit: cvs rdiff -u -r1.76 -r1.77 src/sys/arch/mips/conf/files.mips 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/mips/conf/files.mips diff -u src/sys/arch/mips/conf/files.mips:1.76 src/sys/arch/mips/conf/files.mips:1.77 --- src/sys/arch/mips/conf/files.mips:1.76 Sun Jan 27 02:08:38 2019 +++ src/sys/arch/mips/conf/files.mips Sun Aug 9 08:48:25 2020 @@ -1,12 +1,12 @@ -# $NetBSD: files.mips,v 1.76 2019/01/27 02:08:38 pgoyette Exp $ +# $NetBSD: files.mips,v 1.77 2020/08/09 08:48:25 skrll Exp $ # defflag opt_cputype.h NOFPU FPEMUL -MIPS64_SB1 -ENABLE_MIPS_16KB_PAGE -ENABLE_MIPS_8KB_PAGE -MIPS64_XLP MIPS64_XLR MIPS64_XLS -MIPS64_OCTEON +defflag opt_cputype.h ENABLE_MIPS_16KB_PAGE +defflag opt_cputype.h ENABLE_MIPS_8KB_PAGE +defflag opt_cputype.h MIPS64_OCTEON +defflag opt_cputype.h MIPS64_SB1 +defflag opt_cputype.h MIPS64_XLP MIPS64_XLR MIPS64_XLS # and the rest... # MIPS1 MIPS2 MIPS3 MIPS4 MIPS5 # MIPS3_LOONGSON2 @@ -16,9 +16,10 @@ defflag opt_cputype.h NOFPU FPEMUL # ENABLE_MIPS_TX3900 # ENABLE_MIPS_R4700 # ENABLE_MIPS_R3NKK -defflag opt_mips_cache.h MIPS3_NO_PV_UNCACHED - ENABLE_MIPS4_CACHE_R10K -defflag opt_mips3_wired.h ENABLE_MIPS3_WIRED_MAP +defflag opt_mips_cache.h MIPS3_NO_PV_UNCACHED +defflag opt_mips_cache.h ENABLE_MIPS4_CACHE_R10K + +defflag opt_mips3_wired.h ENABLE_MIPS3_WIRED_MAP defflag opt_ddb.h DDB_TRACE
CVS commit: src/sys/arch/mips/conf
Module Name:src
Committed By: simonb
Date: Wed Jun 24 12:43:40 UTC 2020
Modified Files:
src/sys/arch/mips/conf: files.octeon
Log Message:
Redo cnmac attachments - cnmacM @ gmxN @ pip0 @ iobus
Missed one file - thanks martin@.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/mips/conf/files.octeon
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/mips/conf/files.octeon
diff -u src/sys/arch/mips/conf/files.octeon:1.8 src/sys/arch/mips/conf/files.octeon:1.9
--- src/sys/arch/mips/conf/files.octeon:1.8 Mon Jun 22 02:26:20 2020
+++ src/sys/arch/mips/conf/files.octeon Wed Jun 24 12:43:40 2020
@@ -1,4 +1,4 @@
-# $NetBSD: files.octeon,v 1.8 2020/06/22 02:26:20 simonb Exp $
+# $NetBSD: files.octeon,v 1.9 2020/06/24 12:43:40 simonb Exp $
file arch/mips/mips/locore_octeon.S
file arch/mips/mips/bus_dma.c
@@ -8,15 +8,6 @@ file arch/mips/mips/mips3_clockintr.c
file arch/mips/cavium/octeon_dma.c
file arch/mips/cavium/octeon_intr.c
file arch/mips/cavium/octeon_misc.c
-file arch/mips/cavium/dev/octeon_ciu.c
-
-defparam opt_octeon.h OCTEON_ECLK
-defparam opt_octeon.h CNMAC_RING_MAX
-defparam opt_octeon.h CNMAC_RING_MIN
-defflag opt_octeon.h CNMAC_FAST_CRC
- CNMAC_IPD_RED
- CNMAC_USENFS
- OCTEON_USBN_CN31XX_DMA_WORKAROUND
device mainbus {}
attach mainbus at root
@@ -43,11 +34,9 @@ file arch/mips/cavium/octeon1p_iobus.c i
file arch/mips/cavium/dev/octeon_fpa.c iobus
file arch/mips/cavium/dev/octeon_pow.c iobus
file arch/mips/cavium/dev/octeon_fau.c iobus
-file arch/mips/cavium/dev/octeon_pip.c iobus
file arch/mips/cavium/dev/octeon_ipd.c iobus
file arch/mips/cavium/dev/octeon_pko.c iobus
file arch/mips/cavium/dev/octeon_asx.c iobus
-file arch/mips/cavium/dev/octeon_smi.c iobus
# I/O Bus devices
@@ -63,12 +52,33 @@ device octtwsi: i2cbus
attach octtwsi at iobus
file arch/mips/cavium/dev/octeon_twsi.c octtwsi
-device octmpi {}
+# XXX rename to octspi?
+device octmpi: spibus
attach octmpi at iobus
file arch/mips/cavium/dev/octeon_mpi.c octmpi
+device octcib {}
+attach octcib at iobus
+file arch/mips/cavium/dev/octeon_cib.c octcib
+
+device octcit {}
+attach octcit at iobus
+file arch/mips/cavium/dev/octeon_cit.c octcit
+
+device octciu {}
+attach octciu at iobus
+file arch/mips/cavium/dev/octeon_ciu.c octciu
+
+device octsmi {}
+attach octsmi at iobus
+file arch/mips/cavium/dev/octeon_smi.c octsmi
+
+device octpip {}
+attach octpip at iobus
+file arch/mips/cavium/dev/octeon_pip.c octpip
+
device octgmx {}
-attach octgmx at iobus
+attach octgmx at octpip
file arch/mips/cavium/dev/octeon_gmx.c octgmx
# On-chip ethernet device(s)
@@ -76,9 +86,20 @@ device cnmac: ether, ifnet, arp, mii
attach cnmac at octgmx
file arch/mips/cavium/dev/if_cnmac.c cnmac
+# CN3xxx/CN5xxx USB
attach dwctwo at iobus with octdwctwo
file arch/mips/cavium/dev/octeon_dwctwo.c octdwctwo
+# CN6xxx USB
+device octuctl {}
+attach octuctl at iobus with octuctl
+file arch/mips/cavium/dev/octeon_uctl.c octuctl
+
+# CN7xxx USB
+device octxctl {}
+attach octxctl at iobus with octxctl
+file arch/mips/cavium/dev/octeon_xctl.c octuctl
+
# Boot-Bus
device bootbus {}
@@ -97,5 +118,5 @@ include "dev/ata/files.ata"
# Machine-independent USB device support
include "dev/usb/files.usb"
-# Machine-independent PCI device support
-include "dev/pci/files.pci"
+## # Machine-independent PCI device support
+## include "dev/pci/files.pci"
CVS commit: src/sys/arch/mips/conf
Module Name:src
Committed By: christos
Date: Tue Jun 5 11:39:49 UTC 2018
Modified Files:
src/sys/arch/mips/conf: Makefile.mips
Log Message:
use the compiler way of passing arguments to the linker.
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/mips/conf/Makefile.mips
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/mips/conf/Makefile.mips
diff -u src/sys/arch/mips/conf/Makefile.mips:1.67 src/sys/arch/mips/conf/Makefile.mips:1.68
--- src/sys/arch/mips/conf/Makefile.mips:1.67 Wed Feb 22 08:34:39 2017
+++ src/sys/arch/mips/conf/Makefile.mips Tue Jun 5 07:39:49 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.mips,v 1.67 2017/02/22 13:34:39 maya Exp $
+# $NetBSD: Makefile.mips,v 1.68 2018/06/05 11:39:49 christos Exp $
# Makefile for NetBSD
#
@@ -59,14 +59,14 @@ CFLAGS+= -msym32 -mabi=64
AFLAGS+= -msym32 -mabi=64
.endif
.if ${MACHINE_ARCH} == "mips64eb"
-LDFLAGS+= -m elf64btsmip
+LDFLAGS+= -Wl,-m,elf64btsmip
LINKFORMAT+= -m elf64btsmip
SYSTEM_LD_TAIL_EXTRA+= \
;echo ${OBJCOPY} -O elf32-ntradbigmips $@ $@.elf32; \
${OBJCOPY} -O elf32-ntradbigmips $@ $@.elf32
.endif
.if ${MACHINE_ARCH} == "mips64el"
-LDFLAGS+= -m elf64ltsmip
+LDFLAGS+= -Wl,-m,elf64ltsmip
LINKFORMAT+= -m elf64ltsmip
SYSTEM_LD_TAIL_EXTRA+= \
;echo ${OBJCOPY} -O elf32-ntradlittlemips $@ $@.elf32; \
CVS commit: src/sys/arch/mips/conf
Module Name:src
Committed By: maya
Date: Wed Feb 22 13:34:39 UTC 2017
Modified Files:
src/sys/arch/mips/conf: Makefile.mips
Log Message:
leave the part for GCC >= 5.3 in.
Was a little over-eager and accidentally removed the else case.
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/mips/conf/Makefile.mips
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/mips/conf/Makefile.mips
diff -u src/sys/arch/mips/conf/Makefile.mips:1.66 src/sys/arch/mips/conf/Makefile.mips:1.67
--- src/sys/arch/mips/conf/Makefile.mips:1.66 Wed Feb 22 13:17:29 2017
+++ src/sys/arch/mips/conf/Makefile.mips Wed Feb 22 13:34:39 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.mips,v 1.66 2017/02/22 13:17:29 maya Exp $
+# $NetBSD: Makefile.mips,v 1.67 2017/02/22 13:34:39 maya Exp $
# Makefile for NetBSD
#
@@ -47,6 +47,11 @@ CPPFLAGS+= -D${MACHINE}
DEFGP?= -G 0
GP?= ${DEFGP}
+.if ${ACTIVE_CC} == "gcc"
+COPTS.mips_fpu.c+= -mhard-float -Wa,-mhard-float
+AFLAGS.fp.S+= -Wa,-mhard-float
+.endif
+
CFLAGS+= ${GP} -mno-abicalls -msoft-float -ffixed-24
.if defined(LP64) && ${LP64} == "yes"
.if ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el"
CVS commit: src/sys/arch/mips/conf
Module Name:src
Committed By: maya
Date: Wed Feb 22 13:17:29 UTC 2017
Modified Files:
src/sys/arch/mips/conf: Makefile.mips
Log Message:
GC workaround for GCC 4.8 fixed in GCC 5+
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/mips/conf/Makefile.mips
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/mips/conf/Makefile.mips
diff -u src/sys/arch/mips/conf/Makefile.mips:1.65 src/sys/arch/mips/conf/Makefile.mips:1.66
--- src/sys/arch/mips/conf/Makefile.mips:1.65 Tue Mar 29 18:40:32 2016
+++ src/sys/arch/mips/conf/Makefile.mips Wed Feb 22 13:17:29 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.mips,v 1.65 2016/03/29 18:40:32 macallan Exp $
+# $NetBSD: Makefile.mips,v 1.66 2017/02/22 13:17:29 maya Exp $
# Makefile for NetBSD
#
@@ -47,22 +47,6 @@ CPPFLAGS+= -D${MACHINE}
DEFGP?= -G 0
GP?= ${DEFGP}
-.if ${ACTIVE_CC} == "gcc" && ${HAVE_GCC} == "48"
-# XXX
-# gcc does not pass floating point options to the assembler
-# by default, because it is afraid that the stricter tests
-# will break userland code. The new binutils is pickier about
-# this. Gcc 5.x fixes the issue so for now, set explicitly
-# the assembler soft-float flags when we build the kernel.
-# see: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64569
-
-CFLAGS+= -Wa,-msoft-float
-COPTS.mips_fpu.c+= -Wa,-mhard-float
-.else
-COPTS.mips_fpu.c+= -mhard-float -Wa,-mhard-float
-AFLAGS.fp.S+= -Wa,-mhard-float
-.endif
-
CFLAGS+= ${GP} -mno-abicalls -msoft-float -ffixed-24
.if defined(LP64) && ${LP64} == "yes"
.if ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el"
CVS commit: src/sys/arch/mips/conf
Module Name:src
Committed By: macallan
Date: Tue Mar 29 18:40:32 UTC 2016
Modified Files:
src/sys/arch/mips/conf: Makefile.mips
Log Message:
make sure we compile mips_fpu.c and fp.S with -mhard-float
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/mips/conf/Makefile.mips
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/mips/conf/Makefile.mips
diff -u src/sys/arch/mips/conf/Makefile.mips:1.64 src/sys/arch/mips/conf/Makefile.mips:1.65
--- src/sys/arch/mips/conf/Makefile.mips:1.64 Mon Mar 28 08:10:57 2016
+++ src/sys/arch/mips/conf/Makefile.mips Tue Mar 29 18:40:32 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.mips,v 1.64 2016/03/28 08:10:57 martin Exp $
+# $NetBSD: Makefile.mips,v 1.65 2016/03/29 18:40:32 macallan Exp $
# Makefile for NetBSD
#
@@ -58,6 +58,9 @@ GP?= ${DEFGP}
CFLAGS+= -Wa,-msoft-float
COPTS.mips_fpu.c+= -Wa,-mhard-float
+.else
+COPTS.mips_fpu.c+= -mhard-float -Wa,-mhard-float
+AFLAGS.fp.S+= -Wa,-mhard-float
.endif
CFLAGS+= ${GP} -mno-abicalls -msoft-float -ffixed-24
CVS commit: src/sys/arch/mips/conf
Module Name:src
Committed By: martin
Date: Mon Mar 28 08:10:57 UTC 2016
Modified Files:
src/sys/arch/mips/conf: Makefile.mips
Log Message:
Restrict float format hacks to gcc 4.8
To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/sys/arch/mips/conf/Makefile.mips
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/mips/conf/Makefile.mips
diff -u src/sys/arch/mips/conf/Makefile.mips:1.63 src/sys/arch/mips/conf/Makefile.mips:1.64
--- src/sys/arch/mips/conf/Makefile.mips:1.63 Thu Feb 18 20:50:44 2016
+++ src/sys/arch/mips/conf/Makefile.mips Mon Mar 28 08:10:57 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.mips,v 1.63 2016/02/18 20:50:44 macallan Exp $
+# $NetBSD: Makefile.mips,v 1.64 2016/03/28 08:10:57 martin Exp $
# Makefile for NetBSD
#
@@ -47,6 +47,7 @@ CPPFLAGS+= -D${MACHINE}
DEFGP?= -G 0
GP?= ${DEFGP}
+.if ${ACTIVE_CC} == "gcc" && ${HAVE_GCC} == "48"
# XXX
# gcc does not pass floating point options to the assembler
# by default, because it is afraid that the stricter tests
@@ -57,6 +58,7 @@ GP?= ${DEFGP}
CFLAGS+= -Wa,-msoft-float
COPTS.mips_fpu.c+= -Wa,-mhard-float
+.endif
CFLAGS+= ${GP} -mno-abicalls -msoft-float -ffixed-24
.if defined(LP64) && ${LP64} == "yes"
CVS commit: src/sys/arch/mips/conf
Module Name:src
Committed By: macallan
Date: Thu Feb 18 20:50:44 UTC 2016
Modified Files:
src/sys/arch/mips/conf: Makefile.mips
Log Message:
gcc does not pass floating point options to the assembler
by default, because it is afraid that the stricter tests
will break userland code. The new binutils is pickier about
this. Gcc 5.x fixes the issue so for now, set explicitly
the assembler soft-float flags when we build the kernel.
see: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64569
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/mips/conf/Makefile.mips
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/mips/conf/Makefile.mips
diff -u src/sys/arch/mips/conf/Makefile.mips:1.62 src/sys/arch/mips/conf/Makefile.mips:1.63
--- src/sys/arch/mips/conf/Makefile.mips:1.62 Mon Aug 24 14:04:24 2015
+++ src/sys/arch/mips/conf/Makefile.mips Thu Feb 18 20:50:44 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.mips,v 1.62 2015/08/24 14:04:24 uebayasi Exp $
+# $NetBSD: Makefile.mips,v 1.63 2016/02/18 20:50:44 macallan Exp $
# Makefile for NetBSD
#
@@ -46,6 +46,18 @@ GENASSYM_CONF= ${MIPS}/mips/genassym.cf
CPPFLAGS+= -D${MACHINE}
DEFGP?= -G 0
GP?= ${DEFGP}
+
+# XXX
+# gcc does not pass floating point options to the assembler
+# by default, because it is afraid that the stricter tests
+# will break userland code. The new binutils is pickier about
+# this. Gcc 5.x fixes the issue so for now, set explicitly
+# the assembler soft-float flags when we build the kernel.
+# see: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64569
+
+CFLAGS+= -Wa,-msoft-float
+COPTS.mips_fpu.c+= -Wa,-mhard-float
+
CFLAGS+= ${GP} -mno-abicalls -msoft-float -ffixed-24
.if defined(LP64) && ${LP64} == "yes"
.if ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el"
CVS commit: src/sys/arch/mips/conf
Module Name:src
Committed By: matt
Date: Sat Jun 6 04:34:23 UTC 2015
Modified Files:
src/sys/arch/mips/conf: files.octeon
Log Message:
Add a wdog for octeon
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mips/conf/files.octeon
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/mips/conf/files.octeon
diff -u src/sys/arch/mips/conf/files.octeon:1.3 src/sys/arch/mips/conf/files.octeon:1.4
--- src/sys/arch/mips/conf/files.octeon:1.3 Mon Jun 1 22:55:12 2015
+++ src/sys/arch/mips/conf/files.octeon Sat Jun 6 04:34:23 2015
@@ -1,4 +1,4 @@
-# $NetBSD: files.octeon,v 1.3 2015/06/01 22:55:12 matt Exp $
+# $NetBSD: files.octeon,v 1.4 2015/06/06 04:34:23 matt Exp $
file arch/mips/mips/locore_octeon.S
file arch/mips/mips/bus_dma.c
@@ -25,10 +25,14 @@ file arch/mips/cavium/mainbus_octeon1p.c
device cpunode { [core=-1] }
attach cpunode at mainbus
-file arch/mips/cavium/octeon_cpunode.c cpunode | cpu
-device cpu
-attach cpu at cpunode with cpunode_cpu
+device cpu {}
+attach cpu at cpunode with cpu_cpunode
+
+device wdog: sysmon_wdog
+attach wdog at cpunode with wdog_cpunode
+
+file arch/mips/cavium/octeon_cpunode.c cpunode | cpu | wdog needs-flag
# I/O Bus
CVS commit: src/sys/arch/mips/conf
Module Name:src Committed By: matt Date: Mon May 25 23:47:01 UTC 2015 Modified Files: src/sys/arch/mips/conf: std.octeon Log Message: Switch to MIPS64R2 To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/conf/std.octeon 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/mips/conf/std.octeon diff -u src/sys/arch/mips/conf/std.octeon:1.2 src/sys/arch/mips/conf/std.octeon:1.3 --- src/sys/arch/mips/conf/std.octeon:1.2 Tue May 19 07:08:21 2015 +++ src/sys/arch/mips/conf/std.octeon Mon May 25 23:47:01 2015 @@ -1,4 +1,4 @@ -# $NetBSD: std.octeon,v 1.2 2015/05/19 07:08:21 matt Exp $ +# $NetBSD: std.octeon,v 1.3 2015/05/25 23:47:01 matt Exp $ machine evbmips mips include conf/std # MI standard options @@ -9,7 +9,7 @@ options MIPS3_ENABLE_CLOCK_INTR makeoptions LP64=yes -options MIPS64 +options MIPS64R2 options NOFPU # No FPU options EXEC_ELF32 # exec ELF32 binaries options EXEC_ELF64 # exec ELF64 binaries
CVS commit: src/sys/arch/mips/conf
Module Name:src Committed By: matt Date: Tue May 19 07:08:21 UTC 2015 Modified Files: src/sys/arch/mips/conf: std.octeon Log Message: Let the compiler/assembler know we compiling for octeon. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/mips/conf/std.octeon 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/mips/conf/std.octeon diff -u src/sys/arch/mips/conf/std.octeon:1.1 src/sys/arch/mips/conf/std.octeon:1.2 --- src/sys/arch/mips/conf/std.octeon:1.1 Wed Apr 29 08:32:00 2015 +++ src/sys/arch/mips/conf/std.octeon Tue May 19 07:08:21 2015 @@ -1,4 +1,4 @@ -# $NetBSD: std.octeon,v 1.1 2015/04/29 08:32:00 hikaru Exp $ +# $NetBSD: std.octeon,v 1.2 2015/05/19 07:08:21 matt Exp $ machine evbmips mips include conf/std # MI standard options @@ -16,8 +16,8 @@ options EXEC_ELF64 # exec ELF64 binarie options COMPAT_NETBSD32 options EXEC_SCRIPT # exec #! scripts -makeoptions CFLAGS+=-mips64r2 -makeoptions AFLAGS+=-mips64r2 +makeoptions CFLAGS+=-mips64r2 -march=octeon +makeoptions AFLAGS+=-mips64r2 -march=octeon # There is uboot's boot info around 0x10. makeoptions DEFTEXTADDR=0x8020 makeoptions BOARDTYPE=octeon
CVS commit: src/sys/arch/mips/conf
Module Name:src Committed By: macallan Date: Tue Mar 10 18:16:20 UTC 2015 Modified Files: src/sys/arch/mips/conf: files.ingenic Log Message: config goop for dme To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mips/conf/files.ingenic 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/mips/conf/files.ingenic diff -u src/sys/arch/mips/conf/files.ingenic:1.3 src/sys/arch/mips/conf/files.ingenic:1.4 --- src/sys/arch/mips/conf/files.ingenic:1.3 Sun Mar 8 17:14:27 2015 +++ src/sys/arch/mips/conf/files.ingenic Tue Mar 10 18:16:20 2015 @@ -1,4 +1,4 @@ -# $NetBSD: files.ingenic,v 1.3 2015/03/08 17:14:27 macallan Exp $ +# $NetBSD: files.ingenic,v 1.4 2015/03/10 18:16:20 macallan Exp $ include dev/scsipi/files.scsipi # SCSI devices include dev/ata/files.ata # ATA devices @@ -22,3 +22,7 @@ file arch/mips/ingenic/ingenic_ohci.c in attach ehci at apbus with ingenic_ehci file arch/mips/ingenic/ingenic_ehci.c ingenic_ehci needs-flag + +# Ethernet +attach dme at apbus with ingenic_dme +file arch/mips/ingenic/ingenic_dme.c ingenic_dme needs-flag
CVS commit: src/sys/arch/mips/conf
Module Name:src
Committed By: macallan
Date: Sat Dec 6 14:36:53 UTC 2014
Modified Files:
src/sys/arch/mips/conf: files.ingenic
Log Message:
config goop for apbus and dwc2/usb
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/mips/conf/files.ingenic
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/mips/conf/files.ingenic
diff -u src/sys/arch/mips/conf/files.ingenic:1.1 src/sys/arch/mips/conf/files.ingenic:1.2
--- src/sys/arch/mips/conf/files.ingenic:1.1 Sat Nov 22 15:17:01 2014
+++ src/sys/arch/mips/conf/files.ingenic Sat Dec 6 14:36:52 2014
@@ -1,6 +1,18 @@
-# $NetBSD: files.ingenic,v 1.1 2014/11/22 15:17:01 macallan Exp $
+# $NetBSD: files.ingenic,v 1.2 2014/12/06 14:36:52 macallan Exp $
+
+include dev/scsipi/files.scsipi # SCSI devices
+include dev/ata/files.ata # ATA devices
+include dev/usb/files.usb # USB devices
# On-chip UART device
attach com at mainbus with com_mainbus
file arch/mips/ingenic/ingenic_com.c com_mainbus
+# Ingenic system bus
+device apbus { [addr=-1] }
+attach apbus at mainbus
+file arch/mips/ingenic/apbus.c apbus
+
+# USB
+attach dwctwo at apbus with ingenic_dwctwo
+file arch/mips/ingenic/ingenic_dwctwo.c ingenic_dwctwo needs-flag
CVS commit: src/sys/arch/mips/conf
Module Name:src
Committed By: uebayasi
Date: Sat Nov 15 12:29:02 UTC 2014
Modified Files:
src/sys/arch/mips/conf: Makefile.mips
Log Message:
Use LINKSCRIPT.
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/mips/conf/Makefile.mips
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/mips/conf/Makefile.mips
diff -u src/sys/arch/mips/conf/Makefile.mips:1.59 src/sys/arch/mips/conf/Makefile.mips:1.60
--- src/sys/arch/mips/conf/Makefile.mips:1.59 Sun Mar 10 07:18:20 2013
+++ src/sys/arch/mips/conf/Makefile.mips Sat Nov 15 12:29:02 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.mips,v 1.59 2013/03/10 07:18:20 christos Exp $
+# $NetBSD: Makefile.mips,v 1.60 2014/11/15 12:29:02 uebayasi Exp $
# Makefile for NetBSD
#
@@ -102,7 +102,7 @@ TEXTADDR?= ${DEFTEXTADDR}
.endif
KERNLDSCRIPT?= ${MIPS}/conf/kern.ldscript
# some mips ports specify a magic format
-LINKFORMAT+= -T ${KERNLDSCRIPT}
+LINKSCRIPT+= -T ${KERNLDSCRIPT}
EXTRA_LINKFLAGS= ${GP} ${LDOPTS}
LINKFLAGS_NORMAL= -X
STRIPFLAGS= -g -X
CVS commit: src/sys/arch/mips/conf
Module Name:src
Committed By: uebayasi
Date: Sat Nov 15 15:01:41 UTC 2014
Modified Files:
src/sys/arch/mips/conf: Makefile.mips
Log Message:
LINKSCRIPT is set only once, so use = not +=.
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/mips/conf/Makefile.mips
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/mips/conf/Makefile.mips
diff -u src/sys/arch/mips/conf/Makefile.mips:1.60 src/sys/arch/mips/conf/Makefile.mips:1.61
--- src/sys/arch/mips/conf/Makefile.mips:1.60 Sat Nov 15 12:29:02 2014
+++ src/sys/arch/mips/conf/Makefile.mips Sat Nov 15 15:01:41 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.mips,v 1.60 2014/11/15 12:29:02 uebayasi Exp $
+# $NetBSD: Makefile.mips,v 1.61 2014/11/15 15:01:41 uebayasi Exp $
# Makefile for NetBSD
#
@@ -102,7 +102,7 @@ TEXTADDR?= ${DEFTEXTADDR}
.endif
KERNLDSCRIPT?= ${MIPS}/conf/kern.ldscript
# some mips ports specify a magic format
-LINKSCRIPT+= -T ${KERNLDSCRIPT}
+LINKSCRIPT= -T ${KERNLDSCRIPT}
EXTRA_LINKFLAGS= ${GP} ${LDOPTS}
LINKFLAGS_NORMAL= -X
STRIPFLAGS= -g -X
CVS commit: src/sys/arch/mips/conf
Module Name:src Committed By: matt Date: Mon Apr 28 22:59:49 UTC 2014 Modified Files: src/sys/arch/mips/conf: files.ralink Log Message: Add pci attachment To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mips/conf/files.ralink 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/mips/conf/files.ralink diff -u src/sys/arch/mips/conf/files.ralink:1.3 src/sys/arch/mips/conf/files.ralink:1.4 --- src/sys/arch/mips/conf/files.ralink:1.3 Tue Aug 2 03:40:00 2011 +++ src/sys/arch/mips/conf/files.ralink Mon Apr 28 22:59:49 2014 @@ -1,4 +1,4 @@ -# $NetBSD: files.ralink,v 1.3 2011/08/02 03:40:00 cliff Exp $ +# $NetBSD: files.ralink,v 1.4 2014/04/28 22:59:49 matt Exp $ file arch/mips/ralink/ralink_intr.c file arch/mips/ralink/ralink_bus.c @@ -43,3 +43,7 @@ device cfi: norbus attach cfi at mainbus with ralink_cfi file arch/mips/ralink/ralink_cfi.c ralink_cfi +# Ralink PCIe +device rpci: pcibus +attach rpci at mainbus with ralink_pci +file arch/mips/ralink/ralink_pci.c ralink_pci
CVS commit: src/sys/arch/mips/conf
Module Name:src
Committed By: christos
Date: Fri Oct 4 15:02:43 UTC 2013
Modified Files:
src/sys/arch/mips/conf: stand.ldscript
Log Message:
discard eh sections
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mips/conf/stand.ldscript
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/mips/conf/stand.ldscript
diff -u src/sys/arch/mips/conf/stand.ldscript:1.4 src/sys/arch/mips/conf/stand.ldscript:1.5
--- src/sys/arch/mips/conf/stand.ldscript:1.4 Tue May 4 11:00:39 2010
+++ src/sys/arch/mips/conf/stand.ldscript Fri Oct 4 11:02:43 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: stand.ldscript,v 1.4 2010/05/04 15:00:39 tsutsui Exp $ */
+/* $NetBSD: stand.ldscript,v 1.5 2013/10/04 15:02:43 christos Exp $ */
/* ldscript for NetBSD/mips stand-alone programs */
OUTPUT_ARCH(mips)
@@ -38,4 +38,10 @@ SECTIONS
}
_end = . ;
PROVIDE (end = .);
+ /DISCARD/ : {
+*(.eh_frame_hdr)
+*(.eh_frame)
+*(.rel.eh_frame)
+*(.rela.eh_frame)
+ }
}
CVS commit: src/sys/arch/mips/conf
Module Name:src Committed By: cliff Date: Tue Aug 2 03:40:01 UTC 2011 Modified Files: src/sys/arch/mips/conf: files.ralink Log Message: CFI NOR support for mips/ralink To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/conf/files.ralink 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/mips/conf/files.ralink diff -u src/sys/arch/mips/conf/files.ralink:1.2 src/sys/arch/mips/conf/files.ralink:1.3 --- src/sys/arch/mips/conf/files.ralink:1.2 Thu Jul 28 15:38:48 2011 +++ src/sys/arch/mips/conf/files.ralink Tue Aug 2 03:40:00 2011 @@ -1,4 +1,4 @@ -# $NetBSD: files.ralink,v 1.2 2011/07/28 15:38:48 matt Exp $ +# $NetBSD: files.ralink,v 1.3 2011/08/02 03:40:00 cliff Exp $ file arch/mips/ralink/ralink_intr.c file arch/mips/ralink/ralink_bus.c @@ -37,3 +37,9 @@ device reth: ether, ifnet, arp, mii attach reth at mainbus file arch/mips/ralink/ralink_eth.c reth + +# Ralink CFI NOR +device cfi: norbus +attach cfi at mainbus with ralink_cfi +file arch/mips/ralink/ralink_cfi.c ralink_cfi +
CVS commit: src/sys/arch/mips/conf
Module Name:src Committed By: cliff Date: Thu Apr 14 05:07:00 UTC 2011 Modified Files: src/sys/arch/mips/conf: files.mips Log Message: - option MIPS_DDB_WATCH is deprecated, removed To generate a diff of this commit: cvs rdiff -u -r1.67 -r1.68 src/sys/arch/mips/conf/files.mips 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/mips/conf/files.mips diff -u src/sys/arch/mips/conf/files.mips:1.67 src/sys/arch/mips/conf/files.mips:1.68 --- src/sys/arch/mips/conf/files.mips:1.67 Wed Apr 6 05:47:54 2011 +++ src/sys/arch/mips/conf/files.mips Thu Apr 14 05:07:00 2011 @@ -1,4 +1,4 @@ -# $NetBSD: files.mips,v 1.67 2011/04/06 05:47:54 matt Exp $ +# $NetBSD: files.mips,v 1.68 2011/04/14 05:07:00 cliff Exp $ # defflag opt_cputype.h NOFPU FPEMUL @@ -19,7 +19,6 @@ defflag opt_mips3_wired.h ENABLE_MIPS3_WIRED_MAP defflag opt_ddb.h DDB_TRACE -defflag opt_ddb.h MIPS_DDB_WATCH file arch/mips/mips/locore_mips1.S mips1 file arch/mips/mips/locore_mips3.S mips3|mips4|mips32|mips32r2|mips64|mips64r2
CVS commit: src/sys/arch/mips/conf
Module Name:src Committed By: matt Date: Wed Apr 6 05:47:54 UTC 2011 Modified Files: src/sys/arch/mips/conf: files.mips Log Message: slight reordering. no functional change. To generate a diff of this commit: cvs rdiff -u -r1.66 -r1.67 src/sys/arch/mips/conf/files.mips 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/mips/conf/files.mips diff -u src/sys/arch/mips/conf/files.mips:1.66 src/sys/arch/mips/conf/files.mips:1.67 --- src/sys/arch/mips/conf/files.mips:1.66 Tue Mar 15 07:39:22 2011 +++ src/sys/arch/mips/conf/files.mips Wed Apr 6 05:47:54 2011 @@ -1,4 +1,4 @@ -# $NetBSD: files.mips,v 1.66 2011/03/15 07:39:22 matt Exp $ +# $NetBSD: files.mips,v 1.67 2011/04/06 05:47:54 matt Exp $ # defflag opt_cputype.h NOFPU FPEMUL @@ -22,7 +22,7 @@ defflag opt_ddb.h MIPS_DDB_WATCH file arch/mips/mips/locore_mips1.S mips1 -file arch/mips/mips/locore_mips3.S mips3|mips4|mips32|mips64|mips32r2|mips64r2 +file arch/mips/mips/locore_mips3.S mips3|mips4|mips32|mips32r2|mips64|mips64r2 file arch/mips/mips/mips3_subr.S mips3|mips4 file arch/mips/mips/mips32_subr.S mips32 file arch/mips/mips/mips32r2_subr.S mips32r2
CVS commit: src/sys/arch/mips/conf
Module Name:src Committed By: dyoung Date: Mon Apr 4 20:01:14 UTC 2011 Modified Files: src/sys/arch/mips/conf: files.adm5120 Log Message: Make usb_dma a dependency of ahci(4), since it needs usb_allocmem(9). To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/conf/files.adm5120 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/mips/conf/files.adm5120 diff -u src/sys/arch/mips/conf/files.adm5120:1.2 src/sys/arch/mips/conf/files.adm5120:1.3 --- src/sys/arch/mips/conf/files.adm5120:1.2 Tue Mar 20 08:55:43 2007 +++ src/sys/arch/mips/conf/files.adm5120 Mon Apr 4 20:01:14 2011 @@ -1,4 +1,4 @@ -# $NetBSD: files.adm5120,v 1.2 2007/03/20 08:55:43 dyoung Exp $ +# $NetBSD: files.adm5120,v 1.3 2011/04/04 20:01:14 dyoung Exp $ file arch/mips/adm5120/adm5120_intr.c @@ -44,6 +44,6 @@ file arch/mips/adm5120/dev/wdc_extio.c wdc_extio # On-chip USB controller -device ahci: usbus +device ahci: usbus, usb_dma attach ahci at obio file arch/mips/adm5120/dev/ahci.c ahci
CVS commit: src/sys/arch/mips/conf
Module Name:src
Committed By: cliff
Date: Fri Mar 18 02:13:46 UTC 2011
Modified Files:
src/sys/arch/mips/conf: files.rmixl
Log Message:
- add config for gpio
- add config for iobus, nand, flash
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mips/conf/files.rmixl
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/mips/conf/files.rmixl
diff -u src/sys/arch/mips/conf/files.rmixl:1.3 src/sys/arch/mips/conf/files.rmixl:1.4
--- src/sys/arch/mips/conf/files.rmixl:1.3 Sun Feb 20 07:45:46 2011
+++ src/sys/arch/mips/conf/files.rmixl Fri Mar 18 02:13:46 2011
@@ -1,4 +1,4 @@
-# $NetBSD: files.rmixl,v 1.3 2011/02/20 07:45:46 matt Exp $
+# $NetBSD: files.rmixl,v 1.4 2011/03/18 02:13:46 cliff Exp $
#
# Configuration info for RMI XLP, XLR, XLS
#
@@ -41,6 +41,11 @@
file arch/mips/rmi/rmixl_com.c com_rmixl
defparam opt_com.hCONSADDR CONSFREQ CONSPEED CONMODE
+# GPIO
+device rmixl_gpio: gpiobus
+attach rmixl_gpio at obio
+file arch/mips/rmi/rmixl_gpio.c rmixl_gpio
+
# PCIe
device rmixl_pcie: pcibus
attach rmixl_pcie at obio
@@ -51,6 +56,23 @@
attach rmixl_pcix at obio
filearch/mips/rmi/rmixl_pcix.c rmixl_pcix needs-flag
+# RMI Periperal IO Bus to Flash, PCMCIA memory controllers
+define rmixl_iobus { [cs=-1], [addr=-1], [size=-1], [intr=-1] }
+device rmixl_iobus: rmixl_iobus
+attach rmixl_iobus at obio
+filearch/mips/rmi/rmixl_iobus_space.c rmixl_iobus
+filearch/mips/rmi/rmixl_iobus.c rmixl_iobus
+
+# NAND flash controller
+device rmixl_nand: nandbus
+attach rmixl_nand at rmixl_iobus
+filearch/mips/rmi/rmixl_nand.c rmixl_nand
+
+# PCMCIA controller
+device rmixl_pcic: pcmciabus
+attach rmixl_pcic at rmixl_iobus
+filearch/mips/rmi/rmixl_pcic.c rmixl_pcic
+
# On-chip USB interface
define rmixl_usbi { [addr=-1], [size=-1], [intr=-1] }
device rmixl_usbi: rmixl_usbi
CVS commit: src/sys/arch/mips/conf
Module Name:src
Committed By: matt
Date: Sat Mar 5 15:19:44 UTC 2011
Modified Files:
src/sys/arch/mips/conf: kern.ldscript
Log Message:
Add missing .debug lines from usr/libdata/ldscripts
Add missing .mdebug lines from usr/libdata/ldscripts
Fixes PR/40522
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mips/conf/kern.ldscript
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/mips/conf/kern.ldscript
diff -u src/sys/arch/mips/conf/kern.ldscript:1.6 src/sys/arch/mips/conf/kern.ldscript:1.7
--- src/sys/arch/mips/conf/kern.ldscript:1.6 Sun Feb 20 07:45:46 2011
+++ src/sys/arch/mips/conf/kern.ldscript Sat Mar 5 15:19:44 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript,v 1.6 2011/02/20 07:45:46 matt Exp $ */
+/* $NetBSD: kern.ldscript,v 1.7 2011/03/05 15:19:44 matt Exp $ */
/* ldscript for NetBSD/mips kernels and LKMs */
OUTPUT_ARCH(mips)
@@ -61,12 +61,37 @@
section so we begin .debug at 0. It's not clear yet what needs to happen
for the others. */
.debug 0 : { *(.debug) }
+ /* DWARF 1 */
.debug_srcinfo 0 : { *(.debug_srcinfo) }
+ .debug_sfnames 0 : { *(.debug_sfnames) }
+ /* DWARF 1.1 and DWARF 2 */
.debug_aranges 0 : { *(.debug_aranges) }
.debug_pubnames 0 : { *(.debug_pubnames) }
- .debug_sfnames 0 : { *(.debug_sfnames) }
- .line 0 : { *(.line) }
+ /* DWARF 2 */
+ .debug_info 0 : { *(.debug_info .gnu.linkonce.wi.*) }
+ .debug_abbrev 0 : { *(.debug_abbrev) }
+ .debug_line 0 : { *(.debug_line) }
+ .debug_frame0 : { *(.debug_frame) }
+ .debug_str 0 : { *(.debug_str) }
+ .debug_loc 0 : { *(.debug_loc) }
+ .debug_macinfo 0 : { *(.debug_macinfo) }
+ /* SGI/MIPS DWARF 2 extensions */
+ .debug_weaknames 0 : { *(.debug_weaknames) }
+ .debug_funcnames 0 : { *(.debug_funcnames) }
+ .debug_typenames 0 : { *(.debug_typenames) }
+ .debug_varnames 0 : { *(.debug_varnames) }
+ /* DWARF3 */
+ .debug_pubtypes 0 : { *(.debug_pubtypes) }
+ .debug_ranges 0 : { *(.debug_ranges) }
+ /* for GDB */
+ .mdebug.abi32 : { KEEP(*(.mdebug.abi32)) }
+ .mdebug.abiN32 : { KEEP(*(.mdebug.abiN32)) }
+ .mdebug.abi64 : { KEEP(*(.mdebug.abi64)) }
+ .mdebug.abiO64 : { KEEP(*(.mdebug.abiO64)) }
+ .mdebug.eabi32 : { KEEP(*(.mdebug.eabi32)) }
+ .mdebug.eabi64 : { KEEP(*(.mdebug.eabi64)) }
/* These must appear regardless of . */
.gptab.sdata : { *(.gptab.data) *(.gptab.sdata) }
.gptab.sbss : { *(.gptab.bss) *(.gptab.sbss) }
+ /DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) }
}
CVS commit: src/sys/arch/mips/conf
Module Name:src
Committed By: matt
Date: Tue Feb 1 06:18:40 UTC 2011
Modified Files:
src/sys/arch/mips/conf: Makefile.mips
Log Message:
Use elf32-ntrad{little,big}mips
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/mips/conf/Makefile.mips
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/mips/conf/Makefile.mips
diff -u src/sys/arch/mips/conf/Makefile.mips:1.56 src/sys/arch/mips/conf/Makefile.mips:1.57
--- src/sys/arch/mips/conf/Makefile.mips:1.56 Fri Jan 21 15:59:07 2011
+++ src/sys/arch/mips/conf/Makefile.mips Tue Feb 1 06:18:40 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.mips,v 1.56 2011/01/21 15:59:07 joerg Exp $
+# $NetBSD: Makefile.mips,v 1.57 2011/02/01 06:18:40 matt Exp $
# Makefile for NetBSD
#
@@ -56,15 +56,15 @@
LDFLAGS+= -m elf64btsmip
LINKFORMAT+= -m elf64btsmip
SYSTEM_LD_TAIL_EXTRA+= \
- ;echo ${OBJCOPY} -O elf32-nbigmips $@ $@.elf32; \
- ${OBJCOPY} -O elf32-nbigmips $@ $@.elf32
+ ;echo ${OBJCOPY} -O elf32-ntradbigmips $@ $@.elf32; \
+ ${OBJCOPY} -O elf32-ntradbigmips $@ $@.elf32
.endif
.if ${MACHINE_ARCH} == mips64el
LDFLAGS+= -m elf64ltsmip
LINKFORMAT+= -m elf64ltsmip
SYSTEM_LD_TAIL_EXTRA+= \
- ;echo ${OBJCOPY} -O elf32-nlittlemips $@ $@.elf32; \
- ${OBJCOPY} -O elf32-nlittlemips $@ $@.elf32
+ ;echo ${OBJCOPY} -O elf32-ntradlittlemips $@ $@.elf32; \
+ ${OBJCOPY} -O elf32-ntradlittlemips $@ $@.elf32
.endif
.endif # LP64=yes
AFLAGS+= -mno-abicalls -x assembler-with-cpp ${AOPTS}
CVS commit: src/sys/arch/mips/conf
Module Name:src
Committed By: tsutsui
Date: Tue May 4 15:00:39 UTC 2010
Modified Files:
src/sys/arch/mips/conf: stand.ldscript
Log Message:
Merge .rodata.* sections (like .rodata.str1.4) into .rodata section.
Newer binutils creates such sections and old firmware might be confused.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mips/conf/stand.ldscript
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/mips/conf/stand.ldscript
diff -u src/sys/arch/mips/conf/stand.ldscript:1.3 src/sys/arch/mips/conf/stand.ldscript:1.4
--- src/sys/arch/mips/conf/stand.ldscript:1.3 Fri Oct 5 05:03:27 2001
+++ src/sys/arch/mips/conf/stand.ldscript Tue May 4 15:00:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: stand.ldscript,v 1.3 2001/10/05 05:03:27 simonb Exp $ */
+/* $NetBSD: stand.ldscript,v 1.4 2010/05/04 15:00:39 tsutsui Exp $ */
/* ldscript for NetBSD/mips stand-alone programs */
OUTPUT_ARCH(mips)
@@ -15,7 +15,7 @@
} =0
_etext = .;
PROVIDE (etext = .);
- .rodata: { *(.rodata) }
+ .rodata: { *(.rodata) *(.rodata.*) }
.data:
{
_fdata = . ;
CVS commit: src/sys/arch/mips/conf
Module Name:src Committed By: matt Date: Sat Aug 1 22:58:36 UTC 2009 Added Files: src/sys/arch/mips/conf: files.bonito Log Message: Extract bonito support from sys/arch/algor/conf/files.algor so it can be used by multiple ports. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/mips/conf/files.bonito Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/arch/mips/conf/files.bonito diff -u /dev/null src/sys/arch/mips/conf/files.bonito:1.1 --- /dev/null Sat Aug 1 22:58:36 2009 +++ src/sys/arch/mips/conf/files.bonito Sat Aug 1 22:58:36 2009 @@ -0,0 +1,8 @@ +# $NetBSD: files.bonito,v 1.1 2009/08/01 22:58:36 matt Exp $ + +device bonito: pcibus +file arch/mips/bonito/bonito_pci.c bonito +file arch/mips/bonito/bonito_iobc.c bonito + +attach bonito at mainbus with bonito_mainbus +#file arch/algor/dev/bonito_mainbus.c bonito_mainbus
CVS commit: src/sys/arch/mips/conf
Module Name:src Committed By: matt Date: Sat Aug 1 22:59:52 UTC 2009 Modified Files: src/sys/arch/mips/conf: files.mips Log Message: Add MIPS64_LOONGSON2F since it needs some special help in various places. To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.60 src/sys/arch/mips/conf/files.mips 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/mips/conf/files.mips diff -u src/sys/arch/mips/conf/files.mips:1.59 src/sys/arch/mips/conf/files.mips:1.60 --- src/sys/arch/mips/conf/files.mips:1.59 Wed Nov 19 18:35:59 2008 +++ src/sys/arch/mips/conf/files.mips Sat Aug 1 22:59:52 2009 @@ -1,8 +1,9 @@ -# $NetBSD: files.mips,v 1.59 2008/11/19 18:35:59 ad Exp $ +# $NetBSD: files.mips,v 1.60 2009/08/01 22:59:52 matt Exp $ # defflag opt_cputype.h NOFPU MIPS64_SB1 +MIPS64_LOONGSON2F # and the rest... # MIPS1 MIPS2 MIPS3 MIPS4 MIPS5 # MIPS32 MIPS64
