[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-24-g306d414

[Nicolas <th...@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  306d4143eb6709e72cbed335e594f7aaff02b022 (commit)
      from  304ea80732f76f5813c07c37ee8137989c7ace73 (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 306d4143eb6709e72cbed335e594f7aaff02b022
Author: Nicolas Colombain <sal...@ar...-office>
Date:   Thu Sep 9 14:23:15 2010 +0200

    [U-BOOT] revert update_rootfs command to old version without nand option

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

Summary of changes:
 buildroot/target/device/armadeus/apf27/apf27.h |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf27/apf27.h b/buildroot/target/device/armadeus/apf27/apf27.h
index 78a33c5..966f911 100644
--- a/buildroot/target/device/armadeus/apf27/apf27.h
+++ b/buildroot/target/device/armadeus/apf27/apf27.h
@@ -206,11 +206,7 @@
 		" ${serverpath}${board_name}-rootfs.arm.jffs2\0"	\
 	"update_uboot=run download_uboot flash_uboot\0"			\
 	"update_kernel=run download_kernel flash_kernel\0"		\
-	"update_rootfs=nand erase clean ${rootfs_offset} ${rootfs_len};" \
-		"if tftpboot ${rootfs_offset} ${serverpath}${board_name}-rootfs.arm.jffs2 nand ;"\
-			"then echo Flashing of rootfs succeed;"		\
-			"else echo Flashing of rootfs failed;"		\
-		"fi\0"							\
+	"update_rootfs=run download_rootfs flash_rootfs\0"              \
 	"update_all=run download_kernel flash_kernel download_rootfs "	\
 		"flash_rootfs download_uboot flash_uboot\0"		\
 	"unlock_regs=mw 10000008 0; mw 10020008 0\0"			\
@@ -916,3 +912,16 @@
 #define CFG_SDRAM_PRECHARGE_ALL_VAL (1<<10)
 
 #endif /* __CONFIG_H */
+
+/* Add a wrapper around the values Buildroot sets. */
+#ifndef __BR2_ADDED_CONFIG_H
+#define __BR2_ADDED_CONFIG_H
+#ifdef CONFIG_HOSTNAME
+#undef CONFIG_HOSTNAME
+#endif
+#define CONFIG_HOSTNAME  "apf27"
+#ifdef CONFIG_BOARD_NAME
+#undef CONFIG_BOARD_NAME
+#endif
+#define CONFIG_BOARD_NAME  apf27
+#endif /* __BR2_ADDED_CONFIG_H */


hooks/post-receive
-- 
armadeus