diff -urN linux-2.4.2-rmk2-np1.org/arch/arm/def-configs/freebird linux-2.4.2-rmk2-np1-fb1/arch/arm/def-configs/freebird --- linux-2.4.2-rmk2-np1.org/arch/arm/def-configs/freebird Wed Apr 4 12:59:37 2001 +++ linux-2.4.2-rmk2-np1-fb1/arch/arm/def-configs/freebird Wed Apr 4 13:38:08 2001 @@ -63,9 +63,11 @@ CONFIG_SA1100_FREEBIRD=y CONFIG_SA1100_FREEBIRD_OLD=y # CONFIG_SA1100_FREEBIRD_NEW is not set +CONFIG_SA1100_FL=y +# CONFIG_SA1100_REGMON is not set CONFIG_SA1100_USB=m CONFIG_SA1100_USB_NETLINK=m -CONFIG_SA1100_FREQUENCY_SCALE=y +# CONFIG_SA1100_FREQUENCY_SCALE is not set # CONFIG_SA1100_VOLTAGE_SCALE is not set # @@ -112,9 +114,9 @@ CONFIG_NWFPE=y CONFIG_KCORE_ELF=y # CONFIG_KCORE_AOUT is not set -# CONFIG_BINFMT_AOUT is not set +CONFIG_BINFMT_AOUT=m CONFIG_BINFMT_ELF=y -# CONFIG_BINFMT_MISC is not set +CONFIG_BINFMT_MISC=m CONFIG_PM=y CONFIG_APM=y # CONFIG_ARTHUR is not set @@ -271,7 +273,13 @@ # CONFIG_SK98LIN is not set # CONFIG_FDDI is not set # CONFIG_HIPPI is not set -# CONFIG_PPP 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 # @@ -418,7 +426,7 @@ # CONFIG_INTEL_RNG is not set # CONFIG_NVRAM is not set # CONFIG_RTC is not set -# CONFIG_SA1100_RTC is not set +CONFIG_SA1100_RTC=y # CONFIG_DTLK is not set # CONFIG_R3964 is not set # CONFIG_APPLICOM is not set @@ -454,9 +462,8 @@ # CONFIG_UMSDOS_FS is not set # CONFIG_VFAT_FS is not set # CONFIG_EFS_FS is not set -CONFIG_JFFS_FS=y -CONFIG_JFFS_FS_VERBOSE=0 -CONFIG_CRAMFS=y +# CONFIG_JFFS_FS is not set +# CONFIG_CRAMFS is not set CONFIG_RAMFS=y # CONFIG_ISO9660_FS is not set # CONFIG_JOLIET is not set @@ -546,7 +553,8 @@ # Sound # CONFIG_SOUND=y -CONFIG_SOUND_UDA1341=m +CONFIG_SOUND_UDA1341=y +# CONFIG_SOUND_UDA1341_GSM is not set # CONFIG_SOUND_SA1100_SSP is not set # CONFIG_SOUND_CMPCI is not set # CONFIG_SOUND_EMU10K1 is not set diff -urN linux-2.4.2-rmk2-np1.org/arch/arm/def-configs/freebird_new linux-2.4.2-rmk2-np1-fb1/arch/arm/def-configs/freebird_new --- linux-2.4.2-rmk2-np1.org/arch/arm/def-configs/freebird_new Thu Jan 1 08:00:00 1970 +++ linux-2.4.2-rmk2-np1-fb1/arch/arm/def-configs/freebird_new Wed Apr 4 13:38:14 2001 @@ -0,0 +1,602 @@ +# +# Automatically generated by make menuconfig: 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 +# + +# +# Footbridge Implementations +# + +# +# SA11x0 Implementations +# +# CONFIG_SA1100_ASSABET is not set +# CONFIG_SA1100_HUW_WEBPANEL is not set +# CONFIG_SA1100_BRUTUS is not set +# CONFIG_SA1100_CERF is not set +# CONFIG_SA1100_BITSY is not set +# CONFIG_SA1100_EXTENEX1 is not set +# CONFIG_SA1100_LART is not set +# CONFIG_SA1100_PLEB is not set +# CONFIG_SA1100_GRAPHICSCLIENT is not set +# CONFIG_SA1100_NANOENGINE is not set +# CONFIG_SA1100_VICTOR is not set +# CONFIG_SA1100_YOPY is not set +# CONFIG_SA1100_SHERMAN is not set +# CONFIG_SA1100_XP860 is not set +# CONFIG_SA1100_PANGOLIN is not set +CONFIG_SA1100_FREEBIRD=y +# CONFIG_SA1100_FREEBIRD_OLD is not set +CONFIG_SA1100_FREEBIRD_NEW=y +CONFIG_SA1100_FL=m +# CONFIG_SA1100_REGMON is not set +# CONFIG_SA1100_USB is not set +# CONFIG_SA1100_USB_NETLINK is not set +CONFIG_SA1100_FREQUENCY_SCALE=y +# CONFIG_SA1100_VOLTAGE_SCALE is not set + +# +# 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 +# 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 +# +# 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_CLPS6700 is not set +CONFIG_PCMCIA_SA1100=m +CONFIG_NET=y +CONFIG_SYSVIPC=y +# CONFIG_BSD_PROCESS_ACCT is not set +CONFIG_SYSCTL=y +CONFIG_NWFPE=y +CONFIG_KCORE_ELF=y +# CONFIG_KCORE_AOUT is not set +# CONFIG_BINFMT_AOUT is not set +CONFIG_BINFMT_ELF=y +# CONFIG_BINFMT_MISC is not set +CONFIG_PM=y +CONFIG_APM=y +# CONFIG_ARTHUR is not set +CONFIG_CMDLINE="noinitrd console=ttySA0 init=/linuxrc root=1f04 mem=32m" +# 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 +# CONFIG_MTD_DOC1000 is not set +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOCPROBE is not set +# CONFIG_MTD_PMC551 is not set +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_MTDRAM is not set +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_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_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 +# CONFIG_MTD_MIXMEM is not set +# CONFIG_MTD_OCTAGON is not set +# CONFIG_MTD_VMAX is not set +# CONFIG_MTD_NAND is not set +# CONFIG_MTD_NAND_SPIA is not set +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLOCK=y +# CONFIG_FTL is not set +# CONFIG_NFTL is not set + +# +# Plug and Play configuration +# +# CONFIG_PNP is not set +# CONFIG_ISAPNP is not set + +# +# Block devices +# +# CONFIG_BLK_DEV_FD is not set +# 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_BLK_DEV_DAC960 is not set +CONFIG_BLK_DEV_LOOP=m +CONFIG_BLK_DEV_NBD=m +# CONFIG_BLK_DEV_RAM is not set +# CONFIG_BLK_DEV_INITRD 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_BLK_DEV_LVM is not set + +# +# Networking options +# +CONFIG_PACKET=y +CONFIG_PACKET_MMAP=y +CONFIG_NETLINK=y +CONFIG_RTNETLINK=y +# CONFIG_NETLINK_DEV is not set +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG 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 + +# +# IP: Netfilter Configuration +# +# CONFIG_IP_NF_CONNTRACK is not set +# CONFIG_IP_NF_QUEUE is not set +# CONFIG_IP_NF_IPTABLES is not set +# CONFIG_IP_NF_COMPAT_IPCHAINS is not set +# CONFIG_IP_NF_COMPAT_IPFWADM 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_ETHERTAP is not set +# CONFIG_NET_SB1000 is not set + +# +# Ethernet (10 or 100Mbit) +# +# CONFIG_NET_ETHERNET is not set + +# +# Ethernet (1000 Mbit) +# +# CONFIG_ACENIC is not set +# CONFIG_HAMACHI is not set +# CONFIG_YELLOWFIN is not set +# CONFIG_SK98LIN 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 is not set +# CONFIG_PCMCIA_3C574 is not set +# CONFIG_PCMCIA_FMVJ18X is not set +CONFIG_PCMCIA_PCNET=m +# CONFIG_PCMCIA_NMCLAN is not set +# CONFIG_PCMCIA_SMC91C92 is not set +# CONFIG_PCMCIA_XIRC2PS is not set +# CONFIG_ARCNET_COM20020_CS is not set +# CONFIG_PCMCIA_IBMTR is not set +# CONFIG_NET_PCMCIA_RADIO is not set + +# +# Amateur Radio support +# +# CONFIG_HAMRADIO is not set + +# +# IrDA (infrared) support +# +# CONFIG_IRDA is not set + +# +# ATA/IDE/MFM/RLL support +# +CONFIG_IDE=m + +# +# IDE, ATA and ATAPI Block devices +# +CONFIG_BLK_DEV_IDE=m +# 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_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=m +# CONFIG_BLK_DEV_IDECD is not set +# CONFIG_BLK_DEV_IDETAPE is not set +# CONFIG_BLK_DEV_IDEFLOPPY is not set +# CONFIG_BLK_DEV_IDESCSI is not set +# CONFIG_BLK_DEV_CMD640 is not set +# CONFIG_BLK_DEV_CMD640_ENHANCED is not set +# CONFIG_BLK_DEV_ISAPNP 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 +# CONFIG_I2O_BLOCK is not set +# CONFIG_I2O_LAN is not set +# CONFIG_I2O_SCSI is not set +# CONFIG_I2O_PROC 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 is not set +CONFIG_SERIAL=m +# CONFIG_SERIAL_EXTENDED is not set +# CONFIG_SERIAL_NONSTANDARD is not set +CONFIG_SERIAL_SA1100=y +CONFIG_SERIAL_SA1100_CONSOLE=y +CONFIG_SA1100_DEFAULT_BAUDRATE=9600 +# CONFIG_TOUCHSCREEN_UCB1200 is not set +# CONFIG_TOUCHSCREEN_BITSY is not set +CONFIG_FB_TS_BT=y +# CONFIG_PROFILER is not set +CONFIG_UNIX98_PTYS=y +CONFIG_UNIX98_PTY_COUNT=32 + +# +# I2C support +# +# CONFIG_I2C is not set + +# +# Mice +# +# CONFIG_BUSMOUSE is not set +# CONFIG_MOUSE is not set + +# +# Joysticks +# +# CONFIG_JOYSTICK is not set +# CONFIG_QIC02_TAPE is not set + +# +# Watchdog Cards +# +# CONFIG_WATCHDOG is not set +# CONFIG_INTEL_RNG is not set +# CONFIG_NVRAM is not set +# CONFIG_RTC is not set +CONFIG_SA1100_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 +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=m +# CONFIG_AUTOFS4_FS is not set +# CONFIG_REISERFS_FS is not set +# CONFIG_REISERFS_CHECK 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_BFS_FS 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_EFS_FS is not set +CONFIG_JFFS_FS=m +CONFIG_JFFS_FS_VERBOSE=0 +CONFIG_CRAMFS=y +CONFIG_RAMFS=y +# CONFIG_ISO9660_FS is not set +# CONFIG_JOLIET is not set +# CONFIG_MINIX_FS is not set +# CONFIG_NTFS_FS is not set +# CONFIG_NTFS_RW is not set +# CONFIG_HPFS_FS is not set +CONFIG_PROC_FS=y +# CONFIG_DEVFS_FS is not set +# 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 is not set +CONFIG_EXT2_FS=m +# CONFIG_SYSV_FS is not set +# CONFIG_SYSV_FS_WRITE is not set +# CONFIG_UDF_FS is not set +# CONFIG_UDF_RW is not set +# CONFIG_UFS_FS is not set +# CONFIG_UFS_FS_WRITE is not set + +# +# Network File Systems +# +# CONFIG_CODA_FS is not set +CONFIG_NFS_FS=m +# CONFIG_NFS_V3 is not set +# CONFIG_ROOT_NFS is not set +# CONFIG_NFSD is not set +# CONFIG_NFSD_V3 is not set +CONFIG_SUNRPC=m +CONFIG_LOCKD=m +# 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 + +# +# Partition Types +# +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_MSDOS_PARTITION=y +# CONFIG_SMB_NLS is not set +# CONFIG_NLS 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_ACORN is not set +# CONFIG_FB_CLPS711X is not set +# CONFIG_FB_CYBER2000 is not set +CONFIG_FB_SA1100=y +# CONFIG_FB_VIRTUAL is not set +# CONFIG_FBCON_ADVANCED is not set +CONFIG_FBCON_CFB2=y +CONFIG_FBCON_CFB4=y +CONFIG_FBCON_CFB8=y +CONFIG_FBCON_CFB16=y +# CONFIG_FBCON_FONTWIDTH8_ONLY is not set +CONFIG_FBCON_FONTS=y +CONFIG_FONT_8x8=y +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 + +# +# Sound +# +CONFIG_SOUND=y +CONFIG_SOUND_UDA1341=y +# CONFIG_SOUND_UDA1341_GSM is not set +# 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_VIA82CXXX is not set +# CONFIG_SOUND_OSS is not set +# CONFIG_SOUND_TVMIXER is not set + +# +# USB support +# +# CONFIG_USB is not set + +# +# Kernel hacking +# +# CONFIG_NO_FRAME_POINTER is not set +CONFIG_DEBUG_ERRORS=y +# CONFIG_DEBUG_USER is not set +# CONFIG_DEBUG_INFO is not set +CONFIG_MAGIC_SYSRQ=y +# CONFIG_DEBUG_LL is not set diff -urN linux-2.4.2-rmk2-np1.org/arch/arm/mach-sa1100/arch.c linux-2.4.2-rmk2-np1-fb1/arch/arm/mach-sa1100/arch.c --- linux-2.4.2-rmk2-np1.org/arch/arm/mach-sa1100/arch.c Wed Apr 4 12:59:37 2001 +++ linux-2.4.2-rmk2-np1-fb1/arch/arm/mach-sa1100/arch.c Wed Apr 4 13:41:30 2001 @@ -114,15 +114,15 @@ setup_ramdisk( 1, 0, 0, 16384 ); setup_initrd( 0xc0800000, 3*1024*1024 ); } -#ifdef CONFIG_SA1100_FREEBIRD_OLD else if (machine_is_freebird()) { +#ifdef CONFIG_SA1100_FREEBIRD_OLD SET_BANK( 0, 0xc0000000, 32*1024*1024 ); mi->nr_banks = 1; ROOT_DEV = MKDEV(RAMDISK_MAJOR,0); setup_ramdisk( 1, 0 ,0 , 8192 ); setup_initrd( 0xc0800000, 3*1024*1024 ); - } #endif + } else if (machine_is_brutus()) { SET_BANK( 0, 0xc0000000, 4*1024*1024 ); SET_BANK( 1, 0xc8000000, 4*1024*1024 ); diff -urN linux-2.4.2-rmk2-np1.org/drivers/char/sa1100-rtc.c linux-2.4.2-rmk2-np1-fb1/drivers/char/sa1100-rtc.c --- linux-2.4.2-rmk2-np1.org/drivers/char/sa1100-rtc.c Wed Apr 4 12:59:37 2001 +++ linux-2.4.2-rmk2-np1-fb1/drivers/char/sa1100-rtc.c Wed Apr 4 13:48:25 2001 @@ -14,12 +14,12 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * 0.01 Nils Faerber + * 0.03 CIH + * 03-07-2001 Modify the bug setups RTC clock. + * 0.02 Nils Faerber + * 02272001 removed mktime(), added alarm irq clear + * 0.01 Nils Faerber * 10012000 initial release - * 0.02 Chester Kuo - * 2-2-2001 add function when into sleep mode,RTC clock still alive when - * into the sleep mode function,so we need it - * */ #include @@ -30,9 +30,7 @@ #include #include #include -#ifdef CONFIG_PROC_FS #include -#endif #include #include #include @@ -41,16 +39,6 @@ #define DEFAULT_DIVIDER 0x8000 #define DEFAULT_TRIM 0x0000 -/* For register */ - -#define RTSR_STATUS_MASK (3) -#define RTSR_ENABLE_MASK (0xc) -#define RTSR_CURRENT_ENABLED (RTSR & RTSR_ENABLE_MASK) -#define RTSR_ALARM_ENABLE (4) -#define RTSR_1HZ_ENABLE (0x8) -#define RTSR_ALARM_STATUS (1) -#define RTSR_1HZ_STATUS (2) - static int rtc_usage = 0; static int rtc_irq_data = 0; @@ -67,42 +55,21 @@ static const unsigned char days_in_mo[] = {0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; - -/* - * Convert time to seconds, from arch/xxx/kernel/time.c - */ -#if 0 -unsigned long mktime(unsigned int year, unsigned int mon, unsigned int day, - unsigned int hour, unsigned int min, unsigned int sec) -{ - if (0 >= (int) (mon -= 2)) { /* 1..12 -> 11,12,1..10 */ - mon += 12; /* Puts Feb last since it has leap day */ - year -= 1; - } - return ((( - (unsigned long)(year/4 - year/100 + year/400 + 367*mon/12 + day) + - year*365 - 719499 - )*24 + hour /* now have hours */ - )*60 + min /* now have minutes */ - )*60 + sec; /* finally seconds */ -} -#endif - /* * Convert seconds to time, from the GNU C Library * (this code is ugly ;) */ void timemk(unsigned long t, struct rtc_time *tval) { - long int days, rem, y; - const unsigned short int *ip; - unsigned int wday; - unsigned int yday; - const unsigned short int __mon_yday[2][13] = +long int days, rem, y; +const unsigned short int *ip; +unsigned int wday; +unsigned int yday; +const unsigned short int __mon_yday[2][13] = { /* Normal years. */ - { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 }, - /* Leap years. */ - { 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366 } + { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 }, + /* Leap years. */ + { 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366 } }; #define __isleap(year) \ @@ -134,8 +101,8 @@ { long int yg = y + days / 365 - (days % 365 < 0); days -= ((yg - y) * 365 - + LEAPS_THRU_END_OF (yg - 1) - - LEAPS_THRU_END_OF (y - 1)); + + LEAPS_THRU_END_OF (yg - 1) + - LEAPS_THRU_END_OF (y - 1)); y = yg; } tval->tm_year = y - 1900; @@ -147,65 +114,18 @@ tval->tm_mon = y; tval->tm_mday = days + 1; } -/* For Sleep mode suport ,Chester */ -void rtc_set_alarm(int seconds) -{ - int rtsr_value = (RTSR_CURRENT_ENABLED | RTSR_ALARM_ENABLE); - RTAR = (RCNR + seconds); - if (seconds != 0) { - /* clear RTC alarm status bit */ - rtsr_value |= RTSR_ALARM_STATUS; - } - RTSR = rtsr_value; - PWER |= (1<< IRQ_RTCAlrm); -} -void rtc_clear_alarm(void) -{ - RTSR = ((RTSR_CURRENT_ENABLED & RTSR_1HZ_ENABLE) | RTSR_ALARM_STATUS); - PWER &= ~(1<< IRQ_RTCAlrm); -} -void rtc_disable_alarm(void) -{ - RTSR = (RTSR_CURRENT_ENABLED & RTSR_1HZ_ENABLE); - PWER &= ~(1<< IRQ_RTCAlrm); -} - -int rtc_alarm_happened(void) -{ - return ((RTSR & 0x01) && (PWER & (1<< IRQ_RTCAlrm))); -} -void rtc_set_1hz_detect(void) -{ - RTSR = (RTSR_CURRENT_ENABLED | RTSR_1HZ_ENABLE | RTSR_1HZ_STATUS); - PWER |= (1<state = TASK_RUNNING; remove_wait_queue(&rtc_wait, &wait); - return retval; +return retval; } static int rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { - struct rtc_time wtime; +struct rtc_time wtime; switch (cmd) { case RTC_AIE_OFF: @@ -356,7 +276,7 @@ unsigned long tmpctr; if (copy_from_user(&rtc_tm, (struct rtc_time*)arg, - sizeof(struct rtc_time))) + sizeof(struct rtc_time))) return -EFAULT; yrs = rtc_tm.tm_year + 1900; mon = rtc_tm.tm_mon + 1; /* tm_mon starts at zero */ @@ -401,7 +321,7 @@ unsigned long tmpctr; if (copy_from_user(&rtc_tm, (struct rtc_time*)arg, - sizeof(struct rtc_time))) + sizeof(struct rtc_time))) return -EFAULT; yrs = rtc_tm.tm_year + 1900; mon = rtc_tm.tm_mon + 1; /* tm_mon starts at zero */ @@ -450,12 +370,12 @@ default: return -EINVAL; } - return copy_to_user((void *)arg, &wtime, sizeof wtime) ? -EFAULT : 0; +return copy_to_user((void *)arg, &wtime, sizeof wtime) ? -EFAULT : 0; } static unsigned int rtc_poll(struct file *file, poll_table *wait) { - unsigned long l; +unsigned long l; poll_wait(file, &rtc_wait, wait); @@ -465,29 +385,28 @@ if (l != 0) return POLLIN | POLLRDNORM; - return 0; +return 0; } -#ifdef CONFIG_PROC_FS static int rtc_proc_output (char *buf) { - char *p; - struct rtc_time tm; +char *p; +struct rtc_time tm; timemk(RCNR,&tm); p = buf; p += sprintf(p, - "rtc_time\t: %02d:%02d:%02d\n" - "rtc_date\t: %04d-%02d-%02d\n" - "rtc_epoch\t: %04lu\n", - tm.tm_hour, tm.tm_min, tm.tm_sec, - tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, epoch); + "rtc_time\t: %02d:%02d:%02d\n" + "rtc_date\t: %04d-%02d-%02d\n" + "rtc_epoch\t: %04lu\n", + tm.tm_hour, tm.tm_min, tm.tm_sec, + tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, epoch); timemk(RTAR,&tm); p += sprintf(p, - "alrm_time\t: %02d:%02d:%02d\n" - "alrm_date\t: %04d-%02d-%02d\n", - tm.tm_hour, tm.tm_min, tm.tm_sec, - tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday); + "alrm_time\t: %02d:%02d:%02d\n" + "alrm_date\t: %04d-%02d-%02d\n", + tm.tm_hour, tm.tm_min, tm.tm_sec, + tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday); p += sprintf(p,"trim\t\t: %u\n",RTTR); /* p += sprintf(p,"status = %u\n",RTSR);*/ p += sprintf(p,"alarm_IRQ\t: %s\n", (RTSR & 0x04) ? "yes":"no" ); @@ -495,12 +414,12 @@ p += sprintf(p,"periodic_freq\t: 1\n"); p += sprintf(p,"batt_status\t: okay\n"); - return (p - buf); +return (p - buf); } static int rtc_read_proc(char *page, char **start, off_t off, int count, int *eof, void *data) { - int len = rtc_proc_output (page); +int len = rtc_proc_output (page); if (len <= off+count) *eof = 1; *start = page + off; @@ -508,12 +427,11 @@ if (len>count) len = count; if (len<0) len = 0; - return len; +return len; } -#endif -MODULE_AUTHOR("Nils Faerber "); +MODULE_AUTHOR("Nils Faerber "); MODULE_DESCRIPTION("SA1100 StrongARM Realtime Clock Driver (RTC)"); static struct file_operations rtc_fops = { @@ -542,20 +460,16 @@ spin_unlock_irq (&rtc_lock); free_irq(IRQ_RTC1Hz,NULL); free_irq(IRQ_RTCAlrm,NULL); -#ifdef CONFIG_PROC_FS remove_proc_entry ("driver/rtc", NULL); -#endif misc_deregister(&sa1100rtc_miscdev); } static int __init rtc_init(void) { - unsigned long tmpctr; +unsigned long tmpctr; misc_register(&sa1100rtc_miscdev); -#ifdef CONFIG_PROC_FS create_proc_read_entry ("driver/rtc", 0, 0, rtc_read_proc, NULL); -#endif /* Reset the interrupt flags and disable interrupts */ tmpctr=RTSR; RTSR = (tmpctr | 0x0003) & 0xfff3; @@ -564,7 +478,7 @@ /* then reset it to the default value */ if (tmpctr < 0x7900 || tmpctr > 0x8700) { /* Set the divider to 32768 = one Hz */ - RTTR=DEFAULT_DIVIDER + (DEFAULT_TRIM << 15); + RTTR=DEFAULT_DIVIDER -1 + (DEFAULT_TRIM << 15); } if (request_irq(IRQ_RTC1Hz, rtc_interrupt, SA_INTERRUPT, "rtc1Hz", NULL)) { @@ -577,12 +491,11 @@ return -EIO; } - printk(KERN_INFO "SA1100 Real Time Clock Driver v" DRIVER_VERSION "\n"); + printk(KERN_INFO "Real Time Clock Driver v" DRIVER_VERSION "\n"); - return 0; +return 0; } module_init(rtc_init); module_exit(rtc_exit); EXPORT_NO_SYMBOLS; - diff -urN linux-2.4.2-rmk2-np1.org/drivers/mtd/sa1100-flash.c linux-2.4.2-rmk2-np1-fb1/drivers/mtd/sa1100-flash.c --- linux-2.4.2-rmk2-np1.org/drivers/mtd/sa1100-flash.c Wed Apr 4 12:59:37 2001 +++ linux-2.4.2-rmk2-np1-fb1/drivers/mtd/sa1100-flash.c Wed Apr 4 13:51:25 2001 @@ -197,12 +197,12 @@ offset: 0x00200000 },{ name: "usr cramfs", - size: 0x00800000, + size: 0x00C00000, offset: 0x00500000 },{ name: "local", - offset: 0x00d00000, - size: 0 + offset: 0x01100000, + size: MTDPART_SIZ_FULL } #else { offset: 0, size: 0x00040000, }, diff -urN linux-2.4.2-rmk2-np1.org/drivers/video/Makefile linux-2.4.2-rmk2-np1-fb1/drivers/video/Makefile --- linux-2.4.2-rmk2-np1.org/drivers/video/Makefile Wed Apr 4 12:59:37 2001 +++ linux-2.4.2-rmk2-np1-fb1/drivers/video/Makefile Wed Apr 4 13:59:05 2001 @@ -107,9 +107,6 @@ ifeq ($(CONFIG_SA1100_ASSABET),y) obj-m += sa1100_frontlight.o endif -ifeq ($(CONFIG_SA1100_FREEBIRD),y) - obj-m += sa1100_frontlight.o -endif # Generic Low Level Drivers diff -urN linux-2.4.2-rmk2-np1.org/drivers/video/sa1100fb.c linux-2.4.2-rmk2-np1-fb1/drivers/video/sa1100fb.c --- linux-2.4.2-rmk2-np1.org/drivers/video/sa1100fb.c Wed Apr 4 12:59:37 2001 +++ linux-2.4.2-rmk2-np1-fb1/drivers/video/sa1100fb.c Wed Apr 4 14:04:25 2001 @@ -599,6 +599,7 @@ break; #endif #ifdef FBCON_HAS_CFB16 + case 12: case 16: display->dispsw = &fbcon_cfb16; break; @@ -949,7 +950,7 @@ { unsigned int pcd = 0; - if (machine_is_assabet() | machine_is_pangolin()) { + if (machine_is_assabet() | machine_is_pangolin() | machine_is_freebird()) { pcd = frequency[PPCR & 0xf] / 1000; pcd *= pixclock / 1000; pcd = pcd / 1000000; @@ -1027,10 +1028,30 @@ DPRINTK("pcd = %x, PixCldDiv(pcd)=%x\n", pcd, LCCR3_PixClkDiv(pcd)); } else if (machine_is_freebird()) { +#if 1 lcd_shadow.lccr0 = 0x00000038; lcd_shadow.lccr1 = 0x010108e0; lcd_shadow.lccr2 = 0x0000053f; lcd_shadow.lccr3 = 0x00000c20; +#else + lcd_shadow.lccr0 = + LCCR0_LEN + LCCR0_Color + LCCR0_Sngl + + LCCR0_LDM + LCCR0_BAM + LCCR0_ERM + LCCR0_Pas + + LCCR0_LtlEnd + LCCR0_DMADel(0); + /* Check ,Chester*/ + lcd_shadow.lccr1 = + LCCR1_DisWdth(var->xres) + LCCR1_HorSnchWdth(6) + + LCCR1_BegLnDel(61) + LCCR1_EndLnDel(9); + /* Check ,Chester*/ + lcd_shadow.lccr2 = + LCCR2_DisHght(var->yres) + LCCR2_VrtSnchWdth(1) + + LCCR2_BegFrmDel(3) + LCCR2_EndFrmDel(0); + /* Check ,Chester */ + lcd_shadow.lccr3 = + LCCR3_OutEnH + LCCR3_PixFlEdg + LCCR3_VrtSnchH + + LCCR3_HorSnchH + LCCR3_ACBsCntOff + + LCCR3_ACBsDiv(2) + LCCR3_PixClkDiv(pcd); +#endif } else if (machine_is_bitsy()) { DPRINTK("Configuring Bitsy LCD\n"); lcd_shadow.lccr0 = LCCR0_LEN + LCCR0_Color + LCCR0_Sngl + LCCR0_Act + @@ -1261,7 +1282,7 @@ #endif }else if (machine_is_freebird()) { #ifdef CONFIG_SA1100_FREEBIRD - BCR_clear(BCR_FREEBIRD_LCD_PWR | BCR_FREEBIRD_LCD_DISP | BCR_FREEBIRD_LCD_BACKLIGHT); + BCR_clear(BCR_FREEBIRD_LCD_PWR | BCR_FREEBIRD_LCD_DISP /*| BCR_FREEBIRD_LCD_BACKLIGHT*/); #endif } } @@ -1377,7 +1398,12 @@ #endif } else if (machine_is_freebird()) { #ifdef CONFIG_SA1100_FREEBIRD - BCR_set(BCR_FREEBIRD_LCD_PWR | BCR_FREEBIRD_LCD_DISP | BCR_FREEBIRD_LCD_BACKLIGHT); + BCR_set(BCR_FREEBIRD_LCD_PWR | BCR_FREEBIRD_LCD_DISP /*| BCR_FREEBIRD_LCD_BACKLIGHT*/); + DPRINTK("DBAR1=%p\n", DBAR1); + DPRINTK("LCCR0=%x\n", LCCR0); + DPRINTK("LCCR1=%x\n", LCCR1); + DPRINTK("LCCR2=%x\n", LCCR2); + DPRINTK("LCCR3=%x\n", LCCR3); #endif } else if (machine_is_bitsy()) { #ifdef CONFIG_SA1100_BITSY @@ -1521,9 +1547,9 @@ GPDR |= 0x3fc; GAFR |= 0x3fc; BCR_set(BCR_FREEBIRD_LCD_DISP); - { volatile int i; for (i=0; i<1000; i++); } /* delay */ - BCR_set(BCR_FREEBIRD_LCD_PWR); - { volatile int i; for (i=0; i<3000; i++); } /* delay */ + udelay(20000); + BCR_set(BCR_FREEBIRD_LCD_PWR); + udelay(20000); /* Turn on backlight ,Chester */ BCR_set(BCR_FREEBIRD_LCD_BACKLIGHT); #endif @@ -1551,12 +1577,6 @@ if (sa1100fb_set_var(&init_var, -1, &fb_info)) current_par.allow_modeset = 0; sa1100fb_decode_var(&init_var, ¤t_par); -#ifdef CONFIG_SA1100_FREEBIRD - printk("length = %d:%d:%d \n",init_var.red.length,init_var.green.length, - init_var.blue.length); - printk("offset = %d:%d:%d \n",init_var.red.offset,init_var.green.offset, - init_var.blue.offset); -#endif register_framebuffer(&fb_info); #ifdef CONFIG_PM