From: M. R. B. <mr...@us...> - 2002-10-29 15:20:52
|
Update of /cvsroot/linuxdc/linux-sh-dc/arch/sh In directory usw-pr-cvs1:/tmp/cvs-serv9028/arch/sh Modified Files: config.in Log Message: Linux-SH 2.5.44 switchover Index: config.in =================================================================== RCS file: /cvsroot/linuxdc/linux-sh-dc/arch/sh/config.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- config.in 23 Jan 2002 06:56:48 -0000 1.5 +++ config.in 29 Oct 2002 15:20:19 -0000 1.6 @@ -9,26 +9,16 @@ define_bool CONFIG_UID16 y define_bool CONFIG_RWSEM_GENERIC_SPINLOCK y define_bool CONFIG_RWSEM_XCHGADD_ALGORITHM n +define_bool CONFIG_GENERIC_ISA_DMA y +define_bool CONFIG_VARIABLE_CLOCK_TICK_RATE y -mainmenu_option next_comment -comment 'Code maturity level options' -bool 'Prompt for development and/or incomplete code/drivers' CONFIG_EXPERIMENTAL -endmenu +source init/Config.in mainmenu_option next_comment -comment 'Loadable module support' -bool 'Enable loadable module support' CONFIG_MODULES -if [ "$CONFIG_MODULES" = "y" ]; then - bool ' Set version information on all module symbols' CONFIG_MODVERSIONS - bool ' Kernel module loader' CONFIG_KMOD -fi -endmenu +comment 'System type' -mainmenu_option next_comment -comment 'Processor type and features' choice 'SuperH system type' \ - "Generic CONFIG_SH_GENERIC \ - SolutionEngine CONFIG_SH_SOLUTION_ENGINE \ + "SolutionEngine CONFIG_SH_SOLUTION_ENGINE \ SolutionEngine7751 CONFIG_SH_7751_SOLUTION_ENGINE \ STB1_Harp CONFIG_SH_STB1_HARP \ STB1_Overdrive CONFIG_SH_STB1_OVERDRIVE \ @@ -43,53 +33,29 @@ BigSur CONFIG_SH_BIGSUR \ SH2000 CONFIG_SH_SH2000 \ ADX CONFIG_SH_ADX \ - BareCPU CONFIG_SH_UNKNOWN" Generic - -# The SH7750 RTC module is disabled in the Dreamcast -if [ "$CONFIG_SH_DREAMCAST" = "y" ]; then - define_bool CONFIG_SH_RTC n -else - define_bool CONFIG_SH_RTC y -fi + BareCPU CONFIG_SH_UNKNOWN" BareCPU -if [ "$CONFIG_SH_HP620" = "y" -o "$CONFIG_SH_HP680" = "y" -o \ - "$CONFIG_SH_HP690" = "y" ]; then - define_bool CONFIG_SH_HP600 y -fi +# Board-specific config.in's go here - restructure +# source arch/sh/boards/adx/Config.in +# source arch/sh/boards/bigsur/Config.in +# source arch/sh/boards/cat68701/Config.in +# source arch/sh/boards/cqreek/Config.in +# source arch/sh/boards/dmida/Config.in +# source arch/sh/boards/dreamcast/Config.in +# source arch/sh/boards/ec3104/Config.in +# source arch/sh/boards/harp/Config.in +# source arch/sh/boards/hp6xx/hp620/Config.in +# source arch/sh/boards/hp6xx/hp680/Config.in +# source arch/sh/boards/hp6xx/hp690/Config.in +# source arch/sh/boards/overdrive/Config.in +# source arch/sh/boards/se/770x/Config.in +# source arch/sh/boards/se/7751/Config.in +# source arch/sh/boards/sh2000/Config.in +# source arch/sh/boards/unknown/Config.in -choice 'Processor type' \ - "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 -if [ "$CONFIG_CPU_SUBTYPE_SH7707" = "y" ]; then - define_bool CONFIG_CPU_SH3 y - define_bool CONFIG_CPU_SH4 n -fi -if [ "$CONFIG_CPU_SUBTYPE_SH7708" = "y" ]; then - define_bool CONFIG_CPU_SH3 y - define_bool CONFIG_CPU_SH4 n -fi -if [ "$CONFIG_CPU_SUBTYPE_SH7709" = "y" ]; then - define_bool CONFIG_CPU_SH3 y - define_bool CONFIG_CPU_SH4 n -fi -if [ "$CONFIG_CPU_SUBTYPE_SH7750" = "y" ]; then - define_bool CONFIG_CPU_SH3 n - define_bool CONFIG_CPU_SH4 y -fi -if [ "$CONFIG_CPU_SUBTYPE_SH7751" = "y" ]; then - define_bool CONFIG_CPU_SH3 n - define_bool CONFIG_CPU_SH4 y -fi -if [ "$CONFIG_CPU_SUBTYPE_ST40STB1" = "y" ]; then - define_bool CONFIG_CPU_SH3 n - define_bool CONFIG_CPU_SH4 y -fi -bool 'Little Endian' CONFIG_CPU_LITTLE_ENDIAN # Platform-specific memory start and size definitions +# XXX: break these out into the board-specific configs above +if [ "$CONFIG_MEMORY_OVERRIDE" != "y" ]; then if [ "$CONFIG_SH_SOLUTION_ENGINE" = "y" ]; then define_hex CONFIG_MEMORY_START 0c000000 define_hex CONFIG_MEMORY_SIZE 02000000 @@ -106,53 +72,26 @@ define_hex CONFIG_MEMORY_SIZE 00400000 define_bool CONFIG_MEMORY_SET y fi -if [ "$CONFIG_CPU_SUBTYPE_ST40STB1" = "y" ]; then - bool 'Memory on LMI' CONFIG_ST40_LMI_MEMORY - if [ "$CONFIG_ST40_LMI_MEMORY" = "y" ] ; then - define_hex CONFIG_MEMORY_START 08000000 - define_hex CONFIG_MEMORY_SIZE 00400000 +if [ "$CONFIG_SH_DREAMCAST" = "y" ]; then + define_hex CONFIG_MEMORY_START 0c000000 + define_hex CONFIG_MEMORY_SIZE 01000000 define_bool CONFIG_MEMORY_SET y - fi fi if [ "$CONFIG_SH_ADX" = "y" ]; then define_hex CONFIG_MEMORY_START 08000000 define_hex CONFIG_MEMORY_SIZE 00400000 define_bool CONFIG_MEMORY_SET y fi -if [ "$CONFIG_SH_DREAMCAST" = "y" ]; then - define_hex CONFIG_MEMORY_START 0c000000 - define_hex CONFIG_MEMORY_SIZE 01000000 - 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 +bool 'Override default load address and memory size' CONFIG_MEMORY_OVERRIDE +if [ "$CONFIG_MEMORY_SET" != "y" -o "$CONFIG_MEMORY_OVERRIDE" = "y" ]; then hex 'Physical memory start address' CONFIG_MEMORY_START 08000000 hex 'Physical memory size' CONFIG_MEMORY_SIZE 00400000 fi -endmenu - -if [ "$CONFIG_SH_HP690" = "y" ]; then - define_bool CONFIG_DISCONTIGMEM y -else - define_bool CONFIG_DISCONTIGMEM n -fi -mainmenu_option next_comment -comment 'General setup' - -# 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 -define_bool CONFIG_EISA n -define_bool CONFIG_MCA n -define_bool CONFIG_SBUS n - -bool 'Networking support' CONFIG_NET - -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 +if [ "$CONFIG_SH_ADX" = "y" -o "$CONFIG_SH_SOLUTION_ENGINE" = "y" -o \ + "$CONFIG_SH_UNKNOWN" = "y" -o "$CONFIG_SH_CAT68701" = "y" ]; then bool 'Compact Flash Enabler support' CONFIG_CF_ENABLER fi @@ -168,19 +107,102 @@ fi fi -bool 'Hitachi HD64461 companion chip support' CONFIG_HD64461 -if [ "$CONFIG_HD64461" = "y" ]; then +endmenu + +# The SH7750 RTC module is disabled in the Dreamcast +if [ "$CONFIG_SH_DREAMCAST" = "y" ]; then + define_bool CONFIG_SH_RTC n + define_bool CONFIG_PCI_AUTO n +else + define_bool CONFIG_SH_RTC y +fi + +if [ "$CONFIG_SH_HP620" = "y" -o "$CONFIG_SH_HP680" = "y" -o \ + "$CONFIG_SH_HP690" = "y" ]; then + define_bool CONFIG_SH_HP600 y +fi + +if [ "$CONFIG_SH_HP690" = "y" ]; then + define_bool CONFIG_DISCONTIGMEM y +else + define_bool CONFIG_DISCONTIGMEM n +fi + +mainmenu_option next_comment +comment 'Processor type and features' + +choice 'Processor type' \ + "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 + +if [ "$CONFIG_CPU_SUBTYPE_SH7707" = "y" -o "$CONFIG_CPU_SUBTYPE_SH7708" = "y" -o \ + "$CONFIG_CPU_SUBTYPE_SH7709" = "y" ]; then + define_bool CONFIG_CPU_SH3 y + define_bool CONFIG_CPU_SH4 n +else + if [ "$CONFIG_CPU_SUBTYPE_SH7750" = "y" -o "$CONFIG_CPU_SUBTYPE_SH7751" = "y" -o \ + "$CONFIG_CPU_SUBTYPE_ST40STB1" = "y" ]; then + define_bool CONFIG_CPU_SH3 n + define_bool CONFIG_CPU_SH4 y + fi +fi + +# XXX: needs to lose subtype for system type +if [ "$CONFIG_CPU_SUBTYPE_ST40STB1" = "y" ]; then + bool 'Memory on LMI' CONFIG_ST40_LMI_MEMORY + if [ "$CONFIG_ST40_LMI_MEMORY" = "y" ] ; then + define_hex CONFIG_MEMORY_START 08000000 + define_hex CONFIG_MEMORY_SIZE 00400000 + define_bool CONFIG_MEMORY_SET y + fi +fi + +# We can also split out companion chip Config.in's +# source arch/sh/cchips/hd6446x/hd64461/Config.in +# source arch/sh/cchips/hd6446x/hd64465/Config.in + +if [ "$CONFIG_CPU_SUBTYPE_SH7709" = "y" ]; then + bool 'Hitachi HD64461 companion chip support' CONFIG_HD64461 + if [ "$CONFIG_HD64461" = "y" ]; then int 'HD64461 IRQ' CONFIG_HD64461_IRQ 36 bool 'HD64461 PCMCIA enabler' CONFIG_HD64461_ENABLER + fi fi -bool 'Hitachi HD64465 companion chip support' CONFIG_HD64465 -if [ "$CONFIG_HD64465" = "y" ]; then +if [ "$CONFIG_CPU_SUBTYPE_SH7750" = "y" ]; then + bool 'Hitachi HD64465 companion chip support' CONFIG_HD64465 + if [ "$CONFIG_HD64465" = "y" ]; then hex 'HD64465 start address' CONFIG_HD64465_IOBASE b0000000 int 'HD64465 IRQ' CONFIG_HD64465_IRQ 5 + fi fi +bool 'Little Endian' CONFIG_CPU_LITTLE_ENDIAN +dep_bool 'Preemptible Kernel (EXPERIMENTAL)' CONFIG_PREEMPT $CONFIG_EXPERIMENTAL +bool 'Wakeup UBC on startup' CONFIG_UBC_WAKEUP bool 'DMA controller (DMAC) support' CONFIG_SH_DMA +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 + +endmenu + + +mainmenu_option next_comment +comment 'Bus options (PCI, PCMCIA, EISA, MCA, ISA)' + +# 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 +define_bool CONFIG_EISA n +define_bool CONFIG_MCA n +define_bool CONFIG_SBUS n bool 'PCI support' CONFIG_PCI if [ "$CONFIG_PCI" = "y" ]; then @@ -194,7 +216,7 @@ 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 n + bool 'Cache and PCI noncoherent' CONFIG_SH_PCIDMA_NONCOHERENT fi source drivers/pci/Config.in @@ -203,13 +225,18 @@ if [ "$CONFIG_HOTPLUG" = "y" ] ; then source drivers/pcmcia/Config.in + source drivers/hotplug/Config.in else define_bool CONFIG_PCMCIA n + define_bool CONFIG_HOTPLUG_PCI n fi -bool 'System V IPC' CONFIG_SYSVIPC -bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT -bool 'Sysctl support' CONFIG_SYSCTL +endmenu + + +mainmenu_option next_comment +comment 'Executable file formats' + if [ "$CONFIG_PROC_FS" = "y" ]; then choice 'Kernel core (/proc/kcore) format' \ "ELF CONFIG_KCORE_ELF \ @@ -218,46 +245,52 @@ tristate 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC -source drivers/parport/Config.in - endmenu source drivers/mtd/Config.in -source drivers/block/Config.in - -source drivers/md/Config.in +source drivers/parport/Config.in -if [ "$CONFIG_NET" = "y" ]; then - source net/Config.in -fi +source drivers/block/Config.in mainmenu_option next_comment -comment 'ATA/IDE/MFM/RLL support' +comment 'ATA/ATAPI/MFM/RLL support' -tristate 'ATA/IDE/MFM/RLL support' CONFIG_IDE +tristate 'ATA/ATAPI/MFM/RLL support' CONFIG_IDE if [ "$CONFIG_IDE" != "n" ]; then source drivers/ide/Config.in else - define_bool CONFIG_BLK_DEV_IDE_MODES n define_bool CONFIG_BLK_DEV_HD n fi endmenu mainmenu_option next_comment -comment 'SCSI support' +comment 'SCSI device support' -tristate 'SCSI support' CONFIG_SCSI +tristate 'SCSI device support' CONFIG_SCSI if [ "$CONFIG_SCSI" != "n" ]; then source drivers/scsi/Config.in fi endmenu +mainmenu_option next_comment +comment 'Old CD-ROM drivers (not SCSI, not IDE)' + +bool 'Support non-SCSI/IDE/ATAPI CDROM drives' CONFIG_CD_NO_IDESCSI +if [ "$CONFIG_CD_NO_IDESCSI" != "n" ]; then + source drivers/cdrom/Config.in +fi +endmenu + +source drivers/md/Config.in + source drivers/ieee1394/Config.in if [ "$CONFIG_NET" = "y" ]; then + source net/Config.in + mainmenu_option next_comment comment 'Network device support' @@ -271,17 +304,16 @@ endmenu fi -mainmenu_option next_comment -comment 'Old CD-ROM drivers (not SCSI, not IDE)' +source net/ax25/Config.in -bool 'Support non-SCSI/IDE/ATAPI CDROM drives' CONFIG_CD_NO_IDESCSI -if [ "$CONFIG_CD_NO_IDESCSI" != "n" ]; then - source drivers/cdrom/Config.in -fi -endmenu +source net/irda/Config.in + +source drivers/isdn/Config.in + +source drivers/telephony/Config.in # -# input before char - char/joystick depends on it. As does USB. +# input - input/joystick depends on it. As does USB. # source drivers/input/Config.in @@ -308,8 +340,7 @@ int 'Maximum number of Unix98 PTYs in use (0-2048)' CONFIG_UNIX98_PTY_COUNT 256 fi -if [ "$CONFIG_SH_GENERIC" = "y" -o \ - "$CONFIG_SH_CAT68701" = "y" -o \ +if [ "$CONFIG_SH_CAT68701" = "y" -o \ "$CONFIG_SH_STB1_HARP" = "y" -o \ "$CONFIG_SH_STB1_OVERDRIVE" = "y" -o \ "$CONFIG_SH_BIGSUR" = "y" -o \ @@ -324,15 +355,12 @@ if [ "$CONFIG_INPUT" != "n" ]; then dep_tristate ' Maple Bus keyboard support' CONFIG_MAPLE_KEYBOARD $CONFIG_INPUT dep_tristate ' Maple Bus mouse support' CONFIG_MAPLE_MOUSE $CONFIG_INPUT - dep_tristate ' Maple Light Gun support' CONFIG_MAPLE_LIGHTGUN $CONFIG_INPUT else comment 'Input core support is required for Maple input peripherals' fi endmenu fi -source drivers/char/joystick/Config.in - if [ "$CONFIG_PARPORT" != "n" ]; then dep_tristate 'Parallel printer support' CONFIG_PRINTER $CONFIG_PARPORT if [ "$CONFIG_PRINTER" != "n" ]; then @@ -347,7 +375,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 + tristate ' SH 3/4 Watchdog' CONFIG_SH_WDT fi endmenu @@ -373,16 +401,19 @@ endmenu fi - mainmenu_option next_comment comment 'Sound' tristate 'Sound card support' CONFIG_SOUND if [ "$CONFIG_SOUND" != "n" ]; then - source drivers/sound/Config.in + source sound/Config.in fi endmenu +source drivers/usb/Config.in + +source net/bluetooth/Config.in + mainmenu_option next_comment comment 'Kernel hacking' @@ -392,3 +423,6 @@ bool 'Early printk support' CONFIG_SH_EARLY_PRINTK fi endmenu + +source security/Config.in +source lib/Config.in |