Merge siasl.dyndns.org:code/packages

into odin.sc.ti.com:/home/kergoth/code/packages

2004/11/20 21:33:38-06:00 ti.com!kergoth
Bring tosa kernel defconfig up to par with the other pxa zaurus configs.

BKrev: 41a00cb44W7e0RpBMzMUK7oeM2iGqA

1 files changed, 88 insertions, 20 deletions

diff --git a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-tosa b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-tosa
index df1bf11c7d..5f71966322 100644
--- a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-tosa
+++ b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-tosa
@@ -123,21 +123,20 @@ CONFIG_ARCH_PXA=y
 # CONFIG_POODLE_TR0 is not set
 # CONFIG_ARCH_PXA_CORGI is not set
 # CONFIG_CORGI_TR0 is not set
-# CONFIG_CORGI_LCD_BUFF is not set
-# CONFIG_ARCH_PXA_SHEPHERD is not set
-# CONFIG_ARCH_PXA_HUSKY is not set
-# CONFIG_ARCH_PXA_BOXER is not set
 CONFIG_ARCH_PXA_TOSA=y
 CONFIG_ARCH_PXA_TOSA_SKIP=y
 CONFIG_ARCH_SHARP_SL=y
+CONFIG_SL_CCCR_CHANGE=y
+# CONFIG_SL_CCCR242 is not set
+# CONFIG_SL_CCCR162 is not set
 
 #
 # Language type
 #
-# CONFIG_ARCH_SHARP_SL_E is not set
+CONFIG_ARCH_SHARP_SL_E=y
 # CONFIG_ARCH_SHARP_SL_V is not set
 # CONFIG_ARCH_SHARP_SL_G is not set
-CONFIG_ARCH_SHARP_SL_J=y
+# CONFIG_ARCH_SHARP_SL_J is not set
 # CONFIG_ARCH_SHARP_SL_S is not set
 # CONFIG_ARCH_SHARP_SL_I is not set
 # CONFIG_PXA_USB is not set
@@ -219,7 +218,7 @@ CONFIG_FPE_NWFPE=y
 # CONFIG_FPE_FASTFPE is not set
 CONFIG_KCORE_ELF=y
 # CONFIG_KCORE_AOUT is not set
-CONFIG_BINFMT_AOUT=y
+# CONFIG_BINFMT_AOUT is not set
 CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_MISC is not set
 CONFIG_PM=y
@@ -234,7 +233,8 @@ CONFIG_CMDLINE="<see .oe file>"
 CONFIG_ALIGNMENT_TRAP=y
 CONFIG_FREEPG_SIGNAL=y
 CONFIG_OOM_KILL_SURVIVAL=y
-CONFIG_DEVICEINFO=y
+CONFIG_DEVICEINFO=m
+CONFIG_CORGI_DEVICEINFO=m
 
 #
 # Parallel port support
@@ -346,9 +346,8 @@ CONFIG_MTD_NAND_SHARP_SL_TC6393=y
 # CONFIG_BLK_DEV_DAC960 is not set
 CONFIG_BLK_DEV_LOOP=y
 # CONFIG_BLK_DEV_NBD is not set
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=8192
-CONFIG_BLK_DEV_INITRD=y
+# CONFIG_BLK_DEV_RAM is not set
+# CONFIG_BLK_DEV_INITRD is not set
 
 #
 # Multi-device support (RAID and LVM)
@@ -380,17 +379,47 @@ CONFIG_NET_IPIP=m
 CONFIG_NET_IPGRE=m
 # CONFIG_ARPD is not set
 # CONFIG_INET_ECN is not set
-# CONFIG_SYN_COOKIES is not set
+CONFIG_SYN_COOKIES=y
 
 #
 #   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_IP_NF_IPTABLES=y
