further tweaks to shepherd defconfig:

 update for new openswan configury
 move some modules into the kernel to save space in rootfs

BKrev: 41975da3-HTWyFRvSJgxwT2vHDaWwA

1 files changed, 189 insertions, 24 deletions

diff --git a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-shepherd b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-shepherd
index 29db93e391..1feea1a04d 100644
--- a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-shepherd
+++ b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-shepherd
@@ -1,5 +1,5 @@
 #
-# Automatically generated by make menuconfig: don't edit
+# Automatically generated make config: don't edit
 #
 CONFIG_ARM=y
 # CONFIG_EISA is not set
@@ -46,6 +46,10 @@ CONFIG_ARCH_PXA=y
 #
 # Archimedes/A5000 Implementations
 #
+
+#
+# Archimedes/A5000 Implementations (select only ONE)
+#
 # CONFIG_ARCH_ARC is not set
 # CONFIG_ARCH_A5K is not set
 
@@ -129,6 +133,10 @@ 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=y
 # CONFIG_ARCH_SHARP_SL_V is not set
 # CONFIG_ARCH_SHARP_SL_G is not set
@@ -156,6 +164,10 @@ CONFIG_ARCH_SHARP_SL_E=y
 # 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 is not set
 # CONFIG_CPU_ARM610 is not set
@@ -202,6 +214,10 @@ 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=y
 # CONFIG_FPE_FASTFPE is not set
 CONFIG_KCORE_ELF=y
@@ -239,6 +255,10 @@ CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_REDBOOT_PARTS is not set
 CONFIG_MTD_CMDLINE_PARTS=y
 # CONFIG_MTD_AFS_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
 CONFIG_MTD_CHAR=y
 CONFIG_MTD_BLOCK=y
 # CONFIG_FTL is not set
@@ -292,6 +312,10 @@ CONFIG_MTD_SHARP_SL=y
 # CONFIG_MTD_MTDRAM is not set
 # CONFIG_MTD_MTDRAM_SHARP_SL 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
@@ -361,26 +385,54 @@ 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=m
+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 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
+
+#
+#  
+#
 # CONFIG_IPX is not set
 # CONFIG_ATALK is not set
 # CONFIG_DECNET is not set
@@ -398,17 +450,21 @@ CONFIG_IPV6=m
 # QoS and/or fair queueing
 #
 # CONFIG_NET_SCHED is not set
-CONFIG_KLIPS=m
-CONFIG_KLIPS_IPIP=y
-CONFIG_KLIPS_AH=y
-CONFIG_KLIPS_ESP=y
-CONFIG_KLIPS_ENC_3DES=y
-CONFIG_KLIPS_ENC_AES=y
-CONFIG_KLIPS_AUTH_HMAC_MD5=y
-CONFIG_KLIPS_AUTH_HMAC_SHA1=y
-CONFIG_KLIPS_ALG=y
-CONFIG_KLIPS_IPCOMP=y
-CONFIG_KLIPS_DEBUG=y
+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 is not set
+CONFIG_IPSEC_IPCOMP=y
+CONFIG_IPSEC_DEBUG=y
 
 #
 # Network device support
@@ -477,6 +533,10 @@ CONFIG_NET_RADIO=y
 # CONFIG_AIRONET4500_NONCS is not set
 # CONFIG_AIRONET4500_PROC is not set
 # CONFIG_HERMES is not set
+
+#
+# Wireless Pcmcia cards support
+#
 # CONFIG_PCMCIA_HERMES is not set
 # CONFIG_AIRO_CS is not set
 CONFIG_NET_WIRELESS=y
@@ -519,10 +579,18 @@ CONFIG_PCMCIA_PCNET=y
 # IrDA (infrared) support
 #
 CONFIG_IRDA=y
+
+#
+# IrDA protocols
+#
 # CONFIG_IRLAN is not set
 CONFIG_IRNET=m
 CONFIG_IRCOMM=y
 # CONFIG_IRDA_ULTRA is not set
+
+#
+# IrDA options
+#
 # CONFIG_IRDA_CACHE_LAST_LSAP is not set
 CONFIG_IRDA_FAST_RR=y
 # CONFIG_IRDA_DEBUG is not set
