Merge Opie-Console_CVS Conflict

2004/09/19 16:15:58+02:00 handhelds.org!zecke
Bump the Version number of the Opie CVS Packages to 1.1.6-cvs-${CVSDATE}

2004/09/19 01:46:25+02:00 handhelds.org!zecke
Merge bk://openembedded@openembedded.bkbits.net/packages
into handhelds.org:/home/ich/programming/oe/oe-packages-exported

2004/09/19 01:45:58+02:00 handhelds.org!zecke
Beagle Kernel work:
Fix APM handling
Include more modules, for example mtdchar so that one can erase the partition if needed
Change the BootLogo to another bootscreen

2004/09/18 13:24:59+02:00 handhelds.org!zecke
Merge bk://openembedded@openembedded.bkbits.net/packages
into handhelds.org:/home/ich/programming/oe/oe-packages-exported

2004/09/17 02:52:19+02:00 handhelds.org!zecke
Beagle updates and implementations
-Make tslib work with the beagle touchscreen interface
-Qt/E map the lightning to Key 91, allow keyboard repeating
-Provide default modules and modules.conf for modules-colleteral
-Do not use Intel Assabat as machine name for beagle
-Fix dependencies by fixing spelling

BKrev: 414d9576pvCHcHdDvMCQrAF7FbMcLg

4 files changed, 62 insertions, 139 deletions

diff --git a/linux/montavista-sa-2.4.17-mvl21/apm-hh-merge.patch b/linux/montavista-sa-2.4.17-mvl21/apm-hh-merge.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/linux/montavista-sa-2.4.17-mvl21/apm-hh-merge.patch
diff --git a/linux/montavista-sa-2.4.17-mvl21/defconfig-beagle b/linux/montavista-sa-2.4.17-mvl21/defconfig-beagle
index e9e3658ab7..9ccf866b41 100644
--- a/linux/montavista-sa-2.4.17-mvl21/defconfig-beagle
+++ b/linux/montavista-sa-2.4.17-mvl21/defconfig-beagle
@@ -1,5 +1,5 @@
 #
-# Automatically generated make config: don't edit
+# Automatically generated by make menuconfig: don't edit
 #
 CONFIG_ARM=y
 # CONFIG_EISA is not set
@@ -48,10 +48,6 @@ CONFIG_ARCH_SA1100=y
 #
 # Archimedes/A5000 Implementations
 #
-
-#
-# Archimedes/A5000 Implementations (select only ONE)
-#
 # CONFIG_ARCH_ARC is not set
 # CONFIG_ARCH_A5K is not set
 
@@ -123,10 +119,6 @@ CONFIG_SA1100_USB_CHAR=m
 # 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
@@ -169,10 +161,6 @@ CONFIG_NET=y
 CONFIG_SYSVIPC=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 CONFIG_SYSCTL=y
-
-#
-# At least one math emulation must be selected
-#
 CONFIG_FPE_NWFPE=m
 CONFIG_FPE_FASTFPE=y
 CONFIG_KCORE_ELF=y
@@ -184,7 +172,7 @@ CONFIG_BINFMT_ELF=y
 CONFIG_PM=y
 CONFIG_APM=y
 # CONFIG_ARTHUR is not set
-CONFIG_CMDLINE="<see .oe file>"
+CONFIG_CMDLINE="root=/dev/mtdblock/1 mem=27M console=ttySA0 noinitrd"
 CONFIG_LEDS=y
 CONFIG_LEDS_TIMER=y
 # CONFIG_LEDS_CPU is not set
@@ -205,10 +193,6 @@ CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_REDBOOT_PARTS is not set
 # CONFIG_MTD_BOOTLDR_PARTS is not set
 # CONFIG_MTD_AFS_PARTS is not set
-
-#
-# User Modules And Translation Layers
-#
 CONFIG_MTD_CHAR=m
 CONFIG_MTD_BLOCK=y
 # CONFIG_FTL is not set
@@ -264,10 +248,6 @@ CONFIG_MTD_SA1100=y
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_MTDRAM is not set
 # CONFIG_MTD_BLKMTD 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
