Menu
▾
▴
[Linux-mips-commits]CVS: linux/arch/mips64 Makefile,1.7,1.8 config.in,1.12,1.13 defconfig,1.13,1.14
|
From: James S. <jsi...@us...> - 2002-01-28 20:32:31
|
Update of /cvsroot/linux-mips/linux/arch/mips64
In directory usw-pr-cvs1:/tmp/cvs-serv7656/arch/mips64
Modified Files:
Makefile config.in defconfig
Log Message:
Big overhaul of 64-bit kernel along the lines of what we already have for the 64-bit kernel just more radical.
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips64/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile 2002/01/02 19:12:17 1.7
+++ Makefile 2002/01/28 20:31:57 1.8
@@ -46,28 +46,25 @@
# CPU-dependent compiler/assembler options for optimization.
#
ifdef CONFIG_CPU_R4300
-CFLAGS := $(CFLAGS) -mcpu=r4300 -mips3
+CFLAGS += -mcpu=r4300 -mips3
endif
ifdef CONFIG_CPU_R4X00
-CFLAGS := $(CFLAGS) -mcpu=r4600 -mips3
+CFLAGS += -mcpu=r4600 -mips3
endif
ifdef CONFIG_CPU_R5000
-CFLAGS := $(CFLAGS) -mcpu=r8000 -mips4
+CFLAGS += -mcpu=r8000 -mips4
endif
ifdef CONFIG_CPU_NEVADA
-CFLAGS := $(CFLAGS) -mcpu=r8000 -mips3 -mmad
+CFLAGS += -mcpu=r8000 -mips3 -mmad
endif
ifdef CONFIG_CPU_R8000
-CFLAGS := $(CFLAGS) -mcpu=r8000 -mips4
+CFLAGS += -mcpu=r8000 -mips4
endif
ifdef CONFIG_CPU_R10000
-CFLAGS := $(CFLAGS) -mcpu=r8000 -mips4
+CFLAGS += -mcpu=r8000 -mips4
endif
ifdef CONFIG_CPU_SB1
-GCCFLAGS += -mcpu=sb1 -mips2 -Wa,--trap
-ifdef CONFIG_SB1_PASS_1_WORKAROUNDS
-MODFLAGS += -msb1-pass1-workarounds
-endif
+CFLAGS += -mcpu=r8000 -mips4
endif
ifdef CONFIG_MIPS_FPU_EMULATOR
@@ -127,6 +124,31 @@
# 16kb aligned or the handling of the current variable will break.
#
LOADADDR += 0x80002000
+endif
+
+#
+# Sibyte SB1250 SOC
+#
+ifdef CONFIG_SIBYTE_SB1250
+# This is a LIB so that it links at the end, and initcalls are later
+# the sequence; but it is built as an object so that modules don't get
+# removed (as happens, even if they have __initcall/module_init)
+LIBS += arch/mips/sibyte/sb1250/sb1250.o
+SUBDIRS += arch/mips/sibyte/sb1250
+endif
+
+#
+# Sibyte SWARM board
+#
+ifdef CONFIG_SB1_CACHE_ERROR
+LIBS += arch/mips/sibyte/sb1/sb1kern.a
+SUBDIRS += arch/mips/sibyte/sb1
+endif
+
+ifdef CONFIG_SIBYTE_SWARM
+LIBS += arch/mips/sibyte/swarm/sbswarm.a
+SUBDIRS += arch/mips/sibyte/swarm
+LOADADDR += 0x80100000
endif
#
Index: config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips64/config.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- config.in 2002/01/02 19:12:17 1.12
+++ config.in 2002/01/28 20:31:57 1.13
@@ -24,6 +24,20 @@
bool ' Support for SGI-IP32 (O2)' CONFIG_SGI_IP32
fi
bool ' Support for SiByte SWARM board' CONFIG_SIBYTE_SWARM
+ if [ "$CONFIG_SIBYTE_SB1250" = "y" ]; then
+ bool ' Support for SB1250 onchip PCI controller' CONFIG_PCI
+ bool ' Support for SB1250 profiling - SB1/SCD perf counters' CONFIG_SIBYTE_SB1250_PROF
+ bool ' Support for BCM1250 profiling using trace buffer' CONFIG_BCM1250_TBPROF
+ bool ' Remote debugging (kgdb over UART 1)' CONFIG_REMOTE_DEBUG
+ bool ' Support for SiByte SWARM board' CONFIG_SIBYTE_SWARM
+ if [ "$CONFIG_SIBYTE_SWARM" = "y" ]; then
+ bool ' Running under simulation' CONFIG_SIMULATION
+ bool ' Configure for L3proc Demo' CONFIG_L3DEMO
+ int ' Maximum memory chunks' CONFIG_SIBYTE_SWARM_MAX_MEM_REGIONS 16
+ bool ' Multi-Processing support' CONFIG_SMP
+ fi
+fi
+
if [ "$CONFIG_SGI_IP27" = "y" ]; then
bool ' IP27 N-Mode' CONFIG_SGI_SN0_N_MODE
@@ -92,7 +106,7 @@
define_bool CONFIG_PC_KEYB y
define_bool CONFIG_PCI y
#define_bool CONFIG_BOARD_SCACHE y
- define_bool CONFIG_MAPPED_PCI_IO y
+ define_bool CONFIG_MAPPED_PCI_IO n
define_bool CONFIG_NONCOHERENT_IO y
define_bool CONFIG_ARC_MEMORY y
define_int CONFIG_L1_CACHE_SHIFT 5
@@ -132,6 +146,12 @@
R10000 CONFIG_CPU_R10000 \
SB1 CONFIG_CPU_SB1" R4x00
endmenu
+
+if [ "$CONFIG_CPU_SB1" = "y" ]; then
+ bool ' Workarounds for pass 1 sb1 bugs' CONFIG_SB1_PASS_1_WORKAROUNDS
+ bool ' Support for SB1 Cache Error handler' CONFIG_SB1_CACHE_ERROR
+ define_bool CONFIG_VTAG_ICACHE y
+fi
define_bool CONFIG_CPU_HAS_LLSC y
define_bool CONFIG_CPU_HAS_LLDSCD y
Index: defconfig
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips64/defconfig,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- defconfig 2001/12/05 19:49:28 1.13
+++ defconfig 2002/01/28 20:31:57 1.14
@@ -1,6 +1,8 @@
#
# Automatically generated make config: don't edit
#
+CONFIG_MIPS=y
+CONFIG_MIPS64=y
#
# Code maturity level options
@@ -110,8 +112,6 @@
#
CONFIG_PACKET=y
CONFIG_PACKET_MMAP=y
-CONFIG_NETLINK=y
-CONFIG_RTNETLINK=y
CONFIG_NETLINK_DEV=y
# CONFIG_NETFILTER is not set
# CONFIG_FILTER is not set
|
