Subversion Repositories openrisc

diff -uNr --exclude=.*flags --exclude=*.[ao] --exclude=.*depend /work2/iPAQ/HandHelds.org/cvs/linux/kernel/.config.old ./.config.old

--- /work2/iPAQ/HandHelds.org/cvs/linux/kernel/.config.old      Wed Dec 31 17:00:00 1969

+++ ./.config.old       Sat Mar 24 05:12:24 2001

@@ -0,0 +1,689 @@

+#

+# Automatically generated make config: don't edit

+#

+CONFIG_ARM=y

+# CONFIG_EISA is not set

+# CONFIG_SBUS is not set

+# CONFIG_MCA is not set

+CONFIG_UID16=y

+

+#

+# Code maturity level options

+#

+CONFIG_EXPERIMENTAL=y

+# CONFIG_OBSOLETE is not set

+

+#

+# Loadable module support

+#

+CONFIG_MODULES=y

+# CONFIG_MODVERSIONS is not set

+CONFIG_KMOD=y

+

+#

+# System Type

+#

+# CONFIG_ARCH_ARCA5K is not set

+# CONFIG_ARCH_CLPS7500 is not set

+# CONFIG_ARCH_CO285 is not set

+# CONFIG_ARCH_EBSA110 is not set

+# CONFIG_ARCH_L7200 is not set

+# CONFIG_ARCH_FOOTBRIDGE is not set

+# CONFIG_ARCH_INTEGRATOR is not set

+# CONFIG_ARCH_RPC is not set

+CONFIG_ARCH_SA1100=y

+# CONFIG_ARCH_CLPS711X is not set

+

+#

+# Archimedes/A5000 Implementations

+#

+

+#

+# Archimedes/A5000 Implementations (select only ONE)

+#

+

+#

+# Footbridge Implementations

+#

+

+#

+# SA11x0 Implementations

+#

+# CONFIG_SA1100_ASSABET is not set

+# CONFIG_SA1100_BRUTUS is not set

+# CONFIG_SA1100_CERF is not set

+CONFIG_SA1100_BITSY=y

+# CONFIG_SA1100_JORNADA720 is not set

+# CONFIG_SA1100_EXTENEX1 is not set

+# CONFIG_SA1100_FREEBIRD is not set

+# CONFIG_SA1100_GRAPHICSCLIENT is not set

+# CONFIG_SA1100_HUW_WEBPANEL is not set

+# CONFIG_SA1100_LART is not set

+# CONFIG_SA1100_OMNIMETER is not set

+# CONFIG_SA1100_PLEB is not set

+# CONFIG_SA1100_NANOENGINE is not set

+# CONFIG_SA1100_PANGOLIN is not set

+# CONFIG_SA1100_SHERMAN is not set

+# CONFIG_SA1100_VICTOR is not set

+# CONFIG_SA1100_XP860 is not set

+# CONFIG_SA1100_YOPY is not set

+CONFIG_SA1100_USB=m

+CONFIG_SA1100_USB_NETLINK=m

+CONFIG_SA1100_USB_CHAR=m

+CONFIG_SA1100_FREQUENCY_SCALE=m

+

+#

+# CLPS711X/EP721X Implementations

+#

+# CONFIG_ARCH_ACORN is not set

+# CONFIG_FOOTBRIDGE is not set

+# CONFIG_FOOTBRIDGE_HOST is not set

+# CONFIG_FOOTBRIDGE_ADDIN is not set

+CONFIG_CPU_32=y

+# CONFIG_CPU_26 is not set

+

+#

+# Processor Type

+#

+# CONFIG_CPU_32v3 is not set

+CONFIG_CPU_32v4=y

+# CONFIG_CPU_ARM610 is not set

+# CONFIG_CPU_ARM710 is not set

+# CONFIG_CPU_ARM720T is not set

+# CONFIG_CPU_ARM920T is not set

+# CONFIG_CPU_ARM1020 is not set

+# CONFIG_CPU_SA110 is not set

