updates and additions for avr32 arch

6 files changed, 53 insertions, 16 deletions

diff --git a/target/device/Atmel/atstk1002/target_skeleton/etc/httpd.conf b/target/device/Atmel/atstk1002/target_skeleton/etc/httpd.conf
index 86263f1e9..640f8150d 100644
--- a/target/device/Atmel/atstk1002/target_skeleton/etc/httpd.conf
+++ b/target/device/Atmel/atstk1002/target_skeleton/etc/httpd.conf
@@ -1,6 +1,2 @@
 # Allow all trafic
 A: *
-
-.asp:text/html
-/cgi-bin/webif:root:roota
-/cgi-bin/webif:admin:roota
diff --git a/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/S00mountvirtfs b/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/S00mountvirtfs
index 61c589102..d9e5c9249 100755
--- a/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/S00mountvirtfs
+++ b/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/S00mountvirtfs
@@ -58,6 +58,8 @@ if mount_fs dev /dev tmpfs "size=512k,mode=0755"; then
 	mkdir_fs /dev/pts
 	mount_fs pts /dev/pts devpts
 	mkdir_fs /dev/shm
+	# g_serial is not detected by mdev.
+	mknod /dev/ttygserial c 127 0
 fi
 
 mount_fs config /config configfs
diff --git a/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/S40telnetd b/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/S40telnetd
index b253c1036..e0fd2f2f3 100755
--- a/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/S40telnetd
+++ b/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/S40telnetd
@@ -8,7 +8,7 @@ if [ ! -x "${TELNETD}" ]; then
 	exit 1
 fi
 
-if ${TELNETD} -l /bin/ash; then
+if ${TELNETD} -l /bin/sh; then
 	echo "done"
 else
 	echo "failed"
diff --git a/target/device/Atmel/atstk1002/target_skeleton/etc/inittab b/target/device/Atmel/atstk1002/target_skeleton/etc/inittab
index 6a249d948..82672b1bd 100644
--- a/target/device/Atmel/atstk1002/target_skeleton/etc/inittab
+++ b/target/device/Atmel/atstk1002/target_skeleton/etc/inittab
@@ -1,8 +1,7 @@
 # Inittab for the ATSTK1000 development board
 #
 # Note: BusyBox init doesn't support runlevels.  The runlevels field is
-# completely ignored by BusyBox init. If you want runlevels, use
-# sysvinit.
+# completely ignored by BusyBox init. If you want runlevels, use sysvinit.
 #
 # Format for each entry: <id>:<runlevels>:<action>:<process>
 #
@@ -11,16 +10,19 @@
 # action    == one of sysinit, respawn, askfirst, wait, and once
 # process   == program to run
 
-# Run any rc scripts
+# Run the rcS script after kernel is booted.
 ::sysinit:/etc/init.d/rcS
 
-# Run a shell on the first serial port. Comment this out if you want
-# a getty instead
+# Run a shell on the first serial port. Comment out if you want a getty instead.
 ttyS0::respawn:-/bin/sh
 
-# Uncomment this to run a getty on the first serial port
+# Run a shell on the g_serial port (USB gadget device)? This shell will spawn
+# error message if the device is not connected.
+#ttygserial::respawn:-/bin/sh
+
+# Uncomment this to run a getty on the first serial port.
 #ttyS0::respawn:/sbin/getty -L ttyS0 115200 vt100
 ttyS2::respawn:/sbin/getty -L ttyS2 115200 vt100
 
-# Run a script on shutdown
+# Run a script on shutdown.
 ::shutdown:/etc/init.d/rcK
diff --git a/target/device/Atmel/atstk1002/target_skeleton/etc/proftpd.conf b/target/device/Atmel/atstk1002/target_skeleton/etc/proftpd.conf
new file mode 100644
index 000000000..86b447d37
--- /dev/null
+++ b/target/device/Atmel/atstk1002/target_skeleton/etc/proftpd.conf
@@ -0,0 +1,31 @@
+ServerName			"ATSTK1002 FTP server"
+ServerType			standalone
+DefaultServer			on
+
+# Port 21 is the standard FTP port.
+Port				21
+
+# Umask 022 is a good standard umask to prevent new dirs and files
+# from being group and world writable.
+Umask				022
+
+# Note that this ONLY works in standalone mode, in inetd mode you should use an
+# inetd server that allows you to limit maximum number of processes per service
+# (such as inetd).
+MaxInstances			5
+
+# Set the user and group under which the server will run.
+User				nobody
+Group				nogroup
+
+# To cause every FTP user to be "jailed" (chrooted) into their home
+# directory, uncomment this line.
+#DefaultRoot ~
+
+# Normally, we want files to be overwriteable.
+AllowOverwrite		on
+
+# Deny use of SITE CHMOD, uncomment the three lines below.
+#<Limit SITE_CHMOD>
+#  DenyAll
+#</Limit>
diff --git a/target/device/Atmel/atstk1002/target_skeleton/etc/samba/smb.conf b/target/device/Atmel/atstk1002/target_skeleton/etc/samba/smb.conf
index 7c1b27de6..a29571894 100644
--- a/target/device/Atmel/atstk1002/target_skeleton/etc/samba/smb.conf
+++ b/target/device/Atmel/atstk1002/target_skeleton/etc/samba/smb.conf
@@ -170,10 +170,16 @@
 #   client code page = 850
 
 #============================ Share Definitions ==============================
-;[homes]
-;   comment = Home Directories
-;   browseable = no
-;   writable = yes
+[homes]
+   comment = Home Directories
+   browseable = no
+   writable = yes
+
+[netdisk]
+   comment = Network share on STK1000
+   path = /media
+   read only = no
+   public = yes
 
 # Un-comment the following and create the netlogon directory for Domain Logons
 ; [netlogon]