[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-94-g7ec3a7b
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-94-g7ec3a7b
|
From: Gwenhael Goavec-M. <gwe...@us...> - 2012-03-04 11:28:08
|
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 7ec3a7bd9d43dc8df3cb382169d695169bbea432 (commit)
via 5a04e1774569b507650b002c26b84e3b57b180a9 (commit)
via 606376d9186bb7a0959858bdff833a2442b8bc0c (commit)
via a459a2d878219d871bb95a45bed0be31175b74de (commit)
via 398ef05b0adc5d89686028f717fd2b85519b6d25 (commit)
from 578988ad79410671b45f24985498f58b8a868c99 (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 7ec3a7bd9d43dc8df3cb382169d695169bbea432
Merge: 5a04e17 578988a
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date: Sun Mar 4 12:25:41 2012 +0100
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 5a04e1774569b507650b002c26b84e3b57b180a9
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date: Sun Mar 4 12:25:01 2012 +0100
[UBOOT] net/eth.c: Avoid Warning when ethxaddr is not set
commit 606376d9186bb7a0959858bdff833a2442b8bc0c
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date: Sun Mar 4 12:24:26 2012 +0100
[UBOOT] mach-types: Re-add apf9328
commit a459a2d878219d871bb95a45bed0be31175b74de
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date: Sun Mar 4 12:23:05 2012 +0100
[UBOOT] apf9328: U-Boot 2011.12 default configuration
commit 398ef05b0adc5d89686028f717fd2b85519b6d25
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date: Sun Mar 4 12:22:01 2012 +0100
[UBOOT] apf9328: import patches from U-Boot 2011.06
-----------------------------------------------------------------------
Summary of changes:
...8-u-boot-2011.06.h => apf9328-u-boot-2011.12.h} | 0
.../{2011.06 => 2011.12}/01-mx1-gpio-mode.patch | 0
.../u-boot/{2011.06 => 2011.12}/02-mx1-i2c.patch | 0
.../u-boot/{2011.06 => 2011.12}/03-apf9328.patch | 0
.../{2011.06 => 2011.12}/04-apf9328-makefile.patch | 12 ------------
.../{2011.06 => 2011.12}/05-apf9328-config.patch | 0
.../{2011.06 => 2011.12}/06-mx1-pllclk.patch | 0
.../{2011.06 => 2011.12}/07-mx1-pllclk-debug.patch | 0
.../u-boot/{2011.06 => 2011.12}/08-DM9000.patch | 0
.../{2011.06 => 2011.12}/09-mx1-relocation.patch | 0
.../u-boot/2011.12/10-apf9328_add-mach-types.patch | 10 ++++++++++
...11-avoid_warning_when_ethaddr_not_defined.patch | 12 ++++++++++++
12 files changed, 22 insertions(+), 12 deletions(-)
copy buildroot/target/device/armadeus/apf9328/{apf9328-u-boot-2011.06.h => apf9328-u-boot-2011.12.h} (100%)
copy patches/u-boot/{2011.06 => 2011.12}/01-mx1-gpio-mode.patch (100%)
copy patches/u-boot/{2011.06 => 2011.12}/02-mx1-i2c.patch (100%)
copy patches/u-boot/{2011.06 => 2011.12}/03-apf9328.patch (100%)
copy patches/u-boot/{2011.06 => 2011.12}/04-apf9328-makefile.patch (87%)
copy patches/u-boot/{2011.06 => 2011.12}/05-apf9328-config.patch (100%)
copy patches/u-boot/{2011.06 => 2011.12}/06-mx1-pllclk.patch (100%)
copy patches/u-boot/{2011.06 => 2011.12}/07-mx1-pllclk-debug.patch (100%)
copy patches/u-boot/{2011.06 => 2011.12}/08-DM9000.patch (100%)
copy patches/u-boot/{2011.06 => 2011.12}/09-mx1-relocation.patch (100%)
create mode 100644 patches/u-boot/2011.12/10-apf9328_add-mach-types.patch
create mode 100644 patches/u-boot/2011.12/11-avoid_warning_when_ethaddr_not_defined.patch
diff --git a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2011.06.h b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2011.12.h
similarity index 100%
copy from buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2011.06.h
copy to buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2011.12.h
diff --git a/patches/u-boot/2011.06/01-mx1-gpio-mode.patch b/patches/u-boot/2011.12/01-mx1-gpio-mode.patch
similarity index 100%
copy from patches/u-boot/2011.06/01-mx1-gpio-mode.patch
copy to patches/u-boot/2011.12/01-mx1-gpio-mode.patch
diff --git a/patches/u-boot/2011.06/02-mx1-i2c.patch b/patches/u-boot/2011.12/02-mx1-i2c.patch
similarity index 100%
copy from patches/u-boot/2011.06/02-mx1-i2c.patch
copy to patches/u-boot/2011.12/02-mx1-i2c.patch
diff --git a/patches/u-boot/2011.06/03-apf9328.patch b/patches/u-boot/2011.12/03-apf9328.patch
similarity index 100%
copy from patches/u-boot/2011.06/03-apf9328.patch
copy to patches/u-boot/2011.12/03-apf9328.patch
diff --git a/patches/u-boot/2011.06/04-apf9328-makefile.patch b/patches/u-boot/2011.12/04-apf9328-makefile.patch
similarity index 87%
copy from patches/u-boot/2011.06/04-apf9328-makefile.patch
copy to patches/u-boot/2011.12/04-apf9328-makefile.patch
index 17f32c3..a114f27 100644
--- a/patches/u-boot/2011.06/04-apf9328-makefile.patch
+++ b/patches/u-boot/2011.12/04-apf9328-makefile.patch
@@ -24,18 +24,6 @@ index f895e9a..48807fe 100644
Gary Jennejohn <ga...@de...>
smdk2400 ARM920T
-diff --git a/MAKEALL b/MAKEALL
-index 3b98f03..f1aa6fc 100755
---- a/MAKEALL
-+++ b/MAKEALL
-@@ -320,6 +320,7 @@ LIST_ARM7=" \
-
- LIST_ARM9=" \
- a320evb \
-+ apf9328 \
- ap920t \
- ap922_XA10 \
- ap926ejs \
diff --git a/boards.cfg b/boards.cfg
index 6827cf3..1b4da54 100644
--- a/boards.cfg
diff --git a/patches/u-boot/2011.06/05-apf9328-config.patch b/patches/u-boot/2011.12/05-apf9328-config.patch
similarity index 100%
copy from patches/u-boot/2011.06/05-apf9328-config.patch
copy to patches/u-boot/2011.12/05-apf9328-config.patch
diff --git a/patches/u-boot/2011.06/06-mx1-pllclk.patch b/patches/u-boot/2011.12/06-mx1-pllclk.patch
similarity index 100%
copy from patches/u-boot/2011.06/06-mx1-pllclk.patch
copy to patches/u-boot/2011.12/06-mx1-pllclk.patch
diff --git a/patches/u-boot/2011.06/07-mx1-pllclk-debug.patch b/patches/u-boot/2011.12/07-mx1-pllclk-debug.patch
similarity index 100%
copy from patches/u-boot/2011.06/07-mx1-pllclk-debug.patch
copy to patches/u-boot/2011.12/07-mx1-pllclk-debug.patch
diff --git a/patches/u-boot/2011.06/08-DM9000.patch b/patches/u-boot/2011.12/08-DM9000.patch
similarity index 100%
copy from patches/u-boot/2011.06/08-DM9000.patch
copy to patches/u-boot/2011.12/08-DM9000.patch
diff --git a/patches/u-boot/2011.06/09-mx1-relocation.patch b/patches/u-boot/2011.12/09-mx1-relocation.patch
similarity index 100%
copy from patches/u-boot/2011.06/09-mx1-relocation.patch
copy to patches/u-boot/2011.12/09-mx1-relocation.patch
diff --git a/patches/u-boot/2011.12/10-apf9328_add-mach-types.patch b/patches/u-boot/2011.12/10-apf9328_add-mach-types.patch
new file mode 100644
index 0000000..486b9c3
--- /dev/null
+++ b/patches/u-boot/2011.12/10-apf9328_add-mach-types.patch
@@ -0,0 +1,10 @@
+--- a/arch/arm/include/asm/mach-types.h 2012-02-29 19:04:28.000000000 +0100
++++ b/arch/arm/include/asm/mach-types.h 2012-02-29 19:04:57.000000000 +0100
+@@ -179,6 +179,7 @@
+ #define MACH_TYPE_DAVINCI_EVM 901
+ #define MACH_TYPE_PALMZ72 904
+ #define MACH_TYPE_NXDB500 905
++#define MACH_TYPE_APF9328 906
+ #define MACH_TYPE_PALMT5 917
+ #define MACH_TYPE_PALMTC 918
+ #define MACH_TYPE_OMAP_APOLLON 919
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
new file mode 100644
index 0000000..6d95acc
--- /dev/null
+++ b/patches/u-boot/2011.12/11-avoid_warning_when_ethaddr_not_defined.patch
@@ -0,0 +1,12 @@
+--- 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
|