+CONFIG_CPU_SA1100=y

+CONFIG_DISCONTIGMEM=y

+

+#

+# General setup

+#

+

+#

+# Please ensure that you have read the help on the next option

+#

+# CONFIG_ANGELBOOT is not set

+# CONFIG_PCI is not set

+# CONFIG_ISA is not set

+# CONFIG_ISA_DMA is not set

+CONFIG_HOTPLUG=y

+

+#

+# PCMCIA/CardBus support

+#

+CONFIG_PCMCIA=m

+# CONFIG_I82365 is not set

+# CONFIG_TCIC is not set

+CONFIG_PCMCIA_SA1100=m

+CONFIG_MERCURY_BACKPAQ=m

+CONFIG_NET=y

+CONFIG_SYSVIPC=y

+# CONFIG_BSD_PROCESS_ACCT is not set

+CONFIG_SYSCTL=y

+CONFIG_FPE_NWFPE=m

+CONFIG_FPE_FASTFPE=y

+CONFIG_KCORE_ELF=y

+# CONFIG_KCORE_AOUT is not set

+CONFIG_BINFMT_AOUT=m

+CONFIG_BINFMT_ELF=y

+# CONFIG_BINFMT_MISC is not set

+CONFIG_PM=y

+CONFIG_APM=m

+# CONFIG_ARTHUR is not set

+CONFIG_CMDLINE="keepinitrd"

+# CONFIG_LEDS is not set

+CONFIG_ALIGNMENT_TRAP=y

+# CONFIG_UCB1200 is not set

+

+#

+# Parallel port support

+#

+# CONFIG_PARPORT is not set

+

+#

+# Memory Technology Devices (MTD)

+#

+CONFIG_MTD=y

+# CONFIG_MTD_DEBUG is not set

+

+#

+# Disk-On-Chip Device Drivers

+#

+# CONFIG_MTD_DOC1000 is not set

+# CONFIG_MTD_DOC2000 is not set

+# CONFIG_MTD_DOC2001 is not set

+# CONFIG_MTD_DOCPROBE is not set

+

+#

+# RAM/ROM Device Drivers

+#

+# CONFIG_MTD_SLRAM is not set

+# CONFIG_MTD_RAM is not set

+# CONFIG_MTD_ROM is not set

+# CONFIG_MTD_MTDRAM is not set

+

+#

+# Linearly Mapped Flash Device Drivers

+#

+CONFIG_MTD_CFI=y

+# CONFIG_MTD_CFI_GEOMETRY is not set

+CONFIG_MTD_CFI_INTELEXT=y

+# CONFIG_MTD_CFI_AMDSTD is not set

+# CONFIG_MTD_AMDSTD is not set

+# CONFIG_MTD_SHARP is not set

+# CONFIG_MTD_PHYSMAP is not set

+# CONFIG_MTD_NORA is not set

+# CONFIG_MTD_PNC2000 is not set

+# CONFIG_MTD_RPXLITE is not set

+# CONFIG_MTD_SC520CDP is not set

+# CONFIG_MTD_SBC_MEDIAGX is not set

+# CONFIG_MTD_ELAN_104NC is not set

+CONFIG_MTD_SA1100=y

+# CONFIG_MTD_DC21285 is not set

+# CONFIG_MTD_CSTM_CFI_JEDEC is not set

+# CONFIG_MTD_JEDEC is not set

+

+#

+# NAND Flash Device Drivers

+#

+# CONFIG_MTD_NAND is not set

+

+#

+# User Modules And Translation Layers

+#

+CONFIG_MTD_CHAR=m

+CONFIG_MTD_BLOCK=y

+# CONFIG_FTL is not set

+# CONFIG_NFTL is not set

+

+#

+# Plug and Play configuration

+#

+# CONFIG_PNP is not set

+

+#

+# Block devices

+#

+# CONFIG_BLK_DEV_FD is not set

+CONFIG_BLK_DEV_LOOP=m