+# CONFIG_IP_NF_MATCH_LIMIT is not set
+# CONFIG_IP_NF_MATCH_MAC is not set
+# CONFIG_IP_NF_MATCH_MARK is not set
+# CONFIG_IP_NF_MATCH_MULTIPORT is not set
+# CONFIG_IP_NF_MATCH_TOS is not set
+# CONFIG_IP_NF_MATCH_AH_ESP is not set
+# CONFIG_IP_NF_MATCH_LENGTH is not set
+# CONFIG_IP_NF_MATCH_TTL is not set
+# CONFIG_IP_NF_MATCH_TCPMSS is not set
+# CONFIG_IP_NF_MATCH_UNCLEAN is not set
+# CONFIG_IP_NF_MATCH_OWNER is not set
+CONFIG_IP_NF_FILTER=y
+CONFIG_IP_NF_TARGET_REJECT=y
+# CONFIG_IP_NF_TARGET_MIRROR is not set
+# CONFIG_IP_NF_MANGLE is not set
+CONFIG_IP_NF_TARGET_LOG=y
+# CONFIG_IP_NF_TARGET_ULOG is not set
+# CONFIG_IP_NF_TARGET_TCPMSS is not set
+CONFIG_IPV6=y
+
+#
+#   IPv6: Netfilter Configuration
+#
+# CONFIG_IP6_NF_QUEUE is not set
+CONFIG_IP6_NF_IPTABLES=y
+# CONFIG_IP6_NF_MATCH_LIMIT is not set
+# CONFIG_IP6_NF_MATCH_MAC is not set
+# CONFIG_IP6_NF_MATCH_MULTIPORT is not set
+# CONFIG_IP6_NF_MATCH_OWNER is not set
+# CONFIG_IP6_NF_MATCH_MARK is not set
+CONFIG_IP6_NF_FILTER=y
+CONFIG_IP6_NF_TARGET_LOG=y
+# CONFIG_IP6_NF_MANGLE is not set
 # CONFIG_KHTTPD is not set
 # CONFIG_ATM is not set
 # CONFIG_VLAN_8021Q is not set
@@ -415,6 +444,21 @@ CONFIG_NET_IPGRE=m
 # QoS and/or fair queueing
 #
 # CONFIG_NET_SCHED is not set
+CONFIG_IPSEC=m
+
+#
+# IPSec options (Openswan)
+#
+CONFIG_IPSEC_IPIP=y
+CONFIG_IPSEC_AH=y
+# CONFIG_IPSEC_AUTH_HMAC_MD5 is not set
+CONFIG_IPSEC_AUTH_HMAC_SHA1=y
+CONFIG_IPSEC_ESP=y
+CONFIG_IPSEC_ENC_3DES=y
+# CONFIG_IPSEC_ENC_AES is not set
+CONFIG_IPSEC_ALG=y
+CONFIG_IPSEC_IPCOMP=y
+CONFIG_IPSEC_DEBUG=y
 
 #
 # Network device support
@@ -1032,7 +1076,7 @@ CONFIG_FBCON_CFB16=y
 # CONFIG_FBCON_VGA_PLANES is not set
 # CONFIG_FBCON_VGA is not set
 # CONFIG_FBCON_HGA is not set
-# CONFIG_FBCON_ROTATE_R is not set
+CONFIG_FBCON_ROTATE_R=y
 # CONFIG_FBCON_ROTATE_L is not set
 # CONFIG_FBCON_FONTWIDTH8_ONLY is not set
 CONFIG_FBCON_FONTS=y
@@ -1280,7 +1324,31 @@ CONFIG_USBD_PXA_BUS=m
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+CONFIG_BLUEZ=y
+CONFIG_BLUEZ_L2CAP=y
+CONFIG_BLUEZ_SCO=y
+CONFIG_BLUEZ_RFCOMM=y
+CONFIG_BLUEZ_RFCOMM_TTY=y
+CONFIG_BLUEZ_BNEP=y
+CONFIG_BLUEZ_BNEP_MC_FILTER=y
+CONFIG_BLUEZ_BNEP_PROTO_FILTER=y
+# CONFIG_BLUEZ_HIDP is not set
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BLUEZ_HCIUSB=m
+CONFIG_BLUEZ_HCIUSB_SCO=y
+CONFIG_BLUEZ_HCIUART=y
+CONFIG_BLUEZ_HCIUART_H4=y
+CONFIG_BLUEZ_HCIUART_BCSP=y
+CONFIG_BLUEZ_HCIUART_BCSP_TXCRC=y
+CONFIG_BLUEZ_HCIBFUSB=m
+CONFIG_BLUEZ_HCIDTL1=m
+CONFIG_BLUEZ_HCIBLUECARD=m
+CONFIG_BLUEZ_HCIBTUART=m
+CONFIG_BLUEZ_HCIVHCI=m
+CONFIG_BLUEZ_BT950=m
 
 #
 # Kernel hacking
@@ -1290,9 +1358,9 @@ CONFIG_FRAME_POINTER=y
 # CONFIG_DEBUG_COREDUMP_SIGNAL is not set
 # CONFIG_DEBUG_INFO is not set
 # CONFIG_NO_PGT_CACHE is not set
-# CONFIG_DEBUG_KERNEL is not set
+CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_SLAB is not set
-# CONFIG_MAGIC_SYSRQ is not set
+CONFIG_MAGIC_SYSRQ=y
 # CONFIG_DEBUG_SPINLOCK is not set
 # CONFIG_DEBUG_WAITQ is not set
 # CONFIG_DEBUG_BUGVERBOSE is not set