Menu
▾
▴
[Linux-mips-commits]CVS: linux/arch/mips config.in,1.83,1.84
|
From: James S. <jsi...@us...> - 2002-01-28 19:44:30
|
Update of /cvsroot/linux-mips/linux/arch/mips
In directory usw-pr-cvs1:/tmp/cvs-serv20627
Modified Files:
config.in
Log Message:
First cut of a highmem implementation. Only usable on CPUs that don't suffer from virtual aliases. In connection with the recent patches for 64-bit physical addresses in pagetables this patch increases the maximum memory supported by the 32-bit kernel into the gigabyte range.
Index: config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/config.in,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- config.in 2002/01/24 20:13:33 1.83
+++ config.in 2002/01/28 19:44:27 1.84
@@ -3,7 +3,6 @@
# see Documentation/kbuild/config-language.txt.
#
define_bool CONFIG_MIPS y
-define_bool CONFIG_MIPS32 y
mainmenu_name "Linux Kernel Configuration"
@@ -18,7 +17,7 @@
bool 'Support for Acer PICA 1 chipset' CONFIG_ACER_PICA_61
bool 'Support for Algorithmics P4032 (EXPERIMENTAL)' CONFIG_ALGOR_P4032
bool 'Support for BAGET MIPS series (EXPERIMENTAL)' CONFIG_BAGET_MIPS
- bool 'Support for Cobalt Server (EXPERIMENTAL)' CONFIG_COBALT_MICRO_SERVER
+ bool 'Support for Cobalt Server (EXPERIMENTAL)' CONFIG_MIPS_COBALT
bool 'Support for DECstations (EXPERIMENTAL)' CONFIG_DECSTATION
bool 'Support for NEC DDB Vrc-5074 (EXPERIMENTAL)' CONFIG_DDB5074
bool 'Support for NEC Eagle board (EXPERIMENTAL)' CONFIG_NEC_EAGLE
@@ -27,12 +26,12 @@
fi
bool 'Support for NEC Korva/Markham board (EXPERIMENTAL)' CONFIG_NEC_KORVA
if [ "$CONFIG_NEC_KORVA" = "y" ]; then
- choice 'Board Variant' \
+ choice 'Board Variant' \
"Korva-8MB CONFIG_NEC_KORVA_8MB\
- Markham-32MB CONFIG_NEC_MARKHAM_32MB" CONFIG_NEC_KORVA_8MB
- if [ "$CONFIG_NEC_MARKHAM_32MB" = "y" ]; then
- bool ' Enable Markham onboard PCI controller' CONFIG_PCI
- fi
+ Markham-32MB CONFIG_NEC_MARKHAM_32MB" CONFIG_NEC_KORVA_8MB
+ if [ "$CONFIG_NEC_MARKHAM_32MB" = "y" ]; then
+ bool ' Enable Markham onboard PCI controller' CONFIG_PCI
+ fi
fi
bool 'Support for Galileo EV96100 Evaluation board' CONFIG_MIPS_EV96100
@@ -70,7 +69,7 @@
bool 'Support for Casio Cassiopeia BE-300 (EXPERIMENTAL)' CONFIG_CASIO_BE300
bool 'Support for Casio Cassiopeia E15 (EXPERIMENTAL)' CONFIG_CASIO_E15
bool 'Support for Vadem Clio 1000 (EXPERIMENTAL)' CONFIG_VADEM_CLIO_1000
- bool 'Support for NEC MobilePro 780 PDA (EXPERIMENTAL)' CONFIG_NEC_MOBILEPRO_780
+ bool 'Support for NEC MobilePro 780 PDA (EXPERIMENTAL)' CONFIG_NEC_MOBILEPRO
bool 'Support for IDT 79S334 Evaluation board' CONFIG_IDT_79S334
bool 'Support for IDT 79EB355 Evaluation board' CONFIG_IDT_79EB355
fi
@@ -165,7 +164,7 @@
fi
if [ "$CONFIG_MIPS_ATLAS" = "y" ]; then
define_bool CONFIG_NEW_TIME_C y
- define_bool CONFIG_NEW_IRQ y
+ define_bool CONFIG_NEW_IRQ y
define_bool CONFIG_NONCOHERENT_IO y
define_bool CONFIG_PCI y
define_bool CONFIG_SWAP_IO_SPACE y
@@ -175,8 +174,8 @@
define_bool CONFIG_PCI y
define_bool CONFIG_HAVE_STD_PC_SERIAL_PORT y
define_bool CONFIG_NEW_IRQ y
- define_bool CONFIG_NONCOHERENT_IO y
define_bool CONFIG_NEW_TIME_C y
+ define_bool CONFIG_NONCOHERENT_IO y
define_bool CONFIG_SWAP_IO_SPACE y
fi
if [ "$CONFIG_MOMENCO_OCELOT" = "y" ]; then
@@ -213,7 +212,7 @@
define_bool CONFIG_ISA y
define_bool CONFIG_NONCOHERENT_IO y
define_bool CONFIG_NEW_IRQ y
- define_bool CONFIG_IRQ_CPU y
+ define_bool CONFIG_IRQ_CPU y
define_bool CONFIG_PCI y
define_bool CONFIG_NEW_PCI y
define_bool CONFIG_PCI_AUTO y
@@ -280,6 +279,16 @@
define_bool CONFIG_PCI_AUTO y
fi
fi
+if [ "$CONFIG_MIPS_COBALT" = "y" ]; then
+ define_bool CONFIG_COBALT_LCD y
+ define_bool CONFIG_PCI y
+ define_bool CONFIG_NEW_IRQ y
+ define_bool CONFIG_NEW_TIME_C y
+ define_bool CONFIG_NONCOHERENT_IO y
+ define_bool CONFIG_I8259 y
+ define_bool CONFIG_NEW_PCI y
+ define_bool CONFIG_PCI_AUTO y
+fi
if [ "$CONFIG_MIPS_ITE8172" = "y" ]; then
define_bool CONFIG_PCI y
define_bool CONFIG_IT8712 y
@@ -332,7 +341,6 @@
define_bool CONFIG_PC_KEYB y
fi
fi
-
if [ "$CONFIG_IDT_79EB355" = "y" ]; then
define_bool CONFIG_CPU_RC32355 y
define_bool CONFIG_NEW_IRQ y
@@ -346,22 +354,6 @@
define_bool CONFIG_PC_KEYB y
fi
fi
-if [ "$CONFIG_COBALT_MICRO_SERVER" = "y" ]; then
- define_bool COBALT_MICRO_SERVER y
- define_bool CONFIG_NO_SWAPPER y
- define_bool CONFIG_COBALT_27 y
- define_bool CONFIG_NO_KEYBOARD y
- define_bool CONFIG_NO_VIDEO_CONSOLE y
- define_bool CONFIG_COBALT_LCD y
- define_bool CONFIG_ISA y
- define_bool CONFIG_PCI y
- define_bool CONFIG_NEW_IRQ y
- define_bool CONFIG_I8259 y
- define_bool CONFIG_NEW_PCI y
- define_bool CONFIG_PCI_AUTO y
- define_bool CONFIG_NONCOHERENT_IO y
- define_bool CONFIG_NEW_TIME_C y
-fi
if [ "$CONFIG_VADEM_CLIO_1000" = "y" ]; then
define_bool CONFIG_CPU_VR41XX y
define_bool CONFIG_VR4111 y
@@ -392,6 +384,7 @@
define_bool CONFIG_NONCOHERENT_IO y
define_bool CONFIG_PC_KEYB y
fi
+
if [ "$CONFIG_PS2" = "y" ]; then
define_bool CONFIG_PC_KEYB y
define_bool CONFIG_BOARD_SCACHE y
@@ -423,6 +416,7 @@
define_bool CONFIG_DUMMY_KEYB y
define_bool CONFIG_FB_SIMPLE y
fi
+
if [ "$CONFIG_HP_LASERJET" = "y" ]; then
define_bool CONFIG_IRQ_CPU y
define_bool CONFIG_NEW_TIME_C y
@@ -432,6 +426,11 @@
define_bool CONFIG_PCI y
#not yet define_bool CONFIG_PCI_AUTO y
fi
+
+if [ "$CONFIG_SIBYTE_SWARM" = "y" ]; then
+ define_bool CONFIG_NEW_TIME_C y
+fi
+
if [ "$CONFIG_TOSHIBA_JMR3927" = "y" ]; then
define_bool CONFIG_TOSHIBA_BOARDS y
define_bool CONFIG_PCI y
@@ -441,7 +440,7 @@
define_bool CONFIG_NEW_TIME_C y
define_bool CONFIG_SWAP_IO_SPACE y
define_bool CONFIG_PC_KEYB y
- define_bool CONFIG_NONCOHERENT_IO y
+ define_bool CONFIG_NONCOHERENT_IO y
fi
if [ "$CONFIG_ISA" != "y" ]; then
@@ -474,7 +473,7 @@
R49XX CONFIG_CPU_TX49XX \
R5000 CONFIG_CPU_R5000 \
R5432 CONFIG_CPU_R5432 \
- R5900 CONFIG_CPU_R5900 \
+ R5900 CONFIG_CPU_R5900 \
RM7000 CONFIG_CPU_RM7000 \
SR7100 CONFIG_CPU_SR7100 \
R52xx CONFIG_CPU_NEVADA \
@@ -490,6 +489,16 @@
define_bool CONFIG_VTAG_ICACHE y
fi
+if [ "$CONFIG_CPU_R4X00" = "y" -o \
+ "$CONFIG_CPU_R5000" = "y" -o \
+ "$CONFIG_CPU_RM7000" = "y" -o \
+ "$CONFIG_CPU_R10000" = "y" -o \
+ "$CONFIG_CPU_SB1" = "y" -o \
+ "$CONFIG_CPU_MIPS32" = "y" -o \
+ "$CONFIG_CPU_MIPS64" = "y" ]; then
+ bool ' Support for 64-bit physical addresspace' CONFIG_64BIT_PHYS_ADDR
+fi
+
bool 'Override CPU Options' CONFIG_CPU_ADVANCED
if [ "$CONFIG_CPU_ADVANCED" = "y" ]; then
bool ' ll/sc Instructions available' CONFIG_CPU_HAS_LLSC
@@ -526,10 +535,11 @@
comment 'General setup'
if [ "$CONFIG_DECSTATION" = "y" -o \
"$CONFIG_DDB5074" = "y" -o \
- "$CONFIG_NINO" = "y" -o
- "$CONFIG_VR4111" = "y" -o \
- "$CONFIG_VR4121" = "y" -o \
- "$CONFIG_VR4122" = "y" -o \
+ "$CONFIG_NINO" = "y" -o \
+ "$CONFIG_MIPS_COBALT" = "y" -o \
+ "$CONFIG_VR4111" = "y" -o \
+ "$CONFIG_VR4121" = "y" -o \
+ "$CONFIG_VR4122" = "y" -o \
"$CONFIG_NEC_KORVA" = "y" ]; then
define_bool CONFIG_CPU_LITTLE_ENDIAN y
else
@@ -540,7 +550,7 @@
dep_bool ' Enable Vr4131 cache fixes for early rev processors' CONFIG_VR4131_CACHE_FIX $CONFIG_VR4131
if [ "$CONFIG_TOSHIBA_JMR3927" = "y" ]; then
- bool 'DS1742 BRAM/RTC support' CONFIG_RTC_DS1742
+ bool 'DS1742 BRAM/RTC support' CONFIG_RTC_DS1742
fi
if [ "$CONFIG_PROC_FS" = "y" ]; then
|