+CONFIG_BLK_DEV_NBD=m

+CONFIG_BLK_DEV_RAM=y

+CONFIG_BLK_DEV_RAM_SIZE=4096

+CONFIG_BLK_DEV_INITRD=y

+

+#

+# Multi-device support (RAID and LVM)

+#

+# CONFIG_MD is not set

+

+#

+# Networking options

+#

+CONFIG_PACKET=m

+CONFIG_PACKET_MMAP=y

+# CONFIG_NETLINK is not set

+# CONFIG_NETFILTER is not set

+# CONFIG_FILTER is not set

+CONFIG_UNIX=m

+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_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_IPX is not set

+# CONFIG_ATALK 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 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_NET_SB1000 is not set

+

+#

+# Ethernet (10 or 100Mbit)

+#

+# CONFIG_NET_ETHERNET is not set

+

+#

+# Ethernet (1000 Mbit)

+#

+# CONFIG_ACENIC_OMIT_TIGON_I is not set

+# CONFIG_FDDI is not set

+# CONFIG_HIPPI is not set

+CONFIG_PPP=m

+# CONFIG_PPP_MULTILINK is not set

+CONFIG_PPP_ASYNC=m

+# CONFIG_PPP_SYNC_TTY is not set

+CONFIG_PPP_DEFLATE=m

+CONFIG_PPP_BSDCOMP=m

+# CONFIG_PPPOE 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

+

+#

+# PCMCIA network device support

+#

+CONFIG_NET_PCMCIA=y

+CONFIG_PCMCIA_3C589=m

+CONFIG_PCMCIA_3C574=m

+CONFIG_PCMCIA_FMVJ18X=m

+CONFIG_PCMCIA_PCNET=m

+CONFIG_PCMCIA_NMCLAN=m

+CONFIG_PCMCIA_SMC91C92=m

+CONFIG_PCMCIA_XIRC2PS=m

+# CONFIG_NET_PCMCIA_RADIO is not set

+

+#

+# Amateur Radio support

+#

+# CONFIG_HAMRADIO is not set

+

+#

+# IrDA (infrared) support

+#

+CONFIG_IRDA=m

+

+#

+# IrDA protocols

+#

+CONFIG_IRLAN=m

+CONFIG_IRNET=m

+CONFIG_IRCOMM=m

+CONFIG_IRDA_ULTRA=y

+CONFIG_IRDA_OPTIONS=y

+

+#

+#   IrDA options

+#

+CONFIG_IRDA_CACHE_LAST_LSAP=y

+CONFIG_IRDA_FAST_RR=y

+CONFIG_IRDA_DEBUG=y

+

+#

+# Infrared-port device drivers

+#

+

+#

+# SIR device drivers

+#

+# CONFIG_IRTTY_SIR is not set

+# CONFIG_IRPORT_SIR is not set

+

+#

+# FIR device drivers

+#

+# CONFIG_NSC_FIR is not set

+# CONFIG_WINBOND_FIR is not set

+# CONFIG_TOSHIBA_FIR is not set

+# CONFIG_SMC_IRCC_FIR is not set

+CONFIG_SA1100_FIR=m

+

+#

+# Dongle support

+#

+# CONFIG_DONGLE is not set

+

+#

+# ATA/IDE/MFM/RLL support

+#

+CONFIG_IDE=m

+

+#

+# IDE, ATA and ATAPI Block devices

+#

+CONFIG_BLK_DEV_IDE=m

+

+#

+# 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=m

+# CONFIG_IDEDISK_MULTI_MODE is not set

+# CONFIG_BLK_DEV_IDEDISK_VENDOR is not set

+# CONFIG_BLK_DEV_COMMERIAL is not set

+CONFIG_BLK_DEV_IDECS=m

+CONFIG_BLK_DEV_IDECD=m

+CONFIG_BLK_DEV_IDETAPE=m

+CONFIG_BLK_DEV_IDEFLOPPY=m

+

+#

+# IDE chipset support/bugfixes

