[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-269-g6a3936b

[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  6a3936bc132688b3be022a0933b2e03a31da13bf (commit)
      from  da9f4205a8aea4b2b1260a7484bfb4cb12324b9a (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 6a3936bc132688b3be022a0933b2e03a31da13bf
Author: Eric Jarrige <eri...@ar...>
Date:   Mon May 27 22:35:18 2013 +0200

    [UBOOT] 2013.04: update apf27 FEC config and re-enable CONFIG_SYS_DIRECT_FLASH_TFTP

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

Summary of changes:
 .../device/armadeus/apf27/apf27-u-boot-2013.04.h   |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2013.04.h b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2013.04.h
index e5e1dea..ee3bdb8 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2013.04.h
+++ b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2013.04.h
@@ -325,6 +325,7 @@
 #define NAND_MAX_CHIPS			1
 
 
+#define CONFIG_SYS_DIRECT_FLASH_TFTP
 #define CONFIG_FLASH_SHOW_PROGRESS	45
 #define CONFIG_SYS_NAND_QUIET		1
 
@@ -348,10 +349,9 @@
  * Ethernet (on SOC imx FEC)
  */
 #define CONFIG_FEC_MXC
-
-#define CONFIG_NET_MULTI
+#define CONFIG_PHYLIB
 #define CONFIG_FEC_MXC_PHYADDR		0x1f
-#define CONFIG_MII			1	/* MII PHY management	*/
+#define CONFIG_MII				/* MII PHY management	*/
 
 /*
  * FPGA


hooks/post-receive
-- 
armadeus