* tests: add boot and connect

	* tests: add possibility to use rfc2217 as serial (comport-over-telnet)
	* ckermit: use latest version and patch for moxa


git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@9104 33e552b5-05e3-0310-8538-816dae2090ed

7 files changed, 62 insertions, 3 deletions

diff --git a/config/boardsetup/Kconfig b/config/boardsetup/Kconfig
index df0a6ba75..cc369fee2 100644
--- a/config/boardsetup/Kconfig
+++ b/config/boardsetup/Kconfig
@@ -65,7 +65,9 @@ config BOARDSETUP_SERIALPORT
 	prompt "serial port"
 	default "/dev/ttyS0"
 	help
-	  Specify host's serial port for target connection here.
+	  Specify host's serial port for target connection.
+	  You can also use a rfc2217-connection (comport-over-telnet). Simply
+	  enter 'host:port'.
 
 config BOARDSETUP_SERIALBAUDRATE
 	string
diff --git a/patches/cku212-dev27/generic/moxa_patch.diff b/patches/cku212-dev27/generic/moxa_patch.diff
new file mode 100644
index 000000000..e33aa5a1f
--- /dev/null
+++ b/patches/cku212-dev27/generic/moxa_patch.diff
@@ -0,0 +1,30 @@
+Fix to make the buggy moxa work with kermit.
+
+Not intended for upstream, moxa should update their firmware.
+
+Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
+---
+ ckctel.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: kermit/ckctel.c
+===================================================================
+--- kermit.orig/ckctel.c
++++ kermit/ckctel.c
+@@ -6628,14 +6628,14 @@ tn_sndcomport()
+     /* if (!IS_TELNET()) return(0); */
+ 
+     debug(F100,"tnc_sndcomport","",0);
+-    signature = tnc_get_signature();
++    //signature = tnc_get_signature();
+     baud = tnc_get_baud();
+     datasize = tnc_get_datasize();
+     parity = tnc_get_parity();
+     stopsize = tnc_get_stopsize();
+     oflow = tnc_get_oflow();
+     iflow = tnc_get_iflow();
+-    tnc_set_ls_mask(255);
++    //tnc_set_ls_mask(255);
+     tnc_set_ms_mask(255);
+     return(0);
+ }
diff --git a/rules/host-ckermit.make b/rules/host-ckermit.make
index dfcdc3cc3..92ef32445 100644
--- a/rules/host-ckermit.make
+++ b/rules/host-ckermit.make
@@ -17,10 +17,12 @@ HOST_PACKAGES-$(PTXCONF_HOST_CKERMIT) += host-ckermit
 #
 # Paths and names
 #
-HOST_CKERMIT_VERSION	:= 211
+# FIXME: siwtch back to columbia.edu as soon there is a stable release again (will this ever happen?)
+HOST_CKERMIT_VERSION	:= 212-dev27
 HOST_CKERMIT		:= cku$(HOST_CKERMIT_VERSION)
 HOST_CKERMIT_SUFFIX	:= tar.gz
-HOST_CKERMIT_URL	:= http://www.columbia.edu/kermit/ftp/archives/$(HOST_CKERMIT).$(HOST_CKERMIT_SUFFIX)
+HOST_CKERMIT_URL	:= http://www.pengutronix.de/software/ptxdist/temporary-src/$(HOST_CKERMIT).$(HOST_CKERMIT_SUFFIX)
+#HOST_CKERMIT_URL	:= http://www.columbia.edu/kermit/ftp/archives/$(HOST_CKERMIT).$(HOST_CKERMIT_SUFFIX)
 HOST_CKERMIT_SOURCE	:= $(SRCDIR)/$(HOST_CKERMIT).$(HOST_CKERMIT_SUFFIX)
 HOST_CKERMIT_DIR	:= $(HOST_BUILDDIR)/$(HOST_CKERMIT)
 
diff --git a/tests/boot b/tests/boot
new file mode 100755
index 000000000..af7e72d67
--- /dev/null
+++ b/tests/boot
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+${PTXDIST_TOPDIR}/tests/kwrapper boot
diff --git a/tests/boot.kermit b/tests/boot.kermit
new file mode 100644
index 000000000..9d14113c4
--- /dev/null
+++ b/tests/boot.kermit
@@ -0,0 +1,12 @@
+#Read the library
+take \%1/libptxdisttest.kermit
+
+#Set up the line
+ptx_init \%2
+
+ptx_wait_string_single "Checking for U-Boot" 60 "U-Boot"
+ptx_wait_string_single "Checking for Kernel" 30 "Linux version"
+ptx_wait_string_single "Checking for init" 30 "init started:"
+ptx_wait_string_single "Checking for login" 30 "login:"
+
+ptx_exit
diff --git a/tests/connect b/tests/connect
new file mode 100755
index 000000000..60fe072bc
--- /dev/null
+++ b/tests/connect
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+${PTXDIST_TOPDIR}/tests/kwrapper connect >&2
diff --git a/tests/connect.kermit b/tests/connect.kermit
new file mode 100644
index 000000000..491fe2bfc
--- /dev/null
+++ b/tests/connect.kermit
@@ -0,0 +1,7 @@
+#Read the library
+take \%1/libptxdisttest.kermit
+
+#Set up the line
+ptx_init \%2
+
+connect