--- elwix/config/rc.elwix.i386	2014/01/15 08:48:59	1.1.2.2
+++ elwix/config/rc.elwix.i386	2014/09/15 19:10:20	1.2.2.1
@@ -3,11 +3,11 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: rc.elwix.i386,v 1.1.2.2 2014/01/15 08:48:59 misho Exp $
+# $Id: rc.elwix.i386,v 1.2.2.1 2014/09/15 19:10:20 misho Exp $
 #
 ELWIX_IS_CONFIGURED="YES"
 
-VERSION="2.2"
+VERSION="2.3_x86"
 PLATFORM="elwix"
 TIMEZONE="Europe/Sofia"
 BUILD_DATE=`date "+%Y-%m-%d"`
@@ -40,6 +40,7 @@ ADIR="${TOPDIR}/arch"
 WORLD="${ADIR}/${TARGET_ARCH}/world"
 KERN="${ADIR}/${TARGET_ARCH}/kernel"
 KERN_ROOTFS="${ADIR}/${TARGET_ARCH}/kernel.rootfs"
+KERN_NFS="${ADIR}/${TARGET_ARCH}/kernel.nfs"
 PKG="${ADIR}/${TARGET_ARCH}/pkg"
 AIT="${ADIR}/${TARGET_ARCH}"
 BSDOBJ="${OBJS}/${TARGET_ARCH}"
@@ -51,14 +52,17 @@ CROSSTOOLDIR="${BSDOBJ}/${BSDSRC}/tmp"
 BSDKERNCONF="${BSDSRC}/sys/${TARGET}/conf"
 KERNDEVHINTS="${BSDKERNCONF}/GENERIC.hints"
 
-KERNHINT="ELWIX_${TARGET_ARCH}.hints"
+KERNHINT="ELWIX_i386.hints"
 
 KERNEL="${KERN}/boot/kernel/kernel"
-KERNCONF="ELWIX_${TARGET_ARCH}"
+KERNCONF="ELWIX_i386"
 
 KERNEL_ROOTFS="${KERN_ROOTFS}/boot/kernel/kernel"
-KERNCONF_ROOTFS="ELWIX_${TARGET_ARCH}_ROOTFS"
+KERNCONF_ROOTFS="ELWIX_i386_ROOTFS"
 
+KERNEL_NFS="${KERN_NFS}/boot/kernel/kernel"
+KERNCONF_NFS="ELWIX_i386_NFS"
+
 ### Rootfs
 ROOTFS_MKDIR="${ADIR}/${TARGET_ARCH}/elwix"
 ROOTFS_CONF="elwix_firmware.conf"
@@ -70,7 +74,7 @@ ELWIX_ROOTFS="${CFGDIR}/elwix_rootfs.conf"
 ROOTFS_KERN="kernel_rootfs.gz"
 
 ROOTFS_IMG="rootfs.img"
-ROOTFS_SIZE="9000k"
+ROOTFS_SIZE="9120k"
 
 ### tools Firmware
 LOCALFS_IMG="elwix-pkg.frm"
@@ -109,6 +113,8 @@ OS_EXT="ELWIX-${VERSION}_ext_128mb_${TARGET_ARCH}_${BU
 IMG_SIZE=62592
 IMG_SIZE128=125100
 
+CFG_NAND_SIZE=262144
+
 IMGNAME="${REL}/ELWIX-${VERSION}_${TARGET_ARCH}"
 
 ### Cross
@@ -125,11 +131,11 @@ CROSS_FT_NET80211="${BSDTOOLS}/net80211"
 CROSS_FT_VIMAGE="${BSDTOOLS}/vimage"
 CROSS_FT_WTAP="${BSDTOOLS}/wtap"
 
-CROSS_AXL="../gpl/axl"
-AXL_CFG="./configure --disable-py-axl --prefix=${WORLD}/usr/local --build=${TARGET_BUILD}"
-#AXL_LIB="${CROSS_AXL}/src/.libs/libaxl.so.*"
-#AXL_LIB_NS="${CROSS_AXL}/ns/.libs/libaxl-ns.so.*"
-#AXL_LIB_BABEL="${CROSS_AXL}/babel/.libs/libaxl-babel.so.*"
+#CROSS_AXL="../gpl/axl"
+#AXL_CFG="./configure --disable-py-axl --prefix=${WORLD}/usr/local --build=${TARGET_BUILD}"
+##AXL_LIB="${CROSS_AXL}/src/.libs/libaxl.so.*"
+##AXL_LIB_NS="${CROSS_AXL}/ns/.libs/libaxl-ns.so.*"
+##AXL_LIB_BABEL="${CROSS_AXL}/babel/.libs/libaxl-babel.so.*"
 
 CROSS_ELWIX="../libelwix"
 ELWIX_CFG="./configure --prefix=${WORLD}/usr/local --host=${TARGET_BUILD}"
@@ -182,6 +188,9 @@ MQTT_CFG="./configure --with-sqlite3dir=${WORLD}/usr/l
 
 CROSS_WIFINATOR="../wifinator"
 WIFINATOR_CFG="./configure --prefix=${WORLD}/usr/local --host=${TARGET_BUILD}"
+
+CROSS_TFTPD="../tftpd"
+TFTPD_CFG="./configure --prefix=${WORLD}/usr/local --host=${TARGET_BUILD}"
 
 #####
 [ -r ${CFGDIR}/rc.subr ] && . ${CFGDIR}/rc.subr