+#

+# CONFIG_BLK_DEV_CMD640 is not set

+# CONFIG_IDE_CHIPSETS is not set

+# CONFIG_IDEDMA_AUTO is not set

+# CONFIG_DMA_NONPCI is not set

+# CONFIG_BLK_DEV_IDE_MODES is not set

+

+#

+# SCSI support

+#

+# CONFIG_SCSI is not set

+

+#

+# I2O device support

+#

+# CONFIG_I2O is not set

+

+#

+# ISDN subsystem

+#

+# CONFIG_ISDN is not set

+

+#

+# Input core support

+#

+# CONFIG_INPUT is not set

+

+#

+# Character devices

+#

+CONFIG_VT=y

+CONFIG_VT_CONSOLE=y

+CONFIG_SERIAL_SA1100=y

+CONFIG_SERIAL_SA1100_CONSOLE=y

+CONFIG_SA1100_DEFAULT_BAUDRATE=38400

+CONFIG_TOUCHSCREEN_BITSY=m

+CONFIG_H3600_SLEEVE=m

+CONFIG_SERIAL=m

+# CONFIG_SERIAL_EXTENDED is not set

+# CONFIG_SERIAL_NONSTANDARD is not set

+CONFIG_PROFILER=m

+CONFIG_SERIAL_CORE=y

+CONFIG_SERIAL_CORE_CONSOLE=y

+CONFIG_UNIX98_PTYS=y

+CONFIG_UNIX98_PTY_COUNT=32

+

+#

+# I2C support

+#

+# CONFIG_I2C is not set

+

+#

+# Mice

+#

+# CONFIG_BUSMOUSE is not set

+CONFIG_MOUSE=m

+# CONFIG_PSMOUSE is not set

+# CONFIG_82C710_MOUSE is not set

+# CONFIG_PC110_PAD is not set

+

+#

+# Joysticks

+#

+

+#

+# Game port support

+#

+

+#

+# Gameport joysticks

+#

+

+#

+# Serial port support

+#

+

+#

+# Serial port joysticks

+#

+

+#

+# Parallel port joysticks

+#

+

+#

+#   Parport support is needed for parallel port joysticks

+#

+# CONFIG_QIC02_TAPE is not set

+

+#

+# Watchdog Cards

+#

+# CONFIG_WATCHDOG is not set

+# CONFIG_NVRAM is not set

+# CONFIG_RTC is not set

+CONFIG_SA1100_RTC=m

+# 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

+CONFIG_PCMCIA_SERIAL=m

+

+#

+# PCMCIA character device support

+#

+CONFIG_PCMCIA_SERIAL_CS=m

+

+#

+# Multimedia devices

+#

+# CONFIG_VIDEO_DEV is not set

+

+#

+# File systems

+#

+# CONFIG_QUOTA is not set

+# CONFIG_AUTOFS_FS is not set

+# CONFIG_AUTOFS4_FS is not set

+# CONFIG_REISERFS_FS is not set

+# CONFIG_ADFS_FS is not set

+# CONFIG_AFFS_FS is not set

+# CONFIG_HFS_FS is not set

+# CONFIG_BFS_FS is not set

+CONFIG_FAT_FS=m

+# CONFIG_MSDOS_FS is not set

+CONFIG_VFAT_FS=m

+# CONFIG_EFS_FS is not set

+# CONFIG_JFFS_FS is not set

+CONFIG_JFFS2_FS=y

+CONFIG_JFFS2_FS_DEBUG=1

+CONFIG_CRAMFS=m

+CONFIG_RAMFS=m

+# CONFIG_ISO9660_FS is not set

+# CONFIG_MINIX_FS is not set

+# CONFIG_NTFS_FS is not set

+# 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_ROMFS_FS is not set

+CONFIG_EXT2_FS=m

+# CONFIG_SYSV_FS is not set

+# CONFIG_UDF_FS is not set

+# CONFIG_UFS_FS is not set

+

+#

+# Network File Systems

