[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-120-g1760bba

[Julien B a. A. <ar...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  1760bbaa5e39f3e715fd31334ce21f38fa5d2250 (commit)
       via  50be3cca75028e8297481c39f9e062b9274ad583 (commit)
      from  7a044ab38e21c3c79f11c7b936326b9ab0781c50 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1760bbaa5e39f3e715fd31334ce21f38fa5d2250
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Jan 17 21:16:21 2013 +0100

    [TEST] Fixes mplayer test on APF28 (thanks Nouchi)

commit 50be3cca75028e8297481c39f9e062b9274ad583
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Jan 16 09:31:50 2013 +0100

    Fixes comments

-----------------------------------------------------------------------

Summary of changes:
 .../device/armadeus/apf28/apf28-u-boot-2012.04.h   |    4 ++--
 .../device/armadeus/apf28/apf28-u-boot-2012.10.h   |    4 ++--
 target/test/packages/test_mplayer.sh               |   18 ++++++++++++++----
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.04.h b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.04.h
index 09977ca..e03fad7 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.04.h
+++ b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.04.h
@@ -1,5 +1,5 @@
 /*
- * Configuration settings for the Armadeus Project motherboard APF28.
+ * Configuration settings for the Armadeus Project APF28 module.
  *
  * Copyright (C) 2011-2012 ej / Armadeus Project <eri...@ar...>
  *
@@ -33,7 +33,7 @@
  * SoC configurations
  */
 #define	CONFIG_MX28			/* i.MX28 SoC */
-#define	CONFIG_MACH_TYPE	3845	/* APF9328 */
+#define	CONFIG_MACH_TYPE	3845	/* APF28 */
 
 /*
  * Enable the call to miscellaneous platform dependent initialization.
diff --git a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.10.h b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.10.h
index 4b7db71..3562df1 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.10.h
+++ b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.10.h
@@ -1,5 +1,5 @@
 /*
- * Configuration settings for the Armadeus Project motherboard APF28.
+ * Configuration settings for the Armadeus Project APF28 module.
  *
  * Copyright (C) 2011-2012 ej / Armadeus Project <eri...@ar...>
  *
@@ -33,7 +33,7 @@
  * SoC configurations
  */
 #define	CONFIG_MX28			/* i.MX28 SoC */
-#define	CONFIG_MACH_TYPE	3845	/* APF9328 */
+#define	CONFIG_MACH_TYPE	3845	/* APF28 */
 
 /*
  * Enable the call to miscellaneous platform dependent initialization.
diff --git a/target/test/packages/test_mplayer.sh b/target/test/packages/test_mplayer.sh
index cbb80b2..03e11ea 100755
--- a/target/test/packages/test_mplayer.sh
+++ b/target/test/packages/test_mplayer.sh
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 #
-# Script to test a Buildroot package for Armadeus Software release
+# Script to test mplayer's Buildroot package for Armadeus software release
 #
-#  Copyright (C) 2008 The Armadeus Project
+#  Copyright (C) 2008-2013 The Armadeus Project
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,13 +20,22 @@ source ./test_env.sh
 EXEC_NAME="mplayer"
 FILE_WEB_ADDRESS="http://www.armadeus.com//assos_downloads/misc/apf27.mpg"
 VIDEO_FILE_NAME="$TEMP_DIR/apf27.mpg"
+FBDEV=fbdev
 
+platform_specific_stuff()
+{
+	if [ "$1" == "APF28" ]; then
+		FBDEV=fbdev2
+	fi
+}
+
+# for the end of the test:
 remove_files()
 {
 	if [ "$1" == "APF9328" ]; then
 		# We are a little short in memory on APF9328
 		rm -f $VIDEO_FILE_NAME
-	elif [ "$1" == "APF27" ] || [ "$1" == "APF51" ]; then
+	elif [ "$1" == "APF27" ] || [ "$1" == "APF51" ] || [ "$1" == "APF28" ]; then
 		echo
 	else
 		echo "Platform not supported by this test"
@@ -56,8 +65,9 @@ test_mplayer()
 	        fi
 	fi
 
+	execute_for_target platform_specific_stuff
 	# Launch it
-	$EXEC_NAME -vo fbdev -nosound -fs $VIDEO_FILE_NAME
+	$EXEC_NAME -vo $FBDEV -nosound -fs $VIDEO_FILE_NAME
 	RES=$?
 	# Make cursor blink again
 	echo 1 > /sys/class/graphics/fbcon/cursor_blink


hooks/post-receive
-- 
armadeus