[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-163-g82bc288

[jorasse <jo...@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  82bc2886a327e6d5e80645b9a74bcdba7fdc7515 (commit)
       via  ccea75b0600d7bfa63b45d7bedb04e3910f44bc7 (commit)
      from  8597662cf9066ee78c13eac3a030560fc8ddab0c (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 82bc2886a327e6d5e80645b9a74bcdba7fdc7515
Merge: ccea75b 8597662
Author: Eric Jarrige <eri...@ar...>
Date:   Mon Mar 19 19:01:22 2012 +0100

    Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus

commit ccea75b0600d7bfa63b45d7bedb04e3910f44bc7
Author: Eric Jarrige <eri...@ar...>
Date:   Mon Mar 19 19:00:53 2012 +0100

    [UBOOT] apf28: fix NAND rootfs

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

Summary of changes:
 .../device/armadeus/apf28/apf28-u-boot-2011.12.h   |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h
index aeb6a1b..a18a099 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h
+++ b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h
@@ -26,8 +26,8 @@
 #include <asm/arch/regs-base.h>
 
 #define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION 	"0.4"
-#define CONFIG_IDENT_STRING	" apf28 patch 0.6"
+#define CONFIG_ENV_VERSION 	"0.5"
+#define CONFIG_IDENT_STRING	" apf28 patch 0.7"
 
 /*
  * SoC configurations
@@ -284,7 +284,7 @@
 #define	CONFIG_CMDLINE_TAG
 #define	CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG
-#define	CONFIG_BOOTDELAY	-1
+#define	CONFIG_BOOTDELAY	5
 #define CONFIG_ZERO_BOOTDELAY_CHECK
 #define	CONFIG_BOOTFILE		MK_STR(CONFIG_BOARD_NAME) "-linux.bin"
 #define CONFIG_BOOTARGS \
@@ -327,31 +327,31 @@
 		"${hostname}:eth0:off\0"				\
 	"nfsboot=setenv bootargs ${console} ${mtdparts};"		\
 		"run addnfsargs addipargs; setenv autostart yes;"	\
-		"nboot.jffs2 40800000 0 ${kernel_offset}\0"		\
+		"nboot 40800000 0 ${kernel_offset}\0"		\
 	"ubifsboot=setenv bootargs ${console} ${mtdparts};"		\
 		"run addubifsargs addipargs; setenv autostart yes;"	\
-		"nboot.jffs2 40800000 0 ${kernel_offset}\0"		\
+		"nboot 40800000 0 ${kernel_offset}\0"		\
 	"mmcboot=setenv bootargs ${console} ${mtdparts};"		\
 		"run addmmcargs addipargs; setenv autostart yes;"	\
-		"nboot.jffs2 40800000 0 ${kernel_offset}\0"		\
+		"nboot 40800000 0 ${kernel_offset}\0"		\
 	"flash_uboot=nand unlock;"					\
 		"if bcb nand.write ; then "				\
 		"nand erase ${uboot_offset} ${uboot_len} ; "		\
-		"nand write ${fileaddr} ${uboot_offset} ${filesize};"	\
+		"nand write.trimffs ${fileaddr} ${uboot_offset} ${filesize};" \
 		"nand erase ${uboot2_offset} ${uboot_len};"		\
-		"if nand write ${fileaddr} ${uboot2_offset} ${filesize};" \
+		"if nand write.trimffs ${fileaddr} ${uboot2_offset} ${filesize};"\
 			"then nand lock; nand unlock ${env_offset};"	\
 				"echo Flashing of uboot succeed;"	\
 			"else echo Flashing of uboot failed;"		\
 		"fi; "							\
 		"fi; \0"						\
 	"flash_kernel=nand erase ${kernel_offset} ${kernel_len};"	\
-		"if nand write.jffs2 ${fileaddr} ${kernel_offset} ${filesize};"\
+		"if nand write.trimffs ${fileaddr} ${kernel_offset} ${filesize};"\
 			"then echo Flashing of kernel succeed;"		\
 			"else echo Flashing of kernel failed;"		\
 		"fi\0"							\
 	"flash_rootfs=nand erase.part rootfs;"				\
-		"if nand write.jffs2 ${fileaddr} ${rootfs_offset} ${filesize};"\
+		"if nand write.trimffs ${fileaddr} ${rootfs_offset} ${filesize};"\
 			"then echo Flashing of rootfs succeed;"		\
 			"else echo Flashing of rootfs failed;"		\
 		"fi\0"							\


hooks/post-receive
-- 
armadeus