@@ -293,15 +273,13 @@ CONFIG_MTD_SA1100=y
 # 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 is not set
+CONFIG_BLK_DEV_LOOP=m
 # CONFIG_BLK_DEV_NBD is not set
 # CONFIG_BLK_DEV_RAM is not set
 # CONFIG_BLK_DEV_INITRD is not set
-CONFIG_BLK_DEV_TEL_SDMMC=y
 CONFIG_BLK_DEV_PRD=y
 CONFIG_BLK_DEV_PRD_PHY=C1B00000
 CONFIG_BLK_DEV_PRD_SIZE=5120
-# CONFIG_BLK_DEV_MSYS_DOC is not set
 
 #
 # Multi-device support (RAID and LVM)
@@ -321,8 +299,9 @@ CONFIG_BLK_DEV_PRD_SIZE=5120
 CONFIG_PACKET=m
 CONFIG_PACKET_MMAP=y
 # CONFIG_NETLINK_DEV is not set
-# CONFIG_NETFILTER is not set
-# CONFIG_FILTER is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_FILTER=y
 CONFIG_UNIX=m
 CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set
@@ -333,14 +312,49 @@ CONFIG_NET_IPGRE=m
 # CONFIG_ARPD is not set
 # CONFIG_INET_ECN is not set
 # CONFIG_SYN_COOKIES is not set
+
+#
+#   IP: Netfilter Configuration
+#
+CONFIG_IP_NF_CONNTRACK=m
+CONFIG_IP_NF_FTP=m
+CONFIG_IP_NF_IRC=m
+CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_LIMIT=m
+CONFIG_IP_NF_MATCH_MAC=m
+CONFIG_IP_NF_MATCH_MARK=m
+CONFIG_IP_NF_MATCH_MULTIPORT=m
+CONFIG_IP_NF_MATCH_TOS=m
+CONFIG_IP_NF_MATCH_LENGTH=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_MATCH_TCPMSS=m
+CONFIG_IP_NF_MATCH_STATE=m
+CONFIG_IP_NF_MATCH_UNCLEAN=m
+CONFIG_IP_NF_MATCH_OWNER=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_MIRROR=m
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_NAT_SNMP_BASIC=m
+CONFIG_IP_NF_NAT_IRC=m
+CONFIG_IP_NF_NAT_FTP=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_TOS=m
+CONFIG_IP_NF_TARGET_MARK=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_TCPMSS=m
+CONFIG_IP_NF_COMPAT_IPCHAINS=m
+CONFIG_IP_NF_NAT_NEEDED=y
+CONFIG_IP_NF_COMPAT_IPFWADM=m
+CONFIG_IP_NF_NAT_NEEDED=y
 # 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
 # CONFIG_DECNET is not set
@@ -399,8 +413,11 @@ 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
+CONFIG_PPPOE=m
+CONFIG_SLIP=m
+# CONFIG_SLIP_COMPRESSED is not set
+# CONFIG_SLIP_SMART is not set
+# CONFIG_SLIP_MODE_SLIP6 is not set
 
 #
 # Wireless LAN (non-hamradio)
@@ -413,10 +430,6 @@ CONFIG_WAVELAN=m
 # CONFIG_AIRONET4500_NONCS is not set
 # CONFIG_AIRONET4500_PROC is not set
 CONFIG_HERMES=m
-
-#
-# Wireless Pcmcia cards support
-#
 CONFIG_PCMCIA_HERMES=m
 CONFIG_AIRO_CS=m
 CONFIG_NET_WIRELESS=y
@@ -440,7 +453,7 @@ CONFIG_NET_WIRELESS=y
 CONFIG_NET_PCMCIA=y
 # CONFIG_PCMCIA_3C589 is not set
 # CONFIG_PCMCIA_3C574 is not set
-# CONFIG_PCMCIA_FMVJ18X is not set
+CONFIG_PCMCIA_FMVJ18X=m
 CONFIG_PCMCIA_PCNET=m
 # CONFIG_PCMCIA_AXNET is not set
 # CONFIG_PCMCIA_NMCLAN is not set
@@ -459,19 +472,11 @@ CONFIG_PCMCIA_PCNET=m
 # 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 is not set
