More stuff enabled in config, fix squashfs image, thanks sn9

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6989 3c298f89-4303-0410-b956-a3cf2f4a3e73

2 files changed, 35 insertions, 45 deletions

diff --git a/target/linux/rdc-2.6/Makefile b/target/linux/rdc-2.6/Makefile
index df920ddee..d6f49826b 100644
--- a/target/linux/rdc-2.6/Makefile
+++ b/target/linux/rdc-2.6/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 ARCH:=i386
 BOARD:=rdc
 BOARDNAME:=RDC x86
-FEATURES:=squashfs
+FEATURES:=squashfs jffs2
 
 define Target/Description
         Build firmware images for RDC3211 based routers
@@ -21,7 +21,7 @@ include $(INCLUDE_DIR)/kernel-build.mk
 ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
     define Kernel/SetInitramfs
 	rm -f $(BUILD_DIR)/root/sbin/init
-	$(CP) $(GENERIC_PLATFORM_DIR)/files/init $(BUILD_DIR)/root/sbin/
+	ln -s /etc/preinit $(BUILD_DIR)/root/sbin/init
 	$(CP) $(PLATFORM_DIR)/image/preinit.arch $(BUILD_DIR)/root/etc/
     endef
 endif
diff --git a/target/linux/rdc-2.6/config/default b/target/linux/rdc-2.6/config/default
index 747f809db..0e6cb383f 100644
--- a/target/linux/rdc-2.6/config/default
+++ b/target/linux/rdc-2.6/config/default
@@ -8,8 +8,6 @@
 # CONFIG_ALIM7101_WDT is not set
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_ARCH_POPULATES_NODE_MAP=y
-# CONFIG_ARPD is not set
-# CONFIG_ATM is not set
 # CONFIG_B44 is not set
 CONFIG_BASE_SMALL=0
 CONFIG_BINFMT_AOUT=m
@@ -17,10 +15,9 @@ CONFIG_BINFMT_MISC=m
 # CONFIG_BLK_DEV_FD is not set
 # CONFIG_BLK_DEV_NBD is not set
 # CONFIG_BONDING is not set
-# CONFIG_BRIDGE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
-# CONFIG_BT is not set
-# CONFIG_CIFS is not set
+CONFIG_BT_CMTP=m
+CONFIG_CIFS_XATTR=y
 # CONFIG_COMPAT_VDSO is not set
 # CONFIG_CPU5_WDT is not set
 # CONFIG_CPU_FREQ is not set
@@ -32,7 +29,6 @@ CONFIG_CRYPTO_DES=m
 # CONFIG_CRYPTO_DEV_PADLOCK is not set
 CONFIG_CRYPTO_MANAGER=m
 CONFIG_CRYPTO_MD5=m
-# CONFIG_CRYPTO_TEST is not set
 CONFIG_CRYPTO_TWOFISH_586=m
 # CONFIG_CS5535_GPIO is not set
 # CONFIG_DCDBAS is not set
@@ -40,7 +36,6 @@ CONFIG_CRYPTO_TWOFISH_586=m
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
-CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_DELL_RBU is not set
 CONFIG_DMI=y
 # CONFIG_DOUBLEFAULT is not set
@@ -51,19 +46,23 @@ CONFIG_EARLY_PRINTK=y
 # CONFIG_ENABLE_MUST_CHECK is not set
 # CONFIG_EUROTECH_WDT is not set
 # CONFIG_FIRMWARE_EDID is not set
+CONFIG_FS_POSIX_ACL=y
 # CONFIG_FTAPE is not set
 CONFIG_FW_LOADER=m
 CONFIG_GENERIC_IOMAP=y
 CONFIG_GENERIC_ISA_DMA=y
 # CONFIG_GEN_RTC is not set
-# CONFIG_HAMRADIO is not set
 # CONFIG_HANGCHECK_TIMER is not set
 # CONFIG_HIGHMEM4G is not set
 # CONFIG_HIGHMEM64G is not set
 # CONFIG_HPET_TIMER is not set
 CONFIG_HUGETLBFS=y
 CONFIG_HUGETLB_PAGE=y
-# CONFIG_HW_RANDOM is not set
+CONFIG_HW_RANDOM=y
+# CONFIG_HW_RANDOM_AMD is not set
+# CONFIG_HW_RANDOM_GEODE is not set
+# CONFIG_HW_RANDOM_INTEL is not set
+# CONFIG_HW_RANDOM_VIA is not set
 CONFIG_HZ=250
 # CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y
@@ -75,31 +74,21 @@ CONFIG_HZ_250=y
 # CONFIG_IBMASR is not set
 # CONFIG_IBM_ASM is not set
 # CONFIG_IDE is not set
-# CONFIG_IEEE80211 is not set
+# CONFIG_IEEE80211_CRYPT_TKIP is not set
 # CONFIG_IKCONFIG is not set
