[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-102-g07b5c6c
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-102-g07b5c6c
|
From: Gwenhael Goavec-M. <gwe...@us...> - 2012-03-06 18:48:07
|
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 07b5c6c1eda09df5d8e178d9196fc0e95706c122 (commit)
via 89297127e751e4117af7fdf04d5147ddfdeac729 (commit)
from 90fd795873b466b22f441106371122f207834d60 (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 07b5c6c1eda09df5d8e178d9196fc0e95706c122
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date: Tue Mar 6 19:45:40 2012 +0100
[UBOOT] 2011.12 11-avoid_warning_when_ethaddr_not_defined.patch now useless
commit 89297127e751e4117af7fdf04d5147ddfdeac729
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date: Tue Mar 6 19:45:19 2012 +0100
[UBOOT] 2011.12 apf9328: sets ethaddr variable if it not exist already
-----------------------------------------------------------------------
Summary of changes:
patches/u-boot/2011.12/03-apf9328.patch | 82 +++++++++++---------
...11-avoid_warning_when_ethaddr_not_defined.patch | 12 ---
2 files changed, 44 insertions(+), 50 deletions(-)
delete mode 100644 patches/u-boot/2011.12/11-avoid_warning_when_ethaddr_not_defined.patch
diff --git a/patches/u-boot/2011.12/03-apf9328.patch b/patches/u-boot/2011.12/03-apf9328.patch
index 624b1ae..fb5019d 100644
--- a/patches/u-boot/2011.12/03-apf9328.patch
+++ b/patches/u-boot/2011.12/03-apf9328.patch
@@ -26,11 +26,10 @@ Cc: Nicolas Colombain <nic...@ar...>
create mode 100644 board/armadeus/apf9328/i2c.c
create mode 100644 board/armadeus/apf9328/lowlevel_init.S
-diff --git a/board/armadeus/apf9328/Makefile b/board/armadeus/apf9328/Makefile
-new file mode 100644
-index 0000000..0f097cd
+Index: u-boot-custom/board/armadeus/apf9328/Makefile
+===================================================================
--- /dev/null
-+++ b/board/armadeus/apf9328/Makefile
++++ u-boot-custom/board/armadeus/apf9328/Makefile
@@ -0,0 +1,51 @@
+#
+# (C) Copyright 2000-2004
@@ -83,12 +82,11 @@ index 0000000..0f097cd
+sinclude $(obj).depend
+
+#########################################################################
-diff --git a/board/armadeus/apf9328/apf9328.c b/board/armadeus/apf9328/apf9328.c
-new file mode 100644
-index 0000000..2250221
+Index: u-boot-custom/board/armadeus/apf9328/apf9328.c
+===================================================================
--- /dev/null
-+++ b/board/armadeus/apf9328/apf9328.c
-@@ -0,0 +1,91 @@
++++ u-boot-custom/board/armadeus/apf9328/apf9328.c
+@@ -0,0 +1,106 @@
+/*
+ * (C) Copyright 2005-2011
+ * Nicolas Colombin <th...@us...>
@@ -177,14 +175,28 @@ index 0000000..2250221
+#ifdef CONFIG_DRIVER_DM9000
+int board_eth_init(bd_t *bis)
+{
-+ return dm9000_initialize(bis);
++ struct eth_device *dev;
++ unsigned char env_enetaddr[6];
++
++ if (dm9000_initialize(bis) != 0)
++ return -1;
++ if (!eth_getenv_enetaddr("ethaddr", env_enetaddr)) {
++ dev = eth_get_dev_by_index(0);
++ if (dev) {
++ eth_setenv_enetaddr("ethaddr", dev->enetaddr);
++ } else {
++ printf("DM9000 APF9328: Couldn't get eth device\n");
++ return -1;
++ }
++ }
++
++ return 0;
+}
+#endif
-diff --git a/board/armadeus/apf9328/apf9328fpga.c b/board/armadeus/apf9328/apf9328fpga.c
-new file mode 100644
-index 0000000..d64c0d4
+Index: u-boot-custom/board/armadeus/apf9328/apf9328fpga.c
+===================================================================
--- /dev/null
-+++ b/board/armadeus/apf9328/apf9328fpga.c
++++ u-boot-custom/board/armadeus/apf9328/apf9328fpga.c
@@ -0,0 +1,89 @@
+/*
+ * (C) Copyright 2005-2011
@@ -275,11 +287,10 @@ index 0000000..d64c0d4
+}
+
+#endif /* CONFIG_FPGA */
-diff --git a/board/armadeus/apf9328/apf9328fpga.h b/board/armadeus/apf9328/apf9328fpga.h
-new file mode 100644
-index 0000000..2a15443
+Index: u-boot-custom/board/armadeus/apf9328/apf9328fpga.h
+===================================================================
--- /dev/null
-+++ b/board/armadeus/apf9328/apf9328fpga.h
++++ u-boot-custom/board/armadeus/apf9328/apf9328fpga.h
@@ -0,0 +1,31 @@
+/*
+ * (C) Copyright 2002
@@ -312,11 +323,10 @@ index 0000000..2a15443
+
+#include "fpga.h"
+extern int apf9328_init_fpga(void);
-diff --git a/board/armadeus/apf9328/eeprom.c b/board/armadeus/apf9328/eeprom.c
-new file mode 100644
-index 0000000..8f2ad9a
+Index: u-boot-custom/board/armadeus/apf9328/eeprom.c
+===================================================================
--- /dev/null
-+++ b/board/armadeus/apf9328/eeprom.c
++++ u-boot-custom/board/armadeus/apf9328/eeprom.c
@@ -0,0 +1,88 @@
+/*
+ * (C) Copyright 2008-2011 Armadeus Project
@@ -406,11 +416,10 @@ index 0000000..8f2ad9a
+ "\tdm9000ee read \n"
+ "\tword:\t\t00-02 : MAC Address\n"
+ "\t\t\t03-07 : DM9000 Configuration\n" "\t\t\t08-63 : User data");
-diff --git a/board/armadeus/apf9328/fpga.c b/board/armadeus/apf9328/fpga.c
-new file mode 100644
-index 0000000..ec4c251
+Index: u-boot-custom/board/armadeus/apf9328/fpga.c
+===================================================================
--- /dev/null
-+++ b/board/armadeus/apf9328/fpga.c
++++ u-boot-custom/board/armadeus/apf9328/fpga.c
@@ -0,0 +1,121 @@
+/*
+ * (C) Copyright 2002
@@ -533,11 +542,10 @@ index 0000000..ec4c251
+}
+
+#endif /* CONFIG_FPGA */
-diff --git a/board/armadeus/apf9328/fpga.h b/board/armadeus/apf9328/fpga.h
-new file mode 100644
-index 0000000..3b226d7
+Index: u-boot-custom/board/armadeus/apf9328/fpga.h
+===================================================================
--- /dev/null
-+++ b/board/armadeus/apf9328/fpga.h
++++ u-boot-custom/board/armadeus/apf9328/fpga.h
@@ -0,0 +1,30 @@
+/*
+ * (C) Copyright 2002
@@ -569,11 +577,10 @@ index 0000000..3b226d7
+extern int fpga_done_fn(int cookie);
+extern int fpga_clk_fn(int assert_clk, int flush, int cookie);
+extern int fpga_wr_fn(int assert_write, int flush, int cookie);
-diff --git a/board/armadeus/apf9328/i2c.c b/board/armadeus/apf9328/i2c.c
-new file mode 100644
-index 0000000..0ba0a8d
+Index: u-boot-custom/board/armadeus/apf9328/i2c.c
+===================================================================
--- /dev/null
-+++ b/board/armadeus/apf9328/i2c.c
++++ u-boot-custom/board/armadeus/apf9328/i2c.c
@@ -0,0 +1,276 @@
+/*
+ * (C) Copyright 2005-2011 ej Armadeus Project <eri...@ar...>
@@ -851,11 +858,10 @@ index 0000000..0ba0a8d
+}
+
+#endif /* CONFIG_HARD_I2C */
-diff --git a/board/armadeus/apf9328/lowlevel_init.S b/board/armadeus/apf9328/lowlevel_init.S
-new file mode 100644
-index 0000000..e4c6157
+Index: u-boot-custom/board/armadeus/apf9328/lowlevel_init.S
+===================================================================
--- /dev/null
-+++ b/board/armadeus/apf9328/lowlevel_init.S
++++ u-boot-custom/board/armadeus/apf9328/lowlevel_init.S
@@ -0,0 +1,469 @@
+/*
+ * (C) Copyright 2005-2011 ej Armadeus Project <eri...@ar...>
diff --git a/patches/u-boot/2011.12/11-avoid_warning_when_ethaddr_not_defined.patch b/patches/u-boot/2011.12/11-avoid_warning_when_ethaddr_not_defined.patch
deleted file mode 100644
index 6d95acc..0000000
--- a/patches/u-boot/2011.12/11-avoid_warning_when_ethaddr_not_defined.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/net/eth.c 2012-03-02 17:05:27.000000000 +0100
-+++ b/net/eth.c 2012-03-02 17:05:50.000000000 +0100
-@@ -190,8 +190,7 @@
- unsigned char env_enetaddr[6];
- int ret = 0;
-
-- if (!eth_getenv_enetaddr_by_index(base_name, eth_number, env_enetaddr))
-- return -1;
-+ (void)eth_getenv_enetaddr_by_index(base_name, eth_number, env_enetaddr);
-
- if (memcmp(env_enetaddr, "\0\0\0\0\0\0", 6)) {
- if (memcmp(dev->enetaddr, "\0\0\0\0\0\0", 6) &&
hooks/post-receive
--
armadeus
|
