[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-463-g18af2ea
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-463-g18af2ea
|
From: Sébastien S. <ss...@us...> - 2014-10-30 11:04:33
|
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 18af2eaab184f182adb35a87c42e1c48ea3c1ea5 (commit)
via dd193edc1d6b6e12b72e1e7fc5561a7d28f825d6 (commit)
from 1019dba75a4bd7efb06f3135d3db74c0b1316553 (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 18af2eaab184f182adb35a87c42e1c48ea3c1ea5
Author: Sébastien Szymanski <ss...@us...>
Date: Thu Oct 30 12:06:15 2014 +0100
[TESTS] Update a few tests to make them work on APF6
commit dd193edc1d6b6e12b72e1e7fc5561a7d28f825d6
Author: Sébastien Szymanski <ss...@us...>
Date: Tue Oct 28 09:20:38 2014 +0100
[BUILDROOT] apf6: use Armadeus skeleton
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6_defconfig | 2 ++
target/test/test_audio.sh | 11 +++++++++--
target/test/test_gps.sh | 36 ++++++++++++++++++++++++++----------
target/test/test_gsm.sh | 28 ++++++++++++++++++++--------
target/test/test_helpers.sh | 4 +++-
target/test/test_touchscreen.sh | 4 ++++
6 files changed, 64 insertions(+), 21 deletions(-)
diff --git a/buildroot/configs/apf6_defconfig b/buildroot/configs/apf6_defconfig
index 5a339c5..0a638af 100644
--- a/buildroot/configs/apf6_defconfig
+++ b/buildroot/configs/apf6_defconfig
@@ -10,6 +10,8 @@ BR2_TOOLCHAIN_EXTERNAL=y
BR2_ENABLE_LOCALE_PURGE=y
BR2_TARGET_GENERIC_HOSTNAME="apf6"
BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
+BR2_ROOTFS_SKELETON_CUSTOM=y
+BR2_ROOTFS_SKELETON_CUSTOM_PATH="$(ARMADEUS_PATH)/rootfs/target_skeleton"
BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3"
BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
diff --git a/target/test/test_audio.sh b/target/test/test_audio.sh
index f5347da..fee54c2 100755
--- a/target/test/test_audio.sh
+++ b/target/test/test_audio.sh
@@ -30,6 +30,9 @@ test_init()
amixer cset numid=37 on
amixer cset numid=6 on,on # Headphone Playback ZC Switch
amixer cset numid=5 116,116 # Headphone Playback Volume
+ elif [ "$1" == "APF6" ]; then
+ # drivers are built-in on APF6
+ true
else
echo "Platform not supported by this test"
exit 0
@@ -45,6 +48,8 @@ end_of_test_for_apf9328_and_continue_for_others()
true
elif [ "$1" == "APF51" ]; then
true
+ elif [ "$1" == "APF6" ]; then
+ true
else
echo "Platform not supported by this test"
fi
@@ -60,6 +65,8 @@ test_audio_in_init()
amixer cset numid=44 on
amixer cset numid=50 on
amixer cset numid=3 on,on
+ elif [ "$1" == "APF6" ]; then
+ amixer cset numid=2 8,8
else
echo "Platform not supported by this test"
fi
@@ -81,7 +88,7 @@ test_audio()
exit_failed
fi
- ask_user "Please connect an earphone to the Audio Out connector (top one on APF27). Then press ENTER."
+ ask_user "Please connect an earphone to the Audio Out connector (top one on APF27 and APF6). Then press ENTER."
aplay /usr/share/sounds/alsa/Side_Left.wav
if [ "$?" == 0 ]; then
ask_user "Did you hear something ? (y/N)"
@@ -92,7 +99,7 @@ test_audio()
execute_for_target end_of_test_for_apf9328_and_continue_for_others
- ask_user "Please connect a microphone to the Audio In connector (bottom one on APF27). Then press ENTER."
+ ask_user "Please connect a microphone to the Audio In connector (bottom one on APF27 and APF6). Then press ENTER."
execute_for_target test_audio_in_init
ask_user "You will now have to speak in the MIC. The sampled sound will then be played back. Press ENTER when ready to speak."
# Stereo 16bits @ 16KHz
diff --git a/target/test/test_gps.sh b/target/test/test_gps.sh
index c156cbb..652282c 100755
--- a/target/test/test_gps.sh
+++ b/target/test/test_gps.sh
@@ -13,23 +13,40 @@
source ./test_helpers.sh
-GPS_DEVICE=/dev/ttySMX4
+GPS_DEVICE=""
-test_gps()
+setup_port()
{
- show_test_banner "GPS (APW)"
-
- ask_user "Do you have an APF27 with an APW wireless extension board and the corresponding Linux kernel ? (Y/n)"
- if [ "$response" == "n" ] || [ "$response" == "no" ]; then
- echo "Only the APW is supported by this test yet !!"
+ if [ "$1" == "APF27" ]; then
+ GPS_DEVICE=/dev/ttySMX4
+ elif [ "$1" == "APF6" ]; then
+ GPS_DEVICE=/dev/ttymxc0
+ else
+ echo "$1 platform not supported by this test"
exit_failed
fi
- stty -F /dev/ttySMX4 raw -echo -echoe -echok 38400
+ stty -F $GPS_DEVICE raw -echo -echoe -echok 38400
+
if [ "$?" != 0 ]; then
echo "Failed to setup serial port ($GPS_DEVICE) !!"
exit_failed
fi
+}
+
+test_gps()
+{
+ show_test_banner "GPS"
+
+ if [ "$1" != "-y" ]; then
+ ask_user "Do you have an APF27 with an APW wireless extension board or an APF6Dev with optional GPS chip ? (Y/n)"
+ if [ "$response" == "n" ] || [ "$response" == "no" ]; then
+ echo "Only the APW or APF6Dev with optional GPS chip are supported by this test yet !!"
+ exit_failed
+ fi
+ fi
+
+ execute_for_target setup_port
cat $GPS_DEVICE &
sleep 3
@@ -44,5 +61,4 @@ test_gps()
exit 0
}
-test_gps
-
+test_gps $1
diff --git a/target/test/test_gsm.sh b/target/test/test_gsm.sh
index f10a4ee..b7e5279 100755
--- a/target/test/test_gsm.sh
+++ b/target/test/test_gsm.sh
@@ -52,6 +52,17 @@ prepare_gsm()
ls -al /dev/ttyS*
GSM_DEVICE=/dev/ttyS0
GSM_SPEED=115200
+ elif [ "$1" == "APF6" ]; then
+ echo 205 > /sys/class/gpio/export
+ echo out > /sys/class/gpio/gpio205/direction
+ echo 1 > /sys/class/gpio/gpio205/value
+ echo 4 > /sys/class/gpio/export
+ echo out > /sys/class/gpio/gpio4/direction
+ echo 1 > /sys/class/gpio/gpio4/value
+ sleep 2
+ echo 0 > /sys/class/gpio/gpio4/value
+ GSM_DEVICE=/dev/ttymxc2
+ GSM_SPEED=115200
else
echo "Platform not supported by this test"
fi
@@ -59,12 +70,14 @@ prepare_gsm()
test_gsm()
{
- show_test_banner "GSM (APW)"
+ show_test_banner "GSM"
- ask_user "Do you have an APF27Dev with an APW wireless extension board or an APF51Dev with a GSM/3G modem and the corresponding Linux kernel ? (Y/n)"
- if [ "$response" == "n" ] || [ "$response" == "no" ]; then
- echo "Only APF27+APW or APF51Dev are supported by this test yet !!"
- exit_failed
+ if [ "$1" != "-y" ]; then
+ ask_user "Do you have an APF27Dev with an APW wireless extension board or an APF51Dev or APF6Dev with a GSM/3G modem and the corresponding Linux kernel ? (Y/n)"
+ if [ "$response" == "n" ] || [ "$response" == "no" ]; then
+ echo "Only APF27+APW or APF51Dev or APF6Dev are supported by this test yet !!"
+ exit_failed
+ fi
fi
execute_for_target prepare_gsm
@@ -122,7 +135,7 @@ test_gsm()
fi
killall cat
/usr/sbin/chat ABORT 'NO CARRIER' ECHO ON '' AT OK ATD"$PHONE_NUMBER"\; OK > $GSM_DEVICE < $GSM_DEVICE
- sleep 6
+ sleep 10
send_at_cmd ATH
ask_user "Did you ear it ring ? (Y/n)"
if [ "$response" == "n" ] || [ "$response" == "no" ]; then
@@ -135,5 +148,4 @@ test_gsm()
exit 0
}
-test_gsm
-
+test_gsm $1
diff --git a/target/test/test_helpers.sh b/target/test/test_helpers.sh
index 8065d77..b31c5b8 100755
--- a/target/test/test_helpers.sh
+++ b/target/test/test_helpers.sh
@@ -170,7 +170,9 @@ execute_for_target()
$1 $BOARD
elif [ "$BOARD" == "APF51" ]; then
$1 $BOARD
- fi
+ elif [ "$BOARD" == "APF6" ]; then
+ $1 $BOARD
+ fi
fi
}
diff --git a/target/test/test_touchscreen.sh b/target/test/test_touchscreen.sh
index a4b7e9f..a22d6c9 100755
--- a/target/test/test_touchscreen.sh
+++ b/target/test/test_touchscreen.sh
@@ -29,6 +29,10 @@ load_driver()
# driver is in-kernel/static
dmesg | grep "MXS touch"
RES="$?"
+ elif [ "$1" == "APF6" ]; then
+ # driver is in-kernel/static
+ grep "SX8674 Touchscreen" $(echo /sys/class/input/event*/device/name)
+ RES="$?"
else
echo "$1 platform not supported by this test"
fi
hooks/post-receive
--
armadeus
|