Fonera: adapt last changes for dir300

Copied from ec949fb85d

Signed-off-by: Tim Niemeyer <tim.niemeyer@mastersword.de>

bsp/fonera/.config

@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # OpenWrt version: Attitude Adjustment (r35298)
-# Sat Feb  2 00:43:45 2013
+# Sun Feb  3 12:57:06 2013
 #
 CONFIG_HAVE_DOT_CONFIG=y
 # CONFIG_TARGET_ppc40x is not set
@@ -583,7 +583,7 @@ CONFIG_BUSYBOX_CONFIG_PREFIX="./_install"
 # CONFIG_BUSYBOX_CONFIG_FEATURE_RTMINMAX is not set
 CONFIG_BUSYBOX_CONFIG_PASSWORD_MINLEN=6
 CONFIG_BUSYBOX_CONFIG_MD5_SIZE_VS_SPEED=3
-CONFIG_BUSYBOX_CONFIG_FEATURE_FAST_TOP=y
+# CONFIG_BUSYBOX_CONFIG_FEATURE_FAST_TOP is not set
 # CONFIG_BUSYBOX_CONFIG_FEATURE_ETC_NETWORKS is not set
 # CONFIG_BUSYBOX_CONFIG_FEATURE_USE_TERMIOS is not set
 CONFIG_BUSYBOX_CONFIG_FEATURE_EDITING=y
@@ -1143,14 +1143,7 @@ CONFIG_BUSYBOX_CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
 # CONFIG_BUSYBOX_CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
 # CONFIG_BUSYBOX_CONFIG_TUNCTL is not set
 # CONFIG_BUSYBOX_CONFIG_UDHCPD is not set
-CONFIG_BUSYBOX_CONFIG_UDHCPC=y
+# CONFIG_BUSYBOX_CONFIG_UDHCPC is not set
-# CONFIG_BUSYBOX_CONFIG_FEATURE_UDHCPC_ARPING is not set
-# CONFIG_BUSYBOX_CONFIG_FEATURE_UDHCP_PORT is not set
-CONFIG_BUSYBOX_CONFIG_UDHCP_DEBUG=0
-CONFIG_BUSYBOX_CONFIG_FEATURE_UDHCP_RFC3397=y
-# CONFIG_BUSYBOX_CONFIG_FEATURE_UDHCP_8021Q is not set
-CONFIG_BUSYBOX_CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
-CONFIG_BUSYBOX_CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
 # CONFIG_BUSYBOX_CONFIG_UDPSVD is not set
 CONFIG_BUSYBOX_CONFIG_VCONFIG=y
 CONFIG_BUSYBOX_CONFIG_WGET=y
@@ -1585,7 +1578,7 @@ CONFIG_PACKAGE_kmod-ipv6=y
 # CONFIG_PACKAGE_kmod-slip is not set
 # CONFIG_PACKAGE_kmod-stp is not set
 # CONFIG_PACKAGE_kmod-trelay is not set
-CONFIG_PACKAGE_kmod-tun=y
+# CONFIG_PACKAGE_kmod-tun is not set
 # CONFIG_PACKAGE_kmod-wprobe is not set
 
 #
@@ -2468,7 +2461,7 @@ CONFIG_PACKAGE_wpad-mini=y
 # Firewall
 #
 # CONFIG_PACKAGE_libfko is not set
-CONFIG_PACKAGE_libip4tc=y
+# CONFIG_PACKAGE_libip4tc is not set
 CONFIG_PACKAGE_libip6tc=y
 # CONFIG_PACKAGE_libipq is not set
 # CONFIG_PACKAGE_libiptc is not set
@@ -3136,14 +3129,7 @@ CONFIG_PACKAGE_ubusd=y
 # CONFIG_PACKAGE_clish is not set
 # CONFIG_PACKAGE_cmdpad is not set
 # CONFIG_PACKAGE_collectd is not set
-CONFIG_PACKAGE_compcache=y
+# CONFIG_PACKAGE_compcache is not set
-
-#
-# Configuration
-#
-CONFIG_COMPCACHE_ENABLE=y
-CONFIG_COMPCACHE_RAM_REPORTED="2048"
-CONFIG_COMPCACHE_BACKUP_DEV=""
 # CONFIG_PACKAGE_coreutils is not set
 # CONFIG_PACKAGE_cpusage is not set
 # CONFIG_PACKAGE_crypto-tools is not set

