[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-277-g35902a2

[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  35902a27e059d1edd7372115b4aa261b30875d35 (commit)
      from  8e9e4003e53446f39a9a87770bb4e1afe73dab88 (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 35902a27e059d1edd7372115b4aa261b30875d35
Author: Eric Jarrige <eri...@ar...>
Date:   Fri Apr 20 00:16:26 2012 +0200

    [BUILDROOT] fix uboot-tools to support all the APF boards

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

Summary of changes:
 ...nore-env_sectors-on-NOR-and-SPI-dataflash.patch |   46 ++++++++++++++++++++
 patches/buildroot/2012.02/cleanup_buildroot.sh     |    6 ++-
 2 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 patches/buildroot/2012.02/186-uboot-tools-2011.03-Ignore-env_sectors-on-NOR-and-SPI-dataflash.patch

diff --git a/patches/buildroot/2012.02/186-uboot-tools-2011.03-Ignore-env_sectors-on-NOR-and-SPI-dataflash.patch b/patches/buildroot/2012.02/186-uboot-tools-2011.03-Ignore-env_sectors-on-NOR-and-SPI-dataflash.patch
new file mode 100644
index 0000000..02b47b9
--- /dev/null
+++ b/patches/buildroot/2012.02/186-uboot-tools-2011.03-Ignore-env_sectors-on-NOR-and-SPI-dataflash.patch
@@ -0,0 +1,46 @@
+[uboot-tools] Ignore env_sectors on NOR and SPI-dataflash 
+
+fw_env doc declare that 'the "Number of sectors" is ignored on NOR and 
+SPI-dataflash' but it is wrong and would be usefull to use the same
+configuration file for different boards. This patch aims to fix this issue for
+all the Armadeus boards.
+
+Signed-off-by: Eric Jarrige <eri...@ar...>
+---
+Index: buildroot/package/uboot-tools/uboot-tools-2011.03-Ignore-env_sectors-on-NOR-and-SPI-dataflash.patch
+===================================================================
+--- buildroot/package/uboot-tools/uboot-tools-2011.03-Ignore-env_sectors-on-NOR-and-SPI-dataflash.patch
++++ buildroot/package/uboot-tools/uboot-tools-2011.03-Ignore-env_sectors-on-NOR-and-SPI-dataflash.patch
+@@ -0,0 +1,32 @@
++[PATCH] Ignore env_sectors on NOR and SPI-dataflash
++
++fw_env doc declare that 'the "Number of sectors" is ignored on NOR and 
++SPI-dataflash' but it is wrong and would be usefull to use the same
++configuration file for different boards. This patch aims to fix this issue for
++all the Armadeus boards.
++
++Signed-off-by: Eric Jarrige <eri...@ar...>
++---
++Index: u-boot-2011.03/tools/env/fw_env.c
++===================================================================
++--- uboot-tools-2011.03/tools/env/fw_env.c
+++++ uboot-tools-2011.03/tools/env/fw_env.c
++@@ -777,9 +777,15 @@ static int flash_write_buf (int dev, int
++ 
++ 	blocklen = DEVESIZE (dev);
++ 
++-	/* Erase sector size is always a power of 2 */
++-	top_of_range = (DEVOFFSET (dev) & ~(blocklen - 1)) +
++-		ENVSECTORS (dev) * blocklen;
+++	/* Ignored env_sectors on NOR and SPI-dataflash */
+++	if (mtd_type == MTD_NANDFLASH) {
+++		/* Erase sector size is always a power of 2 */
+++		top_of_range = (DEVOFFSET (dev) & ~(blocklen - 1)) +
+++			ENVSECTORS (dev) * blocklen;
+++	} else {
+++		top_of_range = (DEVOFFSET (dev) & ~(blocklen - 1)) +
+++			blocklen;
+++	}
++ 
++ 	erase_offset = offset & ~(blocklen - 1);
++ 
diff --git a/patches/buildroot/2012.02/cleanup_buildroot.sh b/patches/buildroot/2012.02/cleanup_buildroot.sh
index c988b60..da47017 100755
--- a/patches/buildroot/2012.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2012.02/cleanup_buildroot.sh
@@ -69,5 +69,7 @@ rm -rf buildroot/package/imx-lib/
 rm -rf buildroot/package/imx-test/
 rm -rf buildroot/package/e2fsprogs/
 rm -rf buildroot/package/firmware-imx/
-rm -rf  buildroot/package/multimedia/gst-fsl-plugin/
-rm -rf  buildroot/package/multimedia/fsl-mm-codeclib/
+rm -rf buildroot/package/multimedia/gst-fsl-plugin/
+rm -rf buildroot/package/multimedia/fsl-mm-codeclib/
+rm -rf buildroot/package/uboot-tools/
+


hooks/post-receive
-- 
armadeus