[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-567-g598b84a
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-567-g598b84a
|
From: Julien B a. A. <ar...@us...> - 2010-07-29 20:46:24
|
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 598b84aa1896f023f56737ac16356af31e1c84e7 (commit)
via aedc08f7e3d50842db153db20b498b0b0b74e0e9 (commit)
via c74a125c4c14f7a15d8e57893e488d37bcfed821 (commit)
via 5a9306725fd35e8c9f4db020a7922306869b6302 (commit)
from 94db1bf41a3f6ce69b66a988d56d5332c037c344 (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 598b84aa1896f023f56737ac16356af31e1c84e7
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jul 29 22:40:22 2010 +0200
Correct error from commit 75d48b481b760316c8f332e0b8296585a9540dcd
commit aedc08f7e3d50842db153db20b498b0b0b74e0e9
Merge: c74a125c4c14f7a15d8e57893e488d37bcfed821 94db1bf41a3f6ce69b66a988d56d5332c037c344
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jul 29 22:36:54 2010 +0200
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit c74a125c4c14f7a15d8e57893e488d37bcfed821
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jul 29 17:18:58 2010 +0200
[TEST] Updates test scripts for 3.3 release
commit 5a9306725fd35e8c9f4db020a7922306869b6302
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jul 29 17:15:23 2010 +0200
[LINUX] pwm ressources were badly registered on APF9328
-----------------------------------------------------------------------
Summary of changes:
.../2.6.29/021-armadeus-apf9328.patch | 4 ++--
patches/buildroot/2010.05/cleanup_buildroot.sh | 1 -
patches/buildroot/cleanup_buildroot.sh | 1 +
target/test/mmc/media_perf.sh | 9 ++++++++-
target/test/packages/test_boa.sh | 2 +-
target/test/test_adc.sh | 2 +-
target/test/test_audio.sh | 2 +-
target/test/test_backlight.sh | 1 +
target/test/test_helpers.sh | 2 +-
target/test/test_pwm.sh | 4 ++--
target/test/test_release.sh | 9 +++++++--
target/test/test_rs232.sh | 1 +
target/test/test_usb_device.sh | 12 ++++++++----
target/test/test_usb_host.sh | 9 +++++----
14 files changed, 39 insertions(+), 20 deletions(-)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/021-armadeus-apf9328.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/021-armadeus-apf9328.patch
index 5201554..fa9a6cc 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/021-armadeus-apf9328.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/021-armadeus-apf9328.patch
@@ -114,8 +114,8 @@ Index: linux-2.6.29.6/arch/arm/mach-imx/apf9328.c
+#ifdef CONFIG_PWM
+static struct resource pwm_resources[] = {
+ [0] = {
-+ .start = (IMX_PWM_BASE),
-+ .end = (IMX_PWM_BASE + 0x0C),
++ .start = 0x00208000,
++ .end = 0x0020800c,
+ .flags = IORESOURCE_MEM,
+ },
+ [1] = {
diff --git a/patches/buildroot/2010.05/cleanup_buildroot.sh b/patches/buildroot/2010.05/cleanup_buildroot.sh
index 9065e2f..339312b 100755
--- a/patches/buildroot/2010.05/cleanup_buildroot.sh
+++ b/patches/buildroot/2010.05/cleanup_buildroot.sh
@@ -20,7 +20,6 @@ rm -rf buildroot/package/firmware/
rm -f buildroot/toolchain/gcc/4.2.1/999-4.2.1-armeabi-aapcs-linux.patch
rm -f buildroot/toolchain/gcc/4.2.4/999-4.2.4-armeabi-aapcs-linux.patch
rm -rf buildroot/package/games/wolf4sdl/
-rm -rf buildroot/package/qtopia4/
rm -rf buildroot/package/ussp-push/
rm -rf buildroot/package/openobex/
rm -rf buildroot/package/gpsd/
diff --git a/patches/buildroot/cleanup_buildroot.sh b/patches/buildroot/cleanup_buildroot.sh
index 99b69e3..556f19a 100755
--- a/patches/buildroot/cleanup_buildroot.sh
+++ b/patches/buildroot/cleanup_buildroot.sh
@@ -23,6 +23,7 @@ rm -f buildroot/package/strace/strace-arm-no-cachectl.patch
rm -f buildroot/toolchain/gcc/4.2.1/999-4.2.1-armeabi-aapcs-linux.patch
rm -f buildroot/toolchain/gcc/4.2.4/999-4.2.4-armeabi-aapcs-linux.patch
rm -rf buildroot/package/games/wolf4sdl/
+rm -rf buildroot/package/qtopia4/
rm -rf buildroot/package/ussp-push/
rm -rf buildroot/package/openobex/
rm -rf buildroot/package/gpsd/
diff --git a/target/test/mmc/media_perf.sh b/target/test/mmc/media_perf.sh
index 4d9abaf..bc80b65 100755
--- a/target/test/mmc/media_perf.sh
+++ b/target/test/mmc/media_perf.sh
@@ -23,7 +23,12 @@
source ./test_helpers.sh
# Script parameters
-TEMP_FILE_SIZE=16384 # kbytes (ex: 16384 24576)
+BOARD=`cat /etc/machine`
+if [ "$BOARD" == "APF9328" ]; then
+ TEMP_FILE_SIZE=4096
+else
+ TEMP_FILE_SIZE=16384 # kbytes (ex: 16384 24576)
+fi
NB_ITER=10
MMC_MOUNT_DIR="/media/mmc"
@@ -132,6 +137,8 @@ if [ "$2" != "" ]; then
MMC_DEVICE="$2"
fi
+show_test_banner "Storage medium performances"
+
if [ ! -b $MMC_DEVICE ] && [ ! -b $USB_DEVICE ]; then
echo -n "Please insert your storage device: MMC/SD/microSD or USB key"
it=0
diff --git a/target/test/packages/test_boa.sh b/target/test/packages/test_boa.sh
index 4f8cd80..6ef1e77 100755
--- a/target/test/packages/test_boa.sh
+++ b/target/test/packages/test_boa.sh
@@ -62,7 +62,7 @@ test_boa()
sleep 8
if [ "$?" == 0 ]; then
ask_user "Did you manage to show the web page ? (y/N)"
- if [ "$response" == "y" ]; then
+ if [ "$response" == "y" ] || [ "$response" == "yes" ]; then
echo_test_ok
test_cleanup
exit 0
diff --git a/target/test/test_adc.sh b/target/test/test_adc.sh
index c655652..b20de49 100755
--- a/target/test/test_adc.sh
+++ b/target/test/test_adc.sh
@@ -17,7 +17,7 @@ source ./test_env.sh
test_setup_apf9328()
{
- echo "I hope you didn't forget to wire EOC and CVNST !"
+ ask_user "Please connect EOC (ADC pin 11 & CSI pin 12) and CVNST (ADC pin 10 & CSI pin 9), then press ENTER"
ADC_SPI_SYS="/sys/bus/spi/devices/spi1.0"
}
diff --git a/target/test/test_audio.sh b/target/test/test_audio.sh
index 80eb2dd..e40b2ca 100755
--- a/target/test/test_audio.sh
+++ b/target/test/test_audio.sh
@@ -43,7 +43,7 @@ test_audio()
exit_failed
fi
- ask_user "Please connect an earphone to the Audio Out connector (top on APF27). Then press ENTER."
+ ask_user "Please connect an earphone to the Audio Out connector (top one on APF27). Then press ENTER."
aplay /usr/share/sounds/alsa/Side_Left.wav
if [ "$?" == 0 ]; then
ask_user "Did you hear something ? (y/N)"
diff --git a/target/test/test_backlight.sh b/target/test/test_backlight.sh
index 3699f32..6590b37 100755
--- a/target/test/test_backlight.sh
+++ b/target/test/test_backlight.sh
@@ -37,6 +37,7 @@ test_backlight()
ask_user "Backlight set to MAX, press ENTER"
echo 0 > $SYS_DIR/brightness
ask_user "Backlight set to MIN, press ENTER"
+ echo $current > $SYS_DIR/brightness
ask_user "I will now loop through brightness, press ENTER when ready"
for loop in `seq 1 2 150`; do
diff --git a/target/test/test_helpers.sh b/target/test/test_helpers.sh
index 281f7b0..4cce91a 100644
--- a/target/test/test_helpers.sh
+++ b/target/test/test_helpers.sh
@@ -55,7 +55,7 @@ ask_user()
AWAITEN="$2"
echo -e "\n >>>> $MESSAGE <<<<"
- read response
+ read -p "> " response
}
ask_user_banner()
diff --git a/target/test/test_pwm.sh b/target/test/test_pwm.sh
index 035e3e4..89ca840 100755
--- a/target/test/test_pwm.sh
+++ b/target/test/test_pwm.sh
@@ -28,12 +28,12 @@ SLEEP_TIME=4
prepare_test_for_apf9328()
{
- ask_user "Please connect your oscilloscope probe to pin 4 of X21 connector (press ENTER when ready)"
+ ask_user "Please connect your oscilloscope probe to pin 4 of X21/Timer connector (GND is on pin 8), then press ENTER when ready"
}
prepare_test_for_apf27()
{
- ask_user "Please connect your oscilloscope probe to pin 4 of J22 connector (press ENTER when ready)"
+ ask_user "Please connect your oscilloscope probe to pin 4 of J22 connector, then press ENTER when ready"
}
test_pwm()
diff --git a/target/test/test_release.sh b/target/test/test_release.sh
index 5a2d2b4..826a9a0 100755
--- a/target/test/test_release.sh
+++ b/target/test/test_release.sh
@@ -46,6 +46,9 @@ $THIS_DIR/test_rs232.sh
echo
$THIS_DIR/test_usb_device.sh
echo
+# FPGA test should be run before touch one on APF9328
+$THIS_DIR/test_fpga.sh
+echo
$THIS_DIR/test_backlight.sh
echo
$THIS_DIR/test_framebuffer.sh
@@ -58,13 +61,12 @@ $THIS_DIR/test_adc.sh
echo
$THIS_DIR/test_audio.sh
echo
-$THIS_DIR/test_fpga.sh
-echo
$THIS_DIR/test_gpio.sh
echo
$THIS_DIR/test_pwm.sh
echo
$THIS_DIR/media_perf.sh speed
+rm /tmp/data.bin
# Following tests needs Internet access:
ask_user "I will now try to configure Internet access. Press ENTER when ready"
$THIS_DIR/dhcp.sh
@@ -79,5 +81,8 @@ for package_test in $PACKAGES_TESTS; do
fi
done
+echo
+echo "--- END OF RELEASE TESTS ! ---"
+
exit 0
diff --git a/target/test/test_rs232.sh b/target/test/test_rs232.sh
index 84e887b..016061a 100755
--- a/target/test/test_rs232.sh
+++ b/target/test/test_rs232.sh
@@ -71,6 +71,7 @@ echo_apf27_ports()
echo " Available one: [ 2 ]"
}
+show_test_banner "Serial ports"
PORT="$1"
if [ "$1" == "" ]; then
echo "Please give the port number to test !"
diff --git a/target/test/test_usb_device.sh b/target/test/test_usb_device.sh
index a16c762..69267d5 100755
--- a/target/test/test_usb_device.sh
+++ b/target/test/test_usb_device.sh
@@ -22,15 +22,19 @@ test_usb_gadget()
if [ "$?" == 0 ]; then
udhcpc -i eth0
echo "Downloading test file from Internet"
- wget http://dl.free.fr/q9IKqqweK -O /tmp/backing_file.gz
+ wget http://dl.free.fr/q9IKqqweK -O $BACKING_FILE
if [ "$?" != 0 ]; then
exit_failed
fi
- gunzip /tmp/backing_file.gz
+ gunzip $BACKING_FILE
modprobe g_file_storage file=/tmp/backing_file
sleep 1
- ask_user "Please connect your board to your PC and see if a mass storage\ndevice is detected. Try to open the image inside the device.\n Do you see something interesting ? ;-) (y/n)"
- if [ "$response" == "y" ]; then
+ ask_user "Please connect your board to your PC with a USB cable and see if a mass storage\ndevice is detected. Try to open the image inside the device.\n Do you see something interesting ? ;-) (y/N)"
+ test_result=$response
+ ask_user "Please unmount mass storage device of your PC, unplug USB cable and then press ENTER"
+ rmmod g_file_storage
+ rm /tmp/backing_file
+ if [ "$test_result" == "y" ] || [ "$test_result" == "yes" ]; then
echo_test_ok
else
exit_failed
diff --git a/target/test/test_usb_host.sh b/target/test/test_usb_host.sh
index 7618623..ac1ffaf 100755
--- a/target/test/test_usb_host.sh
+++ b/target/test/test_usb_host.sh
@@ -14,6 +14,7 @@
source ./test_helpers.sh
source ./test_env.sh
+USB_MOUNT_POINT=/media/usbdisk
load_usb_host_driver_apf9328()
{
@@ -50,9 +51,9 @@ wait_key_removal()
check_usb_key()
{
- mount `ls /dev/sd*1` /mnt/mmc && ls /mnt/mmc/
+ mount `ls /dev/sd*1` $USB_MOUNT_POINT && ls $USB_MOUNT_POINT
df -h
- umount /mnt/mmc
+ umount $USB_MOUNT_POINT
if [ "$?" != 0 ]; then
exit_failed
fi
@@ -69,12 +70,12 @@ test_usb_host()
exit_failed
fi
- wait_key_insertion "upper"
+ wait_key_insertion "the UPPER"
check_usb_key
wait_key_removal
- wait_key_insertion "lower"
+ wait_key_insertion "the LOWER"
check_usb_key
wait_key_removal
hooks/post-receive
--
armadeus
|
