[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-177-gea1a935

[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  ea1a9356432018629f5f43b6932f963403335446 (commit)
      from  8c7039ae8806030b1eca595fb95ab336ba784a90 (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 ea1a9356432018629f5f43b6932f963403335446
Author: Eric Jarrige <eri...@ar...>
Date:   Tue Mar 20 11:57:01 2012 +0100

    [UBOOT] apf51: remove JFFS2 scripts - this board does not support JFFS2

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

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

diff --git a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2011.12.h b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2011.12.h
index 1f64949..3930e2d 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2011.12.h
+++ b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2011.12.h
@@ -28,8 +28,8 @@
 #define __CONFIG_H
 
 #define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION 	"0.6"
-#define CONFIG_IDENT_STRING	" apf51 patch 0.8"
+#define CONFIG_ENV_VERSION 	"0.7"
+#define CONFIG_IDENT_STRING	" apf51 patch 0.9"
 
 /*
  * High Level Configuration Options
@@ -62,7 +62,7 @@
 #define CONFIG_ZERO_BOOTDELAY_CHECK
 
 #define CONFIG_BOOTARGS \
-	CONFIG_CONSOLE " root=/dev/mtdblock4 rootfstype=jffs2 " MTDPARTS_DEFAULT
+	CONFIG_CONSOLE " root=/dev/mtdblock4 rootfstype=ubifs " MTDPARTS_DEFAULT
 
 #define CONFIG_CONSOLE "console=ttymxc2,"MK_STR(CONFIG_BAUDRATE)
 #define CONFIG_MTDMAP   "mxc_nand"
@@ -97,8 +97,6 @@
 	"quiet=1\0"							\
 	"addnfsargs=setenv bootargs ${bootargs} "			\
 		"root=/dev/nfs rw nfsroot=${serverip}:${rootpath}\0"    \
-	"addjffsargs=setenv bootargs ${bootargs} "			\
-		"root=/dev/mtdblock4 rootfstype=jffs2\0"   		\
 	"addubifsargs=setenv bootargs ${bootargs} "			\
 		"ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs\0"    \
 	"addmmcargs=setenv bootargs ${bootargs} "			\
@@ -108,26 +106,23 @@
 		"${hostname}:eth0:off\0"				\
 	"nfsboot=setenv bootargs ${console} ${mtdparts};"		\
 		"run addnfsargs addipargs; setenv autostart yes;"	\
-		"nboot.jffs2 90800000 0 ${kernel_offset}\0"		\
-	"jffsboot=setenv bootargs ${console} ${mtdparts};"		\
-		"run addjffsargs addipargs; setenv autostart yes;"	\
-		"nboot.jffs2 90800000 0 ${kernel_offset}\0"		\
+		"nboot 90800000 0 ${kernel_offset}\0"		\
 	"ubifsboot=setenv bootargs ${console} ${mtdparts};"		\
 		"run addubifsargs addipargs; setenv autostart yes;"	\
-		"nboot.jffs2 90800000 0 ${kernel_offset}\0"		\
+		"nboot 90800000 0 ${kernel_offset}\0"		\
 	"mmcboot=setenv bootargs ${console} ${mtdparts};"		\
 		"run addmmcargs addipargs; setenv autostart yes;"	\
-		"nboot.jffs2 90800000 0 ${kernel_offset}\0"		\
+		"nboot 90800000 0 ${kernel_offset}\0"		\
 	"firmware_autoload=0\0"						\
 	"flash_uboot=nand unlock ${uboot_offset} ${uboot_len};"		\
 		"nand erase ${uboot_offset} ${uboot_len};"		\
-		"if nand write.jffs2 ${fileaddr} ${uboot_offset} ${filesize};" \
+		"if nand write.trimffs ${fileaddr} ${uboot_offset} ${filesize};" \
 			"then nand lock; nand unlock ${env_offset};"	\
 				"echo Flashing of uboot succeed;"	\
 			"else echo Flashing of uboot failed;"		\
 		"fi; \0"						\
 	"flash_firmware=nand erase ${firmware_offset} ${firmware_len};" \
-		"if nand write.jffs2 ${fileaddr} ${firmware_offset}"	\
+		"if nand write.trimffs ${fileaddr} ${firmware_offset}"	\
 			" ${filesize};"					\
 			"then echo Flashing of Firmware succeed;"	\
 			"else echo Flashing of Firmware failed;"	\
@@ -136,12 +131,12 @@
 		"run flash_firmware;"					\
 		"fpga load 0 ${fileaddr} ${firmware_len};\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