diff -Nruw linux-2.4.20/arch/ppc/boot/lib/zlib.c 40P-linux-2.4.20/arch/ppc/boot/lib/zlib.c --- linux-2.4.20/arch/ppc/boot/lib/zlib.c 2002-08-04 19:44:37.000000000 +0200 +++ 40P-linux-2.4.20/arch/ppc/boot/lib/zlib.c 2002-11-30 17:10:05.000000000 +0100 @@ -107,6 +107,7 @@ # define Tracecv(c,x) #endif +void putc(const char c); typedef uLong (*check_func) OF((uLong check, Bytef *buf, uInt len)); @@ -1017,6 +1018,7 @@ } s->mode = CODES; case CODES: + putc('.'); UPDATE if ((r = inflate_codes(s, z, r)) != Z_STREAM_END) return inflate_flush(s, z, r); diff -Nruw linux-2.4.20/arch/ppc/boot/Makefile 40P-linux-2.4.20/arch/ppc/boot/Makefile --- linux-2.4.20/arch/ppc/boot/Makefile 2002-11-30 17:00:04.000000000 +0100 +++ 40P-linux-2.4.20/arch/ppc/boot/Makefile 2002-11-30 17:10:05.000000000 +0100 @@ -28,7 +28,7 @@ # Subdirs and tools needed for each. Assume we always need to go into # 'simple' unless told otherwise. subdir-y := lib common simple -subdir-$(CONFIG_ALL_PPC) := chrp pmac prep +subdir-$(CONFIG_ALL_PPC) := prep tools-$(CONFIG_ALL_PPC) := addnote mknote hack-coff mkprep tools-$(CONFIG_4xx) := mktree tools-$(CONFIG_SPRUCE) := mktree diff -Nruw linux-2.4.20/arch/ppc/boot/prep/misc.c 40P-linux-2.4.20/arch/ppc/boot/prep/misc.c --- linux-2.4.20/arch/ppc/boot/prep/misc.c 2002-08-04 19:44:37.000000000 +0200 +++ 40P-linux-2.4.20/arch/ppc/boot/prep/misc.c 2002-11-30 17:10:05.000000000 +0100 @@ -304,6 +304,7 @@ memcpy (cmd_line, cmd_preset, sizeof(cmd_preset)); while ( *cp ) putc(*cp++); +#if 0 /* SDI no commandline waiting */ while (timer++ < 5*1000) { if (tstc()) { while ((ch = getc()) != '\n' && ch != '\r') { @@ -328,6 +329,7 @@ } udelay(1000); /* 1 msec */ } +#endif *cp = 0; puts("\nUncompressing Linux..."); diff -Nruw linux-2.4.20/arch/ppc/config.in 40P-linux-2.4.20/arch/ppc/config.in --- linux-2.4.20/arch/ppc/config.in 2002-11-30 17:00:04.000000000 +0100 +++ 40P-linux-2.4.20/arch/ppc/config.in 2002-11-30 17:10:05.000000000 +0100 @@ -136,7 +136,7 @@ bool 'High memory support (experimental)' CONFIG_HIGHMEM -define_bool CONFIG_ISA n +define_bool CONFIG_ISA y define_bool CONFIG_EISA n define_bool CONFIG_SBUS n diff -Nruw linux-2.4.20/arch/ppc/kernel/head.S 40P-linux-2.4.20/arch/ppc/kernel/head.S --- linux-2.4.20/arch/ppc/kernel/head.S 2002-11-30 17:00:04.000000000 +0100 +++ 40P-linux-2.4.20/arch/ppc/kernel/head.S 2002-11-30 17:10:05.000000000 +0100 @@ -1523,6 +1523,26 @@ addi r3,r3,0x111 /* increment VSID */ addis r4,r4,0x1000 /* address of next segment */ bdnz 3b +/* + A PPC601 IBAT can map only 8 MB of IO-Space at 0x80000000, but for + PCI we need much more. So let us map the whole segment 256MB with + segment register SR8. + One problem is segment protection. Even userspace task may access + 0x80000000 - 0x8fffffff without page level protection. + Next problem is that opcodes like + lwarx, stwcx, lscbx send data access execption + eciwx, ecowx cause boundedly undef. results + dbct, dcbtxt, dcbf, dcbi dcbst, dcbz are executed as no ops + Third problem is the name of this configure variable + CONFIG_PPC601_SYNC_FIX. Since in menuconfig People choose + "Workarounds for PPC601 bugs" this is the right chos, but it's just a + naming thing. +SDI */ +#ifdef CONFIG_PPC601_SYNC_FIX + lis r4,0x87f0 /* t=1,BUID=0x7f IO-Map */ + ori r4,r4,0x8 /* page 0x80000000 as I/O segment */ + mtsr SR8,r4 +#endif #ifndef CONFIG_POWER4 /* Load the BAT registers with the values set up by MMU_init. MMU_init takes care of whether we're on a 601 or not. */ @@ -1665,6 +1685,12 @@ rlwinm r3,r3,0,8,3 /* clear out any overflow from VSID field */ addis r4,r4,0x1000 /* address of next segment */ bdnz 3b +/* SDI */ +#ifdef CONFIG_PPC601_SYNC_FIX + lis r4,0x87f0 /* t=1,Ks=1,Ku=1 BUID=0x7f IO-Map */ + ori r4,r4,0x8 /* page 0x80000000 as I/O segment */ + mtsr SR8,r4 +#endif sync isync blr diff -Nruw linux-2.4.20/arch/ppc/kernel/pci.c 40P-linux-2.4.20/arch/ppc/kernel/pci.c --- linux-2.4.20/arch/ppc/kernel/pci.c 2002-11-30 17:00:04.000000000 +0100 +++ 40P-linux-2.4.20/arch/ppc/kernel/pci.c 2002-11-30 17:10:05.000000000 +0100 @@ -173,11 +173,11 @@ if (offset != 0) { res->start += offset; res->end += offset; -#ifdef DEBUG +/* #ifdef DEBUG SDI */ printk("Fixup res %d (%lx) of dev %s: %lx -> %lx\n", i, res->flags, dev->slot_name, res->start - offset, res->start); -#endif +/* #endif */ } } @@ -439,7 +439,7 @@ old_cmd = cmd; for(idx=0; idx<6; idx++) { r = &dev->resource[idx]; - if (!r->start && r->end) { + if (r->flags & IORESOURCE_UNSET) { printk(KERN_ERR "PCI: Device %s not available because of resource collisions\n", dev->slot_name); return -EINVAL; } diff -Nruw linux-2.4.20/arch/ppc/platforms/prep_pci.c 40P-linux-2.4.20/arch/ppc/platforms/prep_pci.c --- linux-2.4.20/arch/ppc/platforms/prep_pci.c 2002-11-30 17:00:04.000000000 +0100 +++ 40P-linux-2.4.20/arch/ppc/platforms/prep_pci.c 2002-11-30 17:10:05.000000000 +0100 @@ -27,6 +27,7 @@ #include #include +#define MIN_DEVNR 11 #define MAX_DEVNR 22 /* Which PCI interrupt line does a given device [slot] use? */ @@ -633,7 +634,7 @@ static int __prep \ prep_##rw##_config_##size(struct pci_dev *dev, int offset, type val) \ { \ - if ((dev->bus->number != 0) || (DEVNO(dev->devfn) > MAX_DEVNR)) \ + if ((dev->bus->number != 0) || (DEVNO(dev->devfn) > MAX_DEVNR) || (DEVNO(dev->devfn) < MIN_DEVNR)) \ { \ cfg_##rw##_bad(val, size) \ return PCIBIOS_DEVICE_NOT_FOUND; \ @@ -1174,6 +1175,24 @@ (dev->resource[i].end & 0x00FFFFFF) | 0x01000000; } +/* SDI we need some sort of mapping into 16 MB at 0xf0000000 + if ( (pci_resource_flags(dev, i) & IORESOURCE_MEM) && + (dev->resource[i].start > 0x01000000)) { + printk("Relocating PCI address %lx -> %lx\n", + dev->resource[i].start, + (dev->resource[i].start & + 0x000FFFFF)| 0x00100000); + dev->resource[i].start = + (dev->resource[i].start & 0x000FFFFF) + | 0x00100000; + pci_write_config_dword(dev, + PCI_BASE_ADDRESS_0 + (i*0x4), + dev->resource[i].start); + dev->resource[i].end = + (dev->resource[i].end & 0x000FFFFF) + | 0x00100000; + } +*/ } #if 0 /* diff -Nruw linux-2.4.20/arch/ppc/platforms/prep_setup.c 40P-linux-2.4.20/arch/ppc/platforms/prep_setup.c --- linux-2.4.20/arch/ppc/platforms/prep_setup.c 2002-11-30 17:00:04.000000000 +0100 +++ 40P-linux-2.4.20/arch/ppc/platforms/prep_setup.c 2002-11-30 17:10:05.000000000 +0100 @@ -101,15 +101,16 @@ /* for the mac fs */ kdev_t boot_dev; -/* used in nasty hack for sound - see prep_setup_arch() -- Cort */ +#ifdef CONFIG_SOUND_CS4232 long ppc_cs4232_dma, ppc_cs4232_dma2; +#endif extern PTE *Hash, *Hash_end; extern unsigned long Hash_size, Hash_mask; extern int probingmem; extern unsigned long loops_per_jiffy; -#ifdef CONFIG_SOUND_MODULE +#ifdef CONFIG_SOUND_CS4232 EXPORT_SYMBOL(ppc_cs4232_dma); EXPORT_SYMBOL(ppc_cs4232_dma2); #endif @@ -216,10 +217,19 @@ return 0; } +static long __init masktoint(unsigned int i) +{ + int t = -1; + while (i >> ++t) + ; + return (t-1); +} + static void __init prep_setup_arch(void) { unsigned char reg; + PPC_DEVICE *audiodevice = NULL; #if 0 /* unused?? */ unsigned char ucMothMemType; unsigned char ucEquipPres1; @@ -275,44 +285,65 @@ strcpy(saved_command_line, cmd_line); } } - -#ifdef CONFIG_SOUND_CS4232 - /* - * setup proper values for the cs4232 driver so we don't have - * to recompile for the motorola or ibm workstations sound systems. - * This is a really nasty hack, but unless we change the driver - * it's the only way to support both addrs from one binary. - * -- Cort - */ - if ( _machine == _MACH_prep ) +#if 0 { - extern struct card_info snd_installed_cards[]; - struct card_info *snd_ptr; + char *nvramvariables=prep_nvram_first_var(); - for ( snd_ptr = snd_installed_cards; - snd_ptr < &snd_installed_cards[num_sound_cards]; - snd_ptr++ ) - { - if ( snd_ptr->card_type == SNDCARD_CS4232 ) - { - if ( _prep_type == _PREP_Motorola ) + printk("NVRAM-Variables\n"); + + while(nvramvariables != NULL) { - snd_ptr->config.io_base = 0x830; - snd_ptr->config.irq = 10; - snd_ptr->config.dma = ppc_cs4232_dma = 6; - snd_ptr->config.dma2 = ppc_cs4232_dma2 = 7; + printk("%s\n",nvramvariables); + nvramvariables=prep_nvram_next_var(nvramvariables); } - if ( _prep_type == _PREP_IBM ) - { - snd_ptr->config.io_base = 0x530; - snd_ptr->config.irq = 5; - snd_ptr->config.dma = ppc_cs4232_dma = 1; - /* this is wrong - but leave it for now */ - snd_ptr->config.dma2 = ppc_cs4232_dma2 = 7; } +#endif + + /* + * ppc_cs4232_dma and ppc_cs4232_dma2 are used in include/asm/dma.h + * to distinguish sound dma-channels from others. This is because + * blocksize on 16 bit dma-channels 5,6,7 is 128k, but + * the cs4232.c uses 64k like on 8 bit dma-channels 0,1,2,3 + */ + +#ifdef CONFIG_SOUND_CS4232 + /* + * Get the needed resource informations from residual data. + * + */ +#ifdef CONFIG_PREP_RESIDUAL + audiodevice = residual_find_device(~0,NULL, MultimediaController,AudioController, -1, 0); + if (audiodevice != NULL) { + PnP_TAG_PACKET *pkt; + pkt=PnP_find_packet((unsigned char*)&res->DevicePnPHeap[audiodevice->AllocatedOffset], S5_Packet, 0); + if (pkt != NULL) ppc_cs4232_dma = masktoint(pkt->S5_Pack.DMAMask); + pkt=PnP_find_packet((unsigned char*)&res->DevicePnPHeap[audiodevice->AllocatedOffset], S5_Packet, 1); + if (pkt != NULL) ppc_cs4232_dma2 = masktoint(pkt->S5_Pack.DMAMask); } +#endif /* CONFIG_PREP_RESIDUAL */ + /* + * These are PreP-specs' defaults for the cs4231 as fallback for + * residual data. + * At least the IBM Thinkpad 850 with IDE DMA Channels at 6 and 7 will use + * the other values. + */ + if (audiodevice == NULL) + { + switch (_prep_type) { + case _PREP_IBM: + ppc_cs4232_dma = 1; + ppc_cs4232_dma2 = -1; +// ppc_cs4232_io = 0x530; +// ppc_cs4232_irq = 5; + break; + default: + ppc_cs4232_dma = 6; + ppc_cs4232_dma2 = 7; +// ppc_cs4232_io = 0x830; +// ppc_cs4232_irq = 10; } } + #endif /* CONFIG_SOUND_CS4232 */ /*print_residual_device_info();*/ @@ -779,9 +810,29 @@ static void __init prep_map_io(void) { + /* + * On PPC601 IBATs map only 8MB, but + * for PCI config-space we need the 8MB at 0x80800000 and + * for PCI shared memory-io we need space at 0x81000000 + * so we map RAM without IBATS, cause there are no IBATs left. + * that will make us slower, cause kernel mapping is done by + * PTEs + * -- SDI + */ + if (cur_cpu_spec[0]->cpu_features & CPU_FTR_601) { +// io_block_mapping(0x80000000, PREP_ISA_IO_BASE, 0x00800000, _PAGE_IO); +// io_block_mapping(0x80000000+0x00800000, PREP_ISA_IO_BASE + 0x00800000, 0x00800000, _PAGE_IO); +// io_block_mapping(0x80000000+0x01000000, PREP_ISA_IO_BASE + 0x01000000, 0x00800000, _PAGE_IO); + io_block_mapping(0xf0000000,PREP_ISA_MEM_BASE, 0x00800000, _PAGE_IO); +// fuer den Framebuffer + io_block_mapping(0xf1000000,PREP_ISA_MEM_BASE + 0x01000000, 0x00800000, _PAGE_IO); + io_block_mapping(0xf1800000,PREP_ISA_MEM_BASE + 0x01800000, 0x00800000, _PAGE_IO); + } else { io_block_mapping(0x80000000, PREP_ISA_IO_BASE, 0x10000000, _PAGE_IO); io_block_mapping(0xf0000000, PREP_ISA_MEM_BASE, 0x08000000, _PAGE_IO); } + isa_mem_base = 0xf0000000; +} static void __init prep_init2(void) @@ -851,7 +902,7 @@ if (_prep_type == _PREP_IBM) { ppc_md.set_rtc_time = mc146818_set_rtc_time; ppc_md.get_rtc_time = mc146818_get_rtc_time; - ppc_md.calibrate_decr = prep_calibrate_decr; + ppc_md.calibrate_decr = prep_calibrate_decr; /* Won't be used on 601 */ } else { ppc_md.set_rtc_time = mk48t59_set_rtc_time; ppc_md.get_rtc_time = mk48t59_get_rtc_time; diff -Nruw linux-2.4.20/.config 40P-linux-2.4.20/.config --- linux-2.4.20/.config 1970-01-01 01:00:00.000000000 +0100 +++ 40P-linux-2.4.20/.config 2002-11-30 17:16:15.000000000 +0100 @@ -0,0 +1,816 @@ +# +# Automatically generated make config: don't edit +# +# CONFIG_UID16 is not set +# CONFIG_RWSEM_GENERIC_SPINLOCK is not set +CONFIG_RWSEM_XCHGADD_ALGORITHM=y +CONFIG_HAVE_DEC_LOCK=y + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y + +# +# Loadable module support +# +# CONFIG_MODULES is not set + +# +# Platform support +# +CONFIG_PPC=y +CONFIG_PPC32=y +CONFIG_6xx=y +# CONFIG_4xx is not set +# CONFIG_POWER3 is not set +# CONFIG_POWER4 is not set +# CONFIG_8xx is not set +# CONFIG_8260 is not set +CONFIG_PPC_STD_MMU=y +CONFIG_ALL_PPC=y +# CONFIG_APUS is not set +# CONFIG_SPRUCE is not set +# CONFIG_PAL4 is not set +# CONFIG_GEMINI is not set +# CONFIG_SMP is not set +# CONFIG_ALTIVEC is not set +# CONFIG_TAU is not set +CONFIG_PPC_ISATIMER=y + +# +# General setup +# +# CONFIG_HIGHMEM is not set +CONFIG_ISA=y +# CONFIG_EISA is not set +# CONFIG_SBUS is not set +# CONFIG_MCA is not set +CONFIG_PCI=y +CONFIG_NET=y +# CONFIG_SYSCTL is not set +# CONFIG_SYSVIPC is not set +# CONFIG_BSD_PROCESS_ACCT is not set +CONFIG_KCORE_ELF=y +CONFIG_BINFMT_ELF=y +CONFIG_KERNEL_ELF=y +# CONFIG_BINFMT_MISC is not set +CONFIG_PCI_NAMES=y +# CONFIG_HOTPLUG is not set +# CONFIG_PCMCIA is not set + +# +# Parallel port support +# +# CONFIG_PARPORT is not set +CONFIG_PPC_RTC=y +CONFIG_PPC601_SYNC_FIX=y +# CONFIG_PROC_DEVICETREE is not set +# CONFIG_PPC_RTAS is not set +# CONFIG_BOOTX_TEXT is not set +CONFIG_PREP_RESIDUAL=y +CONFIG_PROC_PREPRESIDUAL=y +CONFIG_CMDLINE_BOOL=y +CONFIG_CMDLINE="console=ttyS0,9600 console=tty0 ether=11,0x300,0xe4000,0xe8000,eth0 ether=5,0x320,4,0x3c509,eth1 floppy=0,4,cmos cs4232=0x830,10,6,7,0x330,9 ramdisk_size=4096 root=/dev/ramdisk ramdisk_start=0 load_ramdisk=1 prompt_ramdisk=1" + +# +# Memory Technology Devices (MTD) +# +# CONFIG_MTD is not set + +# +# Plug and Play configuration +# +# CONFIG_PNP is not set +# CONFIG_ISAPNP is not set + +# +# Block devices +# +CONFIG_BLK_DEV_FD=y +# CONFIG_BLK_DEV_XD is not set +# CONFIG_PARIDE is not set +# CONFIG_BLK_CPQ_DA is not set +# CONFIG_BLK_CPQ_CISS_DA is not set +# CONFIG_CISS_SCSI_TAPE is not set +# CONFIG_BLK_DEV_DAC960 is not set +# CONFIG_BLK_DEV_UMEM is not set +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_NBD=y +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_SIZE=4096 +CONFIG_BLK_DEV_INITRD=y +# CONFIG_BLK_STATS is not set + +# +# Multi-device support (RAID and LVM) +# +# CONFIG_MD is not set +# CONFIG_BLK_DEV_MD is not set +# CONFIG_MD_LINEAR is not set +# CONFIG_MD_RAID0 is not set +# CONFIG_MD_RAID1 is not set +# CONFIG_MD_RAID5 is not set +# CONFIG_MD_MULTIPATH is not set +# CONFIG_BLK_DEV_LVM is not set + +# +# Networking options +# +CONFIG_PACKET=y +# CONFIG_PACKET_MMAP is not set +# CONFIG_NETLINK_DEV is not set +# CONFIG_NETFILTER is not set +# CONFIG_FILTER is not set +CONFIG_UNIX=y +CONFIG_INET=y +# CONFIG_IP_MULTICAST is not set +# CONFIG_IP_ADVANCED_ROUTER is not set +# CONFIG_IP_PNP is not set +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_ARPD is not set +# CONFIG_INET_ECN is not set +# CONFIG_SYN_COOKIES is not set +# CONFIG_IPV6 is not set +# CONFIG_KHTTPD is not set +# CONFIG_ATM is not set +# CONFIG_VLAN_8021Q is not set + +# +# +# +# CONFIG_IPX is not set +# CONFIG_ATALK is not set + +# +# Appletalk devices +# +# CONFIG_DEV_APPLETALK is not set +# CONFIG_DECNET is not set +# CONFIG_BRIDGE is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_LLC is not set +# CONFIG_NET_DIVERT is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set +# CONFIG_NET_FASTROUTE is not set +# CONFIG_NET_HW_FLOWCONTROL is not set + +# +# QoS and/or fair queueing +# +# CONFIG_NET_SCHED is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set + +# +# ATA/IDE/MFM/RLL support +# +CONFIG_IDE=y + +# +# IDE, ATA and ATAPI Block devices +# +CONFIG_BLK_DEV_IDE=y + +# +# Please see Documentation/ide.txt for help/info on IDE drives +# +# CONFIG_BLK_DEV_HD_IDE is not set +# CONFIG_BLK_DEV_HD is not set +CONFIG_BLK_DEV_IDEDISK=y +# CONFIG_IDEDISK_MULTI_MODE is not set +# CONFIG_IDEDISK_STROKE is not set +# CONFIG_BLK_DEV_IDEDISK_VENDOR is not set +# CONFIG_BLK_DEV_IDEDISK_FUJITSU is not set +# CONFIG_BLK_DEV_IDEDISK_IBM is not set +# CONFIG_BLK_DEV_IDEDISK_MAXTOR is not set +# CONFIG_BLK_DEV_IDEDISK_QUANTUM is not set +# CONFIG_BLK_DEV_IDEDISK_SEAGATE is not set +# CONFIG_BLK_DEV_IDEDISK_WD is not set +# CONFIG_BLK_DEV_COMMERIAL is not set +# CONFIG_BLK_DEV_TIVO is not set +# CONFIG_BLK_DEV_IDECS is not set +CONFIG_BLK_DEV_IDECD=y +# CONFIG_BLK_DEV_IDETAPE is not set +# CONFIG_BLK_DEV_IDEFLOPPY is not set +# CONFIG_BLK_DEV_IDESCSI is not set +# CONFIG_IDE_TASK_IOCTL is not set + +# +# IDE chipset support/bugfixes +# +# CONFIG_BLK_DEV_CMD640 is not set +# CONFIG_BLK_DEV_CMD640_ENHANCED is not set +# CONFIG_BLK_DEV_ISAPNP is not set +# CONFIG_BLK_DEV_RZ1000 is not set +CONFIG_BLK_DEV_IDEPCI=y +CONFIG_IDEPCI_SHARE_IRQ=y +CONFIG_BLK_DEV_IDEDMA_PCI=y +# CONFIG_BLK_DEV_OFFBOARD is not set +# CONFIG_BLK_DEV_IDEDMA_FORCED is not set +CONFIG_IDEDMA_PCI_AUTO=y +# CONFIG_IDEDMA_ONLYDISK is not set +CONFIG_BLK_DEV_IDEDMA=y +# CONFIG_IDEDMA_PCI_WIP is not set +# CONFIG_BLK_DEV_IDEDMA_TIMEOUT is not set +# CONFIG_IDEDMA_NEW_DRIVE_LISTINGS is not set +CONFIG_BLK_DEV_ADMA=y +# CONFIG_BLK_DEV_AEC62XX is not set +# CONFIG_AEC62XX_TUNING is not set +# CONFIG_BLK_DEV_ALI15X3 is not set +# CONFIG_WDC_ALI15X3 is not set +# CONFIG_BLK_DEV_AMD74XX is not set +# CONFIG_AMD74XX_OVERRIDE is not set +CONFIG_BLK_DEV_CMD64X=y +# CONFIG_BLK_DEV_CMD680 is not set +# CONFIG_BLK_DEV_CY82C693 is not set +# CONFIG_BLK_DEV_CS5530 is not set +# CONFIG_BLK_DEV_HPT34X is not set +# CONFIG_HPT34X_AUTODMA is not set +# CONFIG_BLK_DEV_HPT366 is not set +# CONFIG_BLK_DEV_NS87415 is not set +# CONFIG_BLK_DEV_OPTI621 is not set +# CONFIG_BLK_DEV_PDC202XX is not set +# CONFIG_PDC202XX_BURST is not set +# CONFIG_PDC202XX_FORCE is not set +# CONFIG_BLK_DEV_SVWKS is not set +# CONFIG_BLK_DEV_SIS5513 is not set +# CONFIG_BLK_DEV_SLC90E66 is not set +# CONFIG_BLK_DEV_TRM290 is not set +# CONFIG_BLK_DEV_VIA82CXXX is not set +# CONFIG_BLK_DEV_SL82C105 is not set +# CONFIG_BLK_DEV_IDE_PMAC is not set +# CONFIG_BLK_DEV_IDEDMA_PMAC is not set +# CONFIG_BLK_DEV_IDEDMA_PMAC_AUTO is not set +# CONFIG_IDE_CHIPSETS is not set +CONFIG_IDEDMA_AUTO=y +# CONFIG_IDEDMA_IVB is not set +# CONFIG_DMA_NONPCI is not set +CONFIG_BLK_DEV_IDE_MODES=y +# CONFIG_BLK_DEV_ATARAID is not set +# CONFIG_BLK_DEV_ATARAID_PDC is not set +# CONFIG_BLK_DEV_ATARAID_HPT is not set + +# +# SCSI support +# +CONFIG_SCSI=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=y +CONFIG_SD_EXTRA_DEVS=40 +CONFIG_CHR_DEV_ST=y +CONFIG_CHR_DEV_OSST=y +CONFIG_BLK_DEV_SR=y +CONFIG_BLK_DEV_SR_VENDOR=y +CONFIG_SR_EXTRA_DEVS=2 +CONFIG_CHR_DEV_SG=y + +# +# Some SCSI devices (e.g. CD jukebox) support multiple LUNs +# +# CONFIG_SCSI_DEBUG_QUEUES is not set +# CONFIG_SCSI_MULTI_LUN is not set +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set + +# +# SCSI low-level drivers +# +# CONFIG_BLK_DEV_3W_XXXX_RAID is not set +# CONFIG_SCSI_7000FASST is not set +# CONFIG_SCSI_ACARD is not set +# CONFIG_SCSI_AHA152X is not set +# CONFIG_SCSI_AHA1542 is not set +# CONFIG_SCSI_AHA1740 is not set +# CONFIG_SCSI_AACRAID is not set +# CONFIG_SCSI_AIC7XXX is not set +# CONFIG_SCSI_AIC7XXX_OLD is not set +# CONFIG_SCSI_DPT_I2O is not set +# CONFIG_SCSI_ADVANSYS is not set +# CONFIG_SCSI_IN2000 is not set +# CONFIG_SCSI_AM53C974 is not set +# CONFIG_SCSI_MEGARAID is not set +# CONFIG_SCSI_BUSLOGIC is not set +# CONFIG_SCSI_CPQFCTS is not set +# CONFIG_SCSI_DMX3191D is not set +# CONFIG_SCSI_DTC3280 is not set +# CONFIG_SCSI_EATA is not set +# CONFIG_SCSI_EATA_DMA is not set +# CONFIG_SCSI_EATA_PIO is not set +# CONFIG_SCSI_FUTURE_DOMAIN is not set +# CONFIG_SCSI_GDTH is not set +# CONFIG_SCSI_GENERIC_NCR5380 is not set +# CONFIG_SCSI_INITIO is not set +# CONFIG_SCSI_INIA100 is not set +# CONFIG_SCSI_NCR53C406A is not set +# CONFIG_SCSI_NCR53C7xx is not set +CONFIG_SCSI_SYM53C8XX_2=y +CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0 +CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 +CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 +CONFIG_SCSI_SYM53C8XX_IOMAPPED=y +# CONFIG_SCSI_PAS16 is not set +# CONFIG_SCSI_PCI2000 is not set +# CONFIG_SCSI_PCI2220I is not set +# CONFIG_SCSI_PSI240I is not set +# CONFIG_SCSI_QLOGIC_FAS is not set +# CONFIG_SCSI_QLOGIC_ISP is not set +# CONFIG_SCSI_QLOGIC_FC is not set +# CONFIG_SCSI_QLOGIC_1280 is not set +# CONFIG_SCSI_SIM710 is not set +# CONFIG_SCSI_SYM53C416 is not set +# CONFIG_SCSI_DC390T is not set +# CONFIG_SCSI_T128 is not set +# CONFIG_SCSI_U14_34F is not set +# CONFIG_SCSI_DEBUG is not set +# CONFIG_SCSI_MESH is not set +# CONFIG_SCSI_MAC53C94 is not set + +# +# IEEE 1394 (FireWire) support (EXPERIMENTAL) +# +# CONFIG_IEEE1394 is not set + +# +# Network device support +# +CONFIG_NETDEVICES=y + +# +# ARCnet devices +# +# CONFIG_ARCNET is not set +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set +# CONFIG_ETHERTAP is not set + +# +# Ethernet (10 or 100Mbit) +# +CONFIG_NET_ETHERNET=y +# CONFIG_MACE is not set +# CONFIG_BMAC is not set +# CONFIG_GMAC is not set +# CONFIG_SUNLANCE is not set +# CONFIG_HAPPYMEAL is not set +# CONFIG_SUNBMAC is not set +# CONFIG_SUNQE is not set +# CONFIG_SUNGEM is not set +CONFIG_NET_VENDOR_3COM=y +# CONFIG_EL1 is not set +# CONFIG_EL2 is not set +# CONFIG_ELPLUS is not set +# CONFIG_EL16 is not set +CONFIG_EL3=y +# CONFIG_3C515 is not set +# CONFIG_ELMC is not set +# CONFIG_ELMC_II is not set +# CONFIG_VORTEX is not set +# CONFIG_LANCE is not set +CONFIG_NET_VENDOR_SMC=y +CONFIG_WD80x3=y +# CONFIG_ULTRAMCA is not set +# CONFIG_ULTRA is not set +# CONFIG_ULTRA32 is not set +# CONFIG_SMC9194 is not set +# CONFIG_NET_VENDOR_RACAL is not set +# CONFIG_AT1700 is not set +# CONFIG_DEPCA is not set +# CONFIG_HP100 is not set +# CONFIG_NET_ISA is not set +# CONFIG_NET_PCI is not set +# CONFIG_NET_POCKET is not set + +# +# Ethernet (1000 Mbit) +# +# CONFIG_ACENIC is not set +# CONFIG_DL2K is not set +# CONFIG_E1000 is not set +# CONFIG_MYRI_SBUS is not set +# CONFIG_NS83820 is not set +# CONFIG_HAMACHI is not set +# CONFIG_YELLOWFIN is not set +# CONFIG_SK98LIN is not set +# CONFIG_TIGON3 is not set +# CONFIG_FDDI is not set +# CONFIG_HIPPI is not set +# CONFIG_PLIP is not set +# CONFIG_PPP is not set +# CONFIG_SLIP is not set + +# +# Wireless LAN (non-hamradio) +# +# CONFIG_NET_RADIO is not set + +# +# Token Ring devices +# +# CONFIG_TR is not set +# CONFIG_NET_FC is not set +# CONFIG_RCPCI is not set +# CONFIG_SHAPER is not set + +# +# Wan interfaces +# +# CONFIG_WAN is not set + +# +# Amateur Radio support +# +# CONFIG_HAMRADIO is not set + +# +# IrDA (infrared) support +# +# CONFIG_IRDA is not set + +# +# ISDN subsystem +# +# CONFIG_ISDN is not set + +# +# Old CD-ROM drivers (not SCSI, not IDE) +# +# CONFIG_CD_NO_IDESCSI is not set + +# +# Console drivers +# +# CONFIG_VGA_CONSOLE is not set + +# +# Frame-buffer support +# +CONFIG_FB=y +CONFIG_DUMMY_CONSOLE=y +# CONFIG_FB_RIVA is not set +# CONFIG_FB_CLGEN is not set +# CONFIG_FB_PM2 is not set +# CONFIG_FB_PM3 is not set +# CONFIG_FB_CYBER2000 is not set +# CONFIG_FB_OF is not set +# CONFIG_FB_CONTROL is not set +# CONFIG_FB_PLATINUM is not set +# CONFIG_FB_VALKYRIE is not set +# CONFIG_FB_CT65550 is not set +# CONFIG_FB_IMSTT is not set +# CONFIG_FB_S3TRIO is not set +CONFIG_FB_IBMS15=y +# CONFIG_FB_VGA16 is not set +# CONFIG_FB_MATROX is not set +# CONFIG_FB_ATY is not set +# CONFIG_FB_RADEON is not set +# CONFIG_FB_ATY128 is not set +# CONFIG_FB_SIS is not set +# CONFIG_FB_NEOMAGIC is not set +# CONFIG_FB_3DFX is not set +# CONFIG_FB_VOODOO1 is not set +# CONFIG_FB_TRIDENT is not set +# CONFIG_FB_VIRTUAL is not set +CONFIG_FBCON_ADVANCED=y +# CONFIG_FBCON_MFB is not set +# CONFIG_FBCON_CFB2 is not set +# CONFIG_FBCON_CFB4 is not set +CONFIG_FBCON_CFB8=y +# CONFIG_FBCON_CFB16 is not set +# CONFIG_FBCON_CFB24 is not set +# CONFIG_FBCON_CFB32 is not set +# CONFIG_FBCON_AFB is not set +# CONFIG_FBCON_ILBM is not set +# CONFIG_FBCON_IPLAN2P2 is not set +# CONFIG_FBCON_IPLAN2P4 is not set +# CONFIG_FBCON_IPLAN2P8 is not set +# CONFIG_FBCON_MAC is not set +# CONFIG_FBCON_VGA_PLANES is not set +# CONFIG_FBCON_VGA is not set +# CONFIG_FBCON_HGA is not set +# CONFIG_FBCON_FONTWIDTH8_ONLY is not set +CONFIG_FBCON_FONTS=y +# CONFIG_FONT_8x8 is not set +CONFIG_FONT_8x16=y +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FB_COMPAT_XPMAC is not set + +# +# Input core support +# +# CONFIG_INPUT is not set +# CONFIG_INPUT_KEYBDEV is not set +# CONFIG_INPUT_MOUSEDEV is not set +# CONFIG_INPUT_JOYDEV is not set +# CONFIG_INPUT_EVDEV is not set + +# +# Macintosh device drivers +# +# CONFIG_ADB_CUDA is not set +# CONFIG_ADB_PMU is not set +# CONFIG_MAC_FLOPPY is not set +# CONFIG_MAC_SERIAL is not set +# CONFIG_ADB is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_SERIAL=y +CONFIG_SERIAL_CONSOLE=y +# CONFIG_SERIAL_EXTENDED is not set +# CONFIG_SERIAL_NONSTANDARD is not set +CONFIG_UNIX98_PTYS=y +CONFIG_UNIX98_PTY_COUNT=256 + +# +# I2C support +# +# CONFIG_I2C is not set + +# +# Mice +# +# CONFIG_BUSMOUSE is not set +CONFIG_MOUSE=y +CONFIG_PSMOUSE=y +# CONFIG_82C710_MOUSE is not set +# CONFIG_PC110_PAD is not set +# CONFIG_MK712_MOUSE is not set + +# +# Joysticks +# +# CONFIG_INPUT_GAMEPORT is not set + +# +# Input core support is needed for gameports +# + +# +# Input core support is needed for joysticks +# +# CONFIG_QIC02_TAPE is not set + +# +# Watchdog Cards +# +# CONFIG_WATCHDOG is not set +# CONFIG_AMD_PM768 is not set +# CONFIG_NVRAM is not set +CONFIG_RTC=y +# CONFIG_DTLK is not set +# CONFIG_R3964 is not set +# CONFIG_APPLICOM is not set + +# +# Ftape, the floppy tape device driver +# +# CONFIG_FTAPE is not set +# CONFIG_AGP is not set +# CONFIG_DRM is not set + +# +# Multimedia devices +# +# CONFIG_VIDEO_DEV is not set + +# +# File systems +# +# CONFIG_QUOTA is not set +# CONFIG_AUTOFS_FS is not set +CONFIG_AUTOFS4_FS=y +# CONFIG_REISERFS_FS is not set +# CONFIG_REISERFS_CHECK is not set +# CONFIG_REISERFS_PROC_INFO is not set +# CONFIG_ADFS_FS is not set +# CONFIG_ADFS_FS_RW is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_BEFS_FS is not set +# CONFIG_BEFS_DEBUG is not set +# CONFIG_BFS_FS is not set +CONFIG_EXT3_FS=y +CONFIG_JBD=y +# CONFIG_JBD_DEBUG is not set +CONFIG_FAT_FS=y +CONFIG_MSDOS_FS=y +# CONFIG_UMSDOS_FS is not set +CONFIG_VFAT_FS=y +# CONFIG_EFS_FS is not set +# CONFIG_JFFS_FS is not set +# CONFIG_JFFS2_FS is not set +CONFIG_CRAMFS=y +CONFIG_TMPFS=y +CONFIG_RAMFS=y +CONFIG_ISO9660_FS=y +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +# CONFIG_JFS_FS is not set +# CONFIG_JFS_DEBUG is not set +# CONFIG_JFS_STATISTICS is not set +CONFIG_MINIX_FS=y +# CONFIG_VXFS_FS is not set +CONFIG_NTFS_FS=y +CONFIG_NTFS_RW=y +# CONFIG_HPFS_FS is not set +CONFIG_PROC_FS=y +CONFIG_DEVFS_FS=y +# CONFIG_DEVFS_MOUNT is not set +# CONFIG_DEVFS_DEBUG is not set +CONFIG_DEVPTS_FS=y +# CONFIG_QNX4FS_FS is not set +# CONFIG_QNX4FS_RW is not set +CONFIG_ROMFS_FS=y +CONFIG_EXT2_FS=y +# CONFIG_SYSV_FS is not set +CONFIG_UDF_FS=y +CONFIG_UDF_RW=y +CONFIG_UFS_FS=y +CONFIG_UFS_FS_WRITE=y + +# +# Network File Systems +# +# CONFIG_CODA_FS is not set +# CONFIG_INTERMEZZO_FS is not set +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +# CONFIG_ROOT_NFS is not set +CONFIG_NFSD=y +CONFIG_NFSD_V3=y +# CONFIG_NFSD_TCP is not set +CONFIG_SUNRPC=y +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +# CONFIG_SMB_FS is not set +# CONFIG_NCP_FS is not set +# CONFIG_NCPFS_PACKET_SIGNING is not set +# CONFIG_NCPFS_IOCTL_LOCKING is not set +# CONFIG_NCPFS_STRONG is not set +# CONFIG_NCPFS_NFS_NS is not set +# CONFIG_NCPFS_OS2_NS is not set +# CONFIG_NCPFS_SMALLDOS is not set +# CONFIG_NCPFS_NLS is not set +# CONFIG_NCPFS_EXTRAS is not set +CONFIG_ZISOFS_FS=y + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +# CONFIG_MAC_PARTITION is not set +CONFIG_MSDOS_PARTITION=y +# CONFIG_BSD_DISKLABEL is not set +# CONFIG_MINIX_SUBPARTITION is not set +CONFIG_SOLARIS_X86_PARTITION=y +# CONFIG_UNIXWARE_DISKLABEL is not set +# CONFIG_LDM_PARTITION is not set +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +CONFIG_SUN_PARTITION=y +# CONFIG_EFI_PARTITION is not set +# CONFIG_SMB_NLS is not set +CONFIG_NLS=y + +# +# Native Language Support +# +CONFIG_NLS_DEFAULT="iso8859-1" +# CONFIG_NLS_CODEPAGE_437 is not set +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +# CONFIG_NLS_CODEPAGE_850 is not set +# CONFIG_NLS_CODEPAGE_852 is not set +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +# CONFIG_NLS_CODEPAGE_866 is not set +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +# CONFIG_NLS_CODEPAGE_1250 is not set +# CONFIG_NLS_CODEPAGE_1251 is not set +CONFIG_NLS_ISO8859_1=y +# CONFIG_NLS_ISO8859_2 is not set +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set +# CONFIG_NLS_ISO8859_14 is not set +# CONFIG_NLS_ISO8859_15 is not set +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +CONFIG_NLS_UTF8=y + +# +# Sound +# +CONFIG_SOUND=y +# CONFIG_DMASOUND_PMAC is not set +# CONFIG_SOUND_ALI5455 is not set +# CONFIG_SOUND_BT878 is not set +# CONFIG_SOUND_CMPCI is not set +# CONFIG_SOUND_EMU10K1 is not set +# CONFIG_MIDI_EMU10K1 is not set +# CONFIG_SOUND_FUSION is not set +# CONFIG_SOUND_CS4281 is not set +# CONFIG_SOUND_ES1370 is not set +# CONFIG_SOUND_ES1371 is not set +# CONFIG_SOUND_ESSSOLO1 is not set +# CONFIG_SOUND_MAESTRO is not set +# CONFIG_SOUND_MAESTRO3 is not set +# CONFIG_SOUND_FORTE is not set +# CONFIG_SOUND_ICH is not set +# CONFIG_SOUND_RME96XX is not set +# CONFIG_SOUND_SONICVIBES is not set +# CONFIG_SOUND_TRIDENT is not set +# CONFIG_SOUND_MSNDCLAS is not set +# CONFIG_SOUND_MSNDPIN is not set +# CONFIG_SOUND_VIA82CXXX is not set +# CONFIG_MIDI_VIA82CXXX is not set +CONFIG_SOUND_OSS=y +# CONFIG_SOUND_TRACEINIT is not set +# CONFIG_SOUND_DMAP is not set +# CONFIG_SOUND_AD1816 is not set +# CONFIG_SOUND_SGALAXY is not set +# CONFIG_SOUND_ADLIB is not set +# CONFIG_SOUND_ACI_MIXER is not set +CONFIG_SOUND_CS4232=y +# CONFIG_SOUND_SSCAPE is not set +# CONFIG_SOUND_GUS is not set +# CONFIG_SOUND_VMIDI is not set +# CONFIG_SOUND_TRIX is not set +# CONFIG_SOUND_MSS is not set +# CONFIG_SOUND_MPU401 is not set +# CONFIG_SOUND_NM256 is not set +# CONFIG_SOUND_MAD16 is not set +# CONFIG_SOUND_PAS is not set +# CONFIG_PAS_JOYSTICK is not set +# CONFIG_SOUND_PSS is not set +# CONFIG_SOUND_SB is not set +# CONFIG_SOUND_AWE32_SYNTH is not set +# CONFIG_SOUND_MAUI is not set +CONFIG_SOUND_YM3812=y +# CONFIG_SOUND_OPL3SA1 is not set +# CONFIG_SOUND_OPL3SA2 is not set +# CONFIG_SOUND_YMFPCI is not set +# CONFIG_SOUND_YMFPCI_LEGACY is not set +# CONFIG_SOUND_UART6850 is not set +# CONFIG_SOUND_AEDSP16 is not set +# CONFIG_SOUND_TVMIXER is not set + +# +# USB support +# +# CONFIG_USB is not set + +# +# Bluetooth support +# +# CONFIG_BLUEZ is not set + +# +# Library routines +# +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y + +# +# Kernel hacking +# +# CONFIG_DEBUG_KERNEL is not set diff -Nruw linux-2.4.20/Documentation/Configure.help 40P-linux-2.4.20/Documentation/Configure.help --- linux-2.4.20/Documentation/Configure.help 2002-11-30 17:00:02.000000000 +0100 +++ 40P-linux-2.4.20/Documentation/Configure.help 2002-11-30 17:10:05.000000000 +0100 @@ -4385,6 +4385,15 @@ CONFIG_FB_S3TRIO If you have a S3 Trio say Y. Say N for S3 Virge. +S15 frame buffer device support +CONFIG_FB_IBMS15 + This is the framebuffer driver for the IBM S15 graphics card found in + IBM 6015 and 7020 PowerPC machines. Say Y here if you have one + of these machines. The S15 is actually just an Weitek P9100 paired + with an IBM 525 DAC, so other cards with that combination of chips may + work. Saying Y to this on non-PReP non-PowerPC machines may have + unexpected effects. + 3Dfx Banshee/Voodoo3 display support CONFIG_FB_3DFX This driver supports graphics boards with the 3Dfx Banshee/Voodoo3 @@ -15514,6 +15523,13 @@ (lsresidual) to parse it. If you aren't on a PReP system, you don't want this. +PReP residual data available in /proc/residual +CONFIG_PROC_PREPRESIDUAL + Enabling this option will create a /proc/residual file which allows + you to get at the residual data on PReP systems. You will need a tool + (lsresidual) to parse it. If you aren't on a PReP system, you don't + want this. + /dev file system support CONFIG_DEVFS_FS This is support for devfs, a virtual file system (like /proc) which diff -Nruw linux-2.4.20/drivers/net/ne.c 40P-linux-2.4.20/drivers/net/ne.c --- linux-2.4.20/drivers/net/ne.c 2002-08-04 19:44:39.000000000 +0200 +++ 40P-linux-2.4.20/drivers/net/ne.c 2002-11-30 17:10:05.000000000 +0100 @@ -394,6 +394,8 @@ #endif } + dev->irq=11; /* SDI for PPC/PreP 6015/7020 in ne2000 mode */ + if (dev->irq < 2) { unsigned long cookie = probe_irq_on(); diff -Nruw linux-2.4.20/drivers/video/Config.in 40P-linux-2.4.20/drivers/video/Config.in --- linux-2.4.20/drivers/video/Config.in 2002-11-30 17:00:08.000000000 +0100 +++ 40P-linux-2.4.20/drivers/video/Config.in 2002-11-30 17:10:05.000000000 +0100 @@ -74,6 +74,7 @@ bool ' Chips 65550 display support' CONFIG_FB_CT65550 bool ' IMS Twin Turbo display support' CONFIG_FB_IMSTT bool ' S3 Trio display support' CONFIG_FB_S3TRIO + dep_bool ' IBM S15 display support' CONFIG_FB_IBMS15 $CONFIG_ALL_PPC tristate ' VGA 16-color graphics console' CONFIG_FB_VGA16 fi if [ "$CONFIG_PARISC" = "y" ]; then @@ -248,6 +249,7 @@ "$CONFIG_FB_MAC" = "y" -o "$CONFIG_FB_RETINAZ3" = "y" -o \ "$CONFIG_FB_VIRGE" = "y" -o "$CONFIG_FB_VIRTUAL" = "y" -o \ "$CONFIG_FB_BWTWO" = "y" -o "$CONFIG_FB_CLGEN" = "y" -o \ + "$CONFIG_FB_IBMS15" = "y" -o \ "$CONFIG_FB_TX3912" = "y" ]; then define_tristate CONFIG_FBCON_MFB y else @@ -310,6 +312,7 @@ "$CONFIG_FB_P9100" = "m" -o "$CONFIG_FB_ATY128" = "m" -o \ "$CONFIG_FB_RIVA" = "m" -o "$CONFIG_FB_3DFX" = "m" -o \ "$CONFIG_FB_SGIVW" = "m" -o "$CONFIG_FB_CYBER2000" = "m" -o \ + "$CONFIG_FB_IBMS15" = "m" -o \ "$CONFIG_FB_PMAG_BA" = "m" -o "$CONFIG_FB_PMAGB_B" = "m" -o \ "$CONFIG_FB_MAXINE" = "m" -o "$CONFIG_FB_RADEON" = "m" -o \ "$CONFIG_FB_SA1100" = "m" -o "$CONFIG_FB_SIS" = "m" -o \ diff -Nruw linux-2.4.20/drivers/video/fbmem.c 40P-linux-2.4.20/drivers/video/fbmem.c --- linux-2.4.20/drivers/video/fbmem.c 2002-11-30 17:00:08.000000000 +0100 +++ 40P-linux-2.4.20/drivers/video/fbmem.c 2002-11-30 17:10:05.000000000 +0100 @@ -87,6 +87,8 @@ extern int virgefb_setup(char*); extern int resolver_video_setup(char*); extern int s3triofb_init(void); +extern int ibm_s15fb_init(void); +extern int ibm_s15fb_setup(char*); extern int vesafb_init(void); extern int vesafb_setup(char*); extern int vga16fb_init(void); @@ -276,6 +278,9 @@ #ifdef CONFIG_FB_Q40 { "q40fb", q40fb_init, NULL }, #endif +#ifdef CONFIG_FB_IBMS15 + { "ibm_s15", ibm_s15fb_init, ibm_s15fb_setup }, +#endif #ifdef CONFIG_FB_TGA { "tga", tgafb_init, tgafb_setup }, #endif diff -Nruw linux-2.4.20/drivers/video/ibm_s15fb.c 40P-linux-2.4.20/drivers/video/ibm_s15fb.c --- linux-2.4.20/drivers/video/ibm_s15fb.c 1970-01-01 01:00:00.000000000 +0100 +++ 40P-linux-2.4.20/drivers/video/ibm_s15fb.c 2002-11-30 17:10:05.000000000 +0100 @@ -0,0 +1,925 @@ +/* + * linux/drivers/video/ibm_s15fb.c -- Frame buffer device for the Weitek P9100 + * + IBM 525 DAC combination built into an IBM 6015/7020 called IBM S15 + * or Diamond Viper Pro PCI + * + * Based on skeletonfb.c created 28 Dec 1997 by Geert Uytterhoeven + * Sven Dickert Nov 30 2001 + * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file README.legal in the main directory of this archive + * for more details. + * + * Version Comments + * 0.1 initial version do the colormap + * 0.2 blank/unblank + * 0.3 find out the resolution and bpp + * 0.4 kick hardware cursor when booted from residual shell + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include