[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-210-ge3fc82e
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-210-ge3fc82e
|
From: Julien B a. A. <ar...@us...> - 2011-06-21 15:38:51
|
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 e3fc82e13d6c3ab929efeca4dc7fab3225d4ab49 (commit)
via 7da38f96544e6bafb6e857e1776f738eec34356c (commit)
via ba920613599b1f6d907424e7744d32315f4bad3b (commit)
from 8a9969f7dc366db81eca90334e52663f986d0135 (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 e3fc82e13d6c3ab929efeca4dc7fab3225d4ab49
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jun 21 17:37:55 2011 +0200
[U-BOOT] APF51: cleanup FPGA download
commit 7da38f96544e6bafb6e857e1776f738eec34356c
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jun 21 15:41:46 2011 +0200
Rename patches/buildroot/2010.11/151-...
commit ba920613599b1f6d907424e7744d32315f4bad3b
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jun 21 15:40:20 2011 +0200
typo
-----------------------------------------------------------------------
Summary of changes:
.../target/u-boot/u-boot-2010.03-401-apf51.patch | 47 ++++++++++----------
...ckage_selection_even_if_marked_as_broken.patch} | 2 +-
2 files changed, 24 insertions(+), 25 deletions(-)
rename patches/buildroot/2010.11/{151-java-enable-related-broken-packages.patch => 151-java-allow_package_selection_even_if_marked_as_broken.patch} (89%)
diff --git a/buildroot/target/u-boot/u-boot-2010.03-401-apf51.patch b/buildroot/target/u-boot/u-boot-2010.03-401-apf51.patch
index 90ff7b4..169458e 100644
--- a/buildroot/target/u-boot/u-boot-2010.03-401-apf51.patch
+++ b/buildroot/target/u-boot/u-boot-2010.03-401-apf51.patch
@@ -1,8 +1,8 @@
Index: u-boot-2010.03/board/armadeus/apf51/apf51.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot-2010.03/board/armadeus/apf51/apf51.c 2011-05-27 11:22:10.000000000 +0200
-@@ -0,0 +1,1158 @@
++++ u-boot-2010.03/board/armadeus/apf51/apf51.c 2011-06-21 16:59:15.000000000 +0200
+@@ -0,0 +1,1157 @@
+/*
+ * (C) Copyright 2010 Eric Jarrige, Armadeus Project
+ *
@@ -959,7 +959,7 @@ Index: u-boot-2010.03/board/armadeus/apf51/apf51.c
+ end = offset + simple_strtoul(s, NULL, 16);
+ }
+ if ((-1 != offset) && (offset != end)) {
-+ size = read_firmware (offset, end, firmware_buffer);
++ size = read_firmware (offset, end, firmware_buffer);
+ }
+ }
+ APF51_init_fpga (firmware_buffer, size);
@@ -978,7 +978,6 @@ Index: u-boot-2010.03/board/armadeus/apf51/apf51.c
+#ifdef BOARD_LATE_INIT
+int board_late_init(void)
+{
-+
+ return 0;
+}
+#endif
@@ -1164,14 +1163,14 @@ Index: u-boot-2010.03/board/armadeus/apf51/apf51.c
Index: u-boot-2010.03/board/armadeus/apf51/config.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot-2010.03/board/armadeus/apf51/config.mk 2011-05-26 17:46:17.000000000 +0200
++++ u-boot-2010.03/board/armadeus/apf51/config.mk 2011-06-21 16:03:13.000000000 +0200
@@ -0,0 +1,2 @@
+LDSCRIPT := $(SRCTREE)/board/$(BOARDDIR)/u-boot.lds
+TEXT_BASE = 0x9FF00000
Index: u-boot-2010.03/board/armadeus/apf51/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot-2010.03/board/armadeus/apf51/Makefile 2011-05-26 17:46:17.000000000 +0200
++++ u-boot-2010.03/board/armadeus/apf51/Makefile 2011-06-21 16:03:13.000000000 +0200
@@ -0,0 +1,50 @@
+#
+# Copyright (C) 2007, Guennadi Liakhovetski <lg...@de...>
@@ -1226,7 +1225,7 @@ Index: u-boot-2010.03/board/armadeus/apf51/Makefile
Index: u-boot-2010.03/board/armadeus/apf51/u-boot.lds
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot-2010.03/board/armadeus/apf51/u-boot.lds 2011-05-26 17:46:17.000000000 +0200
++++ u-boot-2010.03/board/armadeus/apf51/u-boot.lds 2011-06-21 16:03:13.000000000 +0200
@@ -0,0 +1,64 @@
+/*
+ * January 2004 - Changed to support H4 device
@@ -1295,7 +1294,7 @@ Index: u-boot-2010.03/board/armadeus/apf51/u-boot.lds
Index: u-boot-2010.03/include/asm-arm/mach-types.h
===================================================================
--- u-boot-2010.03.orig/include/asm-arm/mach-types.h 2010-03-31 23:54:39.000000000 +0200
-+++ u-boot-2010.03/include/asm-arm/mach-types.h 2011-05-26 17:46:17.000000000 +0200
++++ u-boot-2010.03/include/asm-arm/mach-types.h 2011-06-21 16:03:13.000000000 +0200
@@ -2699,6 +2699,7 @@
#define MACH_TYPE_MX53_EVK 2716
#define MACH_TYPE_IGEP0030 2717
@@ -1325,8 +1324,8 @@ Index: u-boot-2010.03/include/asm-arm/mach-types.h
*/
Index: u-boot-2010.03/MAKEALL
===================================================================
---- u-boot-2010.03.orig/MAKEALL 2011-05-26 17:46:17.000000000 +0200
-+++ u-boot-2010.03/MAKEALL 2011-05-26 17:46:17.000000000 +0200
+--- u-boot-2010.03.orig/MAKEALL 2011-06-21 16:03:13.000000000 +0200
++++ u-boot-2010.03/MAKEALL 2011-06-21 16:03:13.000000000 +0200
@@ -549,6 +549,7 @@
ap946es \
ap966 \
@@ -1337,8 +1336,8 @@ Index: u-boot-2010.03/MAKEALL
cp926ejs \
Index: u-boot-2010.03/Makefile
===================================================================
---- u-boot-2010.03.orig/Makefile 2011-05-26 17:46:17.000000000 +0200
-+++ u-boot-2010.03/Makefile 2011-05-26 17:46:17.000000000 +0200
+--- u-boot-2010.03.orig/Makefile 2011-06-21 16:03:13.000000000 +0200
++++ u-boot-2010.03/Makefile 2011-06-21 16:03:13.000000000 +0200
@@ -2735,6 +2735,9 @@
apf27_config : unconfig
@$(MKCONFIG) $(@:_config=) arm arm926ejs apf27 armadeus mx27
@@ -1352,7 +1351,7 @@ Index: u-boot-2010.03/Makefile
Index: u-boot-2010.03/board/armadeus/apf51/fpga.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot-2010.03/board/armadeus/apf51/fpga.h 2011-05-26 17:46:17.000000000 +0200
++++ u-boot-2010.03/board/armadeus/apf51/fpga.h 2011-06-21 17:00:43.000000000 +0200
@@ -0,0 +1,39 @@
+/*
+ * (C) Copyright 2002-2010
@@ -1396,7 +1395,7 @@ Index: u-boot-2010.03/board/armadeus/apf51/fpga.h
Index: u-boot-2010.03/board/armadeus/apf51/fpga.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot-2010.03/board/armadeus/apf51/fpga.c 2011-05-26 17:46:17.000000000 +0200
++++ u-boot-2010.03/board/armadeus/apf51/fpga.c 2011-06-21 17:10:59.000000000 +0200
@@ -0,0 +1,271 @@
+/*
+ * (C) Copyright 2002-2010
@@ -1515,7 +1514,7 @@ Index: u-boot-2010.03/board/armadeus/apf51/fpga.c
+ imx_gpio_pin_set(CONFIG_SYS_FPGA_PWR, 1);
+ imx_gpio_pin_cfg_dir(CONFIG_SYS_FPGA_PWR, 1);
+
-+ printf("Enable fpga power\n");
++ PRINTF("FPGA power enabled\n");
+
+ return cookie;
+}
@@ -1528,7 +1527,7 @@ Index: u-boot-2010.03/board/armadeus/apf51/fpga.c
+{
+ PRINTF ("%s:%d: FPGA PROGRAM %s\n", __FUNCTION__, __LINE__,
+ assert?"high":"low");
-+ imx_gpio_pin_set( CONFIG_SYS_FPGA_PRG, !assert);
++ imx_gpio_pin_set(CONFIG_SYS_FPGA_PRG, !assert);
+ return assert;
+}
+
@@ -1602,7 +1601,7 @@ Index: u-boot-2010.03/board/armadeus/apf51/fpga.c
+ static u32 temp;
+ static u32 index = 0;
+
-+ switch( index++ ){
++ switch (index++) {
+ case 0: temp = data << 8; break;
+ case 1: temp = temp + data; break;
+ case 2: temp = temp + (data << 24); break;
@@ -1646,9 +1645,7 @@ Index: u-boot-2010.03/board/armadeus/apf51/fpga.c
+int
+APF51_init_fpga (u_char * buffer, size_t size)
+{
-+ char *autoload = getenv ("firmware_autoload");
-+
-+ int i,lout=0;
++ int i, lout = 0;
+
+ fpga_init();
+
@@ -1657,14 +1654,16 @@ Index: u-boot-2010.03/board/armadeus/apf51/fpga.c
+ fpga_add (fpga_xilinx, &fpga[i]);
+ }
+
-+ if ((size >= fpga[0].size) && ( autoload ) && (0 == strcmp(autoload, "1"))) {
++ if ((size >= fpga[0].size)) {
++ printf("Loading FPGA...");
+ if (FPGA_SUCCESS != fpga_load( 0, (void *)buffer, size )) {
+ lout = 1;
-+ printf("Firmware download failed!\n");
++ printf("firmware download failed!\n");
++ } else {
++ printf("firmware successfully programmed\n");
+ }
-+ else
-+ printf("Firmware successfully programmed\n");
+ }
++
+ return lout;
+}
+
diff --git a/patches/buildroot/2010.11/151-java-enable-related-broken-packages.patch b/patches/buildroot/2010.11/151-java-allow_package_selection_even_if_marked_as_broken.patch
similarity index 89%
rename from patches/buildroot/2010.11/151-java-enable-related-broken-packages.patch
rename to patches/buildroot/2010.11/151-java-allow_package_selection_even_if_marked_as_broken.patch
index f3d6e2e..6c2c33b 100644
--- a/patches/buildroot/2010.11/151-java-enable-related-broken-packages.patch
+++ b/patches/buildroot/2010.11/151-java-allow_package_selection_even_if_marked_as_broken.patch
@@ -1,4 +1,4 @@
-Enable Java stuffs (not anymore supported in BUILDROOT since 2010.10)
+Enable Java stuffs (no more supported in BUILDROOT since 2010.10)
Signed-off-by :Â Eric Jarrige <eri...@ar...>
---
hooks/post-receive
--
armadeus
|
