[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-206-g47076bb

[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  47076bb5bc196fcd6bad8a6daaa1c19a9f684992 (commit)
       via  14b20434fa6121d7ae89279534ea033b71473073 (commit)
      from  1b903f63a6065d9139b0f63992f56a568b531eca (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 47076bb5bc196fcd6bad8a6daaa1c19a9f684992
Merge: 14b20434fa6121d7ae89279534ea033b71473073 1b903f63a6065d9139b0f63992f56a568b531eca
Author: jorasse <jo...@ar...>
Date:   Tue Jun 21 00:10:26 2011 +0200

    Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus

commit 14b20434fa6121d7ae89279534ea033b71473073
Author: jorasse <jo...@ar...>
Date:   Tue Jun 21 00:09:17 2011 +0200

    [LINUX][apf51] Add FPGA firmware autoload feature

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

Summary of changes:
 .../target/u-boot/u-boot-2010.03-401-apf51.patch   |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

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 1f31e65..90ff7b4 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
@@ -2,7 +2,7 @@ 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,1157 @@
+@@ -0,0 +1,1158 @@
 +/*
 + * (C) Copyright 2010 Eric Jarrige, Armadeus Project
 + *
@@ -38,6 +38,7 @@ Index: u-boot-2010.03/board/armadeus/apf51/apf51.c
 +//#include <asm/arch/gpio.h>
 +#include <asm/arch/mxc_nand.h>
 +#include "fpga.h"
++#include <nand.h>
 +
 +
 +DECLARE_GLOBAL_DATA_PTR;
@@ -45,7 +46,7 @@ Index: u-boot-2010.03/board/armadeus/apf51/apf51.c
 +static u32 system_rev;
 +unsigned long boot_verb = 0;
 +
-+/*
++
 +static int read_firmware (size_t offset, size_t end, u_char * buf)
 +{
 +	size_t amount_loaded = 0;
@@ -69,7 +70,7 @@ Index: u-boot-2010.03/board/armadeus/apf51/apf51.c
 +
 +	return amount_loaded;
 +}
-+*/
++
 +
 +u32 get_board_rev(void)
 +{
@@ -950,7 +951,7 @@ Index: u-boot-2010.03/board/armadeus/apf51/apf51.c
 +
 +#if defined(CONFIG_FPGA)
 +	/* init and download fpga */
-+/*	if (( autoload ) && (0 == strcmp(autoload, "1"))) {
++	if (( autoload ) && (0 == strcmp(autoload, "1"))) {
 +		if ((s = getenv("firmware_offset")) != NULL) {
 +			offset = simple_strtoul(s, NULL, 16);
 +		}
@@ -960,7 +961,7 @@ Index: u-boot-2010.03/board/armadeus/apf51/apf51.c
 +		if ((-1 != offset) && (offset != end)) {
 +		    size = read_firmware (offset, end, firmware_buffer);
 +		}
-+	}*/
++	}
 +	APF51_init_fpga (firmware_buffer, size);
 +#endif
 +


hooks/post-receive
-- 
armadeus