+#

+# CONFIG_CODA_FS is not set

+CONFIG_NFS_FS=m

+# CONFIG_NFS_V3 is not set

+# CONFIG_NFSD is not set

+CONFIG_SUNRPC=m

+CONFIG_LOCKD=m

+CONFIG_SMB_FS=m

+# CONFIG_SMB_NLS_DEFAULT is not set

+# CONFIG_NCP_FS is not set

+

+#

+# Partition Types

+#

+# CONFIG_PARTITION_ADVANCED is not set

+CONFIG_MSDOS_PARTITION=y

+CONFIG_SMB_NLS=y

+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_874 is not set

+# CONFIG_NLS_CODEPAGE_932 is not set

+# CONFIG_NLS_CODEPAGE_936 is not set

+# CONFIG_NLS_CODEPAGE_949 is not set

+# CONFIG_NLS_CODEPAGE_950 is not set

+# CONFIG_NLS_ISO8859_1 is not set

+# 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_8 is not set

+# CONFIG_NLS_ISO8859_9 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_UTF8 is not set

+

+#

+# Console drivers

+#

+CONFIG_PC_KEYMAP=y

+# CONFIG_VGA_CONSOLE is not set

+CONFIG_FB=y

+

+#

+# Frame-buffer support

+#

+CONFIG_FB=y

+CONFIG_DUMMY_CONSOLE=y

+CONFIG_FB_SA1100=y

+# 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 is not set

+CONFIG_FBCON_CFB16=y

+# 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=y

+CONFIG_FBCON_FONTS=y

+CONFIG_FONT_8x8=y

+# CONFIG_FONT_8x16 is not set

+# CONFIG_FONT_SUN8x16 is not set

+# CONFIG_FONT_PEARL_8x8 is not set

+# CONFIG_FONT_ACORN_8x8 is not set

+

+#

+# Sound

+#

+CONFIG_SOUND=m

+CONFIG_SOUND_UDA1341=m

+# CONFIG_SOUND_SA1100_SSP is not set

+# CONFIG_SOUND_CMPCI is not set

+# CONFIG_SOUND_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_SONICVIBES is not set

+# CONFIG_SOUND_TRIDENT is not set

+# CONFIG_SOUND_MSNDCLAS is not set

+# CONFIG_SOUND_MSNDPIN is not set

+# CONFIG_SOUND_OSS is not set

+

+#

+# USB support

+#

+# CONFIG_USB is not set

+

+#

+# Kernel hacking

+#

+# CONFIG_NO_FRAME_POINTER is not set

+# CONFIG_DEBUG_ERRORS is not set

+# CONFIG_DEBUG_USER is not set

+# CONFIG_DEBUG_INFO is not set

+# CONFIG_MAGIC_SYSRQ is not set

+# CONFIG_DEBUG_LL is not set

diff -uNr --exclude=.*flags --exclude=*.[ao] --exclude=.*depend /work2/iPAQ/HandHelds.org/cvs/linux/kernel/drivers/mtd/Makefile ./drivers/mtd/Makefile

--- /work2/iPAQ/HandHelds.org/cvs/linux/kernel/drivers/mtd/Makefile     Thu Mar 22 20:04:59 2001

+++ ./drivers/mtd/Makefile      Fri Mar 23 05:26:31 2001

@@ -108,7 +108,7 @@

 obj-$(CONFIG_MTD_SC520CDP)     += sc520cdp.o

 obj-$(CONFIG_MTD_SBC_MEDIAGX)   += sbc_mediagx.o mtdpart.o

 obj-$(CONFIG_MTD_ELAN_104NC)    += elan-104nc.o mtdpart.o

-obj-$(CONFIG_MTD_SA1100)        += sa1100-flash.o mtdpart.o

+obj-$(CONFIG_MTD_SA1100)        += sa1100-flash.o mtdpart.o redboot.o

 obj-$(CONFIG_MTD_DC21285)       += dc21285.o mtdpart.o

 obj-$(CONFIG_MTD_IQ80310)       += iq80310.o mtdpart.o