@@ -480,21 +485,9 @@ CONFIG_IRDA_DEVICENAME="Linux-Beagle"
 #
 # Infrared-port device drivers
 #
-
-#
-# SIR device drivers
-#
 # CONFIG_IRTTY_SIR is not set
 # CONFIG_IRPORT_SIR is not set
-
-#
-# Dongle support
-#
 # CONFIG_DONGLE is not set
-
-#
-# FIR device drivers
-#
 # CONFIG_USB_IRDA is not set
 # CONFIG_NSC_FIR is not set
 # CONFIG_WINBOND_FIR is not set
@@ -513,10 +506,6 @@ 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
@@ -535,10 +524,6 @@ CONFIG_BLK_DEV_IDECS=m
 # 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
@@ -616,7 +601,8 @@ CONFIG_SA1100_DEFAULT_BAUDRATE=38400
 # CONFIG_SERIAL_8250_HUB6 is not set
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
-# CONFIG_UNIX98_PTYS is not set
+CONFIG_UNIX98_PTYS=y
+CONFIG_UNIX98_PTY_COUNT=256
 
 #
 # I2C support
@@ -629,10 +615,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_L3=y
 CONFIG_L3_ALGOBIT=y
 CONFIG_L3_BIT_SA1100_GPIO=y
-
-#
-# Other L3 adapters
-#
 # CONFIG_L3_SA1111 is not set
 CONFIG_BIT_SA1100_GPIO=y
 
@@ -646,14 +628,6 @@ CONFIG_BIT_SA1100_GPIO=y
 # 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
 
 #
@@ -700,8 +674,8 @@ CONFIG_FS_SYNC=y
 # CONFIG_AFFS_FS is not set
 # CONFIG_HFS_FS is not set
 # CONFIG_BFS_FS is not set
-# CONFIG_EXT3_FS is not set
-# CONFIG_JBD is not set
+CONFIG_EXT3_FS=m
+CONFIG_JBD=m
 # CONFIG_JBD_DEBUG is not set
 CONFIG_FAT_FS=m
 # CONFIG_MSDOS_FS is not set
@@ -711,9 +685,9 @@ CONFIG_VFAT_FS=m
 # CONFIG_JFFS_FS is not set
 CONFIG_JFFS2_FS=y
 CONFIG_JFFS2_FS_DEBUG=0
-CONFIG_CRAMFS=y
+# CONFIG_CRAMFS is not set
 # CONFIG_TMPFS is not set
-CONFIG_RAMFS=y
+# CONFIG_RAMFS is not set
 # CONFIG_ISO9660_FS is not set
 # CONFIG_JOLIET is not set
 # CONFIG_ZISOFS is not set
@@ -730,7 +704,7 @@ CONFIG_DEVFS_MOUNT=y
 # 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=m
 # CONFIG_SYSV_FS is not set
 # CONFIG_UDF_FS is not set
 # CONFIG_UDF_RW is not set
@@ -743,12 +717,13 @@ CONFIG_DEVFS_MOUNT=y
 # CONFIG_CODA_FS is not set
 # CONFIG_INTERMEZZO_FS is not set
 CONFIG_NFS_FS=m
-# CONFIG_NFS_V3 is not set
+CONFIG_NFS_V3=y
 # CONFIG_ROOT_NFS is not set
 # CONFIG_NFSD is not set
 # CONFIG_NFSD_V3 is not set
 CONFIG_SUNRPC=m
 CONFIG_LOCKD=m
+CONFIG_LOCKD_V4=y
 # CONFIG_SMB_FS is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_NCPFS_PACKET_SIGNING is not set
@@ -760,7 +735,7 @@ CONFIG_LOCKD=m
 # CONFIG_NCPFS_NLS is not set
 # CONFIG_NCPFS_EXTRAS is not set
 # CONFIG_ZISOFS_FS is not set
-CONFIG_ZLIB_FS_INFLATE=y
+# CONFIG_ZLIB_FS_INFLATE is not set
 
 #
 # Partition Types
@@ -918,18 +893,10 @@ CONFIG_MCP_UCB1200_TS=y
 # USB support
 #
 # CONFIG_USB is not set
