[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-25-g88b5a8a
Brought to you by:
sszy
|
From: Nicolas <th...@us...> - 2010-09-09 14:39:03
|
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 88b5a8a3cd95d3df130aad090ec72edcc8dec88d (commit)
from 306d4143eb6709e72cbed335e594f7aaff02b022 (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 88b5a8a3cd95d3df130aad090ec72edcc8dec88d
Author: Nicolas Colombain <nic...@ar...>
Date: Thu Sep 9 16:32:48 2010 +0200
[U-BOOT] use UBIFS instead of JFFS2 for APF27
-----------------------------------------------------------------------
Summary of changes:
buildroot/target/device/armadeus/apf27/apf27.h | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf27/apf27.h b/buildroot/target/device/armadeus/apf27/apf27.h
index 966f911..f5e0391 100644
--- a/buildroot/target/device/armadeus/apf27/apf27.h
+++ b/buildroot/target/device/armadeus/apf27/apf27.h
@@ -32,7 +32,7 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_ENV_VERSION "1.8"
+#define CONFIG_ENV_VERSION "1.9"
#define CONFIG_IDENT_STRING " apf27 patch 2.2"
#define CONFIG_ARM926EJS 1 /* this is an ARM926EJS CPU */
@@ -203,7 +203,7 @@
"download_kernel=tftpboot ${loadaddr} " \
" ${serverpath}${board_name}-linux.bin\0" \
"download_rootfs=tftpboot ${loadaddr} " \
- " ${serverpath}${board_name}-rootfs.arm.jffs2\0" \
+ " ${serverpath}${board_name}-rootfs.arm.ubifs\0" \
"update_uboot=run download_uboot flash_uboot\0" \
"update_kernel=run download_kernel flash_kernel\0" \
"update_rootfs=run download_rootfs flash_rootfs\0" \
@@ -211,7 +211,7 @@
"flash_rootfs download_uboot flash_uboot\0" \
"unlock_regs=mw 10000008 0; mw 10020008 0\0" \
-#define CONFIG_BOOTCOMMAND "run jffsboot"
+#define CONFIG_BOOTCOMMAND "run ubifsboot"
#define CFG_AUTOLOAD "no"
#define CFG_DIRECT_FLASH_TFTP
@@ -925,3 +925,16 @@
#endif
#define CONFIG_BOARD_NAME apf27
#endif /* __BR2_ADDED_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
|