bsp/fonera/kernel_config-3.3

@@ -1,15 +1,17 @@
-CONFIG_ADM6996_PHY=y
+# CONFIG_AIO is not set
-CONFIG_AR8216_PHY=y
 CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
 CONFIG_ARCH_DISCARD_MEMBLOCK=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
+# CONFIG_ARPD is not set
 CONFIG_ATHEROS_AR2315=y
 # CONFIG_ATHEROS_AR2315_PCI is not set
 CONFIG_ATHEROS_AR231X=y
 # CONFIG_ATHEROS_AR5312 is not set
 CONFIG_ATHEROS_WDT=y
+# CONFIG_BASE_FULL is not set
+CONFIG_BASE_SMALL=1
 CONFIG_BCMA_POSSIBLE=y
 # CONFIG_BUG is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
@@ -34,7 +36,6 @@ CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=0
 CONFIG_DMA_NONCOHERENT=y
 CONFIG_EARLY_PRINTK=y
-CONFIG_ETHERNET_PACKET_MANGLE=y
 CONFIG_GENERIC_ATOMIC64=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -72,11 +73,18 @@ CONFIG_HW_RANDOM=y
 CONFIG_IMAGE_CMDLINE_HACK=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_IP17XX_PHY=y
+# CONFIG_IP_ADVANCED_ROUTER is not set
+# CONFIG_IP_MULTICAST is not set
 CONFIG_IRQ_CPU=y
 CONFIG_IRQ_FORCED_THREADING=y
 # CONFIG_ISDN is not set
+CONFIG_JFFS2_CMODE_FAVOURLZO=y
+# CONFIG_JFFS2_CMODE_PRIORITY is not set
+# CONFIG_JFFS2_LZMA is not set
+CONFIG_JFFS2_LZO=y
 # CONFIG_LBDAF is not set
 CONFIG_LEDS_GPIO=y
+CONFIG_LOG_BUF_SHIFT=12
 CONFIG_LZO_COMPRESS=y
 CONFIG_LZO_DECOMPRESS=y
 CONFIG_MDIO_BOARDINFO=y
@@ -93,11 +101,19 @@ CONFIG_MTD_MYLOADER_PARTS=y
 CONFIG_MTD_PHYSMAP=y
 CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-3
 CONFIG_MTD_REDBOOT_PARTS=y
-CONFIG_MVSWITCH_PHY=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEED_PER_CPU_KM=y
 # CONFIG_NETWORK_FILESYSTEMS is not set
+# CONFIG_NET_SCHED is not set
 CONFIG_NET_VENDOR_AR231X=y
+# CONFIG_NET_VENDOR_CHELSIO is not set
+# CONFIG_NET_VENDOR_INTEL is not set
+# CONFIG_NET_VENDOR_MARVELL is not set
+# CONFIG_NET_VENDOR_MICREL is not set
+# CONFIG_NET_VENDOR_NATSEMI is not set
+# CONFIG_NET_VENDOR_SEEQ is not set
+# CONFIG_NET_VENDOR_SMSC is not set
+# CONFIG_NET_VENDOR_STMICRO is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 # CONFIG_PARTITION_ADVANCED is not set
 CONFIG_PERF_USE_VMALLOC=y
@@ -111,15 +127,14 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=1
 CONFIG_SLOB=y
 CONFIG_SQUASHFS_EMBEDDED=y
 CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=1
-CONFIG_SQUASHFS_LZO=y
+# CONFIG_STAGING is not set
+# CONFIG_SWAP is not set
 CONFIG_SWCONFIG=y
+# CONFIG_SYN_COOKIES is not set
 CONFIG_SYS_HAS_CPU_MIPS32_R1=y
 CONFIG_SYS_HAS_EARLY_PRINTK=y
 CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
 CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
 CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
-CONFIG_XVMALLOC=y
 CONFIG_XZ_DEC=y
 CONFIG_ZONE_DMA_FLAG=0
-CONFIG_ZRAM=y
-CONFIG_ZRAM_DEBUG=y

bsp/fonera/root_file_system/etc/config/network

@@ -33,7 +33,6 @@ config 'interface' 'wlanmesh'
 # this is for the WAN/VPN on the Ethernet Port
 config 'interface' 'wan'
         option 'ifname' 'eth0'
-        option 'proto' 'dhcp'
 config 'interface' 'mesh'
         option 'type' 'bridge'
         option 'ifname' 'bat0 tap0'