-
-#
-# USB Controllers
-#
 # CONFIG_USB_UHCI is not set
 # CONFIG_USB_UHCI_ALT is not set
 # CONFIG_USB_OHCI is not set
 # CONFIG_USB_NON_PCI_OHCI is not set
-
-#
-# USB Device Class drivers
-#
 # CONFIG_USB_AUDIO is not set
 # CONFIG_USB_BLUETOOTH is not set
 # CONFIG_USB_STORAGE is not set
@@ -943,44 +910,16 @@ CONFIG_MCP_UCB1200_TS=y
 # CONFIG_USB_STORAGE_JUMPSHOT is not set
 # CONFIG_USB_ACM is not set
 # CONFIG_USB_PRINTER is not set
-
-#
-# USB Human Interface Devices (HID)
-#
-
-#
-#   Input core support is needed for USB HID
-#
-
-#
-# USB Imaging devices
-#
 # CONFIG_USB_DC2XX is not set
 # CONFIG_USB_MDC800 is not set
 # CONFIG_USB_SCANNER is not set
 # CONFIG_USB_MICROTEK is not set
 # CONFIG_USB_HPUSBSCSI is not set
-
-#
-# USB Multimedia devices
-#
-
-#
-#   Video4Linux support is needed for USB Multimedia device support
-#
-
-#
-# USB Network adaptors
-#
 # CONFIG_USB_PEGASUS is not set
 # CONFIG_USB_KAWETH is not set
 # CONFIG_USB_CATC is not set
 # CONFIG_USB_CDCETHER is not set
 # CONFIG_USB_USBNET is not set
-
-#
-# USB port drivers
-#
 # CONFIG_USB_USS720 is not set
 
 #
@@ -1011,10 +950,6 @@ CONFIG_MCP_UCB1200_TS=y
 # CONFIG_USB_SERIAL_CYBERJACK is not set
 # CONFIG_USB_SERIAL_XIRCOM is not set
 # CONFIG_USB_SERIAL_OMNINET is not set
-
-#
-# USB Miscellaneous drivers
-#
 # CONFIG_USB_RIO500 is not set
 
 #
@@ -1029,17 +964,9 @@ CONFIG_USBD_USE_SERIAL_NUMBER=y
 CONFIG_USBD_SERIAL_NUMBER_STR="0123456789"
 CONFIG_USBD_SELFPOWERED=y
 CONFIG_USBD_MONITOR=m
-
-#
-# 
-#
 CONFIG_USBD_PROCFS=y
 
 #
-# USB Device functions --
-#
-
-#
 # Network Function
 #
 CONFIG_USBD_NET=m
@@ -1053,7 +980,7 @@ CONFIG_USBD_NET_IN_PKTSIZE=64
 # CONFIG_USBD_NET_ALWAYSUP is not set
 # CONFIG_USBD_NET_SAFE is not set
 CONFIG_USBD_NET_CDC=y
-CONFIG_USBD_NET_REMOTE_MACADDR=""
+CONFIG_USBD_NET_REMOTE_MACADDR="400002000001"
 CONFIG_USBD_NET_REMOTE_OUI=400002
 CONFIG_USBD_NET_LOCAL_MACADDR="400001000001"
 CONFIG_USBD_NET_LOCAL_OUI=400001
@@ -1073,10 +1000,6 @@ CONFIG_USBD_SERIAL_OUT_PKTSIZE=64
 # CONFIG_USBD_SERIAL_SAFE is not set
 
 #
-# USB Device bus interfaces --
-#
-
-#
 # Intel StrongArm SA-1110 Bus Interface Driver
 #
 CONFIG_USBD_SA1100_BUS=m
diff --git a/linux/montavista-sa-2.4.17-mvl21/machine_name.patch b/linux/montavista-sa-2.4.17-mvl21/machine_name.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/linux/montavista-sa-2.4.17-mvl21/machine_name.patch
diff --git a/linux/montavista-sa-2.4.17-mvl21/opie-logo.patch b/linux/montavista-sa-2.4.17-mvl21/opie-logo.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/linux/montavista-sa-2.4.17-mvl21/opie-logo.patch