From: Ralf Baechle Minor update to the code for the Lasat, a Cobalt-like server. Signed-off-by: Andrew Morton --- 25-akpm/arch/mips/Kconfig | 1 25-akpm/arch/mips/configs/lasat200_defconfig | 52 +++++++++++++++++++-- 25-akpm/include/asm-mips/mach-lasat/mach-gt64120.h | 10 ++-- 3 files changed, 54 insertions(+), 9 deletions(-) diff -puN arch/mips/configs/lasat200_defconfig~mips-lasat-updates arch/mips/configs/lasat200_defconfig --- 25/arch/mips/configs/lasat200_defconfig~mips-lasat-updates 2005-01-29 11:26:16.116297872 -0800 +++ 25-akpm/arch/mips/configs/lasat200_defconfig 2005-01-29 11:26:16.125296504 -0800 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.10-rc2 -# Sun Nov 21 14:12:02 2004 +# Linux kernel version: 2.6.11-rc2 +# Wed Jan 26 02:49:06 2005 # CONFIG_MIPS=y # CONFIG_MIPS64 is not set @@ -89,13 +89,13 @@ CONFIG_LASAT_SYSCTL=y # CONFIG_SNI_RM200_PCI is not set # CONFIG_TOSHIBA_RBTX4927 is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_HAVE_DEC_LOCK=y CONFIG_DMA_NONCOHERENT=y CONFIG_MIPS_NILE4=y CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_MIPS_GT64120=y CONFIG_MIPS_L1_CACHE_SHIFT=5 -# CONFIG_FB is not set # # CPU selection @@ -140,6 +140,20 @@ CONFIG_PCI_LEGACY_PROC=y CONFIG_MMU=y # +# PCCARD (PCMCIA/CardBus) support +# +# CONFIG_PCCARD is not set + +# +# PC-card bridges +# + +# +# PCI Hotplug Support +# +# CONFIG_HOTPLUG_PCI is not set + +# # Executable file formats # CONFIG_BINFMT_ELF=y @@ -155,6 +169,7 @@ CONFIG_TRAD_SIGNALS=y # CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y +# CONFIG_FW_LOADER is not set # # Memory Technology Devices (MTD) @@ -216,6 +231,7 @@ CONFIG_MTD_LASAT=y # CONFIG_MTD_PHRAM is not set # CONFIG_MTD_MTDRAM is not set # CONFIG_MTD_BLKMTD is not set +# CONFIG_MTD_BLOCK2MTD is not set # # Disk-On-Chip Device Drivers @@ -246,10 +262,12 @@ CONFIG_MTD_LASAT=y # CONFIG_BLK_CPQ_CISS_DA is not set # CONFIG_BLK_DEV_DAC960 is not set # CONFIG_BLK_DEV_UMEM is not set +# CONFIG_BLK_DEV_COW_COMMON is not set # CONFIG_BLK_DEV_LOOP is not set # CONFIG_BLK_DEV_NBD is not set # CONFIG_BLK_DEV_SX8 is not set # CONFIG_BLK_DEV_RAM is not set +CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_INITRAMFS_SOURCE="" # CONFIG_LBD is not set CONFIG_CDROM_PKTCDVD=m @@ -263,6 +281,7 @@ CONFIG_IOSCHED_NOOP=y CONFIG_IOSCHED_AS=y CONFIG_IOSCHED_DEADLINE=y CONFIG_IOSCHED_CFQ=y +CONFIG_ATA_OVER_ETH=m # # ATA/ATAPI/MFM/RLL support @@ -511,6 +530,7 @@ CONFIG_SERIO_I8042=y CONFIG_SERIO_SERPORT=y # CONFIG_SERIO_CT82C710 is not set # CONFIG_SERIO_PCIPS2 is not set +# CONFIG_SERIO_LIBPS2 is not set CONFIG_SERIO_RAW=m # @@ -565,7 +585,6 @@ CONFIG_LEGACY_PTY_COUNT=256 # # Ftape, the floppy tape device driver # -# CONFIG_AGP is not set # CONFIG_DRM is not set # CONFIG_RAW_DRIVER is not set @@ -596,12 +615,14 @@ CONFIG_LEGACY_PTY_COUNT=256 # # Graphics support # +# CONFIG_FB is not set # # Console display driver support # # CONFIG_VGA_CONSOLE is not set CONFIG_DUMMY_CONSOLE=y +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set # # Sound @@ -616,11 +637,25 @@ CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB_ARCH_HAS_OHCI=y # +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information +# + +# # USB Gadget Support # # CONFIG_USB_GADGET is not set # +# MMC/SD Card support +# +# CONFIG_MMC is not set + +# +# InfiniBand support +# +# CONFIG_INFINIBAND is not set + +# # File systems # CONFIG_EXT2_FS=y @@ -719,6 +754,11 @@ CONFIG_MSDOS_PARTITION=y # CONFIG_NLS is not set # +# Profiling support +# +# CONFIG_PROFILING is not set + +# # Kernel hacking # # CONFIG_DEBUG_KERNEL is not set @@ -738,6 +778,10 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y # CONFIG_CRYPTO is not set # +# Hardware crypto devices +# + +# # Library routines # # CONFIG_CRC_CCITT is not set diff -puN arch/mips/Kconfig~mips-lasat-updates arch/mips/Kconfig --- 25/arch/mips/Kconfig~mips-lasat-updates 2005-01-29 11:26:16.118297568 -0800 +++ 25-akpm/arch/mips/Kconfig 2005-01-29 11:26:16.124296656 -0800 @@ -239,6 +239,7 @@ config LASAT bool "Support for LASAT Networks platforms" select DMA_NONCOHERENT select HW_HAS_PCI + select MIPS_GT64120 select R5000_CPU_SCACHE config PICVUE diff -puN include/asm-mips/mach-lasat/mach-gt64120.h~mips-lasat-updates include/asm-mips/mach-lasat/mach-gt64120.h --- 25/include/asm-mips/mach-lasat/mach-gt64120.h~mips-lasat-updates 2005-01-29 11:26:16.119297416 -0800 +++ 25-akpm/include/asm-mips/mach-lasat/mach-gt64120.h 2005-01-29 11:26:16.126296352 -0800 @@ -18,10 +18,10 @@ * * (Guessing ...) */ -#define GT_PCI_MEM_BASE 0x12000000UL -#define GT_PCI_MEM_SIZE 0x02000000UL -#define GT_PCI_IO_BASE 0x10000000UL -#define GT_PCI_IO_SIZE 0x02000000UL -#define GT_ISA_IO_BASE PCI_IO_BASE +#define GT_PCI_MEM_BASE 0x12000000UL +#define GT_PCI_MEM_SIZE 0x02000000UL +#define GT_PCI_IO_BASE 0x10000000UL +#define GT_PCI_IO_SIZE 0x02000000UL +#define GT_ISA_IO_BASE PCI_IO_BASE #endif /* _ASM_GT64120_LASAT_GT64120_DEP_H */ _