Update of /cvsroot/linux-mips/linux/arch/mips
In directory usw-pr-cvs1:/tmp/cvs-serv7520
Modified Files:
Makefile config.in
Log Message:
Cleanup Makefile crap and add support for Sibyte SB1250 / SWARM.
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/Makefile,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- Makefile 2001/11/01 21:58:13 1.26
+++ Makefile 2001/11/08 17:42:07 1.27
@@ -94,7 +94,10 @@
endif
ifdef CONFIG_CPU_SB1
GCCFLAGS += -mcpu=sb1 -mips2 -Wa,--trap
+ifdef CONFIG_SB1_PASS_1_WORKAROUNDS
+MODFLAGS += -msb1-pass1-workarounds
endif
+endif
GCCFLAGS += -pipe
@@ -313,8 +316,34 @@
# Au1000 eval board
#
ifdef CONFIG_MIPS_PB1000
-LIBS += arch/mips/au1000/pb1000/pb1000.o arch/mips/au1000/common/au1000.o
+LIBS += arch/mips/au1000/pb1000/pb1000.o \
+ arch/mips/au1000/common/au1000.o
SUBDIRS += arch/mips/au1000/pb1000 arch/mips/au1000/common
+LOADADDR += 0x80100000
+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/mips/config.in,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- config.in 2001/11/06 02:57:37 1.47
+++ config.in 2001/11/08 17:42:07 1.48
@@ -3,7 +3,6 @@
# see Documentation/kbuild/config-language.txt.
#
define_bool CONFIG_MIPS y
-define_bool CONFIG_SMP n
mainmenu_name "Linux Kernel Configuration"
@@ -44,6 +43,37 @@
Model-200/210/312/320/325/350/390 CONFIG_NINO_8MB \
Model-500/510 CONFIG_NINO_16MB" CONFIG_NINO_8MB
fi
+ bool 'Support for SiByte SB1250 SOC' CONFIG_SIBYTE_SB1250
+ 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
+ bool ' Standalone compile (for simulation without firmware)' CONFIG_SWARM_STANDALONE
+ if [ "$CONFIG_SWARM_STANDALONE" = "y" ]; then
+ int ' Memory size (in megabytes)' CONFIG_SIBYTE_SWARM_RAM_SIZE 32
+ fi
+ if [ "$CONFIG_SWARM_STANDALONE" = "n" ]; then
+ int ' Maximum memory chunks' CONFIG_SIBYTE_SWARM_MAX_MEM_REGIONS 16
+ bool ' Multi-Processing support' CONFIG_SMP
+ fi
+ if [ "$CONFIG_BLK_DEV_INITRD" = "y" ]; then
+ bool ' Embed root filesystem ramdisk into the kernel' CONFIG_EMBEDDED_RAMDISK
+ if [ "$CONFIG_EMBEDDED_RAMDISK" = "y" ]; then
+ choice ' Ramdisk Image to use for root filesystem' \
+ "Simple-init CONFIG_SIBYTE_RAMDISK_SIMPLE_INIT \
+ General CONFIG_SIBYTE_RAMDISK_GENERAL \
+ Promice-console CONFIG_SIBYTE_RAMDISK_PROMICE_CONSOLE\
+ N+I-demo CONFIG_SIBYTE_RAMDISK_NIDEMO\
+ Screening CONFIG_SIBYTE_RAMDISK_SCREENING" General
+ fi
+ fi
+ fi
+ fi
bool 'Support for Sony PlayStation 2' CONFIG_PS2
bool 'Support for Casio Cassiopeia BE-300 (EXPERIMENTAL)' CONFIG_CASIO_BE300
bool 'Support for Vadem Clio 1000 (EXPERIMENTAL)' CONFIG_VADEM_CLIO_1000
@@ -88,6 +118,13 @@
define_bool CONFIG_MCA n
define_bool CONFIG_SBUS n
+if [ "$CONFIG_SIBYTE_SB1250" = "y" ]; then
+ define_bool CONFIG_COHERENT_IO y
+ define_bool CONFIG_NEW_IRQ y
+ define_bool CONFIG_PCI n
+ define_bool CONFIG_SWAP_IO_SPACE y
+fi
+
if [ "$CONFIG_MIPS_EV96100" = "y" ]; then
define_bool CONFIG_PCI y
define_bool CONFIG_MIPS_GT96100 y
@@ -337,8 +374,12 @@
MIPS32 CONFIG_CPU_MIPS32 \
MIPS64 CONFIG_CPU_MIPS64" R4x00
-bool 'Override CPU Options' CONFIG_CPU_ADVANCED
+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
+fi
+bool 'Override CPU Options' CONFIG_CPU_ADVANCED
if [ "$CONFIG_CPU_ADVANCED" = "y" ]; then
bool ' ll/sc Instructions available' CONFIG_CPU_HAS_LLSC
bool ' lld/scd Instructions available' CONFIG_CPU_HAS_LLDSCD
|
