[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-310-g4bad4aa

[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  4bad4aa07b100eddef973d8e3ba2c0168d1bbf0f (commit)
      from  d2ed37ed5125e32f4e0241ee0a27cb7442e18a6c (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 4bad4aa07b100eddef973d8e3ba2c0168d1bbf0f
Author: Eric Jarrige <eri...@ar...>
Date:   Sun May 20 23:41:45 2012 +0200

    [UBOOT] apf9328: Refactor FPGA autoload feature

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

Summary of changes:
 patches/u-boot/2011.12/103-apf9328.patch |   26 +++++++++++++++++---------
 1 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/patches/u-boot/2011.12/103-apf9328.patch b/patches/u-boot/2011.12/103-apf9328.patch
index 37cd173..c5ca405 100644
--- a/patches/u-boot/2011.12/103-apf9328.patch
+++ b/patches/u-boot/2011.12/103-apf9328.patch
@@ -197,7 +197,7 @@ Index: u-boot-custom/board/armadeus/apf9328/apf9328fpga.c
 ===================================================================
 --- /dev/null
 +++ u-boot-custom/board/armadeus/apf9328/apf9328fpga.c
-@@ -0,0 +1,93 @@
+@@ -0,0 +1,101 @@
 +/*
 + * (C) Copyright 2005-2011
 + * Nicolas Colombin <th...@us...>
@@ -230,6 +230,7 @@ Index: u-boot-custom/board/armadeus/apf9328/apf9328fpga.c
 +#include <common.h>
 +#include <spartan3.h>
 +#include <command.h>
++#include <jffs2/jffs2.h>
 +#include <asm/arch/imx-regs.h>
 +#include <asm/io.h>
 +#include "apf9328fpga.h"
@@ -265,6 +266,9 @@ Index: u-boot-custom/board/armadeus/apf9328/apf9328fpga.c
 +{
 +	char *autoload = getenv("firmware_autoload");
 +	int i, lout = 1;
++	u8 pnum;
++	struct mtd_device *dev;
++	struct part_info *part;
 +
 +	debug("%s:%d: Initialize FPGA interface (relocation offset= 0x%.8lx)\n",
 +		__func__, __LINE__, gd->reloc_off);
@@ -277,14 +281,18 @@ Index: u-boot-custom/board/armadeus/apf9328/apf9328fpga.c
 +	}
 +
 +	if ((autoload) && (0 == strcmp(autoload, "1"))) {
-+		if (ctrlc()) {
-+			printf("Firmware download stopped!\n"); 
-+			lout = 0;
-+		} else if (FPGA_SUCCESS != fpga_load(0,
-+						(void *)CONFIG_FIRMWARE_ADDR,
-+						(size_t) CONFIG_FIRMWARE_LEN)) {
-+			lout = 0;
-+			printf("Firmware not loaded!\n");
++		if (mtdparts_init() == 0)
++		if (find_dev_and_part("firmware", &dev, &pnum, &part) == 0)
++		{
++			if (ctrlc()) {
++				printf("Firmware download stopped!\n");
++				lout = 0;
++			} else if (FPGA_SUCCESS != fpga_load(0,
++							(void *)part->offset,
++							(size_t)part->size)) {
++				lout = 0;
++				printf("Firmware not loaded!\n");
++			}
 +		}
 +	}
 +	return lout;


hooks/post-receive
-- 
armadeus