[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-837-g9820737

[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  9820737d923a3a38b4374ef33b733228b6aece92 (commit)
       via  dfe77ae42a8b3d46d79991cb6928b8e11112e279 (commit)
      from  8636cc1e2022cd053c4d9db9b9e5c323e6b44967 (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 9820737d923a3a38b4374ef33b733228b6aece92
Author: Julien Boibessot <jul...@ar...>
Date:   Mon Aug 10 11:09:09 2015 +0200

    [BUILDROOT] Fixes mke2img options when building boot.ext4, to avoid U-Boot errors when doing update_kernel after update_boot

commit dfe77ae42a8b3d46d79991cb6928b8e11112e279
Author: Julien Boibessot <jul...@ar...>
Date:   Mon Aug 10 11:07:28 2015 +0200

    [U-BOOT] 2014.07+: APF6: really clear 10MB in run erase_rootfs

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

Summary of changes:
 .../device/armadeus/apf6/apf6-u-boot-2014.07.h     |    6 +++---
 .../device/armadeus/apf6/apf6-u-boot-2015.01.h     |    6 +++---
 .../device/armadeus/rootfs/post_image_creation.sh  |    2 +-
 3 files changed, 7 insertions(+), 7 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 363257e..b7a7d0c 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
@@ -16,7 +16,7 @@
 #define CONFIG_SYS_GENERIC_BOARD
 
 #define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION	19
+#define CONFIG_ENV_VERSION	20
 #define CONFIG_BOARD_NAME	apf6
 
 /* SPL */
@@ -255,8 +255,8 @@
 		"fi;\0" 									\
 	"update_boot=run download_boot flash_boot\0" 					\
 	"erase_rootfs=echo Erasing 10 first MB of eMMC rootfs partition: ; "			\
-		"mw ${loadaddr} 0 0x640000 && mmc dev 0 0 && "					\
-		"mmc write ${loadaddr} 0xc800 0x3200\0"						\
+		"mw ${loadaddr} 0 0xa00000 && mmc dev 0 0 && "					\
+		"mmc write ${loadaddr} 0xc800 0x5000\0"						\
 	"download_rootfs=tftpboot ${loadaddr} ${board_name}-rootfs.ext4\0" 			\
 	"flash_rootfs=" 									\
 		"if mmc dev 0 0; then "								\
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 363257e..b7a7d0c 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	19
+#define CONFIG_ENV_VERSION	20
 #define CONFIG_BOARD_NAME	apf6
 
 /* SPL */
@@ -255,8 +255,8 @@
 		"fi;\0" 									\
 	"update_boot=run download_boot flash_boot\0" 					\
 	"erase_rootfs=echo Erasing 10 first MB of eMMC rootfs partition: ; "			\
-		"mw ${loadaddr} 0 0x640000 && mmc dev 0 0 && "					\
-		"mmc write ${loadaddr} 0xc800 0x3200\0"						\
+		"mw ${loadaddr} 0 0xa00000 && mmc dev 0 0 && "					\
+		"mmc write ${loadaddr} 0xc800 0x5000\0"						\
 	"download_rootfs=tftpboot ${loadaddr} ${board_name}-rootfs.ext4\0" 			\
 	"flash_rootfs=" 									\
 		"if mmc dev 0 0; then "								\
diff --git a/buildroot/target/device/armadeus/rootfs/post_image_creation.sh b/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
index 037c7b0..1739369 100755
--- a/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
+++ b/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
@@ -52,7 +52,7 @@ fi
 # if target uses ext4 for rootfs,
 if [ -f "$1/rootfs.ext4" ]; then
 	# generate also boot.ext4:
-	mke2img -d $1/../target/boot/ -G 4 -o $1/boot.ext4
+	mke2img -d $1/../target/boot/ -G 4 -R 1 -l BOOT -b 24576 -o $1/boot.ext4
 	symlink_image $1 boot.ext4 $2-boot.ext4
 	# make a copy of rootfs for MMC/SD usage:
 	#cp $1/rootfs.ext4 $1/rootfs-for-sd.ext4


hooks/post-receive
-- 
armadeus