From 844d2b35122fd03bed3cc3f5371fdd5c0d21edad Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 26 May 2007 20:08:21 +0000 Subject: sync atheros-2.6 config, move parts to the generic config git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7348 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/atheros-2.6/config/default | 24 +++++++++++------------- target/linux/generic-2.6/config-template | 22 ++++++++++++++++++++-- 2 files changed, 31 insertions(+), 15 deletions(-) diff --git a/target/linux/atheros-2.6/config/default b/target/linux/atheros-2.6/config/default index ac8ae54e2..62a642fec 100644 --- a/target/linux/atheros-2.6/config/default +++ b/target/linux/atheros-2.6/config/default @@ -2,11 +2,14 @@ CONFIG_32BIT=y # CONFIG_64BIT is not set # CONFIG_64BIT_PHYS_ADDR is not set CONFIG_AR2313=y +# CONFIG_ARCH_HAS_ILOG2_U32 is not set +# CONFIG_ARCH_HAS_ILOG2_U64 is not set CONFIG_ATHEROS=y CONFIG_ATHEROS_AR5312=y CONFIG_ATHEROS_AR5315=y # CONFIG_ATM is not set CONFIG_BASE_SMALL=0 +CONFIG_BITREVERSE=y # CONFIG_BT is not set CONFIG_CMDLINE="console=ttyS0,9600 rootfstype=squashfs,jffs2 init=/etc/preinit" CONFIG_CPU_BIG_ENDIAN=y @@ -41,20 +44,16 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y # CONFIG_DM9000 is not set CONFIG_DMA_NEED_PCI_MAP_STATE=y CONFIG_DMA_NONCOHERENT=y -# CONFIG_FIRMWARE_EDID is not set CONFIG_FS_POSIX_ACL=y CONFIG_GENERIC_FIND_NEXT_BIT=y +# CONFIG_GENERIC_GPIO is not set +# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set # CONFIG_GEN_RTC is not set +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y CONFIG_HAVE_STD_PC_SERIAL_PORT=y # CONFIG_HOSTAP is not set CONFIG_HW_RANDOM=y -CONFIG_HZ=100 -CONFIG_HZ_100=y -# CONFIG_HZ_1024 is not set -# CONFIG_HZ_128 is not set -# CONFIG_HZ_250 is not set -# CONFIG_HZ_256 is not set -# CONFIG_HZ_48 is not set # CONFIG_I2C is not set # CONFIG_IDE is not set # CONFIG_IEEE80211 is not set @@ -64,7 +63,6 @@ CONFIG_JFFS2_FS_DEBUG=0 # CONFIG_MACH_DECSTATION is not set # CONFIG_MACH_JAZZ is not set # CONFIG_MACH_VR41XX is not set -CONFIG_MINI_FO=y CONFIG_MIPS=y # CONFIG_MIPS_ATLAS is not set # CONFIG_MIPS_BOSPORUS is not set @@ -98,6 +96,7 @@ CONFIG_MIPS_MT_DISABLED=y # CONFIG_MOMENCO_OCELOT_G is not set CONFIG_MTD=y # CONFIG_MTD_ABSENT is not set +CONFIG_MTD_BLKDEVS=y CONFIG_MTD_BLOCK=y # CONFIG_MTD_BLOCK2MTD is not set CONFIG_MTD_CFI=y @@ -131,7 +130,6 @@ CONFIG_MTD_MAP_BANK_WIDTH_2=y CONFIG_MTD_MAP_BANK_WIDTH_4=y # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set # CONFIG_MTD_MTDRAM is not set -# CONFIG_MTD_NAND is not set # CONFIG_MTD_OBSOLETE_CHIPS is not set # CONFIG_MTD_ONENAND is not set # CONFIG_MTD_OTP is not set @@ -150,14 +148,13 @@ CONFIG_MTD_REDBOOT_PARTS_READONLY=y # CONFIG_MTD_ROM is not set # CONFIG_MTD_SLRAM is not set CONFIG_MTD_SPIFLASH=y -CONFIG_MTD_SPLIT_ROOTFS=y +CONFIG_NET_SCH_FIFO=y # CONFIG_PAGE_SIZE_16KB is not set CONFIG_PAGE_SIZE_4KB=y # CONFIG_PAGE_SIZE_64KB is not set # CONFIG_PAGE_SIZE_8KB is not set -# CONFIG_PCMCIA is not set -# CONFIG_PCCARD is not set # CONFIG_PMC_YOSEMITE is not set +# CONFIG_PNPACPI is not set # CONFIG_PNX8550_JBS is not set # CONFIG_PNX8550_STB810 is not set # CONFIG_RTC is not set @@ -180,6 +177,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=1 # CONFIG_SIBYTE_SWARM is not set # CONFIG_SOFT_WATCHDOG is not set # CONFIG_SPARSEMEM_STATIC is not set +CONFIG_SYSVIPC_SYSCTL=y CONFIG_SYS_HAS_CPU_MIPS32_R1=y CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y CONFIG_SYS_SUPPORTS_ARBIT_HZ=y diff --git a/target/linux/generic-2.6/config-template b/target/linux/generic-2.6/config-template index 4729f2873..949d750a9 100644 --- a/target/linux/generic-2.6/config-template +++ b/target/linux/generic-2.6/config-template @@ -339,8 +339,15 @@ CONFIG_HOTPLUG=y # CONFIG_HUGETLB_PAGE is not set # CONFIG_HWMON is not set # CONFIG_HWMON_VID is not set +CONFIG_HZ=100 +CONFIG_HZ_100=y # CONFIG_HZ_1000 is not set +# CONFIG_HZ_1024 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set # CONFIG_HZ_300 is not set +# CONFIG_HZ_48 is not set # CONFIG_I2C_ALGOPCA is not set # CONFIG_I2C_ALGOPCF is not set # CONFIG_I2C_ALI1535 is not set @@ -774,6 +781,7 @@ CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set CONFIG_NFS_V4=y # CONFIG_NFTL is not set +CONFIG_NF_CONNTRACK=y # CONFIG_NF_CONNTRACK_AMANDA is not set CONFIG_NF_CONNTRACK_ENABLED=y # CONFIG_NF_CONNTRACK_EVENTS is not set @@ -782,7 +790,7 @@ CONFIG_NF_CONNTRACK_H323=m CONFIG_NF_CONNTRACK_IPV4=y # CONFIG_NF_CONNTRACK_IPV6 is not set CONFIG_NF_CONNTRACK_IRC=m -# CONFIG_NF_CONNTRACK_MARK is not set +CONFIG_NF_CONNTRACK_MARK=y # CONFIG_NF_CONNTRACK_NETBIOS_NS is not set # CONFIG_NF_CONNTRACK_PPTP is not set CONFIG_NF_CONNTRACK_PROC_COMPAT=y @@ -790,10 +798,18 @@ CONFIG_NF_CONNTRACK_PROC_COMPAT=y CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SUPPORT=y # CONFIG_NF_CONNTRACK_TFTP is not set -# CONFIG_NF_CT_ACCT is not set +CONFIG_NF_CT_ACCT=y # CONFIG_NF_CT_PROTO_SCTP is not set CONFIG_NF_NAT=y +# CONFIG_NF_NAT_AMANDA is not set +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_H323=m +CONFIG_NF_NAT_IRC=m +CONFIG_NF_NAT_NEEDED=y +# CONFIG_NF_NAT_PPTP is not set +CONFIG_NF_NAT_SIP=m # CONFIG_NF_NAT_SNMP_BASIC is not set +# CONFIG_NF_NAT_TFTP is not set CONFIG_NLS=m # CONFIG_NLS_ASCII is not set CONFIG_NLS_CODEPAGE_1250=m @@ -1527,3 +1543,5 @@ CONFIG_ZISOFS=y CONFIG_ZISOFS_FS=m CONFIG_ZLIB_DEFLATE=y CONFIG_ZLIB_INFLATE=y +CONFIG_ZONE_DMA=y +CONFIG_ZONE_DMA_FLAG=1 -- cgit v1.2.3