* preapre unification of setenv for u-boot v1 and v2

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

4 files changed, 181 insertions, 108 deletions

diff --git a/tests/libptxdisttest.kermit b/tests/libptxdisttest.kermit
index 178a68b4b..061d42e3e 100644
--- a/tests/libptxdisttest.kermit
+++ b/tests/libptxdisttest.kermit
@@ -4,25 +4,31 @@ define ptx_init {
 
 	take \%1
 
-        set line \m(PTXCONF_BOARDSETUP_SERIALPORT)
-        set speed \m(PTXCONF_BOARDSETUP_SERIALBAUDRATE)
-        set parity none
-        set stop-bits 1
-        set carrier-watch off
-        set handshake none
-        set flow-control none
-        robust
-
-        set input cancellation off
-        set input case observe
-        set input buffer-length 16384
+	# ':' distinguishes between serial line and telnet port
+	if not match \m(PTXCONF_BOARDSETUP_SERIALPORT) *:* {
+		set line \m(PTXCONF_BOARDSETUP_SERIALPORT)
+		set speed \m(PTXCONF_BOARDSETUP_SERIALBAUDRATE)
+		set parity none
+		set stop-bits 1
+	} else {
+		set host \m(PTXCONF_BOARDSETUP_SERIALPORT)
+		set terminal echo remote
+	}
+	set carrier-watch off
+	set handshake none
+	set flow-control none
+	robust
+
+	set input cancellation off
+	set input case observe
+	set input buffer-length 16384
 
 	writeln ERROR "Communicating via \m(PTXCONF_BOARDSETUP_SERIALPORT) at \m(PTXCONF_BOARDSETUP_SERIALBAUDRATE) bps."
 	writeln ERROR
-        writeln ERROR "==============================="
-        writeln ERROR "Please power on your board now!"
-        writeln ERROR "==============================="
-        writeln ERROR
+	writeln ERROR "==============================="
+	writeln ERROR "Please power on your board now!"
+	writeln ERROR "==============================="
+	writeln ERROR
 }
 
 define ptx_exit {
@@ -33,7 +39,7 @@ define ptx_exit {
 
 define ptx_test_start {
 
-	#do padding with '.'
+	# do padding with '.'
 	write ERROR "\frpad(\%1,40,.)"
 }
 
@@ -44,21 +50,21 @@ define ptx_test_end {
 
 define ptx_wait_string {
 
-        input \%1 \%2
-        if failure {
-	        writeln ERROR "FAILED! (waiting for '\%2')"
-        	exit 1
-        }
+	input \%1 \%2
+	if failure {
+		writeln ERROR "FAILED! (waiting for '\%2')"
+		exit 1
+	}
 }
 
 define ptx_uboot_enter_shell {
 
 	ptx_test_start "Logging into U-Boot"
 	minput 120 "U-Boot 1" "U-Boot 2"
-        if failure {
-	        writeln ERROR "FAILED! (waiting for u-boot-signature)"
-        	exit 1
-        }
+	if failure {
+		writeln ERROR "FAILED! (waiting for u-boot-signature)"
+		exit 1
+	}
 	lineout
 	.uboot_version := \v(minput)
 	ptx_wait_string 10 "\m(PTXCONF_BOARDSETUP_UBOOTPROMPT)"
@@ -96,7 +102,7 @@ define ptx_uboot_exec_single {
 
 define ptx_wait_string_single {
 
-        ptx_test_start "\%1"
+	ptx_test_start "\%1"
 	ptx_wait_string "\%2" "\%3"
 	ptx_test_end
 }
diff --git a/tests/setenv.kermit b/tests/setenv.kermit
index feffc2671..2ddef31a4 100755
--- a/tests/setenv.kermit
+++ b/tests/setenv.kermit
@@ -1,68 +1,97 @@
 #!/usr/bin/kermit +
 
-# Read the library
-take \%1
-
-# Open the file with the new environment
-open read \%3
-if fail {
-	writeln ERROR "FAILED! Could not open \%3."
-	exit 1
-}
+define setenv_uboot_v1 {
+	ptx_test_start "Setting new environment"
 
-# Set up the line
-ptx_init \%2
+	# Open the file with the new environment
+	open read \%1
+	if fail {
+		writeln ERROR "FAILED! Could not open \%1."
+		exit 1
+	}
 
-ptx_uboot_enter_shell
+	clear input
+	lineout "printenv"
 
-ptx_test_start "Setting new environment"
+	declare \&c[1000]
+	# array with entries to skip
+	declare \&s = ethaddr stdin stdout stderr baudrate
+	.\%i = 0
 
-clear input
-lineout "printenv"
+	while true {
+		# wait for newline or u-boot-prompt
+		minput 5 {\10} \m(PTXCONF_BOARDSETUP_UBOOTPROMPT)
+		if fail {
+			writeln ERROR "FAILED! Did not get old environment"
+			exit 1
+		}
+		# quit on u-boot-prompt
+		if = \v(minput) 2 break
+		# if no '=' then continue
+		if not match \v(input) *=* goto out
+		# extract part before '=' (from \v(input) the first word, allow '_')
+		assign envvar \fword(\v(input),1,,_)
+		# skip special keywords
+		if not = \farraylook(\m(envvar),&s) -1 goto out
+		# put setenv-command into array
+		assign \&c[\%i] setenv \m(envvar)
+		incr \%i
+	:out
+		clear input
+	}
 
-declare \&c[1000]
-# array with entries to skip
-declare \&s = ethaddr stdin stdout stderr baudrate
-.\%i = 0
+	# clear old vars
+	for \%j 0 \%i-1 1 {
+		ptx_uboot_exec 5 "\&c[\%j]"
+	}
 
-while true {
-	# wait for newline or u-boot-prompt
-	minput 5 {\10} \m(PTXCONF_BOARDSETUP_UBOOTPROMPT)
-	if fail {
-		writeln ERROR "FAILED! Did not get old environment"
-		exit 1
+	# set new ones from file
+	while true {
+		read \%l
+		if fail break
+		ptx_uboot_exec 5 "\%l"
 	}
-	# quit on u-boot-prompt
-	if = \v(minput) 2 break
-	# if no '=' then continue
-	if not match \v(input) *=* goto out
-	# extract part before '=' (from \v(input) the first word, allow '_')
-	assign envvar \fword(\v(input),1,,_)
-	# skip special keywords
-	if not = \farraylook(\m(envvar),&s) -1 goto out
-	# put setenv-command into array
-	assign \&c[\%i] setenv \m(envvar)
-	incr \%i
-:out
-	clear input
-}
 
-# clear old vars
-for \%j 0 \%i-1 1 {
-	ptx_uboot_exec 5 "\&c[\%j]"
+	close read
+
+	ptx_uboot_exec 5 "printenv"
+	ptx_uboot_exec 10 "saveenv"
+
+	ptx_test_end
 }
 
-# set new ones from file
-while true {
-	read \%l
-	if fail break
-	ptx_uboot_exec 5 "\%l"
+define setenv_uboot_v2 {
+	# ! gen_uboot_v2_image
+
+	ptx_test_start "Setting initial environment"
+	ptx_uboot_exec 3 "eth0.ipaddr=\m(PTXCONF_BOARDSETUP_TARGETIP)"
+	ptx_uboot_exec 3 "eth0.serverip=\m(PTXCONF_BOARDSETUP_SERVERIP)"
+	ptx_uboot_exec 3 "eth0.gateway=\m(PTXCONF_BOARDSETUP_GATEWAY)"
+	ptx_uboot_exec 3 "eth0.netmask=\m(PTXCONF_BOARDSETUP_NETMASK)"
+	ptx_uboot_exec 3 "mtdparts=\"128k(uboot)ro,128k(ubootenv),128k(ageing),1280k(kernel0),1280k(kernel1),8704k(system0),8704k(system1),8320k(application),4096k(persistent)\""
+	ptx_uboot_exec 3 "addpart /dev/nor0 $mtdparts"
+	ptx_test_end
+
+	ptx_uboot_exec_single "Calling server" "ping $eth0.serverip"
+
+	ptx_test_start "Flashing default environment"
+	ptx_uboot_exec 3  "unprotect /dev/nor0.ubootenv"
+	ptx_uboot_exec 10 "erase /dev/nor0.ubootenv"
+	ptx_uboot_exec 20 "tftp \%1 /dev/nor0.ubootenv"
+	ptx_uboot_exec 3  "protect /dev/nor0.ubootenv"
+	ptx_test_end
+
+	ptx_uboot_exec_single "Reloading new environment" 10 "loadenv"
 }
 
-close read
+# Read the library
+take \%1
+
+# Set up the line
+ptx_init \%2
+
+ptx_uboot_enter_shell
 
-ptx_uboot_exec 5 "printenv"
-ptx_uboot_exec 10 "saveenv"
-ptx_test_end
+setenv_uboot_v\m(uboot_version)
 
 ptx_exit
diff --git a/tests/setenv.u-boot-v1.kermit b/tests/setenv.u-boot-v1.kermit
new file mode 100644
index 000000000..c13435bf4
--- /dev/null
+++ b/tests/setenv.u-boot-v1.kermit
@@ -0,0 +1,48 @@
+
+clear input
+lineout "printenv"
+
+declare \&c[1000]
+# array with entries to skip
+declare \&s = ethaddr stdin stdout stderr baudrate
+.\%i = 0
+
+while true {
+	# wait for newline or u-boot-prompt
+	minput 5 {\10} \m(PTXCONF_BOARDSETUP_UBOOTPROMPT)
+	if fail {
+		writeln ERROR "FAILED! Did not get old environment"
+		exit 1
+	}
+	# quit on u-boot-prompt
+	if = \v(minput) 2 break
+	# if no '=' then continue
+	if not match \v(input) *=* goto out
+	# extract part before '=' (from \v(input) the first word, allow '_')
+	assign envvar \fword(\v(input),1,,_)
+	# skip special keywords
+	if not = \farraylook(\m(envvar),&s) -1 goto out
+	# put setenv-command into array
+	assign \&c[\%i] setenv \m(envvar)
+	incr \%i
+:out
+	clear input
+}
+
+# clear old vars
+for \%j 0 \%i-1 1 {
+	ptx_uboot_exec 5 "\&c[\%j]"
+}
+
+# set new ones from file
+while true {
+	read \%l
+	if fail break
+	ptx_uboot_exec 5 "\%l"
+}
+
+close read
+
+ptx_uboot_exec 5 "printenv"
+ptx_uboot_exec 10 "saveenv"
+ptx_test_end
diff --git a/tests/setenv.u-boot-v2.kermit b/tests/setenv.u-boot-v2.kermit
index 16eb05d05..d050c82de 100755
--- a/tests/setenv.u-boot-v2.kermit
+++ b/tests/setenv.u-boot-v2.kermit
@@ -1,33 +1,23 @@
-#!/usr/bin/kermit +
 
-#Read the library
-take \%1
-
-#Set up the line
-pelts_init \%2
-
-#Enter shell
-pelts_uboot_enter_shell
+# ! gen_uboot_v2_image
 
 #Execute commands
-pelts_test_start "Setting environment"
-pelts_uboot_exec "eth0.ipaddr=\m(PTXCONF_BOARDSETUP_TARGETIP)" 
-pelts_uboot_exec "eth0.serverip=\m(PTXCONF_BOARDSETUP_SERVERIP)"
-pelts_uboot_exec "eth0.gateway=\m(PTXCONF_BOARDSETUP_GATEWAY)"
-pelts_uboot_exec "eth0.netmask=\m(PTXCONF_BOARDSETUP_NETMASK)"
-pelts_uboot_exec "mtdparts=\"128k(uboot)ro,128k(ubootenv),128k(ageing),1280k(kernel0),1280k(kernel1),8704k(system0),8704k(system1),8320k(application),4096k(persistent)\""
-pelts_uboot_exec "addpart /dev/nor0 $mtdparts"
-pelts_test_end
-
-pelts_uboot_exec_single "Calling server" "ping $eth0.serverip"
-
-pelts_test_start "Flashing environment"
-pelts_uboot_exec "unprotect /dev/nor0.ubootenv"
-pelts_uboot_exec "erase /dev/nor0.ubootenv"
-pelts_uboot_exec "tftp u-boot-v2-environment-bfin /dev/nor0.ubootenv"
-pelts_uboot_exec "protect /dev/nor0.ubootenv"
-pelts_test_end
-
-pelts_uboot_exec_single "Reloading new environment" "loadenv"
-
-pelts_exit
+ptx_test_start "Setting environment"
+ptx_uboot_exec 3 "eth0.ipaddr=\m(PTXCONF_BOARDSETUP_TARGETIP)" 
+ptx_uboot_exec 3 "eth0.serverip=\m(PTXCONF_BOARDSETUP_SERVERIP)"
+ptx_uboot_exec 3 "eth0.gateway=\m(PTXCONF_BOARDSETUP_GATEWAY)"
+ptx_uboot_exec 3 "eth0.netmask=\m(PTXCONF_BOARDSETUP_NETMASK)"
+ptx_uboot_exec 3 "mtdparts=\"128k(uboot)ro,128k(ubootenv),128k(ageing),1280k(kernel0),1280k(kernel1),8704k(system0),8704k(system1),8320k(application),4096k(persistent)\""
+ptx_uboot_exec 3 "addpart /dev/nor0 $mtdparts"
+ptx_test_end
+
+ptx_uboot_exec_single "Calling server" "ping $eth0.serverip"
+
+ptx_test_start "Flashing environment"
+ptx_uboot_exec 3  "unprotect /dev/nor0.ubootenv"
+ptx_uboot_exec 10 "erase /dev/nor0.ubootenv"
+ptx_uboot_exec 20 "tftp \%1 /dev/nor0.ubootenv"
+ptx_uboot_exec 3  "protect /dev/nor0.ubootenv"
+ptx_test_end
+
+ptx_uboot_exec_single "Reloading new environment" 10 "loadenv"