[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.1-9-g34c060d
Brought to you by:
sszy
|
From: jorasse <jo...@us...> - 2012-10-10 01:51:10
|
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 34c060d518069714f6f9890e1adce6c486b43b62 (commit)
via 1cb7df73afdde89930935a2443642e0aebd94c8c (commit)
from eda9897bd608cce07978c8dbb6bf0be9a5a18efc (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 34c060d518069714f6f9890e1adce6c486b43b62
Merge: 1cb7df7 eda9897
Author: Eric Jarrige <eri...@ar...>
Date: Wed Oct 10 03:54:31 2012 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 1cb7df73afdde89930935a2443642e0aebd94c8c
Author: Eric Jarrige <eri...@ar...>
Date: Wed Oct 10 03:50:45 2012 +0200
[UBOOT] pps: fix wi2wi sdio init
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/pps/pps-u-boot-2012.04.h | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/buildroot/target/device/armadeus/pps/pps-u-boot-2012.04.h b/buildroot/target/device/armadeus/pps/pps-u-boot-2012.04.h
index 2a6b3a5..ff1bc97 100644
--- a/buildroot/target/device/armadeus/pps/pps-u-boot-2012.04.h
+++ b/buildroot/target/device/armadeus/pps/pps-u-boot-2012.04.h
@@ -24,8 +24,8 @@
#define __CONFIG_H
#define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION "3.2"
-#define CONFIG_IDENT_STRING " pps patch 3.7"
+#define CONFIG_ENV_VERSION "3.3"
+#define CONFIG_IDENT_STRING " pps patch 3.8"
#define CONFIG_BOARD_NAME pps
/*
@@ -83,12 +83,12 @@
#define CONFIG_CMD_DHCP /* DHCP Support */
#define CONFIG_CMD_DNS
/*#define CONFIG_CMD_EEPROM */ /* EEPROM read/write support */
-#define CONFIG_CMD_EXT2
+/*#define CONFIG_CMD_EXT2*/
#define CONFIG_CMD_FAT /* FAT support */
/*#define CONFIG_CMD_I2C */ /* I2C serial bus support */
#define CONFIG_CMD_IMX_FUSE /* imx iim fuse */
#define CONFIG_CMD_MII /* MII support */
-#define CONFIG_CMD_MMC
+/*#define CONFIG_CMD_MMC*/
#define CONFIG_CMD_MTDPARTS /* MTD partition support */
#define CONFIG_CMD_NAND /* NAND support */
#define CONFIG_CMD_NAND_LOCK_UNLOCK
@@ -208,6 +208,7 @@
"rootfs_addr=" MK_STR(CONFIG_ROOTFS_OFFSET) "\0" \
"board_name=" MK_STR(CONFIG_BOARD_NAME) "\0" \
"kernel_addr_r=A0000000\0" \
+ "extrabootargs=otg_mode=device\0" \
"addnfsargs=setenv bootargs ${bootargs} " \
"root=/dev/nfs rw nfsroot=${serverip}:${rootpath}\0" \
"addubifsargs=setenv bootargs ${bootargs} " \
hooks/post-receive
--
armadeus
|