summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-06-01 22:56:38 +0000
committerRichard Purdie <richard@openedhand.com>2008-06-01 22:56:38 +0000
commit2850555d1b6decb3678ef2d669d7e408def219cb (patch)
treecc22940b406aab9b254a543e67d8d21c91e07622 /meta
parent04e4de5b433b42332f187ac3333bc1aa62c93487 (diff)
downloadpoky-2850555d1b6decb3678ef2d669d7e408def219cb.tar.gz
linux-rp-2.6.23: Sync defconfigs with OE.dev
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4568 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/linux/linux-rp-2.6.23/defconfig-qemux86109
-rw-r--r--meta/packages/linux/linux-rp-2.6.23/defconfig-spitz3
-rw-r--r--meta/packages/linux/linux-rp-2.6.23/defconfig-zylonite2
3 files changed, 82 insertions, 32 deletions
diff --git a/meta/packages/linux/linux-rp-2.6.23/defconfig-qemux86 b/meta/packages/linux/linux-rp-2.6.23/defconfig-qemux86
index 5cba544cd6..62bbaceaf9 100644
--- a/meta/packages/linux/linux-rp-2.6.23/defconfig-qemux86
+++ b/meta/packages/linux/linux-rp-2.6.23/defconfig-qemux86
@@ -350,40 +350,68 @@ CONFIG_NETFILTER=y
350# 350#
351# Core Netfilter Configuration 351# Core Netfilter Configuration
352# 352#
353# CONFIG_NETFILTER_NETLINK is not set 353CONFIG_NETFILTER_NETLINK=m
354# CONFIG_NF_CONNTRACK_ENABLED is not set 354CONFIG_NETFILTER_NETLINK_QUEUE=m
355# CONFIG_NF_CONNTRACK is not set 355CONFIG_NETFILTER_NETLINK_LOG=m
356CONFIG_NF_CONNTRACK_ENABLED=m
357CONFIG_NF_CONNTRACK=m
358CONFIG_NF_CT_ACCT=y
359CONFIG_NF_CONNTRACK_MARK=y
360# CONFIG_NF_CONNTRACK_EVENTS is not set
361CONFIG_NF_CT_PROTO_GRE=m
362CONFIG_NF_CT_PROTO_SCTP=m
363CONFIG_NF_CT_PROTO_UDPLITE=m
364CONFIG_NF_CONNTRACK_AMANDA=m
365CONFIG_NF_CONNTRACK_FTP=m
366CONFIG_NF_CONNTRACK_H323=m
367CONFIG_NF_CONNTRACK_IRC=m
368CONFIG_NF_CONNTRACK_NETBIOS_NS=m
369CONFIG_NF_CONNTRACK_PPTP=m
370CONFIG_NF_CONNTRACK_SANE=m
371CONFIG_NF_CONNTRACK_SIP=m
372CONFIG_NF_CONNTRACK_TFTP=m
373CONFIG_NF_CT_NETLINK=m
356CONFIG_NETFILTER_XTABLES=m 374CONFIG_NETFILTER_XTABLES=m
357# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set 375CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
358# CONFIG_NETFILTER_XT_TARGET_DSCP is not set 376CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
359# CONFIG_NETFILTER_XT_TARGET_MARK is not set 377CONFIG_NETFILTER_XT_TARGET_DSCP=m
360# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set 378CONFIG_NETFILTER_XT_TARGET_MARK=m
361# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set 379CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
362# CONFIG_NETFILTER_XT_TARGET_TRACE is not set 380CONFIG_NETFILTER_XT_TARGET_NFLOG=m
363# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set 381CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
364# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set 382CONFIG_NETFILTER_XT_TARGET_TRACE=m
365# CONFIG_NETFILTER_XT_MATCH_DCCP is not set 383CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
366# CONFIG_NETFILTER_XT_MATCH_DSCP is not set 384CONFIG_NETFILTER_XT_MATCH_COMMENT=m
367# CONFIG_NETFILTER_XT_MATCH_ESP is not set 385CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
368# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set 386CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
369# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set 387CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
370# CONFIG_NETFILTER_XT_MATCH_MAC is not set 388CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
371# CONFIG_NETFILTER_XT_MATCH_MARK is not set 389CONFIG_NETFILTER_XT_MATCH_DCCP=m
372# CONFIG_NETFILTER_XT_MATCH_POLICY is not set 390CONFIG_NETFILTER_XT_MATCH_DSCP=m
373# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set 391CONFIG_NETFILTER_XT_MATCH_ESP=m
374# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set 392CONFIG_NETFILTER_XT_MATCH_HELPER=m
375# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set 393CONFIG_NETFILTER_XT_MATCH_LENGTH=m
376# CONFIG_NETFILTER_XT_MATCH_REALM is not set 394CONFIG_NETFILTER_XT_MATCH_LIMIT=m
377# CONFIG_NETFILTER_XT_MATCH_SCTP is not set 395CONFIG_NETFILTER_XT_MATCH_MAC=m
378# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set 396CONFIG_NETFILTER_XT_MATCH_MARK=m
379# CONFIG_NETFILTER_XT_MATCH_STRING is not set 397CONFIG_NETFILTER_XT_MATCH_POLICY=m
380# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set 398CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
381# CONFIG_NETFILTER_XT_MATCH_U32 is not set 399CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
382# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set 400CONFIG_NETFILTER_XT_MATCH_QUOTA=m
401CONFIG_NETFILTER_XT_MATCH_REALM=m
402CONFIG_NETFILTER_XT_MATCH_SCTP=m
403CONFIG_NETFILTER_XT_MATCH_STATE=m
404CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
405CONFIG_NETFILTER_XT_MATCH_STRING=m
406CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
407CONFIG_NETFILTER_XT_MATCH_U32=m
408CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
383 409
384# 410#
385# IP: Netfilter Configuration 411# IP: Netfilter Configuration
386# 412#
413CONFIG_NF_CONNTRACK_IPV4=m
414CONFIG_NF_CONNTRACK_PROC_COMPAT=y
387CONFIG_IP_NF_QUEUE=m 415CONFIG_IP_NF_QUEUE=m
388CONFIG_IP_NF_IPTABLES=m 416CONFIG_IP_NF_IPTABLES=m
389CONFIG_IP_NF_MATCH_IPRANGE=m 417CONFIG_IP_NF_MATCH_IPRANGE=m
@@ -398,10 +426,26 @@ CONFIG_IP_NF_FILTER=m
398CONFIG_IP_NF_TARGET_REJECT=m 426CONFIG_IP_NF_TARGET_REJECT=m
399CONFIG_IP_NF_TARGET_LOG=m 427CONFIG_IP_NF_TARGET_LOG=m
400CONFIG_IP_NF_TARGET_ULOG=m 428CONFIG_IP_NF_TARGET_ULOG=m
429CONFIG_NF_NAT=m
430CONFIG_NF_NAT_NEEDED=y
431CONFIG_IP_NF_TARGET_MASQUERADE=m
432CONFIG_IP_NF_TARGET_REDIRECT=m
433CONFIG_IP_NF_TARGET_NETMAP=m
434CONFIG_IP_NF_TARGET_SAME=m
435CONFIG_NF_NAT_SNMP_BASIC=m
436CONFIG_NF_NAT_PROTO_GRE=m
437CONFIG_NF_NAT_FTP=m
438CONFIG_NF_NAT_IRC=m
439CONFIG_NF_NAT_TFTP=m
440CONFIG_NF_NAT_AMANDA=m
441CONFIG_NF_NAT_PPTP=m
442CONFIG_NF_NAT_H323=m
443CONFIG_NF_NAT_SIP=m
401CONFIG_IP_NF_MANGLE=m 444CONFIG_IP_NF_MANGLE=m
402CONFIG_IP_NF_TARGET_TOS=m 445CONFIG_IP_NF_TARGET_TOS=m
403CONFIG_IP_NF_TARGET_ECN=m 446CONFIG_IP_NF_TARGET_ECN=m
404CONFIG_IP_NF_TARGET_TTL=m 447CONFIG_IP_NF_TARGET_TTL=m
448CONFIG_IP_NF_TARGET_CLUSTERIP=m
405CONFIG_IP_NF_RAW=m 449CONFIG_IP_NF_RAW=m
406CONFIG_IP_NF_ARPTABLES=m 450CONFIG_IP_NF_ARPTABLES=m
407CONFIG_IP_NF_ARPFILTER=m 451CONFIG_IP_NF_ARPFILTER=m
@@ -425,6 +469,7 @@ CONFIG_IP_NF_ARP_MANGLE=m
425# QoS and/or fair queueing 469# QoS and/or fair queueing
426# 470#
427# CONFIG_NET_SCHED is not set 471# CONFIG_NET_SCHED is not set
472CONFIG_NET_CLS_ROUTE=y
428 473
429# 474#
430# Network testing 475# Network testing
@@ -439,7 +484,7 @@ CONFIG_IP_NF_ARP_MANGLE=m
439# Wireless 484# Wireless
440# 485#
441# CONFIG_CFG80211 is not set 486# CONFIG_CFG80211 is not set
442# CONFIG_WIRELESS_EXT is not set 487CONFIG_WIRELESS_EXT=y
443# CONFIG_MAC80211 is not set 488# CONFIG_MAC80211 is not set
444# CONFIG_IEEE80211 is not set 489# CONFIG_IEEE80211 is not set
445# CONFIG_RFKILL is not set 490# CONFIG_RFKILL is not set
@@ -1693,6 +1738,10 @@ CONFIG_CRC32=y
1693# CONFIG_CRC7 is not set 1738# CONFIG_CRC7 is not set
1694CONFIG_LIBCRC32C=m 1739CONFIG_LIBCRC32C=m
1695CONFIG_AUDIT_GENERIC=y 1740CONFIG_AUDIT_GENERIC=y
1741CONFIG_TEXTSEARCH=y
1742CONFIG_TEXTSEARCH_KMP=m
1743CONFIG_TEXTSEARCH_BM=m
1744CONFIG_TEXTSEARCH_FSM=m
1696CONFIG_PLIST=y 1745CONFIG_PLIST=y
1697CONFIG_HAS_IOMEM=y 1746CONFIG_HAS_IOMEM=y
1698CONFIG_HAS_IOPORT=y 1747CONFIG_HAS_IOPORT=y
diff --git a/meta/packages/linux/linux-rp-2.6.23/defconfig-spitz b/meta/packages/linux/linux-rp-2.6.23/defconfig-spitz
index 2ced24e951..d3512f2a4b 100644
--- a/meta/packages/linux/linux-rp-2.6.23/defconfig-spitz
+++ b/meta/packages/linux/linux-rp-2.6.23/defconfig-spitz
@@ -579,7 +579,7 @@ CONFIG_MTD_ROM=m
579# 579#
580CONFIG_MTD_COMPLEX_MAPPINGS=y 580CONFIG_MTD_COMPLEX_MAPPINGS=y
581# CONFIG_MTD_PHYSMAP is not set 581# CONFIG_MTD_PHYSMAP is not set
582CONFIG_MTD_SHARP_SL=y 582CONFIG_MTD_SHARP_SL=m
583# CONFIG_MTD_PLATRAM is not set 583# CONFIG_MTD_PLATRAM is not set
584 584
585# 585#
@@ -821,6 +821,7 @@ CONFIG_INPUT_KEYBOARD=y
821# CONFIG_KEYBOARD_STOWAWAY is not set 821# CONFIG_KEYBOARD_STOWAWAY is not set
822# CONFIG_KEYBOARD_CORGI is not set 822# CONFIG_KEYBOARD_CORGI is not set
823CONFIG_KEYBOARD_SPITZ=y 823CONFIG_KEYBOARD_SPITZ=y
824CONFIG_SHARPSL_RC=m
824# CONFIG_KEYBOARD_PXA27x is not set 825# CONFIG_KEYBOARD_PXA27x is not set
825# CONFIG_KEYBOARD_GPIO is not set 826# CONFIG_KEYBOARD_GPIO is not set
826# CONFIG_INPUT_MOUSE is not set 827# CONFIG_INPUT_MOUSE is not set
diff --git a/meta/packages/linux/linux-rp-2.6.23/defconfig-zylonite b/meta/packages/linux/linux-rp-2.6.23/defconfig-zylonite
index bd15f9e933..d98974989f 100644
--- a/meta/packages/linux/linux-rp-2.6.23/defconfig-zylonite
+++ b/meta/packages/linux/linux-rp-2.6.23/defconfig-zylonite
@@ -1026,7 +1026,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
1026# 1026#
1027# CONFIG_SOUND_PRIME is not set 1027# CONFIG_SOUND_PRIME is not set
1028CONFIG_HID_SUPPORT=y 1028CONFIG_HID_SUPPORT=y
1029CONFIG_HID=y 1029CONFIG_HID=m
1030# CONFIG_HID_DEBUG is not set 1030# CONFIG_HID_DEBUG is not set
1031 1031
1032# 1032#