[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-545-gf9626a5
Brought to you by:
sszy
|
From: Julien B a. A. <ar...@us...> - 2015-01-04 17:51: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 f9626a5012b7a05fdebcf836880eb3ca28ca9b8a (commit)
via 365be9f8e85c592314a893b141266366f30aa7bb (commit)
from a5e0e012491db252bf5e8c066f2be80df49e0efd (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 f9626a5012b7a05fdebcf836880eb3ca28ca9b8a
Author: Julien Boibessot <jul...@ar...>
Date: Sun Jan 4 18:50:12 2015 +0100
[U-BOOT] 2014.07: apf6: Add a method to update rootfs directly from U-Boot prompt like on others armadeus boards (run update_rootfs)
commit 365be9f8e85c592314a893b141266366f30aa7bb
Author: Julien Boibessot <jul...@ar...>
Date: Sat Jan 3 18:27:48 2015 +0100
[BUILDROOT] rootfs: also creates apf6-rootfs.ext4 symlink after images generation
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf6/apf6-u-boot-2014.07.h | 11 +++++++++++
.../device/armadeus/rootfs/post_image_creation.sh | 5 +++--
2 files changed, 14 insertions(+), 2 deletions(-)
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 463aa75..2fbd45c 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
@@ -238,6 +238,17 @@
"else echo Flashing of dtb failed; " \
"fi;\0" \
"update_dtb=run download_dtb flash_dtb\0" \
+ "download_rootfs=tftpboot ${loadaddr} ${board_name}-rootfs.ext4\0" \
+ "flash_rootfs=" \
+ "if mmc dev 0 0; then " \
+ "setexpr nbblocks ${filesize} / 0x200; " \
+ "setexpr nbblocks ${nbblocks} + 1; " \
+ "if mmc write ${loadaddr} 0x18800 ${nbblocks}; then " \
+ "echo Flashing of rootfs image succeed; " \
+ "else echo Flashing of rootfs image failed; " \
+ "fi; " \
+ "fi;\0" \
+ "update_rootfs=run download_rootfs flash_rootfs\0" \
"update_all=run update_kernel 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" \
diff --git a/buildroot/target/device/armadeus/rootfs/post_image_creation.sh b/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
index 265d044..361a081 100755
--- a/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
+++ b/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
@@ -17,7 +17,8 @@ symlink_image()
fi
}
-# images symbolic links according to board name, for compatibility with older armadeus versions:
+# Create images symbolic links according to board name,
+# for compatibility with older armadeus versions:
if [ "$2" != "" ]; then
# New BR
@@ -27,7 +28,7 @@ if [ "$2" != "" ]; then
rm -f $1/$2.dtb
# rootfs
- for rootfstype in ubi ubifs tar jffs2; do
+ for rootfstype in ubi ubifs tar jffs2 ext4; do
symlink_image $1 rootfs.$rootfstype $2-rootfs.$rootfstype
done
hooks/post-receive
--
armadeus
|