[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-11-g90b1147
Brought to you by:
sszy
|
From: Julien B a. A. <ar...@us...> - 2014-01-09 10:13:27
|
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 90b1147c16e9ef1b8c63be7fa6113888155b1841 (commit)
from 33f3bc323d9dabd32542539e3799035b2f62f812 (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 90b1147c16e9ef1b8c63be7fa6113888155b1841
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jan 9 11:11:42 2014 +0100
[BUILDROOT] Add support for BR 2013.11 (step 2: apf27 build fix)
-----------------------------------------------------------------------
Summary of changes:
...busybox-1.21.0.config => busybox-1.21.1.config} | 0
.../buildroot/2013.11/097-adds_flite_package.patch | 12 +++---
...for_pld_asm_instruction_on_non_armv5_arch.patch | 4 +-
...nore-env_sectors-on-NOR-and-SPI-dataflash.patch | 44 ++++++++++++++++++--
patches/buildroot/2013.11/cleanup_buildroot.sh | 1 +
5 files changed, 49 insertions(+), 12 deletions(-)
copy buildroot/target/device/armadeus/{busybox-1.21.0.config => busybox-1.21.1.config} (100%)
diff --git a/buildroot/target/device/armadeus/busybox-1.21.0.config b/buildroot/target/device/armadeus/busybox-1.21.1.config
similarity index 100%
copy from buildroot/target/device/armadeus/busybox-1.21.0.config
copy to buildroot/target/device/armadeus/busybox-1.21.1.config
diff --git a/patches/buildroot/2013.11/097-adds_flite_package.patch b/patches/buildroot/2013.11/097-adds_flite_package.patch
index f9d9e3e..a90dc58 100644
--- a/patches/buildroot/2013.11/097-adds_flite_package.patch
+++ b/patches/buildroot/2013.11/097-adds_flite_package.patch
@@ -4,18 +4,18 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Cc: Eric Jarrige <eri...@ar...>
Signed-off-by: Samuel Martin <s.m...@gm...>
---
- package/multimedia/Config.in | 1 +
- package/multimedia/flite/Config.in | 11 ++++++++
- package/multimedia/flite/flite.mk | 57 ++++++++++++++++++++++++++++++++++++++
+ package/Config.in | 1 +
+ package/flite/Config.in | 11 ++++++++
+ package/flite/flite.mk | 57 ++++++++++++++++++++++++++++++++++++++
3 files changed, 69 insertions(+)
- create mode 100644 package/multimedia/flite/Config.in
- create mode 100644 package/multimedia/flite/flite.mk
+ create mode 100644 package/flite/Config.in
+ create mode 100644 package/flite/flite.mk
diff --git a/package/Config.in b/package/Config.in
index 273d9bc..3ca0531 100644
--- a/package/Config.in
+++ b/package/Config.in
-@@ -4,6 +4,7 @@ source "package/multimedia/aumix/Config.in"
+@@ -4,6 +4,7 @@
source "package/faad2/Config.in"
source "package/ffmpeg/Config.in"
source "package/flac/Config.in"
diff --git a/patches/buildroot/2013.11/099-mplayer-add_patch_for_pld_asm_instruction_on_non_armv5_arch.patch b/patches/buildroot/2013.11/099-mplayer-add_patch_for_pld_asm_instruction_on_non_armv5_arch.patch
index 814cbeb..a2cf306 100644
--- a/patches/buildroot/2013.11/099-mplayer-add_patch_for_pld_asm_instruction_on_non_armv5_arch.patch
+++ b/patches/buildroot/2013.11/099-mplayer-add_patch_for_pld_asm_instruction_on_non_armv5_arch.patch
@@ -2,10 +2,10 @@ This patch is needed to have mplayer compile on ARMv4 arch (maybe others...)
Signed-off-by: Julien Boibessot <jul...@ar...>
-Index: buildroot/package/multimedia/mplayer/mplayer-1.0rc2-add_pld_asm_inst_for_non_armv5_arch.patch
+Index: buildroot/package/mplayer/mplayer-1.0rc2-add_pld_asm_inst_for_non_armv5_arch.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/multimedia/mplayer/mplayer-1.0rc2-add_pld_asm_inst_for_non_armv5_arch.patch 2012-02-21 16:44:46.000000000 +0100
++++ buildroot/package/mplayer/mplayer-1.0rc2-add_pld_asm_inst_for_non_armv5_arch.patch 2012-02-21 16:44:46.000000000 +0100
@@ -0,0 +1,13 @@
+--- mplayer-32726/libmpeg2/motion_comp_arm_s.S 2008-09-13 19:31:45.000000000 +0200
++++ mplayer-32726.mod/libmpeg2/motion_comp_arm_s.S 2011-11-02 15:26:00.000000000 +0100
diff --git a/patches/buildroot/2013.11/186-uboot-tools-2011.03-Ignore-env_sectors-on-NOR-and-SPI-dataflash.patch b/patches/buildroot/2013.11/186-uboot-tools-2011.03-Ignore-env_sectors-on-NOR-and-SPI-dataflash.patch
index d3b1c23..2aa50e4 100644
--- a/patches/buildroot/2013.11/186-uboot-tools-2011.03-Ignore-env_sectors-on-NOR-and-SPI-dataflash.patch
+++ b/patches/buildroot/2013.11/186-uboot-tools-2011.03-Ignore-env_sectors-on-NOR-and-SPI-dataflash.patch
@@ -7,14 +7,14 @@ all the Armadeus boards.
Signed-off-by: Eric Jarrige <eri...@ar...>
---
-Index: buildroot/package/uboot-tools/uboot-tools-2013.01-Ignore-env_sectors-on-NOR-and-SPI-dataflash.patch
+Index: buildroot/package/uboot-tools/2013.01/uboot-tools-2013.01-Ignore-env_sectors-on-NOR-and-SPI-dataflash.patch
===================================================================
---- buildroot/package/uboot-tools/uboot-tools-2013.01-Ignore-env_sectors-on-NOR-and-SPI-dataflash.patch
-+++ buildroot/package/uboot-tools/uboot-tools-2013.01-Ignore-env_sectors-on-NOR-and-SPI-dataflash.patch
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/uboot-tools/2013.01/uboot-tools-2013.01-Ignore-env_sectors-on-NOR-and-SPI-dataflash.patch 2014-01-09 09:56:40.955253512 +0100
@@ -0,0 +1,31 @@
+[PATCH] Ignore env_sectors on NOR and SPI-dataflash
+
-+fw_env doc declare that 'the "Number of sectors" is ignored on NOR and
++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.
@@ -43,3 +43,39 @@ Index: buildroot/package/uboot-tools/uboot-tools-2013.01-Ignore-env_sectors-on-N
+
+ erase_offset = (offset / blocklen) * blocklen;
+
+Index: buildroot/package/uboot-tools/uboot-tools-2013.10-Ignore-env_sectors-on-NOR-and-SPI-dataflash.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/uboot-tools/uboot-tools-2013.10-Ignore-env_sectors-on-NOR-and-SPI-dataflash.patch 2014-01-09 10:47:03.546241724 +0100
+@@ -0,0 +1,31 @@
++[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-2013.10/tools/env/fw_env.c
++===================================================================
++--- uboot-tools-2013.10/tools/env/fw_env.c
+++++ uboot-tools-2013.10/tools/env/fw_env.c
++@@ -740,8 +740,15 @@ static int flash_write_buf (int dev, int
++ } else {
++ blocklen = DEVESIZE(dev);
++
++- top_of_range = ((DEVOFFSET(dev) / blocklen) +
++- 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) +
+++ ENVSECTORS (dev)) * blocklen;
+++ } else {
+++ top_of_range = ((DEVOFFSET(dev) / blocklen) +
+++ 1) * blocklen;
+++ }
++
++ erase_offset = (offset / blocklen) * blocklen;
++
diff --git a/patches/buildroot/2013.11/cleanup_buildroot.sh b/patches/buildroot/2013.11/cleanup_buildroot.sh
index 88ac3e5..65bb84b 100755
--- a/patches/buildroot/2013.11/cleanup_buildroot.sh
+++ b/patches/buildroot/2013.11/cleanup_buildroot.sh
@@ -77,3 +77,4 @@ rm -rf buildroot/package/busybox/
rm -rf buildroot/package/joe/
rm -rf buildroot/package/gpsd/
rm -rf buildroot/linux/
+rm -rf buildroot/package/freescale-imx/imx-lib/*.patch
hooks/post-receive
--
armadeus
|