-# CONFIG_INET6_AH is not set
-# CONFIG_INET6_ESP is not set
-# CONFIG_INET6_IPCOMP is not set
-# CONFIG_INET6_TUNNEL is not set
-# CONFIG_INET6_XFRM_TUNNEL is not set
-# CONFIG_INET_AH is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-# CONFIG_INET_TUNNEL is not set
+CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
 CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_XFRM_MODE_TRANSPORT=m
 CONFIG_INET_XFRM_MODE_TUNNEL=m
-# CONFIG_INET_XFRM_TUNNEL is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INOTIFY=y
 CONFIG_INOTIFY_USER=y
 CONFIG_IOSCHED_CFQ=y
 # CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IPSEC_NAT_TRAVERSAL is not set
-# CONFIG_IPV6_ROUTER_PREF is not set
-# CONFIG_IP_ADVANCED_ROUTER is not set
-# CONFIG_IP_DCCP is not set
-# CONFIG_IP_MULTICAST is not set
+CONFIG_IPV6_MIP6=y
+CONFIG_IPV6_PRIVACY=y
+CONFIG_IPV6_ROUTE_INFO=y
+CONFIG_IPV6_TUNNEL=m
 # CONFIG_ISA is not set
 CONFIG_ISA_DMA_API=y
 # CONFIG_ITCO_WDT is not set
@@ -109,8 +98,8 @@ CONFIG_JFFS2_FS_DEBUG=0
 CONFIG_JFFS2_RUBIN=y
 # CONFIG_KEXEC is not set
 CONFIG_KTIME_SCALAR=y
+# CONFIG_LEDS_RDC3211 is not set
 CONFIG_LIBCRC32C=y
-# CONFIG_LLC2 is not set
 # CONFIG_M386 is not set
 CONFIG_M486=y
 # CONFIG_M586 is not set
@@ -196,20 +185,17 @@ CONFIG_MTRR=y
 # CONFIG_MWINCHIPC6 is not set
 # CONFIG_NATSEMI is not set
 # CONFIG_NE2K_PCI is not set
-# CONFIG_NET_IPGRE is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_KEY is not set
+# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NET_ACT_SIMP=m
 # CONFIG_NET_PKTGEN is not set
-# CONFIG_NET_RADIO is not set
 # CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_NFSD is not set
-# CONFIG_NFS_FS is not set
+# CONFIG_NFS_V4 is not set
 CONFIG_NOHIGHMEM=y
 # CONFIG_NSC_GPIO is not set
 CONFIG_NVRAM=y
-# CONFIG_PACKET is not set
 CONFIG_PAGE_OFFSET=0xC0000000
-# CONFIG_PARTITION_ADVANCED is not set
 # CONFIG_PC8736x_GPIO is not set
 # CONFIG_PCIEPORTBUS is not set
 # CONFIG_PCIPCWATCHDOG is not set
@@ -221,9 +207,9 @@ CONFIG_PCI_GOANY=y
 # CONFIG_PCI_GOMMCONFIG is not set
 CONFIG_PHYSICAL_START=0x100000
 # CONFIG_PM is not set
-# CONFIG_PPP is not set
 CONFIG_R6040=y
 # CONFIG_REGPARM is not set
+# CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RTC is not set
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 # CONFIG_SBC8360_WDT is not set
@@ -239,25 +225,30 @@ CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_SEMAPHORE_SLEEPERS=y
 # CONFIG_SERIAL_8250_EXTENDED is not set
 CONFIG_SERIAL_8250_NR_UARTS=4
-# CONFIG_SMB_FS is not set
 # CONFIG_SMP is not set
 # CONFIG_SMSC37B787_WDT is not set
 CONFIG_SOFT_WATCHDOG=m
 # CONFIG_SOUND is not set
 # CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SYN_COOKIES=y
 # CONFIG_SYSVIPC is not set
-# CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_CUBIC=y
 # CONFIG_TELCLOCK is not set
 # CONFIG_TOSHIBA is not set
-# CONFIG_TUN is not set
 CONFIG_UID16=y
-# CONFIG_UNIX is not set
 # CONFIG_UNUSED_SYMBOLS is not set
 # CONFIG_UNWIND_INFO is not set
-# CONFIG_USB is not set
+# CONFIG_USBPCWATCHDOG is not set
+CONFIG_USB_CXACRU=m
+# CONFIG_USB_DEVICEFS is not set
+CONFIG_USB_EHCI_HCD=m
+# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
+# CONFIG_USB_EHCI_SPLIT_ISO is not set
+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
+CONFIG_USB_MON=y
+CONFIG_USB_OHCI_HCD=m
+# CONFIG_USB_UHCI_HCD is not set
+CONFIG_USB_XUSBATM=m
 # CONFIG_VIA_RHINE is not set
-# CONFIG_VLAN_8021Q is not set
 # CONFIG_VM86 is not set
 # CONFIG_VMSPLIT_1G is not set
 # CONFIG_VMSPLIT_2G is not set
@@ -300,5 +291,4 @@ CONFIG_X86_RDC=y
 # CONFIG_X86_VOYAGER is not set
 CONFIG_X86_WP_WORKS_OK=y
 CONFIG_X86_XADD=y
-# CONFIG_XFRM_USER is not set
 # CONFIG_YENTA is not set