Author: imp
Date: Sun Jan 10 05:46:19 2010
New Revision: 201986
URL: http://svn.freebsd.org/changeset/base/201986
Log:
Merge from projects/mips to head by hand:
r200593 | imp | 2009-12-15 16:22:19 -0700 (Tue, 15 Dec 2009) | 4 lines
Remove the now-obsolete comments about compile-with. There are no
compile-with lines in this file at all. So we don't need two warnings
about them.
r198669 | rrs | 2009-10-30 02:53:11 -0600 (Fri, 30 Oct 2009) | 5 lines
With this commit our friend RMI will now compile. I have
not tested it and the chances of it running yet are about
ZERO.. but it will now compile. The hard part now begins,
making it run ;-)
r198311 | neel | 2009-10-20 18:56:13 -0600 (Tue, 20 Oct 2009) | 8 lines
Update options.mips to support config options required to build the SWARM
kernel.
The SWARM kernel does not build yet but at least it gets past the kernel
config stage.
r198154 | rrs | 2009-10-15 15:03:32 -0600 (Thu, 15 Oct 2009) | 10 lines
Does 4 things:
1) Adds future RMI directories
2) Places intr_machdep.c in specfic files.arch pointing to the generic
intr_machdep.c. This allows us to have an architecture dependant
intr_machdep.c (which we will need for RMI) in the machine specific
directory
3) removes intr_machdep.c from files.mips
4) Adds some TARGET_XLR_XLS ifdef's for the machine specific intra_machdep.h.
We
may need to look at finding a better place to put this. But first I want to
get this thing compiling.
r196315 | imp | 2009-08-17 06:37:06 -0600 (Mon, 17 Aug 2009) | 5 lines
Like qdivrem, remove the other quad_t support stuff from 64-bit
kernels.
r195331 | imp | 2009-07-03 20:49:17 -0600 (Fri, 03 Jul 2009) | 4 lines
Merge in new cfe environment passing of kenv for swarm/sibyte boards.
Submitted by: Neelkanth Natu
r195732 | gonzo | 2009-07-16 20:28:27 -0600 (Thu, 16 Jul 2009) | 2 lines
- Add DES and Blowfish implementstions to build. Required by crypto(4)
r195437 | imp | 2009-07-07 23:57:58 -0600 (Tue, 07 Jul 2009) | 2 lines
The kernel isn't quite ready for this to be optional...
r195401 | imp | 2009-07-06 02:16:25 -0600 (Mon, 06 Jul 2009) | 4 lines
Only build qdivrem on 32-bit ISA...
r195331 | imp | 2009-07-03 20:49:17 -0600 (Fri, 03 Jul 2009) | 4 lines
Merge in new cfe environment passing of kenv for swarm/sibyte boards.
Submitted by: Neelkanth Natu
r195165 | gonzo | 2009-06-29 11:36:47 -0600 (Mon, 29 Jun 2009) | 2 lines
- add sys_machdep.c to build
r192864 | gonzo | 2009-05-26 16:40:12 -0600 (Tue, 26 May 2009) | 4 lines
- Replace CPU_NOFPU and SOFTFLOAT options with CPU_FPU. By default
we assume that there is no FPU, because majority of SoC does
not have it.
r191085 | gonzo | 2009-04-14 20:41:35 -0600 (Tue, 14 Apr 2009) | 2 lines
- mainbus.c seems not to be used, disconnect it from build
r191084 | gonzo | 2009-04-14 20:28:26 -0600 (Tue, 14 Apr 2009) | 6 lines
Use FreeBSD/arm approach for handling bus space access: space tag is a pointer
to bus_space structure that defines access methods and hence every bus can
define own accessors. Default space is mips_bus_space_generic. It's a simple
interface to physical memory, values are read with regard to host system
byte order.
r187418 | gonzo | 2009-01-18 19:37:10 -0700 (Sun, 18 Jan 2009) | 4 lines
- Add trampoline stuff for bootloaders that do not support ELF
- Replace arm'ish KERNPHYSADDR/KERNVIRTADDR with
KERNLOADADDR/TRAMPLOADADDR and clean configs
r187415 | gonzo | 2009-01-18 16:49:02 -0700 (Sun, 18 Jan 2009) | 3 lines
- Move Silicon Backplanes code out to system-wide level (dev/siba) as
it's going to be used not only for siba5 devices.
Modified:
head/sys/conf/files.mips
head/sys/conf/options.mips
Modified: head/sys/conf/files.mips
==============================================================================
--- head/sys/conf/files.mips Sun Jan 10 05:36:38 2010 (r201985)
+++ head/sys/conf/files.mips Sun Jan 10 05:46:19 2010 (r201986)
@@ -5,10 +5,6 @@
# All rights reserved.
# JNPR: files.mips,v 1.11 2007/08/09 12:25:35 katta
#
-# The long compile-with and dependency lines are required because of
-# limitations in config: backslash-newline doesn't work in strings, and
-# dependency lines other than the first are silently ignored.
-#
# ----------------------------------------------------------------------
# Phase 2
# ----------------------------------------------------------------------
@@ -20,10 +16,6 @@
# JNPR: files.mips,v 1.11 2007/08/09 12:25:35 katta
# $FreeBSD$
#
-# The long compile-with and dependency lines are required because of
-# limitations in config: backslash-newline doesn't work in strings, and
-# dependency lines other than the first are silently ignored.
-#
# ----------------------------------------------------------------------
# Phase 2
# ----------------------------------------------------------------------
@@ -38,14 +30,13 @@ mips/mips/cpu.c standard
mips/mips/elf_machdep.c standard
mips/mips/exception.S standard
mips/mips/gdb_machdep.c standard
-mips/mips/mainbus.c standard
+# mips/mips/mainbus.c standard
mips/mips/pmap.c standard
mips/mips/trap.c standard
mips/mips/vm_machdep.c standard
# ----------------------------------------------------------------------
# Phase 4
# ----------------------------------------------------------------------
-mips/mips/tick.c standard
# ----------------------------------------------------------------------
# Phase 5
# ----------------------------------------------------------------------
@@ -54,6 +45,7 @@ mips/mips/pm_machdep.c standard
mips/mips/swtch.S standard
mips/mips/tlb.S standard
+mips/mips/bus_space_generic.c standard
mips/mips/busdma_machdep.c standard
mips/mips/cache.c standard
mips/mips/cache_mipsNN.c standard
@@ -63,30 +55,32 @@ mips/mips/db_interface.c optional ddb
mips/mips/db_trace.c optional ddb
mips/mips/dump_machdep.c standard
mips/mips/in_cksum.c optional inet
-mips/mips/intr_machdep.c standard
mips/mips/locore.S standard no-obj
mips/mips/mem.c optional mem
mips/mips/nexus.c standard
mips/mips/stack_machdep.c optional ddb | stack
mips/mips/support.S standard
+mips/mips/sys_machdep.c standard
mips/mips/swtch.S standard
mips/mips/uio_machdep.c standard
+crypto/blowfish/bf_enc.c optional crypto | ipsec
+crypto/des/des_enc.c optional crypto | ipsec | netsmb
geom/geom_bsd.c optional geom_bsd
geom/geom_bsd_enc.c optional geom_bsd
geom/geom_mbr.c optional geom_mbr
geom/geom_mbr_enc.c optional geom_mbr
libkern/ashldi3.c standard
libkern/ashrdi3.c standard
-libkern/divdi3.c standard
+libkern/divdi3.c optional isa_mips32
libkern/ffsl.c standard
libkern/fls.c standard
libkern/flsl.c standard
libkern/lshrdi3.c standard
libkern/memmove.c standard
-libkern/moddi3.c standard
-libkern/qdivrem.c standard
-libkern/udivdi3.c standard
-libkern/umoddi3.c standard
+libkern/moddi3.c optional isa_mips32
+libkern/qdivrem.c optional isa_mips32
+libkern/udivdi3.c optional isa_mips32
+libkern/umoddi3.c optional isa_mips32
#XXX: We can't use these versions, as strcmp.c is included conf/files
#libkern/mips/strcmp.S standard
@@ -94,5 +88,10 @@ libkern/umoddi3.c standard
dev/cfe/cfe_api.c optional cfe
dev/cfe/cfe_console.c optional cfe_console
+dev/cfe/cfe_env.c optional cfe_env
#dev/cfe/cfe_resource.c optional cfe # not yet needed
+dev/siba/siba.c optional siba
+dev/siba/siba_pcib.c optional siba pci
+dev/siba/siba_cc.c optional siba
+#mips/sentry5/siba_mips.c optional siba # not yet
Modified: head/sys/conf/options.mips
==============================================================================
--- head/sys/conf/options.mips Sun Jan 10 05:36:38 2010 (r201985)
+++ head/sys/conf/options.mips Sun Jan 10 05:46:19 2010 (r201986)
@@ -31,8 +31,9 @@
CPU_MIPS4KC opt_global.h
CPU_MIPS32 opt_global.h
CPU_MIPS64 opt_global.h
-CPU_NOFPU opt_global.h
CPU_SENTRY5 opt_global.h
+CPU_HAVEFPU opt_global.h
+CPU_SB1 opt_global.h
ISA_MIPS1 opt_cputype.h
ISA_MIPS3 opt_cputype.h
@@ -44,14 +45,30 @@ ISA_MIPS64v2 opt_cputype.h
YAMON opt_global.h
CFE opt_global.h
CFE_CONSOLE opt_global.h
+CFE_ENV opt_global.h
+CFE_ENV_SIZE opt_global.h
KERNPHYSADDR opt_global.h
KERNVIRTADDR opt_global.h
PHYSADDR opt_global.h
-SOFTFLOAT opt_global.h
-
+PHYS_ADDR_64BIT opt_global.h
+NOFPU opt_global.h
TARGET_OCTEON opt_global.h
TARGET_EMULATOR opt_ddb.h
+TARGET_XLR_XLS opt_global.h
TICK_USE_YAMON_FREQ opt_global.h
TICK_USE_MALTA_RTC opt_global.h
+
+#
+# The MIPS architecture does not have separate memory and i/o address space
+# like x86. However some MIPS processors provide a memory-mapped window that
+# maps onto the PCI I/O space.
+#
+PCI_IOSPACE_SIZE opt_global.h
+PCI_IOSPACE_ADDR opt_global.h
+
+#
+# The highest memory address that can be used by the kernel in units of KB.
+#
+MAXMEM opt_global.h
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
