patch-2.4.22 linux-2.4.22/arch/sh/config.in
Next file: linux-2.4.22/arch/sh/kernel/Makefile
Previous file: linux-2.4.22/arch/sh/Makefile
Back to the patch index
Back to the overall index
- Lines: 248
- Date:
2003-08-25 04:44:40.000000000 -0700
- Orig file:
linux-2.4.21/arch/sh/config.in
- Orig date:
2003-06-13 07:51:32.000000000 -0700
diff -urN linux-2.4.21/arch/sh/config.in linux-2.4.22/arch/sh/config.in
@@ -30,6 +30,7 @@
"Generic CONFIG_SH_GENERIC \
SolutionEngine CONFIG_SH_SOLUTION_ENGINE \
SolutionEngine7751 CONFIG_SH_7751_SOLUTION_ENGINE \
+ SHMobileSolutionEngine CONFIG_SH_MOBILE_SOLUTION_ENGINE \
STB1_Harp CONFIG_SH_STB1_HARP \
STB1_Overdrive CONFIG_SH_STB1_OVERDRIVE \
HP620 CONFIG_SH_HP620 \
@@ -42,11 +43,15 @@
CAT68701 CONFIG_SH_CAT68701 \
BigSur CONFIG_SH_BIGSUR \
SH2000 CONFIG_SH_SH2000 \
+ HS7729PCI CONFIG_SH_HS7729PCI \
ADX CONFIG_SH_ADX \
+ SecureEdge5410 CONFIG_SH_SECUREEDGE5410 \
+ KeyWest CONFIG_SH_KEYWEST \
BareCPU CONFIG_SH_UNKNOWN" Generic
-# The SH7750 RTC module is disabled in the Dreamcast
-if [ "$CONFIG_SH_DREAMCAST" = "y" ]; then
+# The SH7750 RTC module is disabled in the Dreamcast and SH-Mobile SolutionEngine
+if [ "$CONFIG_SH_DREAMCAST" = "y" -o \
+ "$CONFIG_SH_MOBILE_SOLUTION_ENGINE" = "y" ]; then
define_bool CONFIG_SH_RTC n
else
define_bool CONFIG_SH_RTC y
@@ -58,12 +63,18 @@
fi
choice 'Processor type' \
- "SH7707 CONFIG_CPU_SUBTYPE_SH7707 \
+ "SH7300 CONFIG_CPU_SUBTYPE_SH7300 \
+ SH7707 CONFIG_CPU_SUBTYPE_SH7707 \
SH7708 CONFIG_CPU_SUBTYPE_SH7708 \
SH7709 CONFIG_CPU_SUBTYPE_SH7709 \
SH7750 CONFIG_CPU_SUBTYPE_SH7750 \
SH7751 CONFIG_CPU_SUBTYPE_SH7751 \
- ST40STB1 CONFIG_CPU_SUBTYPE_ST40STB1" SH7708
+ ST40RA/ST40STB1 CONFIG_CPU_SUBTYPE_ST40STB1 \
+ ST40GX1 CONFIG_CPU_SUBTYPE_ST40GX1" SH7708
+if [ "$CONFIG_CPU_SUBTYPE_SH7300" = "y" ]; then
+ define_bool CONFIG_CPU_SH3 y
+ define_bool CONFIG_CPU_SH4 n
+fi
if [ "$CONFIG_CPU_SUBTYPE_SH7707" = "y" ]; then
define_bool CONFIG_CPU_SH3 y
define_bool CONFIG_CPU_SH4 n
@@ -87,6 +98,12 @@
if [ "$CONFIG_CPU_SUBTYPE_ST40STB1" = "y" ]; then
define_bool CONFIG_CPU_SH3 n
define_bool CONFIG_CPU_SH4 y
+ define_bool CONFIG_CPU_SUBTYPE_ST40 y
+fi
+if [ "$CONFIG_CPU_SUBTYPE_ST40GX1" = "y" ]; then
+ define_bool CONFIG_CPU_SH3 n
+ define_bool CONFIG_CPU_SH4 y
+ define_bool CONFIG_CPU_SUBTYPE_ST40 y
fi
bool 'Little Endian' CONFIG_CPU_LITTLE_ENDIAN
# Platform-specific memory start and size definitions
@@ -100,13 +117,19 @@
define_hex CONFIG_MEMORY_SIZE 04000000
define_bool CONFIG_MEMORY_SET y
fi
+if [ "$CONFIG_SH_MOBILE_SOLUTION_ENGINE" = "y" ]; then
+ define_hex CONFIG_MEMORY_START 0c000000
+ define_hex CONFIG_MEMORY_SIZE 04000000
+ define_bool CONFIG_MEMORY_SET y
+fi
if [ "$CONFIG_SH_HP600" = "y" -o "$CONFIG_SH_BIGSUR" = "y" -o \
- "$CONFIG_SH_DREAMCAST" = "y" -o "$CONFIG_SH_SH2000" = "y" ]; then
+ "$CONFIG_SH_DREAMCAST" = "y" -o "$CONFIG_SH_SH2000" = "y" -o \
+ "$CONFIG_SH_KEYWEST" = "y" ]; then
define_hex CONFIG_MEMORY_START 0c000000
define_hex CONFIG_MEMORY_SIZE 00400000
define_bool CONFIG_MEMORY_SET y
fi
-if [ "$CONFIG_CPU_SUBTYPE_ST40STB1" = "y" ]; then
+if [ "$CONFIG_CPU_SUBTYPE_ST40" = "y" ]; then
bool 'Memory on LMI' CONFIG_ST40_LMI_MEMORY
if [ "$CONFIG_ST40_LMI_MEMORY" = "y" ] ; then
define_hex CONFIG_MEMORY_START 08000000
@@ -119,11 +142,29 @@
define_hex CONFIG_MEMORY_SIZE 00400000
define_bool CONFIG_MEMORY_SET y
fi
+if [ "$CONFIG_SH_SECUREEDGE5410" = "y" ]; then
+ define_hex CONFIG_MEMORY_START 08000000
+ define_hex CONFIG_MEMORY_SIZE 01000000
+ define_bool CONFIG_MEMORY_SET y
+fi
+if [ "$CONFIG_SH_HS7729PCI" = "y" ]; then
+ define_hex CONFIG_MEMORY_START 0c000000
+ define_hex CONFIG_MEMORY_SIZE 04000000
+ define_bool CONFIG_MEMORY_SET y
+fi
# If none of the above have set memory start/size, ask the user.
if [ "$CONFIG_MEMORY_SET" != "y" ]; then
hex 'Physical memory start address' CONFIG_MEMORY_START 08000000
hex 'Physical memory size' CONFIG_MEMORY_SIZE 00400000
fi
+dep_bool 'Enable OC RAM zone (experimental)' CONFIG_SCRATCH_SPACE $CONFIG_EXPERIMENTAL
+
+if [ "$CONFIG_CPU_SUBTYPE_ST40" = "y" ]; then
+ bool 'PCI emulation of on-chip peripherals' CONFIG_SH_PCI_EMULATION
+ if [ "$CONFIG_SH_PCI_EMULATION" = "y" -a "$CONFIG_CPU_SUBTYPE_ST40GX1" = "y" ]; then
+ bool ' USB OHCI Host Controller' CONFIG_SH_PCI_USB
+ fi
+fi
endmenu
if [ "$CONFIG_SH_HP690" = "y" ]; then
@@ -138,7 +179,13 @@
# Even on SuperH devices which don't have an ISA bus,
# this variable helps the PCMCIA modules handle
# IRQ requesting properly -- Greg Banks.
-define_bool CONFIG_ISA y
+
+if [ "$CONFIG_SH_SECUREEDGE5410" = "y" ]; then
+ define_bool CONFIG_ISA n
+else
+ define_bool CONFIG_ISA y
+fi
+
define_bool CONFIG_EISA n
define_bool CONFIG_MCA n
define_bool CONFIG_SBUS n
@@ -147,7 +194,7 @@
if [ "$CONFIG_SH_GENERIC" = "y" -o "$CONFIG_SH_SOLUTION_ENGINE" = "y" -o \
"$CONFIG_SH_UNKNOWN" = "y" -o "$CONFIG_SH_CAT68701" = "y" -o \
- "$CONFIG_SH_ADX" = "y" ]; then
+ "$CONFIG_SH_ADX" = "y" -o "$CONFIG_SH_HS7729PCI" = "y" ]; then
bool 'Compact Flash Enabler support' CONFIG_CF_ENABLER
fi
@@ -175,21 +222,26 @@
int 'HD64465 IRQ' CONFIG_HD64465_IRQ 5
fi
+bool 'Wakeup UBC on startup' CONFIG_UBC_WAKEUP
bool 'DMA controller (DMAC) support' CONFIG_SH_DMA
+int 'Peripheral clock frequency(Hz) (0: auto detect)' CONFIG_SH_PCLK_FREQ 0 0 1000000000
+
+bool 'Default bootloader kernel arguments' CONFIG_CMDLINE_BOOL
+if [ "$CONFIG_CMDLINE_BOOL" = "y" ] ; then
+ string 'Initial kernel command string' CONFIG_CMDLINE "console=ttySC1,115200"
+fi
bool 'PCI support' CONFIG_PCI
if [ "$CONFIG_PCI" = "y" ]; then
- choice ' PCI access mode' \
- "BIOS CONFIG_PCI_GOBIOS \
- Direct CONFIG_PCI_GODIRECT \
- Any CONFIG_PCI_GOANY" Any
- if [ "$CONFIG_PCI_GOBIOS" = "y" -o "$CONFIG_PCI_GOANY" = "y" ]; then
- define_bool CONFIG_PCI_BIOS y
- fi
- if [ "$CONFIG_PCI_GODIRECT" = "y" -o "$CONFIG_PCI_GOANY" = "y" ]; then
- define_bool CONFIG_PCI_DIRECT y
- fi
- bool 'Cache and PCI noncoherent' CONFIG_SH_PCIDMA_NONCOHERENT
+ if [ "$CONFIG_SH_HS7729PCI" = "y" ]; then
+ define_bool CONFIG_PCI_SD0001 y
+ define_hex CONFIG_PCI_SD0001_IRQ 0
+ define_hex CONFIG_PCI_SD0001_BASE b0000000
+ define_bool CONFIG_SH_PCIDMA_NONCOHERENT y
+ else
+ define_bool CONFIG_PCI_SD0001 n
+ bool 'Cache and PCI noncoherent' CONFIG_SH_PCIDMA_NONCOHERENT
+ fi
fi
source drivers/pci/Config.in
@@ -259,7 +311,7 @@
bool 'Network device support' CONFIG_NETDEVICES
if [ "$CONFIG_NETDEVICES" = "y" ]; then
source drivers/net/Config.in
- if [ "$CONFIG_ATM" = "y" ]; then
+ if [ "$CONFIG_ATM" = "y" -o "$CONFIG_ATM" = "m" ]; then
source drivers/atm/Config.in
fi
fi
@@ -280,9 +332,9 @@
#
source drivers/input/Config.in
-# if [ "$CONFIG_SH_DREAMCAST" = "y" ]; then
-# source drivers/maple/Config.in
-# fi
+if [ "$CONFIG_SH_DREAMCAST" = "y" ]; then
+ source drivers/maple/Config.in
+fi
mainmenu_option next_comment
comment 'Character devices'
@@ -309,6 +361,7 @@
"$CONFIG_SH_STB1_OVERDRIVE" = "y" -o \
"$CONFIG_SH_BIGSUR" = "y" -o \
"$CONFIG_SH_7751_SOLUTION_ENGINE" = "y" -o \
+ "$CONFIG_SH_MOBILE_SOLUTION_ENGINE" = "y" -o \
"$CONFIG_SH_SOLUTION_ENGINE" = "y" ]; then
bool 'Heartbeat LED' CONFIG_HEARTBEAT
fi
@@ -341,7 +394,7 @@
bool 'Watchdog Timer Support' CONFIG_WATCHDOG
if [ "$CONFIG_WATCHDOG" != "n" ]; then
bool ' Disable watchdog shutdown on close' CONFIG_WATCHDOG_NOWAYOUT
- dep_tristate ' SH 3/4 Watchdog' CONFIG_SH_WDT $CONFIG_SUPERH
+ dep_tristate ' SuperH Watchdog' CONFIG_SH_WDT $CONFIG_SUPERH
fi
endmenu
@@ -385,6 +438,34 @@
if [ "$CONFIG_SH_STANDARD_BIOS" = "y" ]; then
bool 'Early printk support' CONFIG_SH_EARLY_PRINTK
fi
+bool 'Include KGDB kernel debugger' CONFIG_SH_KGDB
+if [ "$CONFIG_SH_KGDB" = "y" ]; then
+ bool ' Enter KGDB on NMI' CONFIG_KGDB_NMI
+ bool ' Include KGDB thread support' CONFIG_KGDB_THREAD
+ bool ' Console messages through GDB' CONFIG_SH_KGDB_CONSOLE
+ bool ' Allow SysRq "G" to enter KGDB?' CONFIG_KGDB_SYSRQ
+ if [ "$CONFIG_KGDB_SYSRQ" != "n" ]; then
+ define_bool CONFIG_MAGIC_SYSRQ y
+ fi
+ bool ' Include KGDB kernel asserts' CONFIG_KGDB_KERNEL_ASSERTS
+ bool ' Add additional compile options' CONFIG_KGDB_MORE
+ if [ "$CONFIG_KGDB_MORE" = "y" ]; then
+ string ' Additional compile options' CONFIG_KGDB_OPTIONS "-O1"
+ fi
+ mainmenu_option next_comment
+ comment ' Default KGDB port setup'
+ int 'Port number (ttySCn)' CONFIG_KGDB_DEFPORT 1
+ int 'Baud rate' CONFIG_KGDB_DEFBAUD 115200
+ choice 'Parity' \
+ "None CONFIG_KGDB_DEFPARITY_N \
+ Even CONFIG_KGDB_DEFPARITY_E \
+ Odd CONFIG_KGDB_DEFPARITY_O" None
+ choice 'DataBits' \
+ "7 CONFIG_KGDB_DEFBITS_7 \
+ 8 CONFIG_KGDB_DEFBITS_8" 8
+ endmenu
+fi
endmenu
+source crypto/Config.in
source lib/Config.in
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)