diff -uNr --exclude=.*flags --exclude=*.[ao] --exclude=.*depend /work2/iPAQ/HandHelds.org/cvs/linux/kernel/drivers/mtd/sa1100-flash.c ./drivers/mtd/sa1100-flash.c

--- /work2/iPAQ/HandHelds.org/cvs/linux/kernel/drivers/mtd/sa1100-flash.c       Thu Mar 22 20:05:13 2001

+++ ./drivers/mtd/sa1100-flash.c        Fri Mar 23 20:06:24 2001

@@ -387,6 +387,7 @@

 #define NB_OF(x)  (sizeof(x)/sizeof(x[0]))

 static struct mtd_info *mymtd;

+extern int parse_redboot_partitions(struct mtd_info *master, struct mtd_partition **pparts);

 int __init sa1100_mtd_init(void)

 {

@@ -485,14 +486,36 @@

                nb_parts, buswidth);

        mymtd = do_cfi_probe(&sa1100_map);

-       if (mymtd) {

-               mymtd->module = THIS_MODULE;

-               add_mtd_partitions(mymtd, parts, nb_parts);

-               printk(KERN_NOTICE "SA1100 flash access initialized\n");

-               return 0;

+       if (!mymtd)

+               return -ENXIO;

+

+

+#define CONFIG_SA1100_REDBOOT_PARTITIONS

+#ifdef CONFIG_SA1100_REDBOOT_PARTITIONS

+       {

+               int redboot_nr_parts;

+               struct mtd_partitions *redboot_parts;

+

+

+               redboot_nr_parts = parse_redboot_partitions(mymtd, &redboot_parts);

+               if (nb_parts > 0) {

+                       int i;

+

+                       parts = redboot_parts;

+                       nb_parts = redboot_nr_parts;

+                       for (i=0; i<nb_parts; i++) {

+                               printk("RedBoot Partition: \"%s\", 0x%08lx-0x%08lx\n", parts[i].name, parts[i].offset, parts[i].offset+parts[i].size);

+                       }

+

+               }

        }

-       return -ENXIO;

+#endif

+

+       mymtd->module = THIS_MODULE;

+       add_mtd_partitions(mymtd, parts, nb_parts);

+       printk(KERN_NOTICE "SA1100 flash access initialized\n");

+       return 0;

 }

 static void __exit sa1100_mtd_cleanup(void)

diff -uNr /work2/iPAQ/HandHelds.org/cvs/linux/kernel/drivers/mtd/redboot.c drivers/mtd/redboot.c

--- /work2/iPAQ/HandHelds.org/cvs/linux/kernel/drivers/mtd/redboot.c    Wed Dec 31 17:00:00 1969

+++ drivers/mtd/redboot.c       Fri Mar 23 20:11:37 2001

@@ -0,0 +1,148 @@

+/*

+ * $Id: redboot.c,v 1.2 2001/03/14 13:19:47 dwmw2 Exp $

+ *

+ * Parse RedBoot-style Flash Image System (FIS) tables and

+ * produce a Linux partition array to match.

+ */

+

+#include <linux/kernel.h>

+#include <linux/slab.h>

+

+#include <linux/mtd/mtd.h>

+#include <linux/mtd/partitions.h>

+

+struct fis_image_desc {

+    unsigned char name[16];      // Null terminated name

+    unsigned long flash_base;    // Address within FLASH of image

+    unsigned long mem_base;      // Address in memory where it executes

+    unsigned long size;          // Length of image

+    unsigned long entry_point;   // Execution entry point

+    unsigned long data_length;   // Length of actual data

+    unsigned char _pad[256-(16+7*sizeof(unsigned long))];

+    unsigned long desc_cksum;    // Checksum over image descriptor

+    unsigned long file_cksum;    // Checksum over image data

+};

+

+struct fis_list {

+       struct fis_image_desc *img;

+       struct fis_list *next;

+};

