[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-627-gbabecf2
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-627-gbabecf2
|
From: Julien B a. A. <ar...@us...> - 2015-02-26 15:03: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 babecf2c1fc7ac6dc60d02a7b9045bf8fa1e2c6f (commit)
via a073e8b1318345be536932d3d1934f1351c78d7e (commit)
via 63ee1da2c2cd487cc0bbb01b3b1864ed3df72bbf (commit)
via 12cc57109184125c8e8c8ebb0cd476f59a8e7d0c (commit)
via e9ed4023868aa1caf2259abb0273559525c5a180 (commit)
from 6cb5ee231427c2136361dba9ff6974a1098beba9 (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 babecf2c1fc7ac6dc60d02a7b9045bf8fa1e2c6f
Author: Julien Boibessot <jul...@ar...>
Date: Thu Feb 26 16:03:17 2015 +0100
[U-BOOT] APF6: merge apf6-u-boot-2015.01.h & apf6-u-boot-2014.07.h again together
commit a073e8b1318345be536932d3d1934f1351c78d7e
Author: Julien Boibessot <jul...@ar...>
Date: Thu Feb 26 15:51:29 2015 +0100
[U-BOOT] APF6: 2014.07, 2015.01: add mmcboot script and factorize with emmcboot
commit 63ee1da2c2cd487cc0bbb01b3b1864ed3df72bbf
Author: Julien Boibessot <jul...@ar...>
Date: Thu Feb 26 13:26:52 2015 +0100
[BUILDROOT] Fixes testsuite installation on all APFs
commit 12cc57109184125c8e8c8ebb0cd476f59a8e7d0c
Author: Julien Boibessot <jul...@ar...>
Date: Thu Feb 26 13:00:22 2015 +0100
[BUILDROOT] Fixes testsuite installation on APF28
commit e9ed4023868aa1caf2259abb0273559525c5a180
Author: Julien Boibessot <jul...@ar...>
Date: Fri Feb 20 15:28:50 2015 +0100
[BUILD] Fixes TOPDIR warning when generating armadeus_env.sh
-----------------------------------------------------------------------
Summary of changes:
Makefile.in | 2 +-
buildroot/configs/apf27test_defconfig | 2 +-
buildroot/configs/apf28test_defconfig | 5 +++-
buildroot/configs/apf51test_defconfig | 2 +-
buildroot/configs/apf9328test_defconfig | 2 +-
buildroot/configs/pps51_defconfig | 2 +-
buildroot/package/armadeus/testsuite/Config.in | 8 ++----
.../device/armadeus/apf6/apf6-u-boot-2014.07.h | 16 ++++++++----
.../device/armadeus/apf6/apf6-u-boot-2015.01.h | 25 ++++++++++++--------
target/test/install.sh | 6 +++-
10 files changed, 41 insertions(+), 29 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 56389b6..c4bcbb3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -18,7 +18,7 @@ else
ifneq ($(BR2_DL_DIR),)
ARMADEUS_DL_DIR := $(BR2_DL_DIR)
else
- ARMADEUS_DL_DIR := $(shell grep "BR2_DL_DIR=" $(BUILDROOT_DIR)/.config 2>/dev/null | cut -d = -f 2 | sed 's;$$(BASE_DIR);$(BUILDROOT_DIR);')
+ ARMADEUS_DL_DIR := $(shell grep "BR2_DL_DIR=" $(BUILDROOT_DIR)/.config 2>/dev/null | cut -d = -f 2 | sed 's;$$(TOPDIR);$(BUILDROOT_DIR);')
endif
endif
diff --git a/buildroot/configs/apf27test_defconfig b/buildroot/configs/apf27test_defconfig
index c7b7b3c..48bf6c9 100644
--- a/buildroot/configs/apf27test_defconfig
+++ b/buildroot/configs/apf27test_defconfig
@@ -62,7 +62,7 @@ BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blink
BR2_PACKAGE_ARMADEUS_EXPORT_FPGA_FIRMWARE=y
BR2_PACKAGE_IMXREGS=y
BR2_PACKAGE_MAX5821CTRL=y
-BR2_PACKAGE_ARMADEUS_TESTSUITE=y
+BR2_PACKAGE_TESTSUITE=y
BR2_PACKAGE_AD9889CTRL=y
BR2_PACKAGE_ALSA_UTILS=y
BR2_PACKAGE_ALSA_UTILS_AMIXER=y
diff --git a/buildroot/configs/apf28test_defconfig b/buildroot/configs/apf28test_defconfig
index d7ba973..bd0664b 100644
--- a/buildroot/configs/apf28test_defconfig
+++ b/buildroot/configs/apf28test_defconfig
@@ -49,12 +49,13 @@ BR2_PACKAGE_ARMADEUS_DEMOS_ARMANOID=y
BR2_PACKAGE_ARMADEUS_DEMOS_BACKLIGHT=y
BR2_PACKAGE_ARMADEUS_DEMOS_INPUT=y
BR2_PACKAGE_ARMADEUS_DEMOS_MUSIC_PLAYER=y
+BR2_PACKAGE_ARMADEUS_DEMOS_CAPTURE=y
BR2_PACKAGE_ARMADEUS_DEMOS_OSCILLO=y
BR2_PACKAGE_ARMADEUS_DEMOS_SHOW_IMAGE=y
BR2_PACKAGE_ARMADEUS_DEMOS_TEST_LCD=y
BR2_PACKAGE_HOST_IMX28_USB_DOWNLOADER=y
BR2_PACKAGE_IMXREGS=y
-BR2_PACKAGE_ARMADEUS_TESTSUITE=y
+BR2_PACKAGE_TESTSUITE=y
BR2_PACKAGE_ALSA_UTILS=y
BR2_PACKAGE_ALSA_UTILS_AMIXER=y
BR2_PACKAGE_ALSA_UTILS_APLAY=y
@@ -80,6 +81,8 @@ BR2_PACKAGE_STRACE=y
BR2_PACKAGE_E2FSPROGS=y
BR2_PACKAGE_MTD=y
BR2_PACKAGE_MTD_SUMTOOL=y
+BR2_PACKAGE_LBREAKOUT2=y
+BR2_PACKAGE_OPENTYRIAN=y
BR2_PACKAGE_DOOM_WAD=y
BR2_PACKAGE_PRBOOM=y
BR2_PACKAGE_SLIDESHOW=y
diff --git a/buildroot/configs/apf51test_defconfig b/buildroot/configs/apf51test_defconfig
index cb8cb46..8d7b923 100644
--- a/buildroot/configs/apf51test_defconfig
+++ b/buildroot/configs/apf51test_defconfig
@@ -62,7 +62,7 @@ BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE=y
BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_APF51_DUAL_UART=y
BR2_PACKAGE_ARMADEUS_EXPORT_FPGA_FIRMWARE=y
BR2_PACKAGE_IMXREGS=y
-BR2_PACKAGE_ARMADEUS_TESTSUITE=y
+BR2_PACKAGE_TESTSUITE=y
BR2_PACKAGE_TFP410CTRL=y
BR2_PACKAGE_ALSA_UTILS=y
BR2_PACKAGE_ALSA_UTILS_AMIXER=y
diff --git a/buildroot/configs/apf9328test_defconfig b/buildroot/configs/apf9328test_defconfig
index c610061..89f0d74 100644
--- a/buildroot/configs/apf9328test_defconfig
+++ b/buildroot/configs/apf9328test_defconfig
@@ -63,7 +63,7 @@ BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blink
BR2_PACKAGE_ARMADEUS_EXPORT_FPGA_FIRMWARE=y
BR2_PACKAGE_IMXREGS=y
BR2_PACKAGE_MAX5821CTRL=y
-BR2_PACKAGE_ARMADEUS_TESTSUITE=y
+BR2_PACKAGE_TESTSUITE=y
BR2_PACKAGE_CH7024CTRL=y
BR2_PACKAGE_ALSA_UTILS=y
BR2_PACKAGE_ALSA_UTILS_AMIXER=y
diff --git a/buildroot/configs/pps51_defconfig b/buildroot/configs/pps51_defconfig
index dd4aadc..4f3761f 100644
--- a/buildroot/configs/pps51_defconfig
+++ b/buildroot/configs/pps51_defconfig
@@ -46,7 +46,7 @@ BR2_PACKAGE_FPGAREGS=y
BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE=y
BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_APF51_DUAL_UART=y
BR2_PACKAGE_IMXREGS=y
-BR2_PACKAGE_ARMADEUS_TESTSUITE=y
+BR2_PACKAGE_TESTSUITE=y
BR2_PACKAGE_PPS=y
BR2_PACKAGE_PPS_TEST_SCRIPTS=y
BR2_PACKAGE_TFP410CTRL=y
diff --git a/buildroot/package/armadeus/testsuite/Config.in b/buildroot/package/armadeus/testsuite/Config.in
index 1f0c929..ca2a58f 100644
--- a/buildroot/package/armadeus/testsuite/Config.in
+++ b/buildroot/package/armadeus/testsuite/Config.in
@@ -1,7 +1,5 @@
-config BR2_PACKAGE_ARMADEUS_TESTSUITE
+config BR2_PACKAGE_TESTSUITE
bool "Armadeus Test Suite"
- default n
help
- Install Armadeus "Test Suite" to allow automatic release validation.
- Test scripts will be installed on the APF in /usr/bin/test/ .
-
+ Install Armadeus "Test Suite" (used for BSP release validation).
+ Test scripts will be installed on the APF in /usr/bin/test/.
diff --git a/buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h b/buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h
index 065d991..73dafb9 100644
--- a/buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h
+++ b/buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h
@@ -235,7 +235,7 @@
"update_kernel=run download_kernel flash_kernel\0" \
"download_dtb=tftpboot ${loadaddr} ${cpu_type}-${fdt_name}.dtb\0" \
"flash_dtb=" \
- "if ext4write mmc ${mmcdev}:${mmcpart} ${loadaddr} /dtbs/${cpu_type}-${fdt_name}.dtb ${filesize}; then " \
+ "if ext4write mmc ${mmcdev}:${mmcpart} ${loadaddr} /dtbs/${cpu_type}-${fdt_name}.dtb ${filesize}; then " \
"echo Flashing of dtb succeed; " \
"else echo Flashing of dtb failed; " \
"fi;\0" \
@@ -252,21 +252,25 @@
"fi;\0" \
"update_rootfs=run download_rootfs flash_rootfs\0" \
"update_all=run update_kernel update_rootfs update_dtb update_uboot\0" \
- "loadzimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${board_name}-linux.bin\0" \
- "loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} /dtbs/${cpu_type}-${fdt_name}.dtb\0" \
+ "mmcloadzimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${mmcdir}/${board_name}-linux.bin\0" \
+ "mmcloadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${mmcdir}/dtbs/${cpu_type}-${fdt_name}.dtb\0" \
"addipargs=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:" \
"${gatewayip}:${netmask}:${hostname}:eth0:off\0" \
"addmmcargs=setenv bootargs ${bootargs} root=${mmcroot} " \
"rootfstype=${mmcrootfstype}\0" \
- "emmcboot=setenv bootargs console=${consoledev},${baudrate} ${extrabootargs}; " \
+ "genmmcboot=setenv bootargs console=${consoledev},${baudrate} ${extrabootargs}; " \
"run addmmcargs; " \
- "run loadzimage && run loadfdt && bootz ${loadaddr} - ${fdt_addr};\0" \
+ "run mmcloadzimage && run mmcloadfdt && bootz ${loadaddr} - ${fdt_addr};\0" \
+ "mmcboot=setenv mmcdev 1; setenv mmcpart 1; setenv mmcdir /boot; setenv mmcroot /dev/mmcblk1p1 ro; " \
+ "run genmmcboot;\0" \
+ "emmcboot=setenv mmcdev 0; setenv mmcpart 1; setenv mmcdir; setenv mmcroot /dev/mmcblk2p2 ro; " \
+ "run genmmcboot;\0" \
"addnfsargs=setenv bootargs ${bootargs} root=/dev/nfs rw " \
"nfsroot=${serverip}:${rootpath}\0" \
"nfsboot=setenv bootargs console=${consoledev},${baudrate} ${extrabootargs}; " \
"run addnfsargs addipargs; " \
"nfs ${loadaddr} ${serverip}:${rootpath}/boot/${board_name}-linux.bin && " \
- "nfs ${fdt_addr} ${serverip}:${rootpath}/boot/dtbs/${cpu_type}-${fdt_name}.dtb && " \
+ "nfs ${fdt_addr} ${serverip}:${rootpath}/boot/dtbs/${cpu_type}-${fdt_name}.dtb && " \
"bootz ${loadaddr} - ${fdt_addr};\0"
/* Miscellaneous configurable options */
diff --git a/buildroot/target/device/armadeus/apf6/apf6-u-boot-2015.01.h b/buildroot/target/device/armadeus/apf6/apf6-u-boot-2015.01.h
index ed7629c..73dafb9 100644
--- a/buildroot/target/device/armadeus/apf6/apf6-u-boot-2015.01.h
+++ b/buildroot/target/device/armadeus/apf6/apf6-u-boot-2015.01.h
@@ -16,7 +16,7 @@
#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION 5
+#define CONFIG_ENV_VERSION 6
#define CONFIG_BOARD_NAME apf6
/* SPL */
@@ -181,9 +181,10 @@
"env_version=" __stringify(CONFIG_ENV_VERSION) "\0" \
"consoledev=" __stringify(ACFG_CONSOLE_DEV) "\0" \
"board_name=" __stringify(CONFIG_BOARD_NAME) "\0" \
+ "fdt_addr=0x18000000\0" \
"fdt_high=0xffffffff\0" \
+ "fdt_name=" __stringify(CONFIG_BOARD_NAME) "dev\0" \
"initrd_high=0xffffffff\0" \
- "fdt_addr=0x18000000\0" \
"ip_dyn=yes\0" \
"stdin=serial\0" \
"stout=serial\0" \
@@ -232,9 +233,9 @@
"else echo Flashing of kernel failed; " \
"fi;\0" \
"update_kernel=run download_kernel flash_kernel\0" \
- "download_dtb=tftpboot ${loadaddr} ${fdt_file}\0" \
+ "download_dtb=tftpboot ${loadaddr} ${cpu_type}-${fdt_name}.dtb\0" \
"flash_dtb=" \
- "if ext4write mmc ${mmcdev}:${mmcpart} ${loadaddr} /dtbs/${fdt_file} ${filesize}; then " \
+ "if ext4write mmc ${mmcdev}:${mmcpart} ${loadaddr} /dtbs/${cpu_type}-${fdt_name}.dtb ${filesize}; then " \
"echo Flashing of dtb succeed; " \
"else echo Flashing of dtb failed; " \
"fi;\0" \
@@ -250,22 +251,26 @@
"fi; " \
"fi;\0" \
"update_rootfs=run download_rootfs flash_rootfs\0" \
- "update_all=run update_kernel update_rootfs update_dtb update_uboot\0" \
- "loadzimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${board_name}-linux.bin\0" \
- "loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} /dtbs/${fdt_file}\0" \
+ "update_all=run update_kernel update_rootfs update_dtb update_uboot\0" \
+ "mmcloadzimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${mmcdir}/${board_name}-linux.bin\0" \
+ "mmcloadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${mmcdir}/dtbs/${cpu_type}-${fdt_name}.dtb\0" \
"addipargs=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:" \
"${gatewayip}:${netmask}:${hostname}:eth0:off\0" \
"addmmcargs=setenv bootargs ${bootargs} root=${mmcroot} " \
"rootfstype=${mmcrootfstype}\0" \
- "emmcboot=setenv bootargs console=${consoledev},${baudrate} ${extrabootargs}; " \
+ "genmmcboot=setenv bootargs console=${consoledev},${baudrate} ${extrabootargs}; " \
"run addmmcargs; " \
- "run loadzimage && run loadfdt && bootz ${loadaddr} - ${fdt_addr};\0" \
+ "run mmcloadzimage && run mmcloadfdt && bootz ${loadaddr} - ${fdt_addr};\0" \
+ "mmcboot=setenv mmcdev 1; setenv mmcpart 1; setenv mmcdir /boot; setenv mmcroot /dev/mmcblk1p1 ro; " \
+ "run genmmcboot;\0" \
+ "emmcboot=setenv mmcdev 0; setenv mmcpart 1; setenv mmcdir; setenv mmcroot /dev/mmcblk2p2 ro; " \
+ "run genmmcboot;\0" \
"addnfsargs=setenv bootargs ${bootargs} root=/dev/nfs rw " \
"nfsroot=${serverip}:${rootpath}\0" \
"nfsboot=setenv bootargs console=${consoledev},${baudrate} ${extrabootargs}; " \
"run addnfsargs addipargs; " \
"nfs ${loadaddr} ${serverip}:${rootpath}/boot/${board_name}-linux.bin && " \
- "nfs ${fdt_addr} ${serverip}:${rootpath}/boot/dtbs/${fdt_file} && " \
+ "nfs ${fdt_addr} ${serverip}:${rootpath}/boot/dtbs/${cpu_type}-${fdt_name}.dtb && " \
"bootz ${loadaddr} - ${fdt_addr};\0"
/* Miscellaneous configurable options */
diff --git a/target/test/install.sh b/target/test/install.sh
index 2a898e4..0f17239 100755
--- a/target/test/install.sh
+++ b/target/test/install.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-if [ "$1" == "" ]; then
+if [ ! -d "$1" ]; then
echo "Please provides the directory where to install the Test Suite"
echo "(optionnaly you can provide the board for which to install the"
echo "Test Suite and some not used data won't be installed)"
@@ -25,7 +25,9 @@ install $THIS_DIR/mmc/*.sh $TESTSUITE_TARGET_DIR/
cp -d $THIS_DIR/packages/*.sh $TESTSUITE_TARGET_DIR/packages
#
if [ "$2" != "" ]; then
- cp $THIS_DIR/data/fpga/*$2* $TESTSUITE_TARGET_DIR/data/fpga/
+ if [ "$2" != "apf28" ]; then
+ cp $THIS_DIR/data/fpga/*$2* $TESTSUITE_TARGET_DIR/data/fpga/
+ fi
else
cp $THIS_DIR/data/fpga/* $TESTSUITE_TARGET_DIR/data/fpga/
fi
hooks/post-receive
--
armadeus
|