@@ -530,9 +598,21 @@ CONFIG_IRDA_FAST_RR=y
 #
 # Infrared-port device drivers
 #
+
+#
+# SIR device drivers
+#
 CONFIG_IRTTY_SIR=y
 # 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
@@ -550,6 +630,10 @@ 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
@@ -568,6 +652,10 @@ CONFIG_BLK_DEV_IDECS=y
 # 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
@@ -666,6 +754,10 @@ CONFIG_UNIX98_PTY_COUNT=256
 # CONFIG_L3 is not set
 # CONFIG_L3_ALGOBIT is not set
 # CONFIG_L3_BIT_SA1100_GPIO is not set
+
+#
+# Other L3 adapters
+#
 # CONFIG_L3_SA1111 is not set
 # CONFIG_BIT_SA1100_GPIO is not set
 
@@ -679,6 +771,14 @@ CONFIG_UNIX98_PTY_COUNT=256
 # 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
 
 #
@@ -963,16 +1063,36 @@ CONFIG_SOUND_CORGI=y
 #
 CONFIG_USB=m
 # CONFIG_USB_DEBUG is not set
+
+#
+# Miscellaneous USB options
+#
 # CONFIG_USB_DEVICEFS is not set
 # CONFIG_USB_BANDWIDTH is not set
 # CONFIG_USB_LONG_TIMEOUT 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_OHCI_SA1111 is not set
 # CONFIG_USB_OHCI_TC6393 is not set
 # CONFIG_USB_USE_INTERNAL_MEMORY is not set
+
+#
+# USB Device Class drivers
+#
 # CONFIG_USB_AUDIO is not set
+
+#
+#   USB Bluetooth can only be used with disabled Bluetooth subsystem
+#
+
+#
+#   SCSI support is needed for USB Storage
+#
 # CONFIG_USB_STORAGE is not set
 # CONFIG_USB_STORAGE_DEBUG is not set
 # CONFIG_USB_STORAGE_DATAFAB is not set
@@ -984,16 +1104,44 @@ CONFIG_USB=m
 # 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
 
 #
@@ -1026,6 +1174,10 @@ CONFIG_USB=m
 # 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
 
 #
@@ -1039,9 +1191,17 @@ CONFIG_USBD_MANUFACTURER="Sharp"
 # CONFIG_USBD_USE_SERIAL_NUMBER is not set
 CONFIG_USBD_SELFPOWERED=y
 CONFIG_USBD_MONITOR=m
+
+#
+# 
+#
 # CONFIG_USBD_PROCFS is not set
 
 #
+# USB Device functions
+#
+
+#
 # Network Function
 #
 CONFIG_USBD_NET=m
@@ -1084,6 +1244,10 @@ CONFIG_USBD_STORAGE_INT_PKTSIZE=16
 CONFIG_USBD_STORAGE_DEF_DEVICE_NAME="/dev/hda1"
 
 #
+# USB Device bus interfaces
+#
+
+#
 # USB Device Bus Interface Support
 #
 CONFIG_USBD_PXA_BUS=m
@@ -1092,20 +1256,21 @@ CONFIG_USBD_PXA_BUS=m
 #
 # Bluetooth support
 #
-CONFIG_BLUEZ=m
-CONFIG_BLUEZ_L2CAP=m
-CONFIG_BLUEZ_SCO=m
-CONFIG_BLUEZ_RFCOMM=m
+CONFIG_BLUEZ=y
+CONFIG_BLUEZ_L2CAP=y
+CONFIG_BLUEZ_SCO=y
+CONFIG_BLUEZ_RFCOMM=y
 CONFIG_BLUEZ_RFCOMM_TTY=y
-CONFIG_BLUEZ_BNEP=m
+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 is not set
-CONFIG_BLUEZ_HCIUART=m
+CONFIG_BLUEZ_HCIUART=y
 CONFIG_BLUEZ_HCIUART_H4=y
 CONFIG_BLUEZ_HCIUART_BCSP=y
 CONFIG_BLUEZ_HCIUART_BCSP_TXCRC=y