+

+static inline int redboot_checksum(struct fis_image_desc *img)

+{

+       /* RedBoot doesn't actually write the desc_cksum field yet AFAICT */

+       return 1;

+}

+

+int parse_redboot_partitions(struct mtd_info *master, struct mtd_partition **pparts)

+{

+       int nrparts = 0;

+       struct fis_image_desc *buf;

+       struct mtd_partition *parts;

+       struct fis_list *fl = NULL, *tmp_fl;

+       int ret, i;

+       size_t retlen;

+       char *names;

+       int namelen = 0;

+

+       buf = kmalloc(PAGE_SIZE, GFP_KERNEL);

+

+       if (!buf)

+               return -ENOMEM;

+

+       /* Read the start of the last erase block */

+       ret = master->read(master, master->size - master->erasesize,

+                          PAGE_SIZE, &retlen, (void *)buf);

+

+       if (ret)

+               goto out;

+

+       if (retlen != PAGE_SIZE) {

+               ret = -EIO;

+               goto out;

+       }

+

+       if (memcmp(buf, "RedBoot", 8)) {

+               ret = 0;

+               goto out;

+       }

+

+       for (i = 0; i < PAGE_SIZE / sizeof(struct fis_image_desc); i++) {

+               struct fis_list *new_fl, **prev;

+

+               if (buf[i].name[0] == 0xff)

+                       break;

+               if (!redboot_checksum(&buf[i]))

+                       break;

+

+               new_fl = kmalloc(sizeof(struct fis_list), GFP_KERNEL);

+               namelen += strlen(buf[i].name)+1;

+               if (!new_fl) {

+                       ret = -ENOMEM;

+                       goto out;

+               }

+               new_fl->img = &buf[i];

+               buf[i].flash_base &= master->size-1;

+

+               /* I'm sure the JFFS2 code has done me permanent damage.

+                * I now think the following is _normal_

+                */

+               prev = &fl;

+               while(*prev && (*prev)->img->flash_base < new_fl->img->flash_base)

+                       prev = &(*prev)->next;

+               new_fl->next = *prev;

+               *prev = new_fl;

+

+               nrparts++;

+       }

+       if (fl->img->flash_base)

+               nrparts++;

+

+       for (tmp_fl = fl; tmp_fl->next; tmp_fl = tmp_fl->next) {

+               if (tmp_fl->img->flash_base + tmp_fl->img->size + master->erasesize < tmp_fl->next->img->flash_base)

+                       nrparts++;

+       }

+       parts = kmalloc(sizeof(*parts)*nrparts + namelen, GFP_KERNEL);

+

+       if (!parts) {

+               ret = -ENOMEM;

+               goto out;

+       }

+       names = &parts[nrparts];

+       memset(parts, 0, sizeof(*parts)*nrparts + namelen);

+       i=0;

+

+       if (fl->img->flash_base) {

+              parts[0].name = "unallocated space";

+              parts[0].size = fl->img->flash_base;

+              parts[0].offset = 0;

+       }

+       for ( ; i<nrparts; i++) {

+               parts[i].size = fl->img->size;

+               parts[i].offset = fl->img->flash_base;

+               parts[i].name = names;

+

+               strcpy(names, fl->img->name);

+               names += strlen(names)+1;

+

+               if(fl->next && fl->img->flash_base + fl->img->size + master->erasesize < fl->next->img->flash_base) {

+                       i++;

+                       parts[i].offset = parts[i-1].size + parts[i-1].offset;

+                       parts[i].size = fl->next->img->flash_base - parts[i].offset;

+                       parts[i].name = "unallocated space";

+               }

+               tmp_fl = fl;

+               fl = fl->next;

+               kfree(tmp_fl);

+       }

+       ret = nrparts;

+       *pparts = parts;

+ out:

+       while (fl) {

+               struct fis_list *old = fl;

+               fl = fl->next;

+               kfree(old);

+       }

+       kfree(buf);

+       return ret;

+}