Axel Buehning on Wed, 11 Aug 2004 10:11:34 +0200 (CEST)


[Date Prev] [Date Next] [Thread Prev] [Thread Next] [Date Index] [Thread Index]

cdk/Patches linux-2.4.25-dbox2-ide.diff


diemade     04/08/11 10:11:33

  Added:       Patches  linux-2.4.25-dbox2-ide.diff
  Log:
  2.4.25 patches for dbox2 ide-interface (not clean, includes patches to .config)
  
  Revision  Changes    Path
  1.1                  cdk/Patches/linux-2.4.25-dbox2-ide.diff
  
  file : http://cvs.tuxbox.org/tuxbox/cdk/Patches/linux-2.4.25-dbox2-ide.diff?rev=1.1&content-type=text/vnd.viewcvs-markup
  plain: http://cvs.tuxbox.org/tuxbox/cdk/Patches/linux-2.4.25-dbox2-ide.diff?rev=1.1&content-type=text/plain
  
  Index: linux-2.4.25-dbox2-ide.diff
  ===================================================================
  diff -ur linux-2.4.25-dbox/.config linux-2.4.25/.config
  --- linux-2.4.25-dbox/.config	Sat Feb 21 14:39:13 2004
  +++ linux-2.4.25/.config	Fri Feb 20 21:00:23 2004
  @@ -218,11 +218,15 @@
   # CONFIG_FILTER is not set
   CONFIG_UNIX=y
   CONFIG_INET=y
  -# CONFIG_IP_MULTICAST is not set
  +CONFIG_IP_MULTICAST=y
   # CONFIG_IP_ADVANCED_ROUTER is not set
  -# CONFIG_IP_PNP is not set
  +CONFIG_IP_PNP=y
  +# CONFIG_IP_PNP_DHCP is not set
  +CONFIG_IP_PNP_BOOTP=y
  +# CONFIG_IP_PNP_RARP is not set
   # CONFIG_NET_IPIP is not set
   # CONFIG_NET_IPGRE is not set
  +# CONFIG_IP_MROUTE is not set
   # CONFIG_ARPD is not set
   # CONFIG_INET_ECN is not set
   # CONFIG_SYN_COOKIES is not set
  @@ -271,8 +275,45 @@
   #
   # ATA/IDE/MFM/RLL support
   #
  -# CONFIG_IDE is not set
  +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=y
  +CONFIG_IDEDISK_STROKE=y
  +# 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_MPC8xx_IDE=y
  +# CONFIG_IDE_8xx_PCCARD is not set
  +# CONFIG_IDE_8xx_DIRECT is not set
  +CONFIG_IDE_EXT_DIRECT=y
  +# CONFIG_IDE_CHIPSETS is not set
  +# CONFIG_IDEDMA_AUTO is not set
  +# CONFIG_DMA_NONPCI is not set
  +# CONFIG_BLK_DEV_ATARAID is not set
  +# CONFIG_BLK_DEV_ATARAID_PDC is not set
  +# CONFIG_BLK_DEV_ATARAID_HPT is not set
  +# CONFIG_BLK_DEV_ATARAID_SII is not set
   
   #
   # SCSI support
  @@ -588,7 +629,7 @@
   #
   # CONFIG_QUOTA is not set
   # CONFIG_QFMT_V2 is not set
  -# CONFIG_AUTOFS_FS is not set
  +CONFIG_AUTOFS_FS=y
   # CONFIG_AUTOFS4_FS is not set
   # CONFIG_REISERFS_FS is not set
   # CONFIG_REISERFS_CHECK is not set
  @@ -601,24 +643,24 @@
   # CONFIG_BEFS_FS is not set
   # CONFIG_BEFS_DEBUG is not set
   # CONFIG_BFS_FS is not set
  -# CONFIG_EXT3_FS is not set
  -# CONFIG_JBD is not set
  +CONFIG_EXT3_FS=y
  +CONFIG_JBD=y
   # CONFIG_JBD_DEBUG is not set
  -# CONFIG_FAT_FS is not set
  -# CONFIG_MSDOS_FS is not set
  -# CONFIG_UMSDOS_FS is not set
  -# CONFIG_VFAT_FS is not set
  +CONFIG_FAT_FS=m
  +CONFIG_MSDOS_FS=m
  +CONFIG_UMSDOS_FS=m
  +CONFIG_VFAT_FS=m
   # CONFIG_EFS_FS is not set
   # CONFIG_JFFS_FS is not set
   CONFIG_JFFS2_FS=y
   CONFIG_JFFS2_FS_DEBUG=0
   # CONFIG_JFFS2_FS_NAND is not set
   CONFIG_CRAMFS=y
   # CONFIG_SQUASHFS is not set
  -# CONFIG_TMPFS is not set
  +CONFIG_TMPFS=y
   CONFIG_RAMFS=y
  -# CONFIG_ISO9660_FS is not set
  -# CONFIG_JOLIET is not set
  +CONFIG_ISO9660_FS=y
  +CONFIG_JOLIET=y
   # CONFIG_ZISOFS is not set
   # CONFIG_JFS_FS is not set
   # CONFIG_JFS_DEBUG is not set
  @@ -635,9 +676,9 @@
   # CONFIG_QNX4FS_FS is not set
   # CONFIG_QNX4FS_RW is not set
   # CONFIG_ROMFS_FS is not set
  -# CONFIG_EXT2_FS is not set
  +CONFIG_EXT2_FS=y
   # CONFIG_SYSV_FS is not set
  -# CONFIG_UDF_FS is not set
  +CONFIG_UDF_FS=m
   # CONFIG_UDF_RW is not set
   # CONFIG_UFS_FS is not set
   # CONFIG_UFS_FS_WRITE is not set
  @@ -652,15 +693,15 @@
   #
   # CONFIG_CODA_FS is not set
   # CONFIG_INTERMEZZO_FS is not set
  -CONFIG_NFS_FS=m
  +CONFIG_NFS_FS=y
   CONFIG_NFS_V3=y
   # CONFIG_NFS_DIRECTIO is not set
  -# CONFIG_ROOT_NFS is not set
  +CONFIG_ROOT_NFS=y
   # CONFIG_NFSD is not set
   # CONFIG_NFSD_V3 is not set
   # CONFIG_NFSD_TCP is not set
  -CONFIG_SUNRPC=m
  -CONFIG_LOCKD=m
  +CONFIG_SUNRPC=y
  +CONFIG_LOCKD=y
   CONFIG_LOCKD_V4=y
   CONFIG_CIFS=m
   # CONFIG_SMB_FS is not set
  diff -ur linux-2.4.25-dbox/arch/ppc/platforms/dbox2.h linux-2.4.25/arch/ppc/platforms/dbox2.h
  --- linux-2.4.25-dbox/arch/ppc/platforms/dbox2.h	Fri Nov 28 19:26:19 2003
  +++ linux-2.4.25/arch/ppc/platforms/dbox2.h	Fri Feb 20 21:00:19 2004
  @@ -1,6 +1,6 @@
   /*
    * D-BOX2 board specific definitions
  - * 
  + *
    * Copyright (c) 2001-2002 Florian Schirmer (jolt@tuxbox.org)
    */
   
  @@ -8,7 +8,7 @@
   #define __MACH_DBOX2_H
   
   #include <linux/config.h>
  - 
  +
   #include <asm/ppcboot.h>
   
   #define	DBOX2_IMMR_BASE	0xFF000000	/* phys. addr of IMMR */
  @@ -16,6 +16,83 @@
   
   #define	IMAP_ADDR	DBOX2_IMMR_BASE	/* physical base address of IMMR area */
   #define IMAP_SIZE	DBOX2_IMAP_SIZE	/* mapped size of IMMR area */
  +
  +
  +/*-----------------------------------------------------------------------
  + * added 11.09.2003 07:14 by RR4711 for IDE Interface support
  + *-----------------------------------------------------------------------
  +*/
  +
  +#if (defined(CONFIG_PCMCIA_M8XX)    || defined(CONFIG_PCMCIA_M8XX_MODULE) ) && \
  +    (defined(CONFIG_IDE_8xx_PCCARD) || defined(CONFIG_IDE_8xx_DIRECT) )
  +#error "Do NOT defined CONFIG_PCMCIA_M8XX _and_ CONFIG_IDE_8xx_XXX !!!"
  +#endif
  +
  +
  +/*if defined(CONFIG_PCMCIA_M8XX) || defined(CONFIG_PCMCIA_M8XX_MODULE)*/
  +#ifdef CONFIG_HOTPLUG
  +/* define IO_BASE for PCMCIA */
  +#define _IO_BASE	0x80000000
  +#define _IO_BASE_SIZE	(64<<10)
  +/*#define _IO_BASE_SIZE	0x1000		??? */
  +
  +#ifdef CONFIG_IDE
  +#define ide_request_irq(irq,hand,flg,dev,id)    \
  +        request_8xxirq((irq),(hand),(flg),(dev),(id))
  +#endif
  +#endif
  +
  +#define PCMCIA_MEM_SIZE		( 64 << 20 )
  +
  +#define MAX_HWIFS			1	/* overwrite default in include/asm-ppc/ide.h	*/
  +
  +/*
  + * Definitions for IDE0 Interface
  	<<Truncated>>
  
  

-- 
To UNSUBSCRIBE, email to tuxbox-cvs-request@cvs.tuxbox.org
with a subject of "unsubscribe". Trouble? Contact listmaster@cvs.tuxbox.org