diff -urN linux-2.4.0-test8-rmk5-np2/arch/arm/Makefile linux-2.4.0-test8-rmk5-np2-freebird-3/arch/arm/Makefile --- linux-2.4.0-test8-rmk5-np2/arch/arm/Makefile Mon Nov 13 11:43:24 2000 +++ linux-2.4.0-test8-rmk5-np2-freebird-3/arch/arm/Makefile Thu Nov 9 12:22:12 2000 @@ -240,7 +240,8 @@ empeg_config graphicsclient_config \ assabet_config lart_config \ cerf_config lusl7200_config \ - sherman_config pangolin_config + sherman_config pangolin_config \ + freebird_config $(CFGS): @( \ diff -urN linux-2.4.0-test8-rmk5-np2/arch/arm/config.in linux-2.4.0-test8-rmk5-np2-freebird-3/arch/arm/config.in --- linux-2.4.0-test8-rmk5-np2/arch/arm/config.in Mon Nov 13 11:43:24 2000 +++ linux-2.4.0-test8-rmk5-np2-freebird-3/arch/arm/config.in Wed Nov 8 21:38:56 2000 @@ -90,6 +90,7 @@ bool ' Sherman' CONFIG_SA1100_SHERMAN bool ' XP860' CONFIG_SA1100_XP860 bool ' Pangolin' CONFIG_SA1100_PANGOLIN + bool ' FreeBird-v1.1' CONFIG_SA1100_FREEBIRD # Someday, we'll support this as a general option. bool ' Load kernel using Angel Debug Monitor' CONFIG_ANGELBOOT diff -urN linux-2.4.0-test8-rmk5-np2/arch/arm/def-configs/freebird linux-2.4.0-test8-rmk5-np2-freebird-3/arch/arm/def-configs/freebird --- linux-2.4.0-test8-rmk5-np2/arch/arm/def-configs/freebird Thu Jan 1 08:00:00 1970 +++ linux-2.4.0-test8-rmk5-np2-freebird-3/arch/arm/def-configs/freebird Thu Nov 9 19:21:58 2000 @@ -0,0 +1,386 @@ +# +# Automatically generated by make menuconfig: don't edit +# +CONFIG_ARM=y +# CONFIG_SBUS 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 is not set + +# +# 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_FOOTBRIDGE is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_RPC is not set +CONFIG_ARCH_SA1100=y + +# +# Archimedes/A5000 Implementations +# + +# +# 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 is not set +# CONFIG_SA1100_LART is not set +# CONFIG_SA1100_GRAPHICSCLIENT is not set +# CONFIG_SA1100_NANOENGINE is not set +# CONFIG_SA1100_VICTOR 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_ANGELBOOT is not set +# CONFIG_SA1100_USB is not set +# CONFIG_SA1100_FREQUENCY_SCALE is not set +# CONFIG_SA1100_VOLTAGE_SCALE is not set +# 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_32v4=y +CONFIG_CPU_SA1100=y +CONFIG_DISCONTIGMEM=y + +# +# General setup +# +# CONFIG_PCI is not set +# CONFIG_ISA is not set +# CONFIG_ISA_DMA is not set +CONFIG_PC_KEYMAP=y +CONFIG_HOTPLUG=y + +# +# PCMCIA/CardBus support +# +# CONFIG_PCMCIA is not set +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 is not set +# CONFIG_ARTHUR is not set +CONFIG_CMDLINE="keepinitrd" +# CONFIG_LEDS is not set +CONFIG_ALIGNMENT_TRAP=y + +# +# Parallel port support +# +# CONFIG_PARPORT is not set + +# +# 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 is not set +# CONFIG_BLK_DEV_XD is not set +# CONFIG_PARIDE is not set +# CONFIG_BLK_CPQ_DA is not set +# CONFIG_BLK_DEV_DAC960 is not set +# CONFIG_BLK_DEV_LOOP is not set +# CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_LVM 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_RAM=y +CONFIG_BLK_DEV_RAM_SIZE=4096 +CONFIG_BLK_DEV_INITRD=y +CONFIG_BLK_DEV_FLASH=y + +# +# Networking options +# +# CONFIG_PACKET is not set +# CONFIG_NETLINK 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_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_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 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 is not set +# CONFIG_BLK_DEV_IDE_MODES is not set +# CONFIG_BLK_DEV_HD 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 is not set +# 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_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_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 + +# +# File systems +# +# CONFIG_QUOTA is not set +# CONFIG_AUTOFS_FS is not set +# CONFIG_AUTOFS4_FS 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 is not set +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=y +# 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 is not set +# 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 is not set +# CONFIG_LOCKD is not set +# 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_MOUNT_SUBDIR is not set +# CONFIG_NCPFS_NDS_DOMAINS 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_NLS is not set + +# +# Console drivers +# +# CONFIG_VGA_CONSOLE is not set +# CONFIG_FB is not set + +# +# Frame-buffer support +# +# CONFIG_FB is not set + +# +# Sound +# +CONFIG_SOUND=y +CONFIG_SOUND_UDA1341=y +# 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_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_FRAME_POINTER=y +CONFIG_DEBUG_ERRORS=y +CONFIG_DEBUG_USER=y +# CONFIG_DEBUG_INFO is not set +# CONFIG_MAGIC_SYSRQ is not set +# CONFIG_DEBUG_LL is not set diff -urN linux-2.4.0-test8-rmk5-np2/arch/arm/defconfig linux-2.4.0-test8-rmk5-np2-freebird-3/arch/arm/defconfig --- linux-2.4.0-test8-rmk5-np2/arch/arm/defconfig Mon Nov 13 11:43:24 2000 +++ linux-2.4.0-test8-rmk5-np2-freebird-3/arch/arm/defconfig Thu Nov 9 22:15:03 2000 @@ -1,5 +1,5 @@ # -# Automatically generated make config: don't edit +# Automatically generated by make menuconfig: don't edit # CONFIG_ARM=y # CONFIG_SBUS is not set @@ -41,8 +41,7 @@ # # SA11x0 Implementations # -CONFIG_SA1100_ASSABET=y -# CONFIG_ASSABET_NEPONSET is not set +# CONFIG_SA1100_ASSABET is not set # CONFIG_SA1100_BRUTUS is not set # CONFIG_SA1100_CERF is not set # CONFIG_SA1100_BITSY is not set @@ -53,9 +52,10 @@ # CONFIG_SA1100_SHERMAN is not set # CONFIG_SA1100_XP860 is not set # CONFIG_SA1100_PANGOLIN is not set -CONFIG_ANGELBOOT=y -CONFIG_SA1100_USB=m -CONFIG_SA1100_FREQUENCY_SCALE=y +CONFIG_SA1100_FREEBIRD=y +# CONFIG_ANGELBOOT is not set +# CONFIG_SA1100_USB is not set +# CONFIG_SA1100_FREQUENCY_SCALE is not set # CONFIG_SA1100_VOLTAGE_SCALE is not set # CONFIG_ARCH_ACORN is not set # CONFIG_FOOTBRIDGE is not set @@ -63,10 +63,6 @@ # CONFIG_FOOTBRIDGE_ADDIN is not set CONFIG_CPU_32=y # CONFIG_CPU_26 is not set - -# -# Processor Type -# CONFIG_CPU_32v4=y CONFIG_CPU_SA1100=y CONFIG_DISCONTIGMEM=y @@ -83,10 +79,7 @@ # # PCMCIA/CardBus support # -CONFIG_PCMCIA=y -# CONFIG_PCMCIA_DEBUG is not set -CONFIG_SA1100_PCMCIA=y -CONFIG_VIRTUAL_BUS=y +# CONFIG_PCMCIA is not set CONFIG_NET=y CONFIG_SYSVIPC=y # CONFIG_BSD_PROCESS_ACCT is not set @@ -100,9 +93,7 @@ # CONFIG_PM is not set # CONFIG_ARTHUR is not set CONFIG_CMDLINE="keepinitrd" -CONFIG_LEDS=y -CONFIG_LEDS_TIMER=y -CONFIG_LEDS_CPU=y +# CONFIG_LEDS is not set CONFIG_ALIGNMENT_TRAP=y # @@ -140,7 +131,7 @@ CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_SIZE=4096 CONFIG_BLK_DEV_INITRD=y -# CONFIG_BLK_DEV_FLASH is not set +CONFIG_BLK_DEV_FLASH=y # # Networking options @@ -161,10 +152,6 @@ # 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 @@ -185,76 +172,7 @@ # # 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=y -# CONFIG_NET_VENDOR_3COM is not set -# CONFIG_LANCE is not set -# CONFIG_NET_VENDOR_SMC is not set -# CONFIG_NET_VENDOR_RACAL is not set -# CONFIG_AT1700 is not set -# CONFIG_DEPCA 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_YELLOWFIN is not set -# CONFIG_ACENIC is not set -# CONFIG_SK98LIN is not set -# CONFIG_FDDI is not set -# CONFIG_HIPPI 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 - -# -# 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=y -# 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 -CONFIG_PCMCIA_NETCARD=y +# CONFIG_NETDEVICES is not set # # Amateur Radio support @@ -269,45 +187,9 @@ # # 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_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=y -# 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 - -# -# 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_IDE_CHIPSETS is not set -# CONFIG_IDEDMA_AUTO is not set -# CONFIG_DMA_NONPCI is not set +# CONFIG_IDE is not set # CONFIG_BLK_DEV_IDE_MODES is not set +# CONFIG_BLK_DEV_HD is not set # # SCSI support @@ -344,7 +226,7 @@ CONFIG_SERIAL_SA1100=y CONFIG_SERIAL_SA1100_CONSOLE=y CONFIG_SA1100_DEFAULT_BAUDRATE=9600 -CONFIG_TOUCHSCREEN_UCB1200=y +# CONFIG_TOUCHSCREEN_UCB1200 is not set # CONFIG_TOUCHSCREEN_BITSY is not set CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=32 @@ -364,10 +246,6 @@ # Joysticks # # CONFIG_JOYSTICK is not set - -# -# Input core support is needed for joysticks -# # CONFIG_QIC02_TAPE is not set # @@ -387,7 +265,6 @@ # CONFIG_FTAPE is not set # CONFIG_AGP is not set # CONFIG_DRM is not set -# CONFIG_PCMCIA_SERIAL is not set # # File systems @@ -400,14 +277,14 @@ # CONFIG_AFFS_FS is not set # CONFIG_HFS_FS is not set # CONFIG_BFS_FS is not set -CONFIG_FAT_FS=y -CONFIG_MSDOS_FS=y +# 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 is not set -# CONFIG_CRAMFS is not set -# CONFIG_RAMFS is not set +CONFIG_CRAMFS=y +CONFIG_RAMFS=y # CONFIG_ISO9660_FS is not set # CONFIG_JOLIET is not set # CONFIG_MINIX_FS is not set @@ -434,13 +311,13 @@ # Network File Systems # # CONFIG_CODA_FS is not set -CONFIG_NFS_FS=y +# CONFIG_NFS_FS is not set # 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=y -CONFIG_LOCKD=y +# CONFIG_SUNRPC is not set +# CONFIG_LOCKD is not set # CONFIG_SMB_FS is not set # CONFIG_NCP_FS is not set # CONFIG_NCPFS_PACKET_SIGNING is not set @@ -457,92 +334,26 @@ # # 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_PARTITION_ADVANCED is not set CONFIG_MSDOS_PARTITION=y -# CONFIG_BSD_DISKLABEL is not set -# CONFIG_SOLARIS_X86_PARTITION is not set -# CONFIG_UNIXWARE_DISKLABEL is not set -# CONFIG_SGI_PARTITION is not set -# CONFIG_ULTRIX_PARTITION is not set -# CONFIG_SUN_PARTITION is not set -CONFIG_NLS=y - -# -# Native Language Support -# -CONFIG_NLS_DEFAULT="iso8859-1" -CONFIG_NLS_CODEPAGE_437=y -# 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 +# CONFIG_NLS is not set # # Console drivers # # CONFIG_VGA_CONSOLE is not set -CONFIG_FB=y +# CONFIG_FB is not set # # Frame-buffer support # -CONFIG_FB=y -CONFIG_DUMMY_CONSOLE=y -# CONFIG_FB_CYBER2000 is not set -CONFIG_FB_SA1100=y -# CONFIG_FB_MQ200 is not set -# 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=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 +# CONFIG_FB is not set # # Sound # CONFIG_SOUND=y -CONFIG_SOUND_UDA1341=m +CONFIG_SOUND_UDA1341=y # CONFIG_SOUND_SA1100_SSP is not set # CONFIG_SOUND_CMPCI is not set # CONFIG_SOUND_EMU10K1 is not set diff -urN linux-2.4.0-test8-rmk5-np2/arch/arm/mach-sa1100/arch.c linux-2.4.0-test8-rmk5-np2-freebird-3/arch/arm/mach-sa1100/arch.c --- linux-2.4.0-test8-rmk5-np2/arch/arm/mach-sa1100/arch.c Mon Nov 13 11:43:24 2000 +++ linux-2.4.0-test8-rmk5-np2-freebird-3/arch/arm/mach-sa1100/arch.c Thu Nov 9 21:43:29 2000 @@ -107,7 +107,13 @@ setup_ramdisk( 1, 0, 0, 16384 ); setup_initrd( 0xc0800000, 9*1024*1024 ); } - + else if (machine_is_freebird()) { + 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 ); + } else if (machine_is_brutus()) { SET_BANK( 0, 0xc0000000, 4*1024*1024 ); SET_BANK( 1, 0xc8000000, 4*1024*1024 ); @@ -231,6 +237,13 @@ #ifdef CONFIG_SA1100_PANGOLIN MACHINE_START(PANGOLIN, "Dialogue-Pangolin") BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000) + FIXUP(fixup_sa1100) + MAPIO(sa1100_map_io) +MACHINE_END +#endif +#ifdef CONFIG_SA1100_FREEBIRD +MACHINE_START(FREEBIRD, "Freebird-HPC-1.1") + BOOT_MEM(0xc0000000,0x80000000, 0xf8000000) FIXUP(fixup_sa1100) MAPIO(sa1100_map_io) MACHINE_END diff -urN linux-2.4.0-test8-rmk5-np2/arch/arm/mach-sa1100/hw.c linux-2.4.0-test8-rmk5-np2-freebird-3/arch/arm/mach-sa1100/hw.c --- linux-2.4.0-test8-rmk5-np2/arch/arm/mach-sa1100/hw.c Mon Nov 13 11:43:24 2000 +++ linux-2.4.0-test8-rmk5-np2-freebird-3/arch/arm/mach-sa1100/hw.c Thu Nov 9 22:12:00 2000 @@ -81,6 +81,10 @@ #endif /* CONFIG_SA1100_ASSABET */ +#if defined(CONFIG_SA1100_FREEBIRD) +unsigned long BCR_value = BCR_DB1110; +EXPORT_SYMBOL(BCR_value); +#endif #if defined(CONFIG_SA1100_BITSY) /* diff -urN linux-2.4.0-test8-rmk5-np2/arch/arm/mm/mm-sa1100.c linux-2.4.0-test8-rmk5-np2-freebird-3/arch/arm/mm/mm-sa1100.c --- linux-2.4.0-test8-rmk5-np2/arch/arm/mm/mm-sa1100.c Mon Nov 13 11:43:24 2000 +++ linux-2.4.0-test8-rmk5-np2-freebird-3/arch/arm/mm/mm-sa1100.c Mon Nov 13 11:56:48 2000 @@ -69,6 +69,13 @@ LAST_DESC }; +static struct map_desc freebird_io_desc[] __initdata = { +#ifdef CONFIG_SA1100_FREEBIRD + { 0xe8000000, 0x00000000, 0x02000000, DOMAIN_IO, 1, 1, 0, 0 }, /* Flash bank 0 */ + { 0xf0000000, 0x12000000, 0x00100000, DOMAIN_IO, 1, 1, 0, 0 }, /* Board Control Register */ +#endif + LAST_DESC +}; static struct map_desc cerf_io_desc[] __initdata = { #ifdef CONFIG_SA1100_CERF { 0xe8000000, 0x00000000, 0x01000000, DOMAIN_IO, 1, 1, 0, 0 }, /* Flash bank 0 */ @@ -149,6 +156,8 @@ desc = assabet_io_desc; else if (machine_is_bitsy()) desc = bitsy_io_desc; + else if (machine_is_freebird()) + desc = freebird_io_desc; else if (machine_is_cerf()) desc = cerf_io_desc; else if (machine_is_empeg()) diff -urN linux-2.4.0-test8-rmk5-np2/drivers/block/flash_mem.h linux-2.4.0-test8-rmk5-np2-freebird-3/drivers/block/flash_mem.h --- linux-2.4.0-test8-rmk5-np2/drivers/block/flash_mem.h Mon Nov 13 11:43:25 2000 +++ linux-2.4.0-test8-rmk5-np2-freebird-3/drivers/block/flash_mem.h Thu Nov 9 22:17:51 2000 @@ -42,7 +42,7 @@ #define FLASH_PARTITIONS 4 static int flash_length_default[FLASH_PARTITIONS] = { 0x10000, 0x80000, 0x730000, 0x40000 }; -#elif defined( CONFIG_SA1100_ASSABET ) +#elif defined( CONFIG_SA1100_ASSABET ) || defined( CONFIG_SA1100_FREEBIRD) #define FLASH_PARTITIONS 5 /* @@ -265,7 +265,7 @@ return (FLASH_t *)(base + i); } -#elif defined( CONFIG_SA1100_ASSABET ) +#elif defined( CONFIG_SA1100_ASSABET ) || defined (CONFIG_SA1100_FREEBIRD) /* two paralel 16-bit access */ #define FLASH_CHIPS_PER_BUS 2 diff -urN linux-2.4.0-test8-rmk5-np2/drivers/char/serial_sa1100.c linux-2.4.0-test8-rmk5-np2-freebird-3/drivers/char/serial_sa1100.c --- linux-2.4.0-test8-rmk5-np2/drivers/char/serial_sa1100.c Mon Nov 13 11:43:26 2000 +++ linux-2.4.0-test8-rmk5-np2-freebird-3/drivers/char/serial_sa1100.c Thu Nov 9 18:32:11 2000 @@ -1838,6 +1838,9 @@ } else if( machine_is_pangolin() ){ rs_table[0] = SA1100_UART1; rs_table[1] = SA1100_UART3; + } else if( machine_is_freebird() ) { + rs_table[0] = SA1100_UART1; + rs_table[1] = SA1100_UART3; } else if( machine_is_bitsy() ){ rs_table[0] = SA1100_UART3; rs_table[1] = SA1100_UART1; @@ -1934,6 +1937,22 @@ printk(TTY_NAME"%d on SA1100 UART2 (irq %d), using IRDA\n", state->line, state->irq ); break; } +#endif +#if 0 +#ifdef CONFIG_SA1100_FREEBIRD + if ( machine_is_freebird() ) { + BCR_clear( + BCR_FREEBIRD_IRDA_FSEL | + BCR_FREEBIRD_IRDA_MD1 | + BCR_FREEBIRD_IRDA_MD0 ); + Ser2UTCR4 = UTCR4_HSE; + Ser2HSCR0 = 0; + Ser2HSSR0 = HSSR0_EIF | HSSR0_TUR | HSSR0_RAB | HSSR0_FRE; + if( adv ) + printk(TTY_NAME"%d on SA1100 UART2 (irq %d), using IRDA\n", state->line, state->irq ); + break; + } +#endif #endif #ifdef CONFIG_SA1100_BITSY if( machine_is_bitsy() ){ diff -urN linux-2.4.0-test8-rmk5-np2/drivers/sound/Config.in linux-2.4.0-test8-rmk5-np2-freebird-3/drivers/sound/Config.in --- linux-2.4.0-test8-rmk5-np2/drivers/sound/Config.in Mon Nov 13 11:43:27 2000 +++ linux-2.4.0-test8-rmk5-np2-freebird-3/drivers/sound/Config.in Thu Nov 9 19:20:42 2000 @@ -6,8 +6,8 @@ # Prompt user for primary drivers. -if [ "$CONFIG_SA1100_ASSABET" = "y" -o "$CONFIG_SA1100_BITSY" = "y" ]; then - dep_tristate ' Assabet/Bitsy audio support (UDA1341)' CONFIG_SOUND_UDA1341 $CONFIG_SOUND +if [ "$CONFIG_SA1100_ASSABET" = "y" -o "$CONFIG_SA1100_FREEBIRD" = "y" ]; then + dep_tristate ' Assabet/Bitsy/Freebird audio support (UDA1341)' CONFIG_SOUND_UDA1341 $CONFIG_SOUND fi dep_tristate ' SA-1100 SSP sound' CONFIG_SOUND_SA1100_SSP dep_tristate ' C-Media PCI (CMI8338/8378)' CONFIG_SOUND_CMPCI $CONFIG_SOUND diff -urN linux-2.4.0-test8-rmk5-np2/drivers/sound/sa1100-uda1341.c linux-2.4.0-test8-rmk5-np2-freebird-3/drivers/sound/sa1100-uda1341.c --- linux-2.4.0-test8-rmk5-np2/drivers/sound/sa1100-uda1341.c Mon Nov 13 11:43:27 2000 +++ linux-2.4.0-test8-rmk5-np2-freebird-3/drivers/sound/sa1100-uda1341.c Mon Nov 13 11:57:18 2000 @@ -45,6 +45,7 @@ #undef DEBUG +//#define DEBUG 1 #ifdef DEBUG #define DPRINTK( x... ) printk( ##x ) #else @@ -102,6 +103,11 @@ #define L3_ClockPin GPIO_BITSY_L3_CLOCK #define L3_ModePin GPIO_BITSY_L3_MODE #endif +#ifdef CONFIG_SA1100_FREEBIRD +#define L3_DataPin GPIO_FREEBIRD_L3_DATA +#define L3_ClockPin GPIO_FREEBIRD_L3_CLOCK +#define L3_ModePin GPIO_FREEBIRD_L3_MODE +#endif /* @@ -120,7 +126,7 @@ */ static inline void L3_acquirepins(void) { - if (machine_is_assabet()) { + if (machine_is_assabet() || machine_is_freebird()) { GPSR = (L3_ClockPin | L3_DataPin); GPDR |= (L3_ClockPin | L3_DataPin); } @@ -131,7 +137,7 @@ */ static inline void L3_releasepins(void) { - if (machine_is_assabet()) { + if (machine_is_assabet() || machine_is_freebird()) { GPDR &= ~(L3_ClockPin | L3_DataPin); GPCR = (L3_ClockPin | L3_DataPin); } @@ -1090,7 +1096,7 @@ case SNDCTL_DSP_SPEED: get_user(val, (long *) arg); - if (machine_is_assabet()) { + if (machine_is_assabet() || machine_is_freebird()) { /* FIXME: we need to modify the clock rate for DRAM bank 2 * (our clock source) accordingly. */ @@ -1406,6 +1412,29 @@ mdelay(100); #endif } +static inline void audio_freebird_init(void) +{ +#ifdef CONFIG_SA1100_FREEBIRD + /* Setup the uarts */ + GAFR |= (GPIO_SSP_TXD | GPIO_SSP_RXD | GPIO_SSP_SCLK | + GPIO_SSP_SFRM | GPIO_SSP_CLK); + GPDR |= (GPIO_SSP_TXD | GPIO_SSP_SCLK | GPIO_SSP_SFRM); + GPDR &= ~(GPIO_SSP_RXD | GPIO_SSP_CLK); + PPAR |= PPAR_SPR; + Ser4SSCR0 = SSCR0_SSE + SSCR0_DataSize(16) + SSCR0_TI; + Ser4SSCR1 = SSCR1_SClkIactL + SSCR1_SClk1P + SSCR1_ExtClk; + + /* Enable the audio power */ + BCR_clear(BCR_FREEBIRD_QMUTE | BCR_FREEBIRD_SPK_OFF); + BCR_set(BCR_FREEBIRD_CODEC_RST | BCR_FREEBIRD_AUDIO_PWR); + MDREFR |= (MDREFR_K2DB2 | MDREFR_K2RUN); + /* Make sure EAPD and KAPD are clear to run the clocks at all times. */ + MDREFR &= ~(MDREFR_EAPD | MDREFR_KAPD); + + /* Wait for the UDA1341 to wake up */ + mdelay(100); +#endif +} static int __init audio_init_dma(audio_stream_t * s, char *desc) @@ -1452,6 +1481,7 @@ STATUS_0.reset = 0; L3_write((UDA1341_L3Addr << 2) | UDA1341_STATUS, (char *) &STATUS_0, 1); + DPRINTK("UDA1341 reset call\n"); } @@ -1459,7 +1489,7 @@ int __init audio_uda1341_init(void) { - if (!(machine_is_assabet() || machine_is_bitsy())) + if (!(machine_is_assabet() || machine_is_bitsy()) || machine_is_freebird()) return -ENODEV; /* Acquire and initialize DMA */ @@ -1467,8 +1497,10 @@ audio_init_dma(&input_stream, "UDA1341 in")) { audio_clear_dma(&output_stream); audio_clear_dma(&input_stream); + DPRINTK("Request DMA error\n"); return -EBUSY; } + DPRINTK("Request DMA success\n"); L3_init(); @@ -1476,6 +1508,8 @@ audio_assabet_init(); if (machine_is_bitsy()) audio_bitsy_init(); + if (machine_is_freebird()) + audio_freebird_init(); audio_uda1341_reset(); /* Set some default mixer values... */ diff -urN linux-2.4.0-test8-rmk5-np2/include/asm-arm/arch-sa1100/freebird.h linux-2.4.0-test8-rmk5-np2-freebird-3/include/asm-arm/arch-sa1100/freebird.h --- linux-2.4.0-test8-rmk5-np2/include/asm-arm/arch-sa1100/freebird.h Thu Jan 1 08:00:00 1970 +++ linux-2.4.0-test8-rmk5-np2-freebird-3/include/asm-arm/arch-sa1100/freebird.h Mon Nov 13 11:57:06 2000 @@ -0,0 +1,69 @@ +/* + * + */ + +#ifndef __ASM_ARCH_HARDWARE_H +#error "include instead" +#endif + + +/* Board Control Register */ + +#define BCR_BASE 0xf0000000 +#define BCR (*(volatile unsigned int *)(BCR_BASE)) + +#define BCR_DB1110 (0x00A07410) + + +#define BCR_FREEBIRD_AUDIO_PWR (1<<0) /* Audio Power (1 = on, 0 = off) */ +#define BCR_FREEBIRD_LCD_PWR (1<<1) /* LCD Power (1 = on) */ +#define BCR_FREEBIRD_CODEC_RST (1<<2) /* 0 = Holds UCB1300, ADI7171, and UDA1341 in reset */ +#define BCR_FREEBIRD_IRDA_FSEL (1<<3) /* IRDA Frequency select (0 = SIR, 1 = MIR/ FIR) */ +#define BCR_FREEBIRD_IRDA_MD0 (1<<4) /* Range/Power select */ +#define BCR_FREEBIRD_IRDA_MD1 (1<<5) /* Range/Power select */ +#define BCR_FREEBIRD_LCD_DISP (1<<7) /* LCD display (1 = on, 0 = off */ +#define BCR_FREEBIRD_LCD_BACKLIGHT (1<<16) /* LCD backlight ,1=on */ +#define BCR_FREEBIRD_LCD_LIGHT_INC (1<<17) /* LCD backlight brightness */ +#define BCR_FREEBIRD_LCD_LIGHT_DU (1<<18) /* LCD backlight brightness */ +#define BCR_FREEBIRD_LCD_INC (1<<19) /* LCD contrast */ +#define BCR_FREEBIRD_LCD_DU (1<<20) /* LCD contrast */ +#define BCR_FREEBIRD_QMUTE (1<<21) /* Quick Mute */ +#define BCR_FREEBIRD_ALARM_LED (1<<22) /* ALARM LED control */ +#define BCR_FREEBIRD_SPK_OFF (1<<23) /* 1 = Speaker amplifier power off */ + +#ifndef __ASSEMBLY__ +extern unsigned long BCR_value; +#define BCR_set( x ) BCR = (BCR_value |= (x)) +#define BCR_clear( x ) BCR = (BCR_value &= ~(x)) +#endif + + +/* GPIOs for which the generic definition doesn't say much */ +#define GPIO_FREEBIRD_NPOWER_BUTTON GPIO_GPIO(0) +#define GPIO_FREEBIRD_APP1_BUTTON GPIO_GPIO(1) +#define GPIO_FREEBIRD_APP2_BUTTON GPIO_GPIO(2) +#define GPIO_FREEBIRD_APP3_BUTTOM GPIO_GPIO(3) +#define GPIO_FREEBIRD_UCB1300 GPIO_GPIO(4) + +#define GPIO_FREEBIRD_EXPWR GPIO_GPIO(8) +#define GPIO_FREEBIRD_CHARGING GPIO_GPIO(9) +#define GPIO_FREEBIRD_RAMD GPIO_GPIO(14) +#define GPIO_FREEBIRD_L3_DATA GPIO_GPIO(15) +#define GPIO_FREEBIRD_L3_MODE GPIO_GPIO(17) +#define GPIO_FREEBIRD_L3_CLOCK GPIO_GPIO(18) +#define GPIO_FREEBIRD_STEREO_64FS_CLK GPIO_GPIO(10) + +#define GPIO_FREEBIRD_CF_CD GPIO_GPIO(22) +#define GPIO_FREEBIRD_CF_IRQ GPIO_GPIO(21) +#define GPIO_FREEBIRD_CF_BVD GPIO_GPIO(25) + +#define IRQ_GPIO_FREEBIRD_NPOWER_BUTTON IRQ_GPIO0 +#define IRQ_GPIO_FREEBIRD_APP1_BUTTON IRQ_GPIO1 +#define IRQ_GPIO_FREEBIRD_APP2_BUTTON IRQ_GPIO2 +#define IRQ_GPIO_FREEBIRD_APP3_BUTTON IRQ_GPIO3 +#define IRQ_GPIO_FREEBIRD_UCB1300_IRQ IRQ_GPIO4 + +#define IRQ_GPIO_FREEBIRD_CF_IRQ IRQ_GPIO21 +#define IRQ_GPIO_FREEBIRD_CF_CD IRQ_GPIO22 +#define IRQ_GPIO_FREEBIRD_CF_BVD IRQ_GPIO25 + diff -urN linux-2.4.0-test8-rmk5-np2/include/asm-arm/arch-sa1100/hardware.h linux-2.4.0-test8-rmk5-np2-freebird-3/include/asm-arm/arch-sa1100/hardware.h --- linux-2.4.0-test8-rmk5-np2/include/asm-arm/arch-sa1100/hardware.h Mon Nov 13 11:43:28 2000 +++ linux-2.4.0-test8-rmk5-np2-freebird-3/include/asm-arm/arch-sa1100/hardware.h Thu Nov 9 22:17:28 2000 @@ -90,6 +90,10 @@ #define machine_has_neponset() (0) #endif +#ifdef CONFIG_SA1100_FREEBIRD +#include "freebird.h" +#endif + #ifdef CONFIG_SA1100_CERF #include "cerf.h" #endif