armadeus-commitlog Mailing List for armadeus (Page 66)

Brought to you by: sszy

armadeus-commitlog — Armadeus GIT commit logs

You can subscribe to this list here.

2006	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (1)
2007	Jan (43)	Feb (8)	Mar (7)	Apr (8)	May (14)	Jun (6)	Jul (4)	Aug (17)	Sep (18)	Oct (19)	Nov (52)	Dec (30)
2008	Jan (6)	Feb (6)	Mar (15)	Apr (22)	May (13)	Jun (11)	Jul (41)	Aug (10)	Sep (14)	Oct (21)	Nov (4)	Dec (66)
2009	Jan (67)	Feb (57)	Mar (90)	Apr (54)	May (64)	Jun (76)	Jul (14)	Aug (18)	Sep (18)	Oct (20)	Nov (15)	Dec (36)
2010	Jan (28)	Feb (25)	Mar (32)	Apr (23)	May (22)	Jun (62)	Jul (36)	Aug (16)	Sep (12)	Oct (20)	Nov (44)	Dec (25)
2011	Jan (36)	Feb (49)	Mar (28)	Apr (38)	May (26)	Jun (52)	Jul (33)	Aug (32)	Sep (19)	Oct (26)	Nov (13)	Dec (32)
2012	Jan (38)	Feb (34)	Mar (91)	Apr (35)	May (31)	Jun (72)	Jul (23)	Aug (13)	Sep (33)	Oct (47)	Nov (18)	Dec (22)
2013	Jan (31)	Feb (22)	Mar (26)	Apr (11)	May (38)	Jun (15)	Jul (37)	Aug (68)	Sep (34)	Oct (11)	Nov (26)	Dec (31)
2014	Jan (60)	Feb (55)	Mar (21)	Apr (31)	May (17)	Jun (35)	Jul (24)	Aug (17)	Sep (11)	Oct (23)	Nov (10)	Dec (23)
2015	Jan (15)	Feb (34)	Mar (46)	Apr (23)	May (12)	Jun (14)	Jul (18)	Aug (22)	Sep (6)	Oct (2)	Nov (1)	Dec (6)
2016	Jan (5)	Feb (7)	Mar (10)	Apr (10)	May (17)	Jun (6)	Jul (4)	Aug (6)	Sep (22)	Oct (8)	Nov (9)	Dec (5)
2017	Jan (11)	Feb (12)	Mar (27)	Apr (9)	May (1)	Jun (5)	Jul (11)	Aug (10)	Sep (6)	Oct (10)	Nov (4)	Dec (6)
2018	Jan (6)	Feb (13)	Mar (9)	Apr (7)	May (10)	Jun (9)	Jul (21)	Aug (13)	Sep (10)	Oct (4)	Nov (6)	Dec (1)
2019	Jan (6)	Feb (2)	Mar (5)	Apr (6)	May (19)	Jun (14)	Jul (18)	Aug (3)	Sep (5)	Oct (7)	Nov (8)	Dec (4)
2020	Jan (10)	Feb (3)	Mar (9)	Apr (7)	May (2)	Jun (18)	Jul (3)	Aug	Sep	Oct (7)	Nov	Dec (1)
2021	Jan (9)	Feb (6)	Mar (4)	Apr (11)	May (7)	Jun (5)	Jul (2)	Aug (4)	Sep (10)	Oct (9)	Nov (5)	Dec
2022	Jan (2)	Feb (12)	Mar (3)	Apr (5)	May (1)	Jun (3)	Jul (2)	Aug (1)	Sep (4)	Oct (4)	Nov (1)	Dec (3)
2023	Jan (5)	Feb (3)	Mar (3)	Apr (2)	May (1)	Jun (3)	Jul (3)	Aug (2)	Sep (1)	Oct (1)	Nov	Dec (4)
2024	Jan (2)	Feb (3)	Mar (8)	Apr (4)	May (1)	Jun (13)	Jul (7)	Aug (1)	Sep (6)	Oct (5)	Nov (11)	Dec (7)
2025	Jan (3)	Feb (1)	Mar (6)	Apr (4)	May (4)	Jun (1)	Jul (1)	Aug (7)	Sep (4)	Oct (4)	Nov (4)	Dec (1)
2026	Jan (3)	Feb (7)	Mar (3)	Apr (1)	May (6)	Jun (3)	Jul (1)	Aug	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 64 65 66 67 68 .. 153 > >> (Page 66 of 153)

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-114-gc64f3a1

From: jscheer <js...@us...> - 2013-01-11 13:13:48

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  c64f3a140a2ac16207bc0d73c46e31cfc76f3648 (commit)
      from  1ace1fb5949aa9875e598f1be14c357412b53f23 (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 c64f3a140a2ac16207bc0d73c46e31cfc76f3648
Author: Jeremie Scheer <jer...@ar...>
Date:   Fri Jan 11 14:13:26 2013 +0100

    [BUILDROOT] Update Qt's FTP URL in patch 132.

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

Summary of changes:
 ...-qt-full_integration_with_cross_compiling.patch |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/patches/buildroot/2012.02/132-qt-full_integration_with_cross_compiling.patch b/patches/buildroot/2012.02/132-qt-full_integration_with_cross_compiling.patch
index ab9e958..68ce2df 100644
--- a/patches/buildroot/2012.02/132-qt-full_integration_with_cross_compiling.patch
+++ b/patches/buildroot/2012.02/132-qt-full_integration_with_cross_compiling.patch
@@ -5,7 +5,7 @@ Signed-off-by: JÃ©rÃ©mie Scheer <jer...@ar...>
 Index: buildroot/package/qt/Config.in
 ===================================================================
 --- buildroot.orig/package/qt/Config.in	2012-02-29 23:19:47.000000000 +0100
-+++ buildroot/package/qt/Config.in	2012-09-05 15:29:54.000000000 +0200
++++ buildroot/package/qt/Config.in	2013-01-11 14:09:10.000000000 +0100
 @@ -17,7 +17,12 @@
  	  If unsure, say N.
  
@@ -23,7 +23,16 @@ Index: buildroot/package/qt/Config.in
 Index: buildroot/package/qt/qt.mk
 ===================================================================
 --- buildroot.orig/package/qt/qt.mk	2012-02-29 23:19:47.000000000 +0100
-+++ buildroot/package/qt/qt.mk	2012-09-05 15:24:44.000000000 +0200
++++ buildroot/package/qt/qt.mk	2013-01-11 14:11:10.000000000 +0100
+@@ -14,7 +14,7 @@
+ 
+ QT_VERSION = 4.7.4
+ QT_SOURCE  = qt-everywhere-opensource-src-$(QT_VERSION).tar.gz
+-QT_SITE    = http://get.qt.nokia.com/qt/source
++QT_SITE    = ftp://ftp.qt-project.org/qt/source/
+ QT_DEPENDENCIES = host-pkg-config
+ QT_INSTALL_STAGING = YES
+ 
 @@ -52,9 +52,14 @@
  endif
  


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-113-g1ace1fb

From: Julien B a. A. <ar...@us...> - 2013-01-08 07:14:14

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  1ace1fb5949aa9875e598f1be14c357412b53f23 (commit)
      from  951f88bee7b44aa90932b3cbd1e4b69044155116 (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 1ace1fb5949aa9875e598f1be14c357412b53f23
Author: Julien Boibessot <jul...@ar...>
Date:   Tue Jan 8 08:11:45 2013 +0100

    [LINUX] 3.8: bump to 3.8-rc2 (experimental)

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

Summary of changes:
 ...x-3.8-rc1.config => apf27-linux-3.8-rc2.config} |    0
 ...x-3.8-rc1.config => apf28-linux-3.8-rc2.config} |    0
 ...x-3.8-rc1.config => apf51-linux-3.8-rc2.config} |    0
 .../armadeus/apf9328/apf9328-linux-3.8-rc2.config  |    1 +
 ...8-linux-3.7.config => apf9328-linux-3.8.config} |    0
 patches/linux/{3.8-rc1 => 3.8-rc2}                 |    0
 6 files changed, 1 insertions(+), 0 deletions(-)
 rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.8-rc1.config => apf27-linux-3.8-rc2.config} (100%)
 rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.8-rc1.config => apf28-linux-3.8-rc2.config} (100%)
 rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.8-rc1.config => apf51-linux-3.8-rc2.config} (100%)
 create mode 120000 buildroot/target/device/armadeus/apf9328/apf9328-linux-3.8-rc2.config
 copy buildroot/target/device/armadeus/apf9328/{apf9328-linux-3.7.config => apf9328-linux-3.8.config} (100%)
 rename patches/linux/{3.8-rc1 => 3.8-rc2} (100%)

diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.8-rc1.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.8-rc2.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.8-rc1.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.8-rc2.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.8-rc1.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.8-rc2.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.8-rc1.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.8-rc2.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.8-rc1.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.8-rc2.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.8-rc1.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.8-rc2.config
diff --git a/buildroot/target/device/armadeus/apf9328/apf9328-linux-3.8-rc2.config b/buildroot/target/device/armadeus/apf9328/apf9328-linux-3.8-rc2.config
new file mode 120000
index 0000000..7c15277
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf9328/apf9328-linux-3.8-rc2.config
@@ -0,0 +1 @@
+apf9328-linux-3.8.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf9328/apf9328-linux-3.7.config b/buildroot/target/device/armadeus/apf9328/apf9328-linux-3.8.config
similarity index 100%
copy from buildroot/target/device/armadeus/apf9328/apf9328-linux-3.7.config
copy to buildroot/target/device/armadeus/apf9328/apf9328-linux-3.8.config
diff --git a/patches/linux/3.8-rc1 b/patches/linux/3.8-rc2
similarity index 100%
rename from patches/linux/3.8-rc1
rename to patches/linux/3.8-rc2


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-112-g951f88b

From: Fabien M <fa...@us...> - 2013-01-07 07:54:53

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  951f88bee7b44aa90932b3cbd1e4b69044155116 (commit)
      from  9431f2d398b37926f05db6250eb84ab869728985 (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 951f88bee7b44aa90932b3cbd1e4b69044155116
Author: Fabien Marteau <fab...@ar...>
Date:   Mon Jan 7 08:53:55 2013 +0100

    [U-BOOT][2012.04][APF51] increase DDR RAM timings

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

Summary of changes:
 .../device/armadeus/apf51/apf51-u-boot-2012.04.h   |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.04.h b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.04.h
index 0c251a7..50320e1 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.04.h
+++ b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.04.h
@@ -25,7 +25,7 @@
 
 #define CONFIG_VERSION_VARIABLE
 #define CONFIG_ENV_VERSION	"1.2"
-#define CONFIG_IDENT_STRING	" apf51 patch 1.7"
+#define CONFIG_IDENT_STRING	" apf51 patch 1.8"
 #define CONFIG_BOARD_NAME	apf51
 
 /*
@@ -522,17 +522,17 @@
 #define ACFG_SDRAM_NUM_COL		10	/* 8..11 column address bits */
 #define ACFG_SDRAM_NUM_ROW		14	/* 11..13 row address bits */
 #define ACFG_SDRAM_REFRESH		3	/* 0=OFF 1=2048 2=4096 3=8192.*/
-#define ACFG_SDRAM_XSR_DELAY		125	/* ns Exit self refresh */
+#define ACFG_SDRAM_XSR_DELAY		138	/* ns Exit self refresh */
 #define ACFG_SDRAM_EXIT_PWD		10	/* ns exit power down delay */
 #define ACFG_SDRAM_W2R_DELAY		1	/* 0=1ck 1=2ck */
-#define ACFG_SDRAM_ROW_PRECHARGE_DELAY	15	/* ns (>2 x ddr_clk) */
+#define ACFG_SDRAM_ROW_PRECHARGE_DELAY	25	/* ns (>2 x ddr_clk) */
 #define ACFG_SDRAM_TMRD_DELAY		2	/* 1..4 */
 #define ACFG_SDRAM_TWR_DELAY		1	/* DDR: 0=2ck 1=3ck */
 #define ACFG_SDRAM_RAS_DELAY		40	/* ns ACTIVE-to-PRECHARGE */
 #define ACFG_SDRAM_RRD_DELAY		10	/* ns ACTIVE-to-ACTIVE delay */
-#define ACFG_SDRAM_RCD_DELAY		15	/* ns Row to Column delay */
-#define ACFG_SDRAM_RC_DELAY		55	/* ns Row cycle delay */
-#define ACFG_SDRAM_RFC_DELAY		72	/* ns (> 10xddr_clk) */
+#define ACFG_SDRAM_RCD_DELAY		25 	/* ns Row to Column delay */
+#define ACFG_SDRAM_RC_DELAY		68	/* ns Row cycle delay */
+#define ACFG_SDRAM_RFC_DELAY		110	/* ns (> 10xddr_clk) */
 #define ACFG_SDRAM_PARTIAL_ARRAY_SR	0	/* 0..4 */
 #define ACFG_SDRAM_DRIVE_STRENGH	0	/* 0..3 */
 #define ACFG_SDRAM_BURST_LENGTH		3	/* 2^N BYTES (N=0..3) */


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-111-g9431f2d

From: Julien B a. A. <ar...@us...> - 2013-01-06 21:07:03

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  9431f2d398b37926f05db6250eb84ab869728985 (commit)
      from  d94311c980a4e457413d2f17198f73d787543ee5 (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 9431f2d398b37926f05db6250eb84ab869728985
Author: Julien Boibessot <jul...@ar...>
Date:   Sun Jan 6 22:06:17 2013 +0100

    [LINUX] 3.7: fixes build of fpgaloader

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

Summary of changes:
 .../fpga/dev_tools/loader/apf27-fpga-loader.c      |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/target/linux/modules/fpga/dev_tools/loader/apf27-fpga-loader.c b/target/linux/modules/fpga/dev_tools/loader/apf27-fpga-loader.c
index 000a6fc..ca62f1b 100644
--- a/target/linux/modules/fpga/dev_tools/loader/apf27-fpga-loader.c
+++ b/target/linux/modules/fpga/dev_tools/loader/apf27-fpga-loader.c
@@ -26,7 +26,7 @@
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)
 #include <mach/iomux-mx1-mx2.h>
 #else
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,20)
 #include <mach/iomux-mx27.h>
 #else
 #include <linux/../../arch/arm/mach-imx/iomux-mx27.h>
@@ -37,7 +37,7 @@
 #else
 #include <linux/gpio.h>
 #endif
-#if LINUX_VERSION_CODE > KERNEL_VERSION(3,7,0)
+#if LINUX_VERSION_CODE > KERNEL_VERSION(3,7,20)
 #include <linux/../../arch/arm/mach-imx/fpga.h>
 #else
 #include <mach/fpga.h>


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-110-gd94311c

From: jorasse <jo...@us...> - 2013-01-06 18:50:11

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  d94311c980a4e457413d2f17198f73d787543ee5 (commit)
      from  387c90090a6911cf352dfbe5482fd069f524adcf (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 d94311c980a4e457413d2f17198f73d787543ee5
Author: Eric Jarrige <eri...@ar...>
Date:   Sun Jan 6 19:54:25 2013 +0100

    [BUILD] update patches for BR 2012.11.1

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

Summary of changes:
 Makefile                                           |    2 +-
 .../001-add_armadeus_device.patch                  |    0
 .../002-add_armadeus_specific_packages.patch       |    0
 .../{2012.11 => 2012.11.1}/006-lcd4linux.patch     |    0
 .../{2012.11 => 2012.11.1}/018-allegro.patch       |    0
 .../021-sdl-water-config.patch                     |    0
 .../{2012.11 => 2012.11.1}/034-slideshow.patch     |    0
 .../040-linux-makefile.patch                       |    0
 .../043-mesa-add_packages.patch                    |    0
 .../045-openssh-add_passwd_expire.patch            |    0
 ...support-for-Safe-Boot-file-format-this-fo.patch |    0
 ...d_possibility_to_choose_board_header_file.patch |    0
 ...x_in_a_standalone_way_after_configuration.patch |    0
 ...-linux-change_board_specific_patches_name.patch |    0
 .../072-xenomai-package.patch                      |    0
 .../081-adds_quake_package.patch                   |    0
 .../083-pygame-armadeus_addons.patch               |    0
 .../085-adds_gpm_package.patch                     |    0
 .../097-adds_flite_package.patch                   |    0
 ...for_pld_asm_instruction_on_non_armv5_arch.patch |    0
 ...r-add_patch_for_recent_alsa_compatibility.patch |    0
 .../107-games-add_wolf4sdl.patch                   |    0
 .../110-bluez3-add_package.patch                   |    0
 .../{2012.11 => 2012.11.1}/111-bluez3-hacks.patch  |    0
 .../116-openobex-add_package.patch                 |    0
 .../117-ussp-push-add_package.patch                |    0
 .../118-snes9x-add_package.patch                   |    0
 .../119-fbtest-add_package.patch                   |    0
 .../120-cwiid-add_package.patch                    |    0
 .../121-target-arm926t_is_arm926ej-s.patch         |    0
 .../122-urg-add_package.patch                      |    0
 .../123-pywebradio-add_package.patch               |    0
 .../124-e-uae-add_package.patch                    |    0
 .../125-opentyrian-add_package.patch               |    0
 .../130-lbreakout-add_package.patch                |    0
 .../131-ltetris-add_package.patch                  |    0
 ...-qt-full_integration_with_cross_compiling.patch |    0
 .../133-qwt-add_package.patch                      |    0
 ...ffs2-add_board_name_to_binary_rootfs_name.patch |    0
 .../135-linux-add_linux26-clean_target.patch       |    0
 ...42-ncurses-fix_compilation_with_old_hosts.patch |    0
 ...-disable_ip_busybox_if_iproute2_buildroot.patch |    0
 ...fix_installation_bug_on_some_host_systems.patch |    0
 ...lection_even_when_custom_rootfs_is_chosen.patch |    0
 .../158-setserial-bump_version.patch               |    0
 .../168-libcanfestival-add_package.patch           |    0
 .../170-mplayer-make_it_compile_on_apf51.patch     |    0
 .../172-gsmmux-add_package.patch                   |    0
 .../174-imx-lib-add_package.patch                  |    0
 .../176-imx-test-add_package.patch                 |    0
 ...177-restore-java-packages-classpath-jamvm.patch |    0
 .../178-uboot-add-missing-UBOOT_CLEAN_CMDS.patch   |    0
 ...e4defrag_build_against_old_kernel_headers.patch |    0
 .../181-qtcreator-add_package.patch                |    0
 .../182-uclibc-add_accept4_declaration_fix.patch   |    0
 .../183-firmware-imx-add_package.patch             |    0
 .../184-fsl-mm-codeclib-add_package.patch          |    0
 .../185-gst-fsl-plugin-add_package.patch           |    0
 ...-linux-firmware-add_marvell_libertas_8686.patch |    0
 ...nore-env_sectors-on-NOR-and-SPI-dataflash.patch |    0
 .../188-marble-add_package.patch                   |    0
 .../189-dbus-fix_installation.patch                |    0
 .../191-madplay-requires_libintl.patch             |    0
 .../196-python-crc16-add_package.patch             |    0
 .../197-cunit-add_package.patch                    |    0
 .../198-boost-bump-version.patch                   |    0
 .../{2012.11 => 2012.11.1}/cleanup_buildroot.sh    |    0
 67 files changed, 1 insertions(+), 1 deletions(-)
 rename patches/buildroot/{2012.11 => 2012.11.1}/001-add_armadeus_device.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/002-add_armadeus_specific_packages.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/006-lcd4linux.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/018-allegro.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/021-sdl-water-config.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/034-slideshow.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/040-linux-makefile.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/043-mesa-add_packages.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/045-openssh-add_passwd_expire.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/051a-U-Boot-add-support-for-Safe-Boot-file-format-this-fo.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/051d-u-boot-add_possibility_to_choose_board_header_file.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/060-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/071-linux-change_board_specific_patches_name.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/072-xenomai-package.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/081-adds_quake_package.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/083-pygame-armadeus_addons.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/085-adds_gpm_package.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/097-adds_flite_package.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/099-mplayer-add_patch_for_pld_asm_instruction_on_non_armv5_arch.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/101-mplayer-add_patch_for_recent_alsa_compatibility.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/107-games-add_wolf4sdl.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/110-bluez3-add_package.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/111-bluez3-hacks.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/116-openobex-add_package.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/117-ussp-push-add_package.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/118-snes9x-add_package.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/119-fbtest-add_package.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/120-cwiid-add_package.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/121-target-arm926t_is_arm926ej-s.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/122-urg-add_package.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/123-pywebradio-add_package.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/124-e-uae-add_package.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/125-opentyrian-add_package.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/130-lbreakout-add_package.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/131-ltetris-add_package.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/132-qt-full_integration_with_cross_compiling.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/133-qwt-add_package.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/134-jffs2-add_board_name_to_binary_rootfs_name.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/135-linux-add_linux26-clean_target.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/142-ncurses-fix_compilation_with_old_hosts.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/146-busybox-disable_ip_busybox_if_iproute2_buildroot.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/150-alsa-utils-fix_installation_bug_on_some_host_systems.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/157-buildroot-allow_generic_device_selection_even_when_custom_rootfs_is_chosen.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/158-setserial-bump_version.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/168-libcanfestival-add_package.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/170-mplayer-make_it_compile_on_apf51.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/172-gsmmux-add_package.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/174-imx-lib-add_package.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/176-imx-test-add_package.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/177-restore-java-packages-classpath-jamvm.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/178-uboot-add-missing-UBOOT_CLEAN_CMDS.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/179-e2fsprog-allow_e4defrag_build_against_old_kernel_headers.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/181-qtcreator-add_package.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/182-uclibc-add_accept4_declaration_fix.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/183-firmware-imx-add_package.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/184-fsl-mm-codeclib-add_package.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/185-gst-fsl-plugin-add_package.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/186-linux-firmware-add_marvell_libertas_8686.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/186-uboot-tools-2011.03-Ignore-env_sectors-on-NOR-and-SPI-dataflash.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/188-marble-add_package.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/189-dbus-fix_installation.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/191-madplay-requires_libintl.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/196-python-crc16-add_package.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/197-cunit-add_package.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/198-boost-bump-version.patch (100%)
 rename patches/buildroot/{2012.11 => 2012.11.1}/cleanup_buildroot.sh (100%)

diff --git a/Makefile b/Makefile
index 138ef8d..771b6cd 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ export ARMADEUS_TOPDIR
 
 #--- User configurable stuff:
 BUILDROOT_VERSION:=2012.02
-#BUILDROOT_VERSION:=2012.11
+#BUILDROOT_VERSION:=2012.11.1
 include ./Makefile.in
 BUILDROOT_SITE:=http://buildroot.uclibc.org/downloads
 BUILDROOT_PATCH_DIR:=$(ARMADEUS_TOPDIR)/patches/buildroot/$(BUILDROOT_VERSION)
diff --git a/patches/buildroot/2012.11/001-add_armadeus_device.patch b/patches/buildroot/2012.11.1/001-add_armadeus_device.patch
similarity index 100%
rename from patches/buildroot/2012.11/001-add_armadeus_device.patch
rename to patches/buildroot/2012.11.1/001-add_armadeus_device.patch
diff --git a/patches/buildroot/2012.11/002-add_armadeus_specific_packages.patch b/patches/buildroot/2012.11.1/002-add_armadeus_specific_packages.patch
similarity index 100%
rename from patches/buildroot/2012.11/002-add_armadeus_specific_packages.patch
rename to patches/buildroot/2012.11.1/002-add_armadeus_specific_packages.patch
diff --git a/patches/buildroot/2012.11/006-lcd4linux.patch b/patches/buildroot/2012.11.1/006-lcd4linux.patch
similarity index 100%
rename from patches/buildroot/2012.11/006-lcd4linux.patch
rename to patches/buildroot/2012.11.1/006-lcd4linux.patch
diff --git a/patches/buildroot/2012.11/018-allegro.patch b/patches/buildroot/2012.11.1/018-allegro.patch
similarity index 100%
rename from patches/buildroot/2012.11/018-allegro.patch
rename to patches/buildroot/2012.11.1/018-allegro.patch
diff --git a/patches/buildroot/2012.11/021-sdl-water-config.patch b/patches/buildroot/2012.11.1/021-sdl-water-config.patch
similarity index 100%
rename from patches/buildroot/2012.11/021-sdl-water-config.patch
rename to patches/buildroot/2012.11.1/021-sdl-water-config.patch
diff --git a/patches/buildroot/2012.11/034-slideshow.patch b/patches/buildroot/2012.11.1/034-slideshow.patch
similarity index 100%
rename from patches/buildroot/2012.11/034-slideshow.patch
rename to patches/buildroot/2012.11.1/034-slideshow.patch
diff --git a/patches/buildroot/2012.11/040-linux-makefile.patch b/patches/buildroot/2012.11.1/040-linux-makefile.patch
similarity index 100%
rename from patches/buildroot/2012.11/040-linux-makefile.patch
rename to patches/buildroot/2012.11.1/040-linux-makefile.patch
diff --git a/patches/buildroot/2012.11/043-mesa-add_packages.patch b/patches/buildroot/2012.11.1/043-mesa-add_packages.patch
similarity index 100%
rename from patches/buildroot/2012.11/043-mesa-add_packages.patch
rename to patches/buildroot/2012.11.1/043-mesa-add_packages.patch
diff --git a/patches/buildroot/2012.11/045-openssh-add_passwd_expire.patch b/patches/buildroot/2012.11.1/045-openssh-add_passwd_expire.patch
similarity index 100%
rename from patches/buildroot/2012.11/045-openssh-add_passwd_expire.patch
rename to patches/buildroot/2012.11.1/045-openssh-add_passwd_expire.patch
diff --git a/patches/buildroot/2012.11/051a-U-Boot-add-support-for-Safe-Boot-file-format-this-fo.patch b/patches/buildroot/2012.11.1/051a-U-Boot-add-support-for-Safe-Boot-file-format-this-fo.patch
similarity index 100%
rename from patches/buildroot/2012.11/051a-U-Boot-add-support-for-Safe-Boot-file-format-this-fo.patch
rename to patches/buildroot/2012.11.1/051a-U-Boot-add-support-for-Safe-Boot-file-format-this-fo.patch
diff --git a/patches/buildroot/2012.11/051d-u-boot-add_possibility_to_choose_board_header_file.patch b/patches/buildroot/2012.11.1/051d-u-boot-add_possibility_to_choose_board_header_file.patch
similarity index 100%
rename from patches/buildroot/2012.11/051d-u-boot-add_possibility_to_choose_board_header_file.patch
rename to patches/buildroot/2012.11.1/051d-u-boot-add_possibility_to_choose_board_header_file.patch
diff --git a/patches/buildroot/2012.11/060-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.patch b/patches/buildroot/2012.11.1/060-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.patch
similarity index 100%
rename from patches/buildroot/2012.11/060-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.patch
rename to patches/buildroot/2012.11.1/060-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.patch
diff --git a/patches/buildroot/2012.11/071-linux-change_board_specific_patches_name.patch b/patches/buildroot/2012.11.1/071-linux-change_board_specific_patches_name.patch
similarity index 100%
rename from patches/buildroot/2012.11/071-linux-change_board_specific_patches_name.patch
rename to patches/buildroot/2012.11.1/071-linux-change_board_specific_patches_name.patch
diff --git a/patches/buildroot/2012.11/072-xenomai-package.patch b/patches/buildroot/2012.11.1/072-xenomai-package.patch
similarity index 100%
rename from patches/buildroot/2012.11/072-xenomai-package.patch
rename to patches/buildroot/2012.11.1/072-xenomai-package.patch
diff --git a/patches/buildroot/2012.11/081-adds_quake_package.patch b/patches/buildroot/2012.11.1/081-adds_quake_package.patch
similarity index 100%
rename from patches/buildroot/2012.11/081-adds_quake_package.patch
rename to patches/buildroot/2012.11.1/081-adds_quake_package.patch
diff --git a/patches/buildroot/2012.11/083-pygame-armadeus_addons.patch b/patches/buildroot/2012.11.1/083-pygame-armadeus_addons.patch
similarity index 100%
rename from patches/buildroot/2012.11/083-pygame-armadeus_addons.patch
rename to patches/buildroot/2012.11.1/083-pygame-armadeus_addons.patch
diff --git a/patches/buildroot/2012.11/085-adds_gpm_package.patch b/patches/buildroot/2012.11.1/085-adds_gpm_package.patch
similarity index 100%
rename from patches/buildroot/2012.11/085-adds_gpm_package.patch
rename to patches/buildroot/2012.11.1/085-adds_gpm_package.patch
diff --git a/patches/buildroot/2012.11/097-adds_flite_package.patch b/patches/buildroot/2012.11.1/097-adds_flite_package.patch
similarity index 100%
rename from patches/buildroot/2012.11/097-adds_flite_package.patch
rename to patches/buildroot/2012.11.1/097-adds_flite_package.patch
diff --git a/patches/buildroot/2012.11/099-mplayer-add_patch_for_pld_asm_instruction_on_non_armv5_arch.patch b/patches/buildroot/2012.11.1/099-mplayer-add_patch_for_pld_asm_instruction_on_non_armv5_arch.patch
similarity index 100%
rename from patches/buildroot/2012.11/099-mplayer-add_patch_for_pld_asm_instruction_on_non_armv5_arch.patch
rename to patches/buildroot/2012.11.1/099-mplayer-add_patch_for_pld_asm_instruction_on_non_armv5_arch.patch
diff --git a/patches/buildroot/2012.11/101-mplayer-add_patch_for_recent_alsa_compatibility.patch b/patches/buildroot/2012.11.1/101-mplayer-add_patch_for_recent_alsa_compatibility.patch
similarity index 100%
rename from patches/buildroot/2012.11/101-mplayer-add_patch_for_recent_alsa_compatibility.patch
rename to patches/buildroot/2012.11.1/101-mplayer-add_patch_for_recent_alsa_compatibility.patch
diff --git a/patches/buildroot/2012.11/107-games-add_wolf4sdl.patch b/patches/buildroot/2012.11.1/107-games-add_wolf4sdl.patch
similarity index 100%
rename from patches/buildroot/2012.11/107-games-add_wolf4sdl.patch
rename to patches/buildroot/2012.11.1/107-games-add_wolf4sdl.patch
diff --git a/patches/buildroot/2012.11/110-bluez3-add_package.patch b/patches/buildroot/2012.11.1/110-bluez3-add_package.patch
similarity index 100%
rename from patches/buildroot/2012.11/110-bluez3-add_package.patch
rename to patches/buildroot/2012.11.1/110-bluez3-add_package.patch
diff --git a/patches/buildroot/2012.11/111-bluez3-hacks.patch b/patches/buildroot/2012.11.1/111-bluez3-hacks.patch
similarity index 100%
rename from patches/buildroot/2012.11/111-bluez3-hacks.patch
rename to patches/buildroot/2012.11.1/111-bluez3-hacks.patch
diff --git a/patches/buildroot/2012.11/116-openobex-add_package.patch b/patches/buildroot/2012.11.1/116-openobex-add_package.patch
similarity index 100%
rename from patches/buildroot/2012.11/116-openobex-add_package.patch
rename to patches/buildroot/2012.11.1/116-openobex-add_package.patch
diff --git a/patches/buildroot/2012.11/117-ussp-push-add_package.patch b/patches/buildroot/2012.11.1/117-ussp-push-add_package.patch
similarity index 100%
rename from patches/buildroot/2012.11/117-ussp-push-add_package.patch
rename to patches/buildroot/2012.11.1/117-ussp-push-add_package.patch
diff --git a/patches/buildroot/2012.11/118-snes9x-add_package.patch b/patches/buildroot/2012.11.1/118-snes9x-add_package.patch
similarity index 100%
rename from patches/buildroot/2012.11/118-snes9x-add_package.patch
rename to patches/buildroot/2012.11.1/118-snes9x-add_package.patch
diff --git a/patches/buildroot/2012.11/119-fbtest-add_package.patch b/patches/buildroot/2012.11.1/119-fbtest-add_package.patch
similarity index 100%
rename from patches/buildroot/2012.11/119-fbtest-add_package.patch
rename to patches/buildroot/2012.11.1/119-fbtest-add_package.patch
diff --git a/patches/buildroot/2012.11/120-cwiid-add_package.patch b/patches/buildroot/2012.11.1/120-cwiid-add_package.patch
similarity index 100%
rename from patches/buildroot/2012.11/120-cwiid-add_package.patch
rename to patches/buildroot/2012.11.1/120-cwiid-add_package.patch
diff --git a/patches/buildroot/2012.11/121-target-arm926t_is_arm926ej-s.patch b/patches/buildroot/2012.11.1/121-target-arm926t_is_arm926ej-s.patch
similarity index 100%
rename from patches/buildroot/2012.11/121-target-arm926t_is_arm926ej-s.patch
rename to patches/buildroot/2012.11.1/121-target-arm926t_is_arm926ej-s.patch
diff --git a/patches/buildroot/2012.11/122-urg-add_package.patch b/patches/buildroot/2012.11.1/122-urg-add_package.patch
similarity index 100%
rename from patches/buildroot/2012.11/122-urg-add_package.patch
rename to patches/buildroot/2012.11.1/122-urg-add_package.patch
diff --git a/patches/buildroot/2012.11/123-pywebradio-add_package.patch b/patches/buildroot/2012.11.1/123-pywebradio-add_package.patch
similarity index 100%
rename from patches/buildroot/2012.11/123-pywebradio-add_package.patch
rename to patches/buildroot/2012.11.1/123-pywebradio-add_package.patch
diff --git a/patches/buildroot/2012.11/124-e-uae-add_package.patch b/patches/buildroot/2012.11.1/124-e-uae-add_package.patch
similarity index 100%
rename from patches/buildroot/2012.11/124-e-uae-add_package.patch
rename to patches/buildroot/2012.11.1/124-e-uae-add_package.patch
diff --git a/patches/buildroot/2012.11/125-opentyrian-add_package.patch b/patches/buildroot/2012.11.1/125-opentyrian-add_package.patch
similarity index 100%
rename from patches/buildroot/2012.11/125-opentyrian-add_package.patch
rename to patches/buildroot/2012.11.1/125-opentyrian-add_package.patch
diff --git a/patches/buildroot/2012.11/130-lbreakout-add_package.patch b/patches/buildroot/2012.11.1/130-lbreakout-add_package.patch
similarity index 100%
rename from patches/buildroot/2012.11/130-lbreakout-add_package.patch
rename to patches/buildroot/2012.11.1/130-lbreakout-add_package.patch
diff --git a/patches/buildroot/2012.11/131-ltetris-add_package.patch b/patches/buildroot/2012.11.1/131-ltetris-add_package.patch
similarity index 100%
rename from patches/buildroot/2012.11/131-ltetris-add_package.patch
rename to patches/buildroot/2012.11.1/131-ltetris-add_package.patch
diff --git a/patches/buildroot/2012.11/132-qt-full_integration_with_cross_compiling.patch b/patches/buildroot/2012.11.1/132-qt-full_integration_with_cross_compiling.patch
similarity index 100%
rename from patches/buildroot/2012.11/132-qt-full_integration_with_cross_compiling.patch
rename to patches/buildroot/2012.11.1/132-qt-full_integration_with_cross_compiling.patch
diff --git a/patches/buildroot/2012.11/133-qwt-add_package.patch b/patches/buildroot/2012.11.1/133-qwt-add_package.patch
similarity index 100%
rename from patches/buildroot/2012.11/133-qwt-add_package.patch
rename to patches/buildroot/2012.11.1/133-qwt-add_package.patch
diff --git a/patches/buildroot/2012.11/134-jffs2-add_board_name_to_binary_rootfs_name.patch b/patches/buildroot/2012.11.1/134-jffs2-add_board_name_to_binary_rootfs_name.patch
similarity index 100%
rename from patches/buildroot/2012.11/134-jffs2-add_board_name_to_binary_rootfs_name.patch
rename to patches/buildroot/2012.11.1/134-jffs2-add_board_name_to_binary_rootfs_name.patch
diff --git a/patches/buildroot/2012.11/135-linux-add_linux26-clean_target.patch b/patches/buildroot/2012.11.1/135-linux-add_linux26-clean_target.patch
similarity index 100%
rename from patches/buildroot/2012.11/135-linux-add_linux26-clean_target.patch
rename to patches/buildroot/2012.11.1/135-linux-add_linux26-clean_target.patch
diff --git a/patches/buildroot/2012.11/142-ncurses-fix_compilation_with_old_hosts.patch b/patches/buildroot/2012.11.1/142-ncurses-fix_compilation_with_old_hosts.patch
similarity index 100%
rename from patches/buildroot/2012.11/142-ncurses-fix_compilation_with_old_hosts.patch
rename to patches/buildroot/2012.11.1/142-ncurses-fix_compilation_with_old_hosts.patch
diff --git a/patches/buildroot/2012.11/146-busybox-disable_ip_busybox_if_iproute2_buildroot.patch b/patches/buildroot/2012.11.1/146-busybox-disable_ip_busybox_if_iproute2_buildroot.patch
similarity index 100%
rename from patches/buildroot/2012.11/146-busybox-disable_ip_busybox_if_iproute2_buildroot.patch
rename to patches/buildroot/2012.11.1/146-busybox-disable_ip_busybox_if_iproute2_buildroot.patch
diff --git a/patches/buildroot/2012.11/150-alsa-utils-fix_installation_bug_on_some_host_systems.patch b/patches/buildroot/2012.11.1/150-alsa-utils-fix_installation_bug_on_some_host_systems.patch
similarity index 100%
rename from patches/buildroot/2012.11/150-alsa-utils-fix_installation_bug_on_some_host_systems.patch
rename to patches/buildroot/2012.11.1/150-alsa-utils-fix_installation_bug_on_some_host_systems.patch
diff --git a/patches/buildroot/2012.11/157-buildroot-allow_generic_device_selection_even_when_custom_rootfs_is_chosen.patch b/patches/buildroot/2012.11.1/157-buildroot-allow_generic_device_selection_even_when_custom_rootfs_is_chosen.patch
similarity index 100%
rename from patches/buildroot/2012.11/157-buildroot-allow_generic_device_selection_even_when_custom_rootfs_is_chosen.patch
rename to patches/buildroot/2012.11.1/157-buildroot-allow_generic_device_selection_even_when_custom_rootfs_is_chosen.patch
diff --git a/patches/buildroot/2012.11/158-setserial-bump_version.patch b/patches/buildroot/2012.11.1/158-setserial-bump_version.patch
similarity index 100%
rename from patches/buildroot/2012.11/158-setserial-bump_version.patch
rename to patches/buildroot/2012.11.1/158-setserial-bump_version.patch
diff --git a/patches/buildroot/2012.11/168-libcanfestival-add_package.patch b/patches/buildroot/2012.11.1/168-libcanfestival-add_package.patch
similarity index 100%
rename from patches/buildroot/2012.11/168-libcanfestival-add_package.patch
rename to patches/buildroot/2012.11.1/168-libcanfestival-add_package.patch
diff --git a/patches/buildroot/2012.11/170-mplayer-make_it_compile_on_apf51.patch b/patches/buildroot/2012.11.1/170-mplayer-make_it_compile_on_apf51.patch
similarity index 100%
rename from patches/buildroot/2012.11/170-mplayer-make_it_compile_on_apf51.patch
rename to patches/buildroot/2012.11.1/170-mplayer-make_it_compile_on_apf51.patch
diff --git a/patches/buildroot/2012.11/172-gsmmux-add_package.patch b/patches/buildroot/2012.11.1/172-gsmmux-add_package.patch
similarity index 100%
rename from patches/buildroot/2012.11/172-gsmmux-add_package.patch
rename to patches/buildroot/2012.11.1/172-gsmmux-add_package.patch
diff --git a/patches/buildroot/2012.11/174-imx-lib-add_package.patch b/patches/buildroot/2012.11.1/174-imx-lib-add_package.patch
similarity index 100%
rename from patches/buildroot/2012.11/174-imx-lib-add_package.patch
rename to patches/buildroot/2012.11.1/174-imx-lib-add_package.patch
diff --git a/patches/buildroot/2012.11/176-imx-test-add_package.patch b/patches/buildroot/2012.11.1/176-imx-test-add_package.patch
similarity index 100%
rename from patches/buildroot/2012.11/176-imx-test-add_package.patch
rename to patches/buildroot/2012.11.1/176-imx-test-add_package.patch
diff --git a/patches/buildroot/2012.11/177-restore-java-packages-classpath-jamvm.patch b/patches/buildroot/2012.11.1/177-restore-java-packages-classpath-jamvm.patch
similarity index 100%
rename from patches/buildroot/2012.11/177-restore-java-packages-classpath-jamvm.patch
rename to patches/buildroot/2012.11.1/177-restore-java-packages-classpath-jamvm.patch
diff --git a/patches/buildroot/2012.11/178-uboot-add-missing-UBOOT_CLEAN_CMDS.patch b/patches/buildroot/2012.11.1/178-uboot-add-missing-UBOOT_CLEAN_CMDS.patch
similarity index 100%
rename from patches/buildroot/2012.11/178-uboot-add-missing-UBOOT_CLEAN_CMDS.patch
rename to patches/buildroot/2012.11.1/178-uboot-add-missing-UBOOT_CLEAN_CMDS.patch
diff --git a/patches/buildroot/2012.11/179-e2fsprog-allow_e4defrag_build_against_old_kernel_headers.patch b/patches/buildroot/2012.11.1/179-e2fsprog-allow_e4defrag_build_against_old_kernel_headers.patch
similarity index 100%
rename from patches/buildroot/2012.11/179-e2fsprog-allow_e4defrag_build_against_old_kernel_headers.patch
rename to patches/buildroot/2012.11.1/179-e2fsprog-allow_e4defrag_build_against_old_kernel_headers.patch
diff --git a/patches/buildroot/2012.11/181-qtcreator-add_package.patch b/patches/buildroot/2012.11.1/181-qtcreator-add_package.patch
similarity index 100%
rename from patches/buildroot/2012.11/181-qtcreator-add_package.patch
rename to patches/buildroot/2012.11.1/181-qtcreator-add_package.patch
diff --git a/patches/buildroot/2012.11/182-uclibc-add_accept4_declaration_fix.patch b/patches/buildroot/2012.11.1/182-uclibc-add_accept4_declaration_fix.patch
similarity index 100%
rename from patches/buildroot/2012.11/182-uclibc-add_accept4_declaration_fix.patch
rename to patches/buildroot/2012.11.1/182-uclibc-add_accept4_declaration_fix.patch
diff --git a/patches/buildroot/2012.11/183-firmware-imx-add_package.patch b/patches/buildroot/2012.11.1/183-firmware-imx-add_package.patch
similarity index 100%
rename from patches/buildroot/2012.11/183-firmware-imx-add_package.patch
rename to patches/buildroot/2012.11.1/183-firmware-imx-add_package.patch
diff --git a/patches/buildroot/2012.11/184-fsl-mm-codeclib-add_package.patch b/patches/buildroot/2012.11.1/184-fsl-mm-codeclib-add_package.patch
similarity index 100%
rename from patches/buildroot/2012.11/184-fsl-mm-codeclib-add_package.patch
rename to patches/buildroot/2012.11.1/184-fsl-mm-codeclib-add_package.patch
diff --git a/patches/buildroot/2012.11/185-gst-fsl-plugin-add_package.patch b/patches/buildroot/2012.11.1/185-gst-fsl-plugin-add_package.patch
similarity index 100%
rename from patches/buildroot/2012.11/185-gst-fsl-plugin-add_package.patch
rename to patches/buildroot/2012.11.1/185-gst-fsl-plugin-add_package.patch
diff --git a/patches/buildroot/2012.11/186-linux-firmware-add_marvell_libertas_8686.patch b/patches/buildroot/2012.11.1/186-linux-firmware-add_marvell_libertas_8686.patch
similarity index 100%
rename from patches/buildroot/2012.11/186-linux-firmware-add_marvell_libertas_8686.patch
rename to patches/buildroot/2012.11.1/186-linux-firmware-add_marvell_libertas_8686.patch
diff --git a/patches/buildroot/2012.11/186-uboot-tools-2011.03-Ignore-env_sectors-on-NOR-and-SPI-dataflash.patch b/patches/buildroot/2012.11.1/186-uboot-tools-2011.03-Ignore-env_sectors-on-NOR-and-SPI-dataflash.patch
similarity index 100%
rename from patches/buildroot/2012.11/186-uboot-tools-2011.03-Ignore-env_sectors-on-NOR-and-SPI-dataflash.patch
rename to patches/buildroot/2012.11.1/186-uboot-tools-2011.03-Ignore-env_sectors-on-NOR-and-SPI-dataflash.patch
diff --git a/patches/buildroot/2012.11/188-marble-add_package.patch b/patches/buildroot/2012.11.1/188-marble-add_package.patch
similarity index 100%
rename from patches/buildroot/2012.11/188-marble-add_package.patch
rename to patches/buildroot/2012.11.1/188-marble-add_package.patch
diff --git a/patches/buildroot/2012.11/189-dbus-fix_installation.patch b/patches/buildroot/2012.11.1/189-dbus-fix_installation.patch
similarity index 100%
rename from patches/buildroot/2012.11/189-dbus-fix_installation.patch
rename to patches/buildroot/2012.11.1/189-dbus-fix_installation.patch
diff --git a/patches/buildroot/2012.11/191-madplay-requires_libintl.patch b/patches/buildroot/2012.11.1/191-madplay-requires_libintl.patch
similarity index 100%
rename from patches/buildroot/2012.11/191-madplay-requires_libintl.patch
rename to patches/buildroot/2012.11.1/191-madplay-requires_libintl.patch
diff --git a/patches/buildroot/2012.11/196-python-crc16-add_package.patch b/patches/buildroot/2012.11.1/196-python-crc16-add_package.patch
similarity index 100%
rename from patches/buildroot/2012.11/196-python-crc16-add_package.patch
rename to patches/buildroot/2012.11.1/196-python-crc16-add_package.patch
diff --git a/patches/buildroot/2012.11/197-cunit-add_package.patch b/patches/buildroot/2012.11.1/197-cunit-add_package.patch
similarity index 100%
rename from patches/buildroot/2012.11/197-cunit-add_package.patch
rename to patches/buildroot/2012.11.1/197-cunit-add_package.patch
diff --git a/patches/buildroot/2012.11/198-boost-bump-version.patch b/patches/buildroot/2012.11.1/198-boost-bump-version.patch
similarity index 100%
rename from patches/buildroot/2012.11/198-boost-bump-version.patch
rename to patches/buildroot/2012.11.1/198-boost-bump-version.patch
diff --git a/patches/buildroot/2012.11/cleanup_buildroot.sh b/patches/buildroot/2012.11.1/cleanup_buildroot.sh
similarity index 100%
rename from patches/buildroot/2012.11/cleanup_buildroot.sh
rename to patches/buildroot/2012.11.1/cleanup_buildroot.sh


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-109-g387c900

From: jorasse <jo...@us...> - 2013-01-06 17:21:08

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  387c90090a6911cf352dfbe5482fd069f524adcf (commit)
      from  3dd9308efd6e7bb0861c41bac6b21f23353e3ee1 (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 387c90090a6911cf352dfbe5482fd069f524adcf
Author: Eric Jarrige <eri...@ar...>
Date:   Sun Jan 6 18:25:26 2013 +0100

    [BUILD] remove useless check of BASH shell. Recent versions of Buildroot have fixed issues with DASH

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

Summary of changes:
 Makefile |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/Makefile b/Makefile
index eb9cb99..138ef8d 100644
--- a/Makefile
+++ b/Makefile
@@ -158,7 +158,6 @@ linux26-clean linux-clean: $(BUILDROOT_DIR)/.configured
 	fi;
 
 all: $(BUILDROOT_DIR)/.configured
-	@./scripts/check_bash.sh
 	@echo -n `date +%s` > before.txt
 	@$(MAKE) -C $(BUILDROOT_DIR) $@
 	@./scripts/show_build_infos.sh


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-108-g3dd9308

From: Julien B a. A. <ar...@us...> - 2013-01-04 15:37:34

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  3dd9308efd6e7bb0861c41bac6b21f23353e3ee1 (commit)
       via  4d75c5bbfbea2dd42d16cb2e03a64b79f9bfc986 (commit)
       via  645dcff048a596231bb1dc87c14ec73cf84597aa (commit)
      from  07e6d05e1dafc7a28701596dd74b166aa279210e (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 3dd9308efd6e7bb0861c41bac6b21f23353e3ee1
Author: Julien Boibessot <jul...@ar...>
Date:   Fri Jan 4 16:35:46 2013 +0100

    [LINUX] 3.8 : APF51 : Fixes NAND ECC/OOB/BBT to be compatible with older kernels

commit 4d75c5bbfbea2dd42d16cb2e03a64b79f9bfc986
Author: Julien Boibessot <jul...@ar...>
Date:   Fri Jan 4 16:34:12 2013 +0100

    [LINUX] Fixes target/linux/modules/pwm/pwm.c build with recent kernels

commit 645dcff048a596231bb1dc87c14ec73cf84597aa
Author: Julien Boibessot <jul...@ar...>
Date:   Fri Jan 4 16:33:02 2013 +0100

    [LINUX] 3.8 : Add (non working) APF51 DT support

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

Summary of changes:
 .../armadeus/apf51/apf51-linux-3.8-rc1.config      |    1 +
 ...f51-linux-3.0.config => apf51-linux-3.8.config} |   24 ++--
 .../3.8/0400-Add-apf51-basic-dt-support.patch      |  147 ++++++++++++++++++++
 .../0404-armadeus-fix_nand_ecc_oob.patch}          |   50 ++++----
 target/linux/modules/pwm/pwm.c                     |   10 ++-
 5 files changed, 193 insertions(+), 39 deletions(-)
 create mode 120000 buildroot/target/device/armadeus/apf51/apf51-linux-3.8-rc1.config
 copy buildroot/target/device/armadeus/apf51/{apf51-linux-3.0.config => apf51-linux-3.8.config} (98%)
 create mode 100644 patches/linux/3.8/0400-Add-apf51-basic-dt-support.patch
 copy patches/linux/{3.0/404-armadeus-fix_nand_ecc_oob.patch => 3.8/0404-armadeus-fix_nand_ecc_oob.patch} (57%)

diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.8-rc1.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.8-rc1.config
new file mode 120000
index 0000000..08e79a8
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf51/apf51-linux-3.8-rc1.config
@@ -0,0 +1 @@
+apf51-linux-3.8.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.0.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.8.config
similarity index 98%
copy from buildroot/target/device/armadeus/apf51/apf51-linux-3.0.config
copy to buildroot/target/device/armadeus/apf51/apf51-linux-3.8.config
index 21eb398..8ec9ac2 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-linux-3.0.config
+++ b/buildroot/target/device/armadeus/apf51/apf51-linux-3.8.config
@@ -2,6 +2,8 @@ CONFIG_EXPERIMENTAL=y
 # CONFIG_LOCALVERSION_AUTO is not set
 # CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=14
@@ -13,13 +15,13 @@ CONFIG_OPROFILE=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_BLK_DEV_BSG is not set
+CONFIG_PARTITION_ADVANCED=y
+CONFIG_BSD_DISKLABEL=y
 # CONFIG_IOSCHED_CFQ is not set
 CONFIG_ARCH_MXC=y
-CONFIG_ARCH_MX51=y
-CONFIG_MACH_APF51=y
+CONFIG_MXC_IRQ_PRIOR=y
+CONFIG_MACH_IMX51_DT=y
 CONFIG_ARM_THUMBEE=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
 CONFIG_PREEMPT=y
 CONFIG_AEABI=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
@@ -104,8 +106,6 @@ CONFIG_LIBERTAS_SDIO=m
 CONFIG_RT2X00=m
 CONFIG_RT73USB=m
 CONFIG_ZD1211RW=m
-CONFIG_PPP=m
-CONFIG_PPP_ASYNC=m
 CONFIG_INPUT_JOYDEV=y
 CONFIG_INPUT_EVDEV=y
 CONFIG_KEYBOARD_GPIO=m
@@ -211,11 +211,6 @@ CONFIG_USB_CDC_COMPOSITE=m
 CONFIG_USB_G_MULTI=m
 CONFIG_USB_G_MULTI_CDC=y
 CONFIG_USB_G_HID=m
-CONFIG_ARMADEUS_DRIVERS=y
-CONFIG_ARMADEUS_FPGA_DRIVERS=y
-CONFIG_ARMADEUS_FPGA_LOADER_DRIVER=m
-# CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS is not set
-CONFIG_ARMADEUS_PWM_DRIVER=m
 CONFIG_MMC=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_PLTFM=y
@@ -230,6 +225,11 @@ CONFIG_RTC_MXC=y
 CONFIG_RTC_DRV_WM831X=y
 CONFIG_STAGING=y
 CONFIG_IIO=m
+CONFIG_ARMADEUS_DRIVERS=y
+CONFIG_ARMADEUS_FPGA_DRIVERS=y
+CONFIG_ARMADEUS_FPGA_LOADER_DRIVER=m
+# CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS is not set
+CONFIG_ARMADEUS_PWM_DRIVER=m
 CONFIG_MCP49x2=m
 # CONFIG_MXC_HWEVENT is not set
 # CONFIG_MXC_VPU is not set
@@ -260,8 +260,6 @@ CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
 CONFIG_NFS_V4=y
 CONFIG_ROOT_NFS=y
-CONFIG_PARTITION_ADVANCED=y
-CONFIG_BSD_DISKLABEL=y
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_CODEPAGE_850=y
 CONFIG_NLS_ISO8859_1=y
diff --git a/patches/linux/3.8/0400-Add-apf51-basic-dt-support.patch b/patches/linux/3.8/0400-Add-apf51-basic-dt-support.patch
new file mode 100644
index 0000000..97c8844
--- /dev/null
+++ b/patches/linux/3.8/0400-Add-apf51-basic-dt-support.patch
@@ -0,0 +1,147 @@
+From 8155aee3ff56633876965a69c154ecb2b396a3b4 Mon Sep 17 00:00:00 2001
+From: Laurent Cans <lau...@gm...>
+Date: Sun, 16 Dec 2012 21:20:26 +0100
+Subject: [PATCH] Add apf51 basic support
+
+Signed-off-by: Laurent Cans <lau...@gm...>
+Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
+---
+ arch/arm/boot/dts/Makefile        |    3 +-
+ arch/arm/boot/dts/imx51-apf51.dts |   62 +++++++++++++++++++++++++++++++++++++
+ arch/arm/boot/dts/imx51.dtsi      |   30 ++++++++++++++++++
+ 3 files changed, 94 insertions(+), 1 deletion(-)
+ create mode 100644 arch/arm/boot/dts/imx51-apf51.dts
+
+diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
+index e44da40..1acf809 100644
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -79,7 +79,8 @@ dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
+ 	armada-370-mirabox.dtb \
+ 	armada-xp-db.dtb \
+ 	armada-xp-openblocks-ax3-4.dtb
+-dtb-$(CONFIG_ARCH_MXC) += imx51-babbage.dtb \
++dtb-$(CONFIG_ARCH_MXC) += imx51-apf51.dtb \
++	imx51-babbage.dtb \
+ 	imx53-ard.dtb \
+ 	imx53-evk.dtb \
+ 	imx53-qsb.dtb \
+diff --git a/arch/arm/boot/dts/imx51-apf51.dts b/arch/arm/boot/dts/imx51-apf51.dts
+new file mode 100644
+index 0000000..d3e0d06
+--- /dev/null
++++ b/arch/arm/boot/dts/imx51-apf51.dts
+@@ -0,0 +1,62 @@
++/*
++ * Copyright 2012 Laurent Cans <lau...@gm...>
++ * Copyright 2012 Armadeus Systems - <su...@ar...>
++ *
++ * Based on mx51-babbage.dts
++ * Copyright 2011 Freescale Semiconductor, Inc.
++ * Copyright 2011 Linaro Ltd.
++ *
++ * The code contained herein is licensed under the GNU General Public
++ * License. You may obtain a copy of the GNU General Public License
++ * Version 2 or later at the following locations:
++ *
++ * http://www.opensource.org/licenses/gpl-license.html
++ * http://www.gnu.org/copyleft/gpl.html
++ */
++
++/dts-v1/;
++/include/ "imx51.dtsi"
++
++/ {
++	model = "Armadeus Systems APF51 module";
++	compatible = "fsl,imx51-apf51", "fsl,imx51";
++
++	memory {
++		reg = <0x90000000 0x20000000>;
++	};
++
++	clocks {
++		#address-cells = <1>;
++		#size-cells = <0>;
++
++		ckih1 {
++			clock-frequency = <0>;
++		};
++
++		osc {
++			clock-frequency = <33554432>;
++		};
++	};
++};
++
++&uart3 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&pinctrl_uart3_2>;
++	status = "okay";
++};
++
++&nfc {
++	nand-bus-width = <8>;
++	nand-ecc-mode = "hw";
++	nand-on-flash-bbt;
++	status = "okay";
++};
++
++&fec {
++	pinctrl-names = "default";
++	pinctrl-0 = <&pinctrl_fec_2>;
++	phy-mode = "mii";
++	phy-reset-gpios = <&gpio3 0 0>;
++	phy-reset-duration = <1>;
++	status = "okay";
++};
+diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi
+index 1f5d45e..8427279 100644
+--- a/arch/arm/boot/dts/imx51.dtsi
++++ b/arch/arm/boot/dts/imx51.dtsi
+@@ -273,6 +273,29 @@
+ 							260 0x80000000	/* MX51_PAD_NANDF_RDY_INT__FEC_TX_CLK */
+ 						>;
+ 					};
++
++					pinctrl_fec_2: fecgrp-2 {
++						fsl,pins = <
++							589 0x80000000 /* MX51_PAD_DI_GP3__FEC_TX_ER */
++							592 0x80000000 /* MX51_PAD_DI2_PIN4__FEC_CRS */
++							594 0x80000000 /* MX51_PAD_DI2_PIN2__FEC_MDC */
++							596 0x80000000 /* MX51_PAD_DI2_PIN3__FEC_MDIO */
++							598 0x80000000 /* MX51_PAD_DI2_DISP_CLK__FEC_RDATA1 */
++							602 0x80000000 /* MX51_PAD_DI_GP4__FEC_RDATA2 */
++							604 0x80000000 /* MX51_PAD_DISP2_DAT0__FEC_RDATA3 */
++							609 0x80000000 /* MX51_PAD_DISP2_DAT1__FEC_RX_ER */
++							618 0x80000000 /* MX51_PAD_DISP2_DAT6__FEC_TDATA1 */
++							623 0x80000000 /* MX51_PAD_DISP2_DAT7__FEC_TDATA2 */
++							628 0x80000000 /* MX51_PAD_DISP2_DAT8__FEC_TDATA3 */
++							634 0x80000000 /* MX51_PAD_DISP2_DAT9__FEC_TX_EN */
++							639 0x80000000 /* MX51_PAD_DISP2_DAT10__FEC_COL */
++							644 0x80000000 /* MX51_PAD_DISP2_DAT11__FEC_RX_CLK */
++							649 0x80000000 /* MX51_PAD_DISP2_DAT12__FEC_RX_DV */
++							653 0x80000000 /* MX51_PAD_DISP2_DAT13__FEC_TX_CLK */
++							657 0x80000000 /* MX51_PAD_DISP2_DAT14__FEC_RDATA0 */
++							662 0x80000000 /* MX51_PAD_DISP2_DAT15__FEC_TDATA0 */
++						>;
++					};
+ 				};
+ 
+ 				ecspi1 {
+@@ -409,6 +432,13 @@
+ 							49 0x1c5	/* MX51_PAD_EIM_D24__UART3_CTS */
+ 						>;
+ 					};
++
++					pinctrl_uart3_2: uart3grp-2 {
++						fsl,pins = <
++							434 0x1c5	/* MX51_PAD_UART3_RXD__UART3_RXD */
++							430 0x1c5	/* MX51_PAD_UART3_TXD__UART3_TXD */
++						>;
++					};
+ 				};
+ 			};
+ 
+-- 
+1.7.10.4
+
diff --git a/patches/linux/3.0/404-armadeus-fix_nand_ecc_oob.patch b/patches/linux/3.8/0404-armadeus-fix_nand_ecc_oob.patch
similarity index 57%
copy from patches/linux/3.0/404-armadeus-fix_nand_ecc_oob.patch
copy to patches/linux/3.8/0404-armadeus-fix_nand_ecc_oob.patch
index 8cace4c..8e7912a 100644
--- a/patches/linux/3.0/404-armadeus-fix_nand_ecc_oob.patch
+++ b/patches/linux/3.8/0404-armadeus-fix_nand_ecc_oob.patch
@@ -2,11 +2,11 @@ Add OOB and bad block table management to the V3 mxc_nand driver
 
 Signed-off-by: Nicolas Colombain <nic...@ar...>
 
-Index: linux-3.0.10/drivers/mtd/nand/mxc_nand.c
+Index: linux-3.8-rc1/drivers/mtd/nand/mxc_nand.c
 ===================================================================
---- linux-3.0.10.orig/drivers/mtd/nand/mxc_nand.c	2011-11-21 23:37:44.000000000 +0100
-+++ linux-3.0.10/drivers/mtd/nand/mxc_nand.c	2011-11-30 17:18:02.000000000 +0100
-@@ -243,6 +243,18 @@
+--- linux-3.8-rc1.orig/drivers/mtd/nand/mxc_nand.c	2012-12-22 02:19:00.000000000 +0100
++++ linux-3.8-rc1/drivers/mtd/nand/mxc_nand.c	2013-01-04 15:03:40.000000000 +0100
+@@ -266,6 +266,18 @@
  	}
  };
  
@@ -15,17 +15,17 @@ Index: linux-3.0.10/drivers/mtd/nand/mxc_nand.c
 +	.eccbytes = 4 * 8,
 +	.eccpos = {
 +		8, 9, 10, 11, 12, 13, 14, 15,
-+		72, 73, 74, 75, 76, 77, 78, 79, 
++		72, 73, 74, 75, 76, 77, 78, 79,
 +		136, 137, 138, 139, 140, 141, 142, 143,
 +		200, 201, 202, 203, 204, 205, 206, 207
 +	},
 +	.oobfree = { {2, 4}, {16, 56}, {80, 56}, {144, 56}, {208, 48} },
 +};
 +
- static const char *part_probes[] = { "RedBoot", "cmdlinepart", NULL };
+ static const char const *part_probes[] = {
+ 	"cmdlinepart", "RedBoot", "ofpart", NULL };
  
- static irqreturn_t mxc_nfc_irq(int irq, void *dev_id)
-@@ -1037,6 +1049,28 @@
+@@ -1147,6 +1159,28 @@
  	.pattern = mirror_pattern,
  };
  
@@ -51,31 +51,31 @@ Index: linux-3.0.10/drivers/mtd/nand/mxc_nand.c
 +	.pattern = mirror_pattern
 +};
 +
- static int __init mxcnd_probe(struct platform_device *pdev)
- {
- 	struct nand_chip *this;
-@@ -1152,7 +1186,7 @@
- 		host->get_dev_status = get_dev_status_v3;
- 		host->irq_control = irq_control_v3;
- 		oob_smallpage = &nandv2_hw_eccoob_smallpage;
--		oob_largepage = &nandv2_hw_eccoob_largepage;
-+		oob_largepage = &nandv3_hw_eccoob_largepage;
- 	} else
- 		BUG();
- 
-@@ -1176,8 +1210,13 @@
+ /* v1 + irqpending_quirk: i.MX21 */
+ static const struct mxc_nand_devtype_data imx21_nand_devtype_data = {
+ 	.preset = preset_v1,
+@@ -1236,7 +1270,7 @@
+ 	.irq_control = irq_control_v3,
+ 	.get_ecc_status = get_ecc_status_v3,
+ 	.ecclayout_512 = &nandv2_hw_eccoob_smallpage,
+-	.ecclayout_2k = &nandv2_hw_eccoob_largepage,
++	.ecclayout_2k = &nandv3_hw_eccoob_largepage,
+ 	.ecclayout_4k = &nandv2_hw_eccoob_smallpage, /* XXX: needs fix */
+ 	.select_chip = mxc_nand_select_chip_v1_v3,
+ 	.correct_data = mxc_nand_correct_data_v2_v3,
+@@ -1482,8 +1516,13 @@
  		this->options |= NAND_BUSWIDTH_16;
  
- 	if (pdata->flash_bbt) {
+ 	if (host->pdata.flash_bbt) {
 -		this->bbt_td = &bbt_main_descr;
 -		this->bbt_md = &bbt_mirror_descr;
-+		if (nfc_is_v3_2()) {
++		if (is_imx51_nfc(host)) {
 +			this->bbt_td = &v3bbt_main_descr;
-+			this->bbt_md = &v3bbt_mirror_descr;		
++			this->bbt_md = &v3bbt_mirror_descr;
 +		} else {
 +			this->bbt_td = &bbt_main_descr;
 +			this->bbt_md = &bbt_mirror_descr;
 +		}
  		/* update flash based bbt */
- 		this->options |= NAND_USE_FLASH_BBT;
+ 		this->bbt_options |= NAND_BBT_USE_FLASH;
  	}
diff --git a/target/linux/modules/pwm/pwm.c b/target/linux/modules/pwm/pwm.c
index 1fe0c9e..877aca7 100644
--- a/target/linux/modules/pwm/pwm.c
+++ b/target/linux/modules/pwm/pwm.c
@@ -33,12 +33,14 @@
 #include <linux/fcntl.h>
 #include <linux/interrupt.h>
 #include <asm/io.h>
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(3,7,9)
 #include <mach/hardware.h>
+#include <linux/sysdev.h>
+#endif
 #include <linux/errno.h>
 #include <linux/wait.h>
 #include <linux/pm.h>
 #include <linux/clk.h>
-#include <linux/sysdev.h>
 #include <linux/device.h>	/* struct class */
 #include <linux/circ_buf.h>
 #include <linux/platform_device.h>
@@ -439,8 +441,12 @@ static int pwm_fasync(int fd, struct file *filp, int mode)
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
 int pwm_ioctl(struct inode * inode, struct file *filp, unsigned int cmd, unsigned long arg)
 #else
+#if LINUX_VERSION_CODE > KERNEL_VERSION(3,7,0)
+long pwm_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
+#else
 int pwm_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 #endif
+#endif
 {
 	char *str=NULL;
 	int ret = 0;
@@ -1011,7 +1017,9 @@ error_platform_init:
 	free_irq(pwm->irq, pwm);
 error_chrdev:
 	unregister_chrdev(gMajor, DRIVER_NAME);
+#ifndef CONFIG_ARCH_MX5
 error_iounmap:
+#endif
         iounmap(pwm->membase);
 error_memreg:
 	release_mem_region(res->start, resource_size(res));


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-80-gafb27cd

From: Fabien M <fa...@us...> - 2013-01-04 08:59:24

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  afb27cd715c32f5749f99a524c7acc00f8283a9c (commit)
       via  165ad06ba619850be5a923241ec47d4b3f35af71 (commit)
      from  8a2d2a31d213297ae70a5805c090e06201e32874 (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 afb27cd715c32f5749f99a524c7acc00f8283a9c
Merge: 165ad06 8a2d2a3
Author: Fabien Marteau <fab...@ar...>
Date:   Fri Jan 4 09:58:51 2013 +0100

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

commit 165ad06ba619850be5a923241ec47d4b3f35af71
Author: Fabien Marteau <fab...@ar...>
Date:   Fri Jan 4 09:58:10 2013 +0100

    [U-BOOT][2012.04][APF51] increase DDR RAM timings

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

Summary of changes:
 .../device/armadeus/apf51/apf51-u-boot-2012.04.h   |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.04.h b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.04.h
index 0c251a7..50320e1 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.04.h
+++ b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.04.h
@@ -25,7 +25,7 @@
 
 #define CONFIG_VERSION_VARIABLE
 #define CONFIG_ENV_VERSION	"1.2"
-#define CONFIG_IDENT_STRING	" apf51 patch 1.7"
+#define CONFIG_IDENT_STRING	" apf51 patch 1.8"
 #define CONFIG_BOARD_NAME	apf51
 
 /*
@@ -522,17 +522,17 @@
 #define ACFG_SDRAM_NUM_COL		10	/* 8..11 column address bits */
 #define ACFG_SDRAM_NUM_ROW		14	/* 11..13 row address bits */
 #define ACFG_SDRAM_REFRESH		3	/* 0=OFF 1=2048 2=4096 3=8192.*/
-#define ACFG_SDRAM_XSR_DELAY		125	/* ns Exit self refresh */
+#define ACFG_SDRAM_XSR_DELAY		138	/* ns Exit self refresh */
 #define ACFG_SDRAM_EXIT_PWD		10	/* ns exit power down delay */
 #define ACFG_SDRAM_W2R_DELAY		1	/* 0=1ck 1=2ck */
-#define ACFG_SDRAM_ROW_PRECHARGE_DELAY	15	/* ns (>2 x ddr_clk) */
+#define ACFG_SDRAM_ROW_PRECHARGE_DELAY	25	/* ns (>2 x ddr_clk) */
 #define ACFG_SDRAM_TMRD_DELAY		2	/* 1..4 */
 #define ACFG_SDRAM_TWR_DELAY		1	/* DDR: 0=2ck 1=3ck */
 #define ACFG_SDRAM_RAS_DELAY		40	/* ns ACTIVE-to-PRECHARGE */
 #define ACFG_SDRAM_RRD_DELAY		10	/* ns ACTIVE-to-ACTIVE delay */
-#define ACFG_SDRAM_RCD_DELAY		15	/* ns Row to Column delay */
-#define ACFG_SDRAM_RC_DELAY		55	/* ns Row cycle delay */
-#define ACFG_SDRAM_RFC_DELAY		72	/* ns (> 10xddr_clk) */
+#define ACFG_SDRAM_RCD_DELAY		25 	/* ns Row to Column delay */
+#define ACFG_SDRAM_RC_DELAY		68	/* ns Row cycle delay */
+#define ACFG_SDRAM_RFC_DELAY		110	/* ns (> 10xddr_clk) */
 #define ACFG_SDRAM_PARTIAL_ARRAY_SR	0	/* 0..4 */
 #define ACFG_SDRAM_DRIVE_STRENGH	0	/* 0..3 */
 #define ACFG_SDRAM_BURST_LENGTH		3	/* 2^N BYTES (N=0..3) */


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-105-g07e6d05

From: Julien B a. A. <ar...@us...> - 2013-01-02 21:35:09

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  07e6d05e1dafc7a28701596dd74b166aa279210e (commit)
      from  f8a7324ed11844bbe03d47ba4bcee329bb9a88e1 (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 07e6d05e1dafc7a28701596dd74b166aa279210e
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Jan 2 22:32:17 2013 +0100

    [LINUX] 3.8: APF27: improve FPGA related drivers support

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

Summary of changes:
 .../device/armadeus/apf27/apf27-linux-3.8.config   |    6 ++++++
 ...50-armadeus-add_custom_drivers_to_kconfig.patch |   16 ++++++++--------
 .../0322-armadeus-add_mach_fpga_h.patch            |   14 +++++---------
 ..._star_completion_for_source_in_menuconfig.patch |    6 +++---
 .../fpga/dev_tools/loader/apf27-fpga-loader.c      |    8 ++++++++
 .../fpga/virtual_components/irq_mngr/main.c        |   10 ++++++++--
 .../modules/fpga/virtual_components/led/g_led.c    |    2 ++
 7 files changed, 40 insertions(+), 22 deletions(-)
 copy patches/linux/{3.7 => 3.8}/0050-armadeus-add_custom_drivers_to_kconfig.patch (56%)
 copy patches/linux/{3.7 => 3.8}/0322-armadeus-add_mach_fpga_h.patch (87%)
 copy patches/linux/{3.7 => 3.8}/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch (87%)

diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.8.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.8.config
index dcd0fec..bc08620 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.8.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.8.config
@@ -201,6 +201,12 @@ CONFIG_IMX_SDMA=y
 CONFIG_IMX_DMA=y
 # CONFIG_IOMMU_SUPPORT is not set
 CONFIG_IIO=m
+CONFIG_ARMADEUS_DRIVERS=y
+CONFIG_ARMADEUS_FPGA_DRIVERS=y
+CONFIG_ARMADEUS_FPGA_LOADER_DRIVER=m
+CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS_IRQ_MNGR=m
+CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS_BUTTON=m
+CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS_LED=m
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
 CONFIG_EXT3_FS_POSIX_ACL=y
diff --git a/patches/linux/3.7/0050-armadeus-add_custom_drivers_to_kconfig.patch b/patches/linux/3.8/0050-armadeus-add_custom_drivers_to_kconfig.patch
similarity index 56%
copy from patches/linux/3.7/0050-armadeus-add_custom_drivers_to_kconfig.patch
copy to patches/linux/3.8/0050-armadeus-add_custom_drivers_to_kconfig.patch
index 0a689a5..9a18198 100644
--- a/patches/linux/3.7/0050-armadeus-add_custom_drivers_to_kconfig.patch
+++ b/patches/linux/3.8/0050-armadeus-add_custom_drivers_to_kconfig.patch
@@ -1,20 +1,20 @@
 This patch adds the possibility to have custom Armadeus drivers built in kernel or compiled as modules.
 
-Index: linux-3.7.1/drivers/Kconfig
+Index: linux-3.8-rc1/drivers/Kconfig
 ===================================================================
---- linux-3.7.1.orig/drivers/Kconfig	2012-12-17 20:14:54.000000000 +0100
-+++ linux-3.7.1/drivers/Kconfig	2013-01-02 16:49:43.000000000 +0100
-@@ -156,4 +156,6 @@
+--- linux-3.8-rc1.orig/drivers/Kconfig	2012-12-22 02:19:00.000000000 +0100
++++ linux-3.8-rc1/drivers/Kconfig	2013-01-02 20:28:02.000000000 +0100
+@@ -158,4 +158,6 @@
  
- source "drivers/irqchip/Kconfig"
+ source "drivers/ipack/Kconfig"
  
 +source "drivers/armadeus/Kconfig"
 +
  endmenu
-Index: linux-3.7.1/drivers/Makefile
+Index: linux-3.8-rc1/drivers/Makefile
 ===================================================================
---- linux-3.7.1.orig/drivers/Makefile	2012-12-17 20:14:54.000000000 +0100
-+++ linux-3.7.1/drivers/Makefile	2013-01-02 17:19:48.000000000 +0100
+--- linux-3.8-rc1.orig/drivers/Makefile	2012-12-22 02:19:00.000000000 +0100
++++ linux-3.8-rc1/drivers/Makefile	2013-01-02 20:28:02.000000000 +0100
 @@ -121,6 +121,7 @@
  obj-$(CONFIG_HID)		+= hid/
  obj-$(CONFIG_PPC_PS3)		+= ps3/
diff --git a/patches/linux/3.7/0322-armadeus-add_mach_fpga_h.patch b/patches/linux/3.8/0322-armadeus-add_mach_fpga_h.patch
similarity index 87%
copy from patches/linux/3.7/0322-armadeus-add_mach_fpga_h.patch
copy to patches/linux/3.8/0322-armadeus-add_mach_fpga_h.patch
index 34b4777..4fc87d2 100644
--- a/patches/linux/3.7/0322-armadeus-add_mach_fpga_h.patch
+++ b/patches/linux/3.8/0322-armadeus-add_mach_fpga_h.patch
@@ -1,8 +1,8 @@
-Index: linux-3.7.1/arch/arm/plat-mxc/include/mach/fpga.h
+Index: linux-3.8-rc1/arch/arm/mach-imx/fpga.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7.1/arch/arm/plat-mxc/include/mach/fpga.h	2013-01-02 18:45:18.000000000 +0100
-@@ -0,0 +1,50 @@
++++ linux-3.8-rc1/arch/arm/mach-imx/fpga.h	2013-01-02 22:16:56.000000000 +0100
+@@ -0,0 +1,46 @@
 +/*
 + * Copyright (C) 2009-2013 Armadeus Systems
 + *
@@ -24,11 +24,6 @@ Index: linux-3.7.1/arch/arm/plat-mxc/include/mach/fpga.h
 +#ifndef __ASM_ARCH_ARMADEUS_FPGA_H__
 +#define __ASM_ARCH_ARMADEUS_FPGA_H__
 +
-+#ifndef CONFIG_MACH_APF9328
-+# include <mach/irqs.h>
-+# include <linux/gpio.h>
-+#endif
-+
 +#if defined(CONFIG_MACH_APF51) /* */
 +# define APF51_FPGA_BASE_ADDR		0xb8000000
 +# define ARMADEUS_FPGA_BASE_ADDR	APF51_FPGA_BASE_ADDR
@@ -37,7 +32,7 @@ Index: linux-3.7.1/arch/arm/plat-mxc/include/mach/fpga.h
 +# define ARMADEUS_FPGA_IRQ		APF51_FPGA_IRQ
 +# define IRQ_FPGA_START			(MXC_BOARD_IRQ_START + 64)
 +#elif defined(CONFIG_MACH_APF27) /* */
-+#include <mach/iomux-v1.h>
++#include "iomux-v1.h"
 +# define APF27_FPGA_BASE_ADDR		0xd6000000
 +# define ARMADEUS_FPGA_BASE_ADDR	APF27_FPGA_BASE_ADDR
 +# define APF27_FPGA_INT_PIN		(GPIO_PORTF | 12)
@@ -52,4 +47,5 @@ Index: linux-3.7.1/arch/arm/plat-mxc/include/mach/fpga.h
 +#endif
 +
 +#define IRQ_FPGA(x)     (IRQ_FPGA_START + x)
++
 +#endif /* __ASM_ARCH_ARMADEUS_FPGA_H__ */
diff --git a/patches/linux/3.7/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch b/patches/linux/3.8/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
similarity index 87%
copy from patches/linux/3.7/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
copy to patches/linux/3.8/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
index 9f6b4d5..18e5b98 100644
--- a/patches/linux/3.7/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
+++ b/patches/linux/3.8/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
@@ -1,7 +1,7 @@
-Index: linux-3.7.1/scripts/kconfig/zconf.tab.c_shipped
+Index: linux-3.8-rc1/scripts/kconfig/zconf.tab.c_shipped
 ===================================================================
---- linux-3.7.1.orig/scripts/kconfig/zconf.tab.c_shipped	2013-01-02 17:19:25.000000000 +0100
-+++ linux-3.7.1/scripts/kconfig/zconf.tab.c_shipped	2013-01-02 17:24:41.000000000 +0100
+--- linux-3.8-rc1.orig/scripts/kconfig/zconf.tab.c_shipped	2012-12-22 02:19:00.000000000 +0100
++++ linux-3.8-rc1/scripts/kconfig/zconf.tab.c_shipped	2013-01-02 20:28:03.000000000 +0100
 @@ -86,6 +86,8 @@
  #include <stdlib.h>
  #include <string.h>
diff --git a/target/linux/modules/fpga/dev_tools/loader/apf27-fpga-loader.c b/target/linux/modules/fpga/dev_tools/loader/apf27-fpga-loader.c
index 473e344..000a6fc 100644
--- a/target/linux/modules/fpga/dev_tools/loader/apf27-fpga-loader.c
+++ b/target/linux/modules/fpga/dev_tools/loader/apf27-fpga-loader.c
@@ -26,14 +26,22 @@
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)
 #include <mach/iomux-mx1-mx2.h>
 #else
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
 #include <mach/iomux-mx27.h>
+#else
+#include <linux/../../arch/arm/mach-imx/iomux-mx27.h>
+#endif
 #endif
 #if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
 #include <mach/gpio.h>
 #else
 #include <linux/gpio.h>
 #endif
+#if LINUX_VERSION_CODE > KERNEL_VERSION(3,7,0)
+#include <linux/../../arch/arm/mach-imx/fpga.h>
+#else
 #include <mach/fpga.h>
+#endif
 
 #include "xilinx-fpga-loader.h"
 
diff --git a/target/linux/modules/fpga/virtual_components/irq_mngr/main.c b/target/linux/modules/fpga/virtual_components/irq_mngr/main.c
index f587c60..8d5cba2 100644
--- a/target/linux/modules/fpga/virtual_components/irq_mngr/main.c
+++ b/target/linux/modules/fpga/virtual_components/irq_mngr/main.c
@@ -36,8 +36,10 @@
 #endif
 #include <linux/irq.h>
 
-#include <mach/hardware.h>
-#include <mach/irqs.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,9)
+# include <mach/hardware.h>
+# include <mach/irqs.h>
+#endif
 #include <asm/irq.h>
 #include <asm/io.h> /* readb() & Co */
 #include <asm/mach/irq.h>
@@ -45,7 +47,11 @@
 #include "irq_mng.h"
 
 #ifndef CONFIG_MACH_APF9328
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,9)
 # include <mach/fpga.h> /* To remove when MX1 platform is merged */
+#else
+# include <linux/../../arch/arm/mach-imx/fpga.h>
+#endif
 #endif
 
 #define ID_OFFSET	(0x02 *(16/8))
diff --git a/target/linux/modules/fpga/virtual_components/led/g_led.c b/target/linux/modules/fpga/virtual_components/led/g_led.c
index ad81871..3011a2d 100644
--- a/target/linux/modules/fpga/virtual_components/led/g_led.c
+++ b/target/linux/modules/fpga/virtual_components/led/g_led.c
@@ -32,7 +32,9 @@
 
 #include <asm/uaccess.h>	/* copy_to_user function */
 #include <asm/io.h>		/* readw() writew() */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,9)
 #include <mach/hardware.h>
+#endif
 
 #include "led.h"
 


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-104-gf8a7324

From: Julien B a. A. <ar...@us...> - 2013-01-02 18:27:11

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  f8a7324ed11844bbe03d47ba4bcee329bb9a88e1 (commit)
       via  cc04bae83391e4f008e7f2317e55200fc55f0d58 (commit)
       via  3276f0dbd800e9b1c3e9306d3ff35d5e2dab8705 (commit)
       via  88f83da56b20fc061384abaa7ee8e65df5c3fc0f (commit)
       via  833f8547f5c987222733668e01ef1580b7e4d7e0 (commit)
       via  4478efb8b018cf3b2888426d36bcbe5cdbcbbded (commit)
       via  7d3770f2b13fbdbe4ce526b15c7f58135080dba4 (commit)
      from  c1b487f95a5902340a7240f251731c4c5bd2de1d (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 f8a7324ed11844bbe03d47ba4bcee329bb9a88e1
Author: Victor Hiairrassary <vic...@gm...>
Date:   Wed Jan 2 19:04:13 2013 +0100

    [LINUX] cleanup custom Armadeus drivers config and make fpgaloader compiles again on > 3.7

commit cc04bae83391e4f008e7f2317e55200fc55f0d58
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Jan 2 18:59:59 2013 +0100

    [LINUX] 3.7: add some FPGA drivers to default config and fixes build

commit 3276f0dbd800e9b1c3e9306d3ff35d5e2dab8705
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Jan 2 18:57:15 2013 +0100

    [LINUX] 3.7: fixes build of recent commits and rename some patches

commit 88f83da56b20fc061384abaa7ee8e65df5c3fc0f
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Jan 2 15:12:59 2013 +0100

    [LINUX] APF27/28/9328: bump Linux 3.7 support to 3.7.1

commit 833f8547f5c987222733668e01ef1580b7e4d7e0
Author: Victor Hiairrassary <vic...@gm...>
Date:   Fri Dec 28 22:30:19 2012 +0100

    Linux 3.7 is out, so remove symlinks related to linux 3.7-rc*

commit 4478efb8b018cf3b2888426d36bcbe5cdbcbbded
Author: Victor Hiairrassary <vic...@gm...>
Date:   Fri Dec 28 18:02:41 2012 +0100

    Add support for armadeus drivers on current linux release

commit 7d3770f2b13fbdbe4ce526b15c7f58135080dba4
Author: Victor Hiairrassary <vic...@gm...>
Date:   Fri Dec 28 18:02:40 2012 +0100

    Copy and paste this patch for the actual linux release

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

Summary of changes:
 .../armadeus/apf27/apf27-linux-3.7-rc6.config      |    1 -
 .../armadeus/apf27/apf27-linux-3.7-rc7.config      |    1 -
 .../armadeus/apf27/apf27-linux-3.7-rc8.config      |    1 -
 ...nux-3.7-rc4.config => apf27-linux-3.7.1.config} |    0
 .../device/armadeus/apf27/apf27-linux-3.7.config   |    6 +++
 ...nux-3.7-rc3.config => apf28-linux-3.7.1.config} |    0
 ...x-3.7-rc6.config => apf9328-linux-3.7.1.config} |    0
 patches/linux/3.7-rc4                              |    1 -
 patches/linux/3.7-rc6                              |    1 -
 patches/linux/3.7-rc7                              |    1 -
 patches/linux/3.7-rc8                              |    1 -
 patches/linux/{3.7-rc3 => 3.7.1}                   |    0
 ...50-armadeus-add_custom_drivers_to_kconfig.patch |   25 +++++++++++
 .../3.7/0201-armadeus-add_apf27dev_baseboard.patch |   45 ++++++++++----------
 .../0322-armadeus-add_mach_fpga_h.patch}           |   10 ++--
 ...star_completion_for_source_in_menuconfig.patch} |   29 +++++++------
 target/linux/modules/Kconfig                       |   30 +++----------
 target/linux/modules/fpga/Kconfig                  |   20 +++------
 target/linux/modules/fpga/board_designs/Kconfig    |    5 +-
 .../fpga/dev_tools/loader/apf27-fpga-loader.c      |    7 +++
 .../fpga/virtual_components/button/gbutton.c       |    7 +++-
 .../fpga/virtual_components/irq_mngr/main.c        |    9 +++-
 22 files changed, 108 insertions(+), 92 deletions(-)
 delete mode 120000 buildroot/target/device/armadeus/apf27/apf27-linux-3.7-rc6.config
 delete mode 120000 buildroot/target/device/armadeus/apf27/apf27-linux-3.7-rc7.config
 delete mode 120000 buildroot/target/device/armadeus/apf27/apf27-linux-3.7-rc8.config
 rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.7-rc4.config => apf27-linux-3.7.1.config} (100%)
 rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.7-rc3.config => apf28-linux-3.7.1.config} (100%)
 rename buildroot/target/device/armadeus/apf9328/{apf9328-linux-3.7-rc6.config => apf9328-linux-3.7.1.config} (100%)
 delete mode 120000 patches/linux/3.7-rc4
 delete mode 120000 patches/linux/3.7-rc6
 delete mode 120000 patches/linux/3.7-rc7
 delete mode 120000 patches/linux/3.7-rc8
 rename patches/linux/{3.7-rc3 => 3.7.1} (100%)
 create mode 100644 patches/linux/3.7/0050-armadeus-add_custom_drivers_to_kconfig.patch
 copy patches/linux/{3.0/322-apf27-armadeus-add_mach_fpga_h.patch => 3.7/0322-armadeus-add_mach_fpga_h.patch} (88%)
 copy patches/linux/{3.0/441-armadeus-adding_star_completion_for_source_in_menuconfig.patch => 3.7/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch} (75%)

diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.7-rc6.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.7-rc6.config
deleted file mode 120000
index 2a64a30..0000000
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.7-rc6.config
+++ /dev/null
@@ -1 +0,0 @@
-apf27-linux-3.7.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.7-rc7.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.7-rc7.config
deleted file mode 120000
index 2a64a30..0000000
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.7-rc7.config
+++ /dev/null
@@ -1 +0,0 @@
-apf27-linux-3.7.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.7-rc8.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.7-rc8.config
deleted file mode 120000
index 2a64a30..0000000
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.7-rc8.config
+++ /dev/null
@@ -1 +0,0 @@
-apf27-linux-3.7.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.7-rc4.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.7.1.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.7-rc4.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.7.1.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.7.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.7.config
index afe1dc0..fca5c1e 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.7.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.7.config
@@ -203,6 +203,12 @@ CONFIG_IMX_SDMA=y
 CONFIG_IMX_DMA=y
 # CONFIG_IOMMU_SUPPORT is not set
 CONFIG_IIO=m
+CONFIG_ARMADEUS_DRIVERS=y
+CONFIG_ARMADEUS_FPGA_DRIVERS=y
+CONFIG_ARMADEUS_FPGA_LOADER_DRIVER=m
+CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS_IRQ_MNGR=m
+CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS_BUTTON=m
+CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS_LED=m
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
 CONFIG_EXT3_FS_POSIX_ACL=y
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.7-rc3.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.7.1.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.7-rc3.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.7.1.config
diff --git a/buildroot/target/device/armadeus/apf9328/apf9328-linux-3.7-rc6.config b/buildroot/target/device/armadeus/apf9328/apf9328-linux-3.7.1.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf9328/apf9328-linux-3.7-rc6.config
rename to buildroot/target/device/armadeus/apf9328/apf9328-linux-3.7.1.config
diff --git a/patches/linux/3.7-rc4 b/patches/linux/3.7-rc4
deleted file mode 120000
index 548d713..0000000
--- a/patches/linux/3.7-rc4
+++ /dev/null
@@ -1 +0,0 @@
-3.7
\ No newline at end of file
diff --git a/patches/linux/3.7-rc6 b/patches/linux/3.7-rc6
deleted file mode 120000
index 548d713..0000000
--- a/patches/linux/3.7-rc6
+++ /dev/null
@@ -1 +0,0 @@
-3.7
\ No newline at end of file
diff --git a/patches/linux/3.7-rc7 b/patches/linux/3.7-rc7
deleted file mode 120000
index 548d713..0000000
--- a/patches/linux/3.7-rc7
+++ /dev/null
@@ -1 +0,0 @@
-3.7
\ No newline at end of file
diff --git a/patches/linux/3.7-rc8 b/patches/linux/3.7-rc8
deleted file mode 120000
index 548d713..0000000
--- a/patches/linux/3.7-rc8
+++ /dev/null
@@ -1 +0,0 @@
-3.7
\ No newline at end of file
diff --git a/patches/linux/3.7-rc3 b/patches/linux/3.7.1
similarity index 100%
rename from patches/linux/3.7-rc3
rename to patches/linux/3.7.1
diff --git a/patches/linux/3.7/0050-armadeus-add_custom_drivers_to_kconfig.patch b/patches/linux/3.7/0050-armadeus-add_custom_drivers_to_kconfig.patch
new file mode 100644
index 0000000..0a689a5
--- /dev/null
+++ b/patches/linux/3.7/0050-armadeus-add_custom_drivers_to_kconfig.patch
@@ -0,0 +1,25 @@
+This patch adds the possibility to have custom Armadeus drivers built in kernel or compiled as modules.
+
+Index: linux-3.7.1/drivers/Kconfig
+===================================================================
+--- linux-3.7.1.orig/drivers/Kconfig	2012-12-17 20:14:54.000000000 +0100
++++ linux-3.7.1/drivers/Kconfig	2013-01-02 16:49:43.000000000 +0100
+@@ -156,4 +156,6 @@
+ 
+ source "drivers/irqchip/Kconfig"
+ 
++source "drivers/armadeus/Kconfig"
++
+ endmenu
+Index: linux-3.7.1/drivers/Makefile
+===================================================================
+--- linux-3.7.1.orig/drivers/Makefile	2012-12-17 20:14:54.000000000 +0100
++++ linux-3.7.1/drivers/Makefile	2013-01-02 17:19:48.000000000 +0100
+@@ -121,6 +121,7 @@
+ obj-$(CONFIG_HID)		+= hid/
+ obj-$(CONFIG_PPC_PS3)		+= ps3/
+ obj-$(CONFIG_OF)		+= of/
++obj-$(CONFIG_ARMADEUS_DRIVERS)	+= armadeus/
+ obj-$(CONFIG_SSB)		+= ssb/
+ obj-$(CONFIG_BCMA)		+= bcma/
+ obj-$(CONFIG_VHOST_NET)		+= vhost/
diff --git a/patches/linux/3.7/0201-armadeus-add_apf27dev_baseboard.patch b/patches/linux/3.7/0201-armadeus-add_apf27dev_baseboard.patch
index ff9ac9d..fbec6e4 100644
--- a/patches/linux/3.7/0201-armadeus-add_apf27dev_baseboard.patch
+++ b/patches/linux/3.7/0201-armadeus-add_apf27dev_baseboard.patch
@@ -8,11 +8,11 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
 Signed-off-by: Jeremie Scheer <jer...@ar...>
 Signed-off-by: Kevin Joly <jol...@gm...>
 
-Index: linux-3.7/arch/arm/mach-imx/apf27-dev.c
+Index: linux-3.7.1/arch/arm/mach-imx/apf27-dev.c
 ===================================================================
---- /dev/null
-+++ linux-3.7/arch/arm/mach-imx/apf27-dev.c
-@@ -0,0 +1,1026 @@
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.1/arch/arm/mach-imx/apf27-dev.c	2013-01-02 17:57:45.000000000 +0100
+@@ -0,0 +1,1025 @@
 + /*
 + * apf27-dev.c
 + * Support for AFP27 module's development baseboard
@@ -526,7 +526,6 @@ Index: linux-3.7/arch/arm/mach-imx/apf27-dev.c
 +
 +static int max1027_exit(struct spi_device *spi)
 +{
-+	mxc_gpio_release_multiple_pins(max1027_pins, ARRAY_SIZE(max1027_pins));
 +	return 0;
 +}
 +
@@ -1039,10 +1038,10 @@ Index: linux-3.7/arch/arm/mach-imx/apf27-dev.c
 +#endif
 +}
 +
-Index: linux-3.7/arch/arm/mach-imx/apf27-lcd.c
+Index: linux-3.7.1/arch/arm/mach-imx/apf27-lcd.c
 ===================================================================
---- /dev/null
-+++ linux-3.7/arch/arm/mach-imx/apf27-lcd.c
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.1/arch/arm/mach-imx/apf27-lcd.c	2013-01-02 17:21:07.000000000 +0100
 @@ -0,0 +1,157 @@
 +/*
 + * apf27-lcd.c
@@ -1201,10 +1200,10 @@ Index: linux-3.7/arch/arm/mach-imx/apf27-lcd.c
 +}
 +
 +#endif
-Index: linux-3.7/arch/arm/mach-imx/apf27-dev-ext-apw.c
+Index: linux-3.7.1/arch/arm/mach-imx/apf27-dev-ext-apw.c
 ===================================================================
---- /dev/null
-+++ linux-3.7/arch/arm/mach-imx/apf27-dev-ext-apw.c
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.1/arch/arm/mach-imx/apf27-dev-ext-apw.c	2013-01-02 17:21:07.000000000 +0100
 @@ -0,0 +1,175 @@
 + /*
 + * apf27-dev-ext-apw.c
@@ -1381,10 +1380,10 @@ Index: linux-3.7/arch/arm/mach-imx/apf27-dev-ext-apw.c
 +	printk("done\n");
 +}
 +
-Index: linux-3.7/arch/arm/mach-imx/mach-apf27.c
+Index: linux-3.7.1/arch/arm/mach-imx/mach-apf27.c
 ===================================================================
---- linux-3.7.orig/arch/arm/mach-imx/mach-apf27.c
-+++ linux-3.7/arch/arm/mach-imx/mach-apf27.c
+--- linux-3.7.1.orig/arch/arm/mach-imx/mach-apf27.c	2013-01-02 17:21:07.000000000 +0100
++++ linux-3.7.1/arch/arm/mach-imx/mach-apf27.c	2013-01-02 17:21:07.000000000 +0100
 @@ -43,6 +43,7 @@
  
  #include "devices-imx27.h"
@@ -1393,7 +1392,7 @@ Index: linux-3.7/arch/arm/mach-imx/mach-apf27.c
  
  static const int apf27_pins[] __initconst = {
  	/* UART1 */
-@@ -270,6 +271,10 @@ static void __init apf27_init(void)
+@@ -270,6 +271,10 @@
  	i2c_register_board_info(1, apf27_i2c_devices_bus1,
  				ARRAY_SIZE(apf27_i2c_devices_bus1));
  	imx27_add_imx_i2c(1, &apf27_i2c_1_data);
@@ -1404,11 +1403,11 @@ Index: linux-3.7/arch/arm/mach-imx/mach-apf27.c
  }
  
  static void __init apf27_timer_init(void)
-Index: linux-3.7/arch/arm/mach-imx/Kconfig
+Index: linux-3.7.1/arch/arm/mach-imx/Kconfig
 ===================================================================
---- linux-3.7.orig/arch/arm/mach-imx/Kconfig
-+++ linux-3.7/arch/arm/mach-imx/Kconfig
-@@ -430,6 +430,103 @@ config MACH_APF27
+--- linux-3.7.1.orig/arch/arm/mach-imx/Kconfig	2013-01-02 17:21:07.000000000 +0100
++++ linux-3.7.1/arch/arm/mach-imx/Kconfig	2013-01-02 17:21:07.000000000 +0100
+@@ -430,6 +430,103 @@
  	  Include support for APF27 platform. This includes specific
  	  configurations for the module and its peripherals.
  
@@ -1512,11 +1511,11 @@ Index: linux-3.7/arch/arm/mach-imx/Kconfig
  endif
  
  if ARCH_IMX_V6_V7
-Index: linux-3.7/arch/arm/mach-imx/Makefile
+Index: linux-3.7.1/arch/arm/mach-imx/Makefile
 ===================================================================
---- linux-3.7.orig/arch/arm/mach-imx/Makefile
-+++ linux-3.7/arch/arm/mach-imx/Makefile
-@@ -46,6 +46,9 @@ obj-$(CONFIG_MACH_MXT_TD60) += mach-mxt_
+--- linux-3.7.1.orig/arch/arm/mach-imx/Makefile	2013-01-02 17:21:07.000000000 +0100
++++ linux-3.7.1/arch/arm/mach-imx/Makefile	2013-01-02 17:21:07.000000000 +0100
+@@ -46,6 +46,9 @@
  obj-$(CONFIG_MACH_IMX27IPCAM) += mach-imx27ipcam.o
  obj-$(CONFIG_MACH_IMX27_DT) += imx27-dt.o
  obj-$(CONFIG_MACH_APF27) += mach-apf27.o
diff --git a/patches/linux/3.0/322-apf27-armadeus-add_mach_fpga_h.patch b/patches/linux/3.7/0322-armadeus-add_mach_fpga_h.patch
similarity index 88%
copy from patches/linux/3.0/322-apf27-armadeus-add_mach_fpga_h.patch
copy to patches/linux/3.7/0322-armadeus-add_mach_fpga_h.patch
index 603e5a3..34b4777 100644
--- a/patches/linux/3.0/322-apf27-armadeus-add_mach_fpga_h.patch
+++ b/patches/linux/3.7/0322-armadeus-add_mach_fpga_h.patch
@@ -1,10 +1,10 @@
-Index: linux-3.0.10/arch/arm/plat-mxc/include/mach/fpga.h
+Index: linux-3.7.1/arch/arm/plat-mxc/include/mach/fpga.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.0.10/arch/arm/plat-mxc/include/mach/fpga.h	2011-12-02 08:38:34.000000000 +0100
++++ linux-3.7.1/arch/arm/plat-mxc/include/mach/fpga.h	2013-01-02 18:45:18.000000000 +0100
 @@ -0,0 +1,50 @@
 +/*
-+ * Copyright (C) 2009-2011 ARMadeus Systems
++ * Copyright (C) 2009-2013 Armadeus Systems
 + *
 + * This program is free software; you can redistribute it and/or
 + * modify it under the terms of the GNU General Public License
@@ -26,7 +26,7 @@ Index: linux-3.0.10/arch/arm/plat-mxc/include/mach/fpga.h
 +
 +#ifndef CONFIG_MACH_APF9328
 +# include <mach/irqs.h>
-+# include <mach/gpio.h>
++# include <linux/gpio.h>
 +#endif
 +
 +#if defined(CONFIG_MACH_APF51) /* */
@@ -43,7 +43,7 @@ Index: linux-3.0.10/arch/arm/plat-mxc/include/mach/fpga.h
 +# define APF27_FPGA_INT_PIN		(GPIO_PORTF | 12)
 +# define APF27_FPGA_IRQ			(IRQ_GPIOF(12))
 +# define ARMADEUS_FPGA_IRQ		APF27_FPGA_IRQ
-+# define IRQ_FPGA_START			MXC_BOARD_IRQ_START
++# define IRQ_FPGA_START			96
 +#elif defined(CONFIG_MACH_APF9328) /* */
 +# define APF9328_FPGA_BASE_ADDR		0x12000000
 +# define ARMADEUS_FPGA_BASE_ADDR	APF9328_FPGA_BASE_ADDR
diff --git a/patches/linux/3.0/441-armadeus-adding_star_completion_for_source_in_menuconfig.patch b/patches/linux/3.7/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
similarity index 75%
copy from patches/linux/3.0/441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
copy to patches/linux/3.7/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
index 804d83e..9f6b4d5 100644
--- a/patches/linux/3.0/441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
+++ b/patches/linux/3.7/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
@@ -1,17 +1,17 @@
-Index: linux-3.0.10/scripts/kconfig/zconf.tab.c_shipped
+Index: linux-3.7.1/scripts/kconfig/zconf.tab.c_shipped
 ===================================================================
---- linux-3.0.10.orig/scripts/kconfig/zconf.tab.c_shipped	2011-11-21 23:37:44.000000000 +0100
-+++ linux-3.0.10/scripts/kconfig/zconf.tab.c_shipped	2011-11-30 18:40:10.000000000 +0100
-@@ -87,6 +87,8 @@
+--- linux-3.7.1.orig/scripts/kconfig/zconf.tab.c_shipped	2013-01-02 17:19:25.000000000 +0100
++++ linux-3.7.1/scripts/kconfig/zconf.tab.c_shipped	2013-01-02 17:24:41.000000000 +0100
+@@ -86,6 +86,8 @@
  #include <stdlib.h>
  #include <string.h>
  #include <stdbool.h>
 +#include <dirent.h>
 +#include <sys/stat.h>
  
- #define LKC_DIRECT_LINK
  #include "lkc.h"
-@@ -95,6 +97,7 @@
+ 
+@@ -93,6 +95,7 @@
  
  #define PRINTD		0x0001
  #define DEBUG_PARSE	0x0002
@@ -19,11 +19,13 @@ Index: linux-3.0.10/scripts/kconfig/zconf.tab.c_shipped
  
  int cdebug = PRINTD;
  
-@@ -108,6 +111,26 @@
+@@ -109,6 +112,27 @@
+ 
  
- static struct menu *current_menu, *current_entry;
  
 +
++static int isDir(const char *, const char *);
++
 +int isDir(const char *fullpath, const char *dname) {
 +  struct stat sbuf;
 +
@@ -39,14 +41,13 @@ Index: linux-3.0.10/scripts/kconfig/zconf.tab.c_shipped
 +    return 1;
 +  }
 +
-+return 0;
++  return 0;
 +}
 +
-+
- #define YYDEBUG 0
- #if YYDEBUG
- #define YYERROR_VERBOSE
-@@ -1897,8 +1920,30 @@
+ /* Enabling traces.  */
+ #ifndef YYDEBUG
+ # define YYDEBUG 1
+@@ -1900,8 +1924,30 @@
    case 83:
  
      {
diff --git a/target/linux/modules/Kconfig b/target/linux/modules/Kconfig
index 298ea6a..e4fe452 100644
--- a/target/linux/modules/Kconfig
+++ b/target/linux/modules/Kconfig
@@ -2,49 +2,31 @@
 # Armadeus custom drivers configuration
 #
 
-menu "Armadeus specific drivers"
-
-#
-config ARMADEUS_DRIVERS
-	boolean "Support for specific Armadeus drivers"
-	default n
+menuconfig ARMADEUS_DRIVERS
+	bool "Support for specific Armadeus drivers"
 	---help---
+	  This menu will give you access on some Armadeus drivers and tool.
+
+if ARMADEUS_DRIVERS
 
 comment "Misc."
-	depends on ARMADEUS_DRIVERS
-	  
 source "drivers/armadeus/generic/Kconfig"
-
 source "drivers/armadeus/as1531_platform/Kconfig"
-
 source "drivers/armadeus/mxs_lradc/Kconfig"
-
 source "drivers/armadeus/gpio/Kconfig"
-
 source "drivers/armadeus/imxlkeypad/Kconfig"
-
 source "drivers/armadeus/max1027/Kconfig"
-
 source "drivers/armadeus/max9768/Kconfig"
 
 comment "FPGA related"
-	depends on ARMADEUS_DRIVERS
-
 source "drivers/armadeus/fpga/Kconfig"
 
 comment "Handheld related"
-	depends on ARMADEUS_DRIVERS
-
 source "drivers/armadeus/pwm/Kconfig"
-
 source "drivers/armadeus/backlight/Kconfig"
-
 source "drivers/armadeus/display/Kconfig"
 
 comment "Communication bus related"
-	depends on ARMADEUS_DRIVERS
-
 source "drivers/armadeus/isp1761/Kconfig"
 
-endmenu
-
+endif # ARMADEUS_DRIVERS
diff --git a/target/linux/modules/fpga/Kconfig b/target/linux/modules/fpga/Kconfig
index dcb8ecc..65ca9db 100644
--- a/target/linux/modules/fpga/Kconfig
+++ b/target/linux/modules/fpga/Kconfig
@@ -1,26 +1,20 @@
 #
-# Armadeus custom drivers configuration
+# Armadeus FPGA drivers configuration
 #
 
-menu "FPGA Drivers "
-
-#
-config ARMADEUS_FPGA_DRIVERS
-	boolean "Support FPGA specific drivers"
-	default n
+menuconfig ARMADEUS_FPGA_DRIVERS
+	bool "FPGA specific drivers and tools"
 	---help---
-	  All drivers for FPGA components
+	  All drivers and tools related to FPGA.
 
-source "drivers/armadeus/fpga/dev_tools/Kconfig"
+if ARMADEUS_FPGA_DRIVERS
 
+source "drivers/armadeus/fpga/dev_tools/Kconfig"
 source "drivers/armadeus/fpga/others/Kconfig"
 
 comment "Specific designs"
-	depends on ARMADEUS_FPGA_DRIVERS
-
 source "drivers/armadeus/fpga/virtual_components/Kconfig"
 source "drivers/armadeus/fpga/POD/Kconfig"
 source "drivers/armadeus/fpga/board_designs/Kconfig"
 
-endmenu
-
+endif # ARMADEUS_FPGA_DRIVERS
diff --git a/target/linux/modules/fpga/board_designs/Kconfig b/target/linux/modules/fpga/board_designs/Kconfig
index bf7fa8b..7e47434 100644
--- a/target/linux/modules/fpga/board_designs/Kconfig
+++ b/target/linux/modules/fpga/board_designs/Kconfig
@@ -1,13 +1,12 @@
 #
-# Armadeus custom drivers configuration
+# Armadeus FPGA platform drivers configuration
 #
 
 config ARMADEUS_FPGA_BOARD_DESIGNS
 	boolean "Board designs"
-	default n
 	depends on ARMADEUS_FPGA_DRIVERS
 	---help---
-	  Board support for fpga designs
+	  Board support for FPGA designs
 
 source "drivers/armadeus/fpga/board_designs/*/Kconfig"
 
diff --git a/target/linux/modules/fpga/dev_tools/loader/apf27-fpga-loader.c b/target/linux/modules/fpga/dev_tools/loader/apf27-fpga-loader.c
index 6c77b2e..473e344 100644
--- a/target/linux/modules/fpga/dev_tools/loader/apf27-fpga-loader.c
+++ b/target/linux/modules/fpga/dev_tools/loader/apf27-fpga-loader.c
@@ -28,7 +28,11 @@
 #else
 #include <mach/iomux-mx27.h>
 #endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
 #include <mach/gpio.h>
+#else
+#include <linux/gpio.h>
+#endif
 #include <mach/fpga.h>
 
 #include "xilinx-fpga-loader.h"
@@ -175,8 +179,11 @@ int apf27_fpga_busy(void)
 int apf27_fpga_post(void)
 {
 	iounmap(fpga_membase);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
 	mxc_gpio_release_multiple_pins(fpga_shared_pins,
 				       ARRAY_SIZE(fpga_shared_pins));
+	/* see https://github.com/torvalds/linux/commit/581f84e24b45ab871ae5f15f9290261c7226ffa9 */
+#endif
 	/* reconfigure bus ctrl signals */
 	mxc_gpio_mode(CFG_FPGA_RW | GPIO_PF | GPIO_PUEN);
 	mxc_gpio_mode(CFG_FPGA_CS | GPIO_PF | GPIO_PUEN);
diff --git a/target/linux/modules/fpga/virtual_components/button/gbutton.c b/target/linux/modules/fpga/virtual_components/button/gbutton.c
index 78a74fd..9b78ae4 100644
--- a/target/linux/modules/fpga/virtual_components/button/gbutton.c
+++ b/target/linux/modules/fpga/virtual_components/button/gbutton.c
@@ -230,7 +230,12 @@ static int button_probe(struct platform_device *pdev)
 	/* irq registering */
 	ret = request_irq(sdev->irq_res->start,
 			  button_interrupt,
-			  IRQF_SAMPLE_RANDOM, sdev->name, sdev);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
+			  IRQF_SAMPLE_RANDOM,
+#else
+			  0,
+#endif
+			  sdev->name, sdev);
 	if (ret < 0) {
 		printk(KERN_ERR "Can't register irq %d\n",
 		       sdev->irq_res->start);
diff --git a/target/linux/modules/fpga/virtual_components/irq_mngr/main.c b/target/linux/modules/fpga/virtual_components/irq_mngr/main.c
index ff9d6d5..f587c60 100644
--- a/target/linux/modules/fpga/virtual_components/irq_mngr/main.c
+++ b/target/linux/modules/fpga/virtual_components/irq_mngr/main.c
@@ -1,7 +1,7 @@
 /*
  * Driver for the IRQ manager (OpenCore/Wishbone based) IP
  *
- * (C) Copyright 2008-2011 ARMadeus Systems
+ * (C) Copyright 2008-2013 Armadeus Systems
  * Author: Julien Boibessot <jul...@ar...>
  *
  * Inspired of linux/arch/arm/mach-imx/irq.c
@@ -281,7 +281,12 @@ static int __devinit ocore_irq_mng_probe(struct platform_device *pdev)
 	writew(0xffff, mng->membase + FPGA_ISR);
 
 	ret = request_irq(mng->irq_res->start, ocore_irq_mng_interrupt,
-				IRQF_SAMPLE_RANDOM, "ocore_irq_mng", mng);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
+				IRQF_SAMPLE_RANDOM,
+#else
+				0,
+#endif
+				"ocore_irq_mng", mng);
 
 	if (ret < 0) {
 		printk(KERN_ERR "Can't register irq %d\n",


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-96-gf91e217

From: Julien B a. A. <ar...@us...> - 2013-01-01 20:48:41

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  f91e217447ca4d471ec70f029291b16a81b8d7cd (commit)
      from  f2ef6ee142d66d14b2179624f8beb463f9dab100 (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 f91e217447ca4d471ec70f029291b16a81b8d7cd
Author: Julien Boibessot <jul...@ar...>
Date:   Tue Jan 1 21:48:10 2013 +0100

    [LINUX] APF28 : add support for 3.8-rc1 kernel (experimental)

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

Summary of changes:
 .../armadeus/apf28/apf28-linux-3.8-rc1.config      |    1 +
 ...f28-linux-3.7.config => apf28-linux-3.8.config} |    0
 patches/linux/3.8-rc1                              |    1 +
 .../linux/{3.7 => 3.8}/0021-armadeus-apf9328.patch |   36 +++++-----
 ...s-apf9328-add_board_to_linux_build_system.patch |   20 +++---
 .../0025-armadeus-imx-correct_dma_shift.patch      |    8 +-
 .../0029-armadeus-add_csi_and_spi_registers.patch  |    6 +-
 .../0029b-armadeus-add_csi_registers.patch         |    6 +-
 ...rmadeus-devices-imx1-add_udc_registration.patch |    8 +-
 .../0030-armadeus-imx_udc-change_clk_get.patch     |    6 +-
 ...35-armadeus-re_add_pwm_and_correct_driver.tofix |    0
 ...7-armadeus-imx_udc-add_printk_when_probed.patch |    6 +-
 ...s-imx_udc-prevent_crash_after_soft_reboot.patch |    6 +-
 .../linux/{3.7 => 3.8}/0073-armadeus-tsc2102.patch |    8 +-
 ...02_integrate_driver_to_linux_build_system.patch |   18 +++--
 ...chscreen-add_driver_to_linux_build_system.patch |   16 ++--
 .../0074-armadeus-tsc2102-touchscreen.patch        |    6 +-
 .../0075-armadeus-spi2-reg-defines.patch           |    6 +-
 ...eus-clock_correct_mxc_decode_pll_for_imx1.tofix |    0
 ...madeus-clock-imx1_avoid_crash_with_module.tofix |    0
 .../0200-armadeus-add_apf27_module.patch           |   44 ++++-------
 .../0201-armadeus-add_apf27dev_baseboard.patch     |   76 ++++++++------------
 ...armadeus-mx27_add_clk_gate_to_enable_sspl.patch |   14 ++--
 ...armadeus-mx27-ehci-mxc-add_per_clk_enable.patch |   14 ++--
 ...rmadeus-mx27-imxfb-fix_pwm_contrast_issue.patch |   10 ++--
 ...-imx27-rename_spi_ipg_and_add_spi_per_clk.patch |   20 +++---
 .../linux/3.8/0420-armadeus-Add-apf28dev-dts.patch |   29 ++++++++
 27 files changed, 188 insertions(+), 177 deletions(-)
 create mode 120000 buildroot/target/device/armadeus/apf28/apf28-linux-3.8-rc1.config
 copy buildroot/target/device/armadeus/apf28/{apf28-linux-3.7.config => apf28-linux-3.8.config} (100%)
 create mode 120000 patches/linux/3.8-rc1
 copy patches/linux/{3.7 => 3.8}/0021-armadeus-apf9328.patch (96%)
 copy patches/linux/{3.7 => 3.8}/0024-armadeus-apf9328-add_board_to_linux_build_system.patch (72%)
 copy patches/linux/{3.7 => 3.8}/0025-armadeus-imx-correct_dma_shift.patch (74%)
 copy patches/linux/{3.7 => 3.8}/0029-armadeus-add_csi_and_spi_registers.patch (68%)
 copy patches/linux/{3.7 => 3.8}/0029b-armadeus-add_csi_registers.patch (76%)
 copy patches/linux/{3.7 => 3.8}/0030-armadeus-devices-imx1-add_udc_registration.patch (62%)
 copy patches/linux/{3.7 => 3.8}/0030-armadeus-imx_udc-change_clk_get.patch (59%)
 copy patches/linux/{3.7 => 3.8}/0035-armadeus-re_add_pwm_and_correct_driver.tofix (100%)
 copy patches/linux/{3.7 => 3.8}/0037-armadeus-imx_udc-add_printk_when_probed.patch (60%)
 copy patches/linux/{3.7 => 3.8}/0038-armadeus-imx_udc-prevent_crash_after_soft_reboot.patch (74%)
 copy patches/linux/{3.7 => 3.8}/0073-armadeus-tsc2102.patch (99%)
 copy patches/linux/{3.7 => 3.8}/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch (53%)
 copy patches/linux/{3.7 => 3.8}/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch (68%)
 copy patches/linux/{3.7 => 3.8}/0074-armadeus-tsc2102-touchscreen.patch (93%)
 copy patches/linux/{3.7 => 3.8}/0075-armadeus-spi2-reg-defines.patch (67%)
 copy patches/linux/{3.7 => 3.8}/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix (100%)
 copy patches/linux/{3.7 => 3.8}/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix (100%)
 copy patches/linux/{3.7 => 3.8}/0200-armadeus-add_apf27_module.patch (89%)
 copy patches/linux/{3.7 => 3.8}/0201-armadeus-add_apf27dev_baseboard.patch (95%)
 copy patches/linux/{3.7 => 3.8}/0202-armadeus-mx27_add_clk_gate_to_enable_sspl.patch (82%)
 copy patches/linux/{3.7 => 3.8}/0203-armadeus-mx27-ehci-mxc-add_per_clk_enable.patch (78%)
 copy patches/linux/{3.7 => 3.8}/0204-armadeus-mx27-imxfb-fix_pwm_contrast_issue.patch (77%)
 copy patches/linux/{3.7 => 3.8}/0205-armadeus-mx27-clk-imx27-rename_spi_ipg_and_add_spi_per_clk.patch (57%)
 create mode 100644 patches/linux/3.8/0420-armadeus-Add-apf28dev-dts.patch

diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.8-rc1.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.8-rc1.config
new file mode 120000
index 0000000..9893aa9
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-3.8-rc1.config
@@ -0,0 +1 @@
+apf28-linux-3.8.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.7.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.8.config
similarity index 100%
copy from buildroot/target/device/armadeus/apf28/apf28-linux-3.7.config
copy to buildroot/target/device/armadeus/apf28/apf28-linux-3.8.config
diff --git a/patches/linux/3.8-rc1 b/patches/linux/3.8-rc1
new file mode 120000
index 0000000..98fccd6
--- /dev/null
+++ b/patches/linux/3.8-rc1
@@ -0,0 +1 @@
+3.8
\ No newline at end of file
diff --git a/patches/linux/3.7/0021-armadeus-apf9328.patch b/patches/linux/3.8/0021-armadeus-apf9328.patch
similarity index 96%
copy from patches/linux/3.7/0021-armadeus-apf9328.patch
copy to patches/linux/3.8/0021-armadeus-apf9328.patch
index c985daa..2a223cc 100644
--- a/patches/linux/3.7/0021-armadeus-apf9328.patch
+++ b/patches/linux/3.8/0021-armadeus-apf9328.patch
@@ -1,7 +1,7 @@
-Index: linux-3.7/arch/arm/mach-imx/apf9328_lcd_config.h
+Index: linux-3.8-rc1/arch/arm/mach-imx/apf9328_lcd_config.h
 ===================================================================
---- /dev/null
-+++ linux-3.7/arch/arm/mach-imx/apf9328_lcd_config.h
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.8-rc1/arch/arm/mach-imx/apf9328_lcd_config.h	2013-01-01 21:19:56.000000000 +0100
 @@ -0,0 +1,350 @@
 +/*
 + *
@@ -353,10 +353,10 @@ Index: linux-3.7/arch/arm/mach-imx/apf9328_lcd_config.h
 +#endif /* CONFIG_FB_IMX */
 +
 +#endif /* APF_LCD_CONFIG_H */
-Index: linux-3.7/arch/arm/mach-imx/mach-apf9328.c
+Index: linux-3.8-rc1/arch/arm/mach-imx/mach-apf9328.c
 ===================================================================
---- linux-3.7.orig/arch/arm/mach-imx/mach-apf9328.c
-+++ linux-3.7/arch/arm/mach-imx/mach-apf9328.c
+--- linux-3.8-rc1.orig/arch/arm/mach-imx/mach-apf9328.c	2012-12-22 02:19:00.000000000 +0100
++++ linux-3.8-rc1/arch/arm/mach-imx/mach-apf9328.c	2013-01-01 21:19:56.000000000 +0100
 @@ -20,7 +20,16 @@
  #include <linux/dm9000.h>
  #include <linux/gpio.h>
@@ -374,10 +374,10 @@ Index: linux-3.7/arch/arm/mach-imx/mach-apf9328.c
  #include <asm/mach-types.h>
  #include <asm/mach/arch.h>
  #include <asm/mach/time.h>
-@@ -30,6 +39,43 @@
- #include <mach/iomux-mx1.h>
- 
+@@ -29,6 +38,43 @@
  #include "devices-imx1.h"
+ #include "hardware.h"
+ #include "iomux-mx1.h"
 +#include <linux/gpio.h>
 +#include <linux/platform_data/serial-imx.h>
 +/*#include <mach/mmc.h>
@@ -418,7 +418,7 @@ Index: linux-3.7/arch/arm/mach-imx/mach-apf9328.c
  
  static const int apf9328_pins[] __initconst = {
  	/* UART1 */
-@@ -42,10 +88,225 @@ static const int apf9328_pins[] __initco
+@@ -41,10 +87,225 @@
  	PB29_PF_UART2_RTS,
  	PB30_PF_UART2_TXD,
  	PB31_PF_UART2_RXD,
@@ -644,7 +644,7 @@ Index: linux-3.7/arch/arm/mach-imx/mach-apf9328.c
  
  /*
   * The APF9328 can have up to 32MB NOR Flash
-@@ -106,11 +367,19 @@ static const struct imxuart_platform_dat
+@@ -105,11 +366,19 @@
  	.flags = IMXUART_HAVE_RTSCTS,
  };
  
@@ -664,7 +664,7 @@ Index: linux-3.7/arch/arm/mach-imx/mach-apf9328.c
  	&apf9328_flash_device,
  	&dm9000x_device,
  };
-@@ -126,11 +395,31 @@ static void __init apf9328_init(void)
+@@ -125,11 +394,31 @@
  	imx1_add_imx_uart0(NULL);
  	imx1_add_imx_uart1(&uart1_pdata);
  
@@ -696,10 +696,10 @@ Index: linux-3.7/arch/arm/mach-imx/mach-apf9328.c
  }
  
  static void __init apf9328_timer_init(void)
-Index: linux-3.7/arch/arm/mach-imx/apf9328-dev.c
+Index: linux-3.8-rc1/arch/arm/mach-imx/apf9328-dev.c
 ===================================================================
---- /dev/null
-+++ linux-3.7/arch/arm/mach-imx/apf9328-dev.c
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.8-rc1/arch/arm/mach-imx/apf9328-dev.c	2013-01-01 21:19:56.000000000 +0100
 @@ -0,0 +1,309 @@
 +/*
 + * apf9328-dev.c
@@ -1010,10 +1010,10 @@ Index: linux-3.7/arch/arm/mach-imx/apf9328-dev.c
 +#endif
 +}
 +
-Index: linux-3.7/arch/arm/plat-mxc/include/mach/board-apf9328.h
+Index: linux-3.8-rc1/arch/arm/plat-mxc/include/mach/board-apf9328.h
 ===================================================================
---- /dev/null
-+++ linux-3.7/arch/arm/plat-mxc/include/mach/board-apf9328.h
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.8-rc1/arch/arm/plat-mxc/include/mach/board-apf9328.h	2013-01-01 21:19:56.000000000 +0100
 @@ -0,0 +1,71 @@
 +/*
 + * linux/include/asm-arm/arch-imx/apf9328.h
diff --git a/patches/linux/3.7/0024-armadeus-apf9328-add_board_to_linux_build_system.patch b/patches/linux/3.8/0024-armadeus-apf9328-add_board_to_linux_build_system.patch
similarity index 72%
copy from patches/linux/3.7/0024-armadeus-apf9328-add_board_to_linux_build_system.patch
copy to patches/linux/3.8/0024-armadeus-apf9328-add_board_to_linux_build_system.patch
index 15f3b75..7dfaa54 100644
--- a/patches/linux/3.7/0024-armadeus-apf9328-add_board_to_linux_build_system.patch
+++ b/patches/linux/3.8/0024-armadeus-apf9328-add_board_to_linux_build_system.patch
@@ -1,8 +1,8 @@
-Index: linux-3.7-rc6/arch/arm/mach-imx/Kconfig
+Index: linux-3.8-rc1/arch/arm/mach-imx/Kconfig
 ===================================================================
---- linux-3.7-rc6.orig/arch/arm/mach-imx/Kconfig
-+++ linux-3.7-rc6/arch/arm/mach-imx/Kconfig
-@@ -129,10 +129,43 @@ config MACH_APF9328
+--- linux-3.8-rc1.orig/arch/arm/mach-imx/Kconfig	2012-12-22 02:19:00.000000000 +0100
++++ linux-3.8-rc1/arch/arm/mach-imx/Kconfig	2013-01-01 21:22:49.000000000 +0100
+@@ -202,10 +202,43 @@
  	bool "APF9328"
  	select IMX_HAVE_PLATFORM_IMX_I2C
  	select IMX_HAVE_PLATFORM_IMX_UART
@@ -43,14 +43,14 @@ Index: linux-3.7-rc6/arch/arm/mach-imx/Kconfig
 +
 +endchoice
 +
- comment "MX21 platforms:"
+ endif
  
- config MACH_MX21ADS
-Index: linux-3.7-rc6/arch/arm/mach-imx/Makefile
+ if ARCH_MULTI_V5
+Index: linux-3.8-rc1/arch/arm/mach-imx/Makefile
 ===================================================================
---- linux-3.7-rc6.orig/arch/arm/mach-imx/Makefile
-+++ linux-3.7-rc6/arch/arm/mach-imx/Makefile
-@@ -22,6 +22,7 @@ obj-$(CONFIG_MX1_VIDEO) += mx1-camera-fi
+--- linux-3.8-rc1.orig/arch/arm/mach-imx/Makefile	2012-12-22 02:19:00.000000000 +0100
++++ linux-3.8-rc1/arch/arm/mach-imx/Makefile	2013-01-01 21:22:49.000000000 +0100
+@@ -42,6 +42,7 @@
  obj-$(CONFIG_ARCH_MX1ADS) += mach-mx1ads.o
  obj-$(CONFIG_MACH_SCB9328) += mach-scb9328.o
  obj-$(CONFIG_MACH_APF9328) += mach-apf9328.o
diff --git a/patches/linux/3.7/0025-armadeus-imx-correct_dma_shift.patch b/patches/linux/3.8/0025-armadeus-imx-correct_dma_shift.patch
similarity index 74%
copy from patches/linux/3.7/0025-armadeus-imx-correct_dma_shift.patch
copy to patches/linux/3.8/0025-armadeus-imx-correct_dma_shift.patch
index 1c9a4e0..687c248 100644
--- a/patches/linux/3.7/0025-armadeus-imx-correct_dma_shift.patch
+++ b/patches/linux/3.8/0025-armadeus-imx-correct_dma_shift.patch
@@ -3,11 +3,11 @@ DMA clock is enabled by setting GCCR bit 3 instead of 4
 Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
 ---
 
-Index: linux-3.7-rc6/arch/arm/mach-imx/clk-imx1.c
+Index: linux-3.8-rc1/arch/arm/mach-imx/clk-imx1.c
 ===================================================================
---- linux-3.7-rc6.orig/arch/arm/mach-imx/clk-imx1.c
-+++ linux-3.7-rc6/arch/arm/mach-imx/clk-imx1.c
-@@ -72,7 +72,7 @@ int __init mx1_clocks_init(unsigned long
+--- linux-3.8-rc1.orig/arch/arm/mach-imx/clk-imx1.c	2012-12-22 02:19:00.000000000 +0100
++++ linux-3.8-rc1/arch/arm/mach-imx/clk-imx1.c	2013-01-01 21:19:56.000000000 +0100
+@@ -72,7 +72,7 @@
  	clk[per3] = imx_clk_divider("per3", "spll", CCM_PCDR, 16, 7);
  	clk[clko] = imx_clk_mux("clko", CCM_CSCR, 29, 3, clko_sel_clks,
  			ARRAY_SIZE(clko_sel_clks));
diff --git a/patches/linux/3.7/0029-armadeus-add_csi_and_spi_registers.patch b/patches/linux/3.8/0029-armadeus-add_csi_and_spi_registers.patch
similarity index 68%
copy from patches/linux/3.7/0029-armadeus-add_csi_and_spi_registers.patch
copy to patches/linux/3.8/0029-armadeus-add_csi_and_spi_registers.patch
index 65f2398..5884050 100644
--- a/patches/linux/3.7/0029-armadeus-add_csi_and_spi_registers.patch
+++ b/patches/linux/3.8/0029-armadeus-add_csi_and_spi_registers.patch
@@ -1,7 +1,7 @@
-Index: linux-3.7-rc4/drivers/spi/spi-imx.c
+Index: linux-3.8-rc1/drivers/spi/spi-imx.c
 ===================================================================
---- linux-3.7-rc4.orig/drivers/spi/spi-imx.c	2012-11-04 20:07:39.000000000 +0100
-+++ linux-3.7-rc4/drivers/spi/spi-imx.c	2012-11-06 08:50:16.000000000 +0100
+--- linux-3.8-rc1.orig/drivers/spi/spi-imx.c	2012-12-22 02:19:00.000000000 +0100
++++ linux-3.8-rc1/drivers/spi/spi-imx.c	2013-01-01 21:19:56.000000000 +0100
 @@ -47,6 +47,9 @@
  #define MXC_CSPITXDATA		0x04
  #define MXC_CSPICTRL		0x08
diff --git a/patches/linux/3.7/0029b-armadeus-add_csi_registers.patch b/patches/linux/3.8/0029b-armadeus-add_csi_registers.patch
similarity index 76%
copy from patches/linux/3.7/0029b-armadeus-add_csi_registers.patch
copy to patches/linux/3.8/0029b-armadeus-add_csi_registers.patch
index 7f3b277..856b0b3 100644
--- a/patches/linux/3.7/0029b-armadeus-add_csi_registers.patch
+++ b/patches/linux/3.8/0029b-armadeus-add_csi_registers.patch
@@ -1,7 +1,7 @@
-Index: linux-3.7-rc6/drivers/media/platform/soc_camera/mx1_camera.c
+Index: linux-3.8-rc1/drivers/media/platform/soc_camera/mx1_camera.c
 ===================================================================
---- linux-3.7-rc6.orig/drivers/media/platform/soc_camera/mx1_camera.c
-+++ linux-3.7-rc6/drivers/media/platform/soc_camera/mx1_camera.c
+--- linux-3.8-rc1.orig/drivers/media/platform/soc_camera/mx1_camera.c	2012-12-22 02:19:00.000000000 +0100
++++ linux-3.8-rc1/drivers/media/platform/soc_camera/mx1_camera.c	2013-01-01 21:19:56.000000000 +0100
 @@ -50,9 +50,13 @@
   * CSI registers
   */
diff --git a/patches/linux/3.7/0030-armadeus-devices-imx1-add_udc_registration.patch b/patches/linux/3.8/0030-armadeus-devices-imx1-add_udc_registration.patch
similarity index 62%
copy from patches/linux/3.7/0030-armadeus-devices-imx1-add_udc_registration.patch
copy to patches/linux/3.8/0030-armadeus-devices-imx1-add_udc_registration.patch
index 5b94c4d..6a4a7c2 100644
--- a/patches/linux/3.7/0030-armadeus-devices-imx1-add_udc_registration.patch
+++ b/patches/linux/3.8/0030-armadeus-devices-imx1-add_udc_registration.patch
@@ -3,11 +3,11 @@ Add registration functions for UDC.
 Signed-off-by: Gwenhael Goavec-Merou <gw...@tr...>
 ---
 
-Index: linux-3.7-rc4/arch/arm/mach-imx/devices-imx1.h
+Index: linux-3.8-rc1/arch/arm/mach-imx/devices-imx1.h
 ===================================================================
---- linux-3.7-rc4.orig/arch/arm/mach-imx/devices-imx1.h	2012-11-04 20:07:39.000000000 +0100
-+++ linux-3.7-rc4/arch/arm/mach-imx/devices-imx1.h	2012-11-06 08:50:16.000000000 +0100
-@@ -29,3 +29,7 @@
+--- linux-3.8-rc1.orig/arch/arm/mach-imx/devices-imx1.h	2012-12-22 02:19:00.000000000 +0100
++++ linux-3.8-rc1/arch/arm/mach-imx/devices-imx1.h	2013-01-01 21:19:56.000000000 +0100
+@@ -28,3 +28,7 @@
  
  #define imx1_add_spi_imx0(pdata) imx1_add_cspi(0, pdata)
  #define imx1_add_spi_imx1(pdata) imx1_add_cspi(1, pdata)
diff --git a/patches/linux/3.7/0030-armadeus-imx_udc-change_clk_get.patch b/patches/linux/3.8/0030-armadeus-imx_udc-change_clk_get.patch
similarity index 59%
copy from patches/linux/3.7/0030-armadeus-imx_udc-change_clk_get.patch
copy to patches/linux/3.8/0030-armadeus-imx_udc-change_clk_get.patch
index 527446a..553a4e8 100644
--- a/patches/linux/3.7/0030-armadeus-imx_udc-change_clk_get.patch
+++ b/patches/linux/3.8/0030-armadeus-imx_udc-change_clk_get.patch
@@ -1,8 +1,8 @@
 The usb clock is now register with device name.
-Index: linux-3.7-rc4/drivers/usb/gadget/imx_udc.c
+Index: linux-3.8-rc1/drivers/usb/gadget/imx_udc.c
 ===================================================================
---- linux-3.7-rc4.orig/drivers/usb/gadget/imx_udc.c	2012-11-04 20:07:39.000000000 +0100
-+++ linux-3.7-rc4/drivers/usb/gadget/imx_udc.c	2012-11-06 09:06:02.000000000 +0100
+--- linux-3.8-rc1.orig/drivers/usb/gadget/imx_udc.c	2012-12-22 02:19:00.000000000 +0100
++++ linux-3.8-rc1/drivers/usb/gadget/imx_udc.c	2013-01-01 21:23:05.000000000 +0100
 @@ -1426,7 +1426,7 @@
  		goto fail1;
  	}
diff --git a/patches/linux/3.7/0035-armadeus-re_add_pwm_and_correct_driver.tofix b/patches/linux/3.8/0035-armadeus-re_add_pwm_and_correct_driver.tofix
similarity index 100%
copy from patches/linux/3.7/0035-armadeus-re_add_pwm_and_correct_driver.tofix
copy to patches/linux/3.8/0035-armadeus-re_add_pwm_and_correct_driver.tofix
diff --git a/patches/linux/3.7/0037-armadeus-imx_udc-add_printk_when_probed.patch b/patches/linux/3.8/0037-armadeus-imx_udc-add_printk_when_probed.patch
similarity index 60%
copy from patches/linux/3.7/0037-armadeus-imx_udc-add_printk_when_probed.patch
copy to patches/linux/3.8/0037-armadeus-imx_udc-add_printk_when_probed.patch
index a14553f..c73e0a3 100644
--- a/patches/linux/3.7/0037-armadeus-imx_udc-add_printk_when_probed.patch
+++ b/patches/linux/3.8/0037-armadeus-imx_udc-add_printk_when_probed.patch
@@ -2,10 +2,10 @@ Needed by Armadeus UDC test to know if driver is up or not.
 
 Signed-off-by: Julien Boibessot <jul...@ar...>
 
-Index: linux-3.7-rc4/drivers/usb/gadget/imx_udc.c
+Index: linux-3.8-rc1/drivers/usb/gadget/imx_udc.c
 ===================================================================
---- linux-3.7-rc4.orig/drivers/usb/gadget/imx_udc.c	2012-11-06 08:50:16.000000000 +0100
-+++ linux-3.7-rc4/drivers/usb/gadget/imx_udc.c	2012-11-06 09:05:55.000000000 +0100
+--- linux-3.8-rc1.orig/drivers/usb/gadget/imx_udc.c	2013-01-01 21:19:56.000000000 +0100
++++ linux-3.8-rc1/drivers/usb/gadget/imx_udc.c	2013-01-01 21:23:03.000000000 +0100
 @@ -1490,6 +1490,7 @@
  	if (ret)
  		goto fail4;
diff --git a/patches/linux/3.7/0038-armadeus-imx_udc-prevent_crash_after_soft_reboot.patch b/patches/linux/3.8/0038-armadeus-imx_udc-prevent_crash_after_soft_reboot.patch
similarity index 74%
copy from patches/linux/3.7/0038-armadeus-imx_udc-prevent_crash_after_soft_reboot.patch
copy to patches/linux/3.8/0038-armadeus-imx_udc-prevent_crash_after_soft_reboot.patch
index e85eb46..87f2c12 100644
--- a/patches/linux/3.7/0038-armadeus-imx_udc-prevent_crash_after_soft_reboot.patch
+++ b/patches/linux/3.8/0038-armadeus-imx_udc-prevent_crash_after_soft_reboot.patch
@@ -5,10 +5,10 @@ So this patch moves imx_usb->base definition at the right place.
 
 Signed-off-by: Julien Boibessot <jul...@ar...>
 
-Index: linux-3.7-rc4/drivers/usb/gadget/imx_udc.c
+Index: linux-3.8-rc1/drivers/usb/gadget/imx_udc.c
 ===================================================================
---- linux-3.7-rc4.orig/drivers/usb/gadget/imx_udc.c	2012-11-06 08:50:16.000000000 +0100
-+++ linux-3.7-rc4/drivers/usb/gadget/imx_udc.c	2012-11-06 08:50:16.000000000 +0100
+--- linux-3.8-rc1.orig/drivers/usb/gadget/imx_udc.c	2013-01-01 21:19:56.000000000 +0100
++++ linux-3.8-rc1/drivers/usb/gadget/imx_udc.c	2013-01-01 21:19:56.000000000 +0100
 @@ -1455,6 +1455,7 @@
  		}
  	}
diff --git a/patches/linux/3.7/0073-armadeus-tsc2102.patch b/patches/linux/3.8/0073-armadeus-tsc2102.patch
similarity index 99%
copy from patches/linux/3.7/0073-armadeus-tsc2102.patch
copy to patches/linux/3.8/0073-armadeus-tsc2102.patch
index 99c1745..90e8154 100644
--- a/patches/linux/3.7/0073-armadeus-tsc2102.patch
+++ b/patches/linux/3.8/0073-armadeus-tsc2102.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.36/include/linux/spi/tsc2102.h
+Index: linux-3.8-rc1/include/linux/spi/tsc2102.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.36/include/linux/spi/tsc2102.h	2010-05-31 11:02:34.000000000 +0200
++++ linux-3.8-rc1/include/linux/spi/tsc2102.h	2013-01-01 21:19:56.000000000 +0100
 @@ -0,0 +1,306 @@
 +/*
 + * include/linux/spi/tsc2102.h
@@ -309,10 +309,10 @@ Index: linux-2.6.36/include/linux/spi/tsc2102.h
 +};
 +
 +#endif	/* __LINUX_SPI_TSC2102_H */
-Index: linux-2.6.36/drivers/spi/tsc2102.c
+Index: linux-3.8-rc1/drivers/spi/tsc2102.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.36/drivers/spi/tsc2102.c	2010-05-31 13:50:30.000000000 +0200
++++ linux-3.8-rc1/drivers/spi/tsc2102.c	2013-01-01 21:19:56.000000000 +0100
 @@ -0,0 +1,1311 @@
 +/*
 + * drivers/spi/tsc2102.c
diff --git a/patches/linux/3.7/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch b/patches/linux/3.8/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch
similarity index 53%
copy from patches/linux/3.7/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch
copy to patches/linux/3.8/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch
index d3cad46..3e76095 100644
--- a/patches/linux/3.7/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch
+++ b/patches/linux/3.8/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch
@@ -1,6 +1,8 @@
---- a/drivers/spi/Kconfig	2010-12-07 13:15:03.000000000 +0100
-+++ b/drivers/spi/Kconfig	2010-12-07 13:14:38.000000000 +0100
-@@ -379,6 +379,14 @@
+Index: linux-3.8-rc1/drivers/spi/Kconfig
+===================================================================
+--- linux-3.8-rc1.orig/drivers/spi/Kconfig	2012-12-22 02:19:00.000000000 +0100
++++ linux-3.8-rc1/drivers/spi/Kconfig	2013-01-01 21:19:56.000000000 +0100
+@@ -494,6 +494,14 @@
  	  sysfs interface, with each line presented as a kind of GPIO
  	  exposing both switch control and diagnostic feedback.
  
@@ -15,10 +17,12 @@
  #
  # Add new SPI protocol masters in alphabetical order above this line
  #
---- a/drivers/spi/Makefile	2010-12-07 13:15:11.000000000 +0100
-+++ b/drivers/spi/Makefile	2010-12-07 13:15:27.000000000 +0100
-@@ -62,6 +62,7 @@
- obj-$(CONFIG_SPI_STMP3XXX)		+= spi-stmp.o
+Index: linux-3.8-rc1/drivers/spi/Makefile
+===================================================================
+--- linux-3.8-rc1.orig/drivers/spi/Makefile	2012-12-22 02:19:00.000000000 +0100
++++ linux-3.8-rc1/drivers/spi/Makefile	2013-01-01 21:19:56.000000000 +0100
+@@ -64,6 +64,7 @@
+ obj-$(CONFIG_SPI_TEGRA20_SLINK)		+= spi-tegra20-slink.o
  obj-$(CONFIG_SPI_TI_SSP)		+= spi-ti-ssp.o
  obj-$(CONFIG_SPI_TLE62X0)		+= spi-tle62x0.o
 +obj-$(CONFIG_SPI_TSC2102)		+= tsc2102.o
diff --git a/patches/linux/3.7/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch b/patches/linux/3.8/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch
similarity index 68%
copy from patches/linux/3.7/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch
copy to patches/linux/3.8/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch
index 6449ec7..2640882 100644
--- a/patches/linux/3.7/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch
+++ b/patches/linux/3.8/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.36/drivers/input/touchscreen/Kconfig
+Index: linux-3.8-rc1/drivers/input/touchscreen/Kconfig
 ===================================================================
---- linux-2.6.36.orig/drivers/input/touchscreen/Kconfig	2010-12-22 14:32:51.000000000 +0100
-+++ linux-2.6.36/drivers/input/touchscreen/Kconfig	2010-12-22 14:33:05.000000000 +0100
-@@ -364,6 +364,20 @@
+--- linux-3.8-rc1.orig/drivers/input/touchscreen/Kconfig	2012-12-22 02:19:00.000000000 +0100
++++ linux-3.8-rc1/drivers/input/touchscreen/Kconfig	2013-01-01 21:19:56.000000000 +0100
+@@ -541,6 +541,20 @@
  	  To compile this driver as a module, choose M here: the
  	  module will be called atmel_tsadcc.
  
@@ -23,11 +23,11 @@ Index: linux-2.6.36/drivers/input/touchscreen/Kconfig
  config TOUCHSCREEN_UCB1400
  	tristate "Philips UCB1400 touchscreen"
  	depends on AC97_BUS
-Index: linux-2.6.36/drivers/input/touchscreen/Makefile
+Index: linux-3.8-rc1/drivers/input/touchscreen/Makefile
 ===================================================================
---- linux-3.7/drivers/input/touchscreen/Makefile	2012-12-11 04:30:57.000000000 +0100
-+++ linux-3.7.new/drivers/input/touchscreen/Makefile	2012-12-23 12:23:37.000000000 +0100
-@@ -60,6 +60,7 @@
+--- linux-3.8-rc1.orig/drivers/input/touchscreen/Makefile	2012-12-22 02:19:00.000000000 +0100
++++ linux-3.8-rc1/drivers/input/touchscreen/Makefile	2013-01-01 21:19:56.000000000 +0100
+@@ -59,6 +59,7 @@
  obj-$(CONFIG_TOUCHSCREEN_TSC_SERIO)	+= tsc40.o
  obj-$(CONFIG_TOUCHSCREEN_TSC2005)	+= tsc2005.o
  obj-$(CONFIG_TOUCHSCREEN_TSC2007)	+= tsc2007.o
diff --git a/patches/linux/3.7/0074-armadeus-tsc2102-touchscreen.patch b/patches/linux/3.8/0074-armadeus-tsc2102-touchscreen.patch
similarity index 93%
copy from patches/linux/3.7/0074-armadeus-tsc2102-touchscreen.patch
copy to patches/linux/3.8/0074-armadeus-tsc2102-touchscreen.patch
index a396f84..24e6b91 100644
--- a/patches/linux/3.7/0074-armadeus-tsc2102-touchscreen.patch
+++ b/patches/linux/3.8/0074-armadeus-tsc2102-touchscreen.patch
@@ -1,5 +1,7 @@
---- /dev/null	2010-11-28 19:42:11.148000001 +0100
-+++ b/drivers/input/touchscreen/tsc2102_ts.c	2010-12-13 07:41:34.000000000 +0100
+Index: linux-3.8-rc1/drivers/input/touchscreen/tsc2102_ts.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.8-rc1/drivers/input/touchscreen/tsc2102_ts.c	2013-01-01 21:19:56.000000000 +0100
 @@ -0,0 +1,160 @@
 +/*
 + * input/touchscreen/tsc2102_ts.c
diff --git a/patches/linux/3.7/0075-armadeus-spi2-reg-defines.patch b/patches/linux/3.8/0075-armadeus-spi2-reg-defines.patch
similarity index 67%
copy from patches/linux/3.7/0075-armadeus-spi2-reg-defines.patch
copy to patches/linux/3.8/0075-armadeus-spi2-reg-defines.patch
index 32c570e..558e944 100644
--- a/patches/linux/3.7/0075-armadeus-spi2-reg-defines.patch
+++ b/patches/linux/3.8/0075-armadeus-spi2-reg-defines.patch
@@ -1,7 +1,7 @@
-Index: linux-3.7-rc4/arch/arm/plat-mxc/include/mach/iomux-mx1.h
+Index: linux-3.8-rc1/arch/arm/mach-imx/iomux-mx1.h
 ===================================================================
---- linux-3.7-rc4.orig/arch/arm/plat-mxc/include/mach/iomux-mx1.h	2012-11-04 20:07:39.000000000 +0100
-+++ linux-3.7-rc4/arch/arm/plat-mxc/include/mach/iomux-mx1.h	2012-11-06 08:50:16.000000000 +0100
+--- linux-3.8-rc1.orig/arch/arm/mach-imx/iomux-mx1.h	2012-12-22 02:19:00.000000000 +0100
++++ linux-3.8-rc1/arch/arm/mach-imx/iomux-mx1.h	2013-01-01 21:19:56.000000000 +0100
 @@ -119,7 +119,7 @@
  #define PD6_PF_LSCLK		(GPIO_PORTD | GPIO_PF | GPIO_OUT | 6)
  #define PD7_PF_REV		(GPIO_PORTD | GPIO_PF | 7)
diff --git a/patches/linux/3.7/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix b/patches/linux/3.8/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix
similarity index 100%
copy from patches/linux/3.7/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix
copy to patches/linux/3.8/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix
diff --git a/patches/linux/3.7/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix b/patches/linux/3.8/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix
similarity index 100%
copy from patches/linux/3.7/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix
copy to patches/linux/3.8/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix
diff --git a/patches/linux/3.7/0200-armadeus-add_apf27_module.patch b/patches/linux/3.8/0200-armadeus-add_apf27_module.patch
similarity index 89%
copy from patches/linux/3.7/0200-armadeus-add_apf27_module.patch
copy to patches/linux/3.8/0200-armadeus-add_apf27_module.patch
index 2429f80..1fdd4e4 100644
--- a/patches/linux/3.7/0200-armadeus-add_apf27_module.patch
+++ b/patches/linux/3.8/0200-armadeus-add_apf27_module.patch
@@ -13,11 +13,11 @@ Signed-off-by: Nicolas Colombain <nic...@ar...>
  4 files changed, 273 insertions(+), 0 deletions(-)
  create mode 100644 arch/arm/mach-imx/mach-apf27.c
 
-Index: linux-3.7/arch/arm/mach-imx/Kconfig
+Index: linux-3.8-rc1/arch/arm/mach-imx/Kconfig
 ===================================================================
---- linux-3.7.orig/arch/arm/mach-imx/Kconfig
-+++ linux-3.7/arch/arm/mach-imx/Kconfig
-@@ -415,6 +415,21 @@ config MACH_IMX27_DT
+--- linux-3.8-rc1.orig/arch/arm/mach-imx/Kconfig	2013-01-01 21:19:56.000000000 +0100
++++ linux-3.8-rc1/arch/arm/mach-imx/Kconfig	2013-01-01 21:22:46.000000000 +0100
+@@ -500,6 +500,21 @@
  	  Include support for Freescale i.MX27 based platforms
  	  using the device tree for discovery
  
@@ -38,12 +38,12 @@ Index: linux-3.7/arch/arm/mach-imx/Kconfig
 +
  endif
  
- if ARCH_IMX_V6_V7
-Index: linux-3.7/arch/arm/mach-imx/Makefile
+ if ARCH_MULTI_V6
+Index: linux-3.8-rc1/arch/arm/mach-imx/Makefile
 ===================================================================
---- linux-3.7.orig/arch/arm/mach-imx/Makefile
-+++ linux-3.7/arch/arm/mach-imx/Makefile
-@@ -45,6 +45,7 @@ obj-$(CONFIG_MACH_PCA100) += mach-pca100
+--- linux-3.8-rc1.orig/arch/arm/mach-imx/Makefile	2013-01-01 21:19:56.000000000 +0100
++++ linux-3.8-rc1/arch/arm/mach-imx/Makefile	2013-01-01 21:22:46.000000000 +0100
+@@ -66,6 +66,7 @@
  obj-$(CONFIG_MACH_MXT_TD60) += mach-mxt_td60.o
  obj-$(CONFIG_MACH_IMX27IPCAM) += mach-imx27ipcam.o
  obj-$(CONFIG_MACH_IMX27_DT) += imx27-dt.o
@@ -51,10 +51,10 @@ Index: linux-3.7/arch/arm/mach-imx/Makefile
  
  # i.MX31 based machines
  obj-$(CONFIG_MACH_MX31ADS) += mach-mx31ads.o
-Index: linux-3.7/arch/arm/mach-imx/mach-apf27.c
+Index: linux-3.8-rc1/arch/arm/mach-imx/mach-apf27.c
 ===================================================================
---- /dev/null
-+++ linux-3.7/arch/arm/mach-imx/mach-apf27.c
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.8-rc1/arch/arm/mach-imx/mach-apf27.c	2013-01-01 21:22:46.000000000 +0100
 @@ -0,0 +1,294 @@
 + /*
 + * Support for the APF27 System On Module
@@ -350,23 +350,11 @@ Index: linux-3.7/arch/arm/mach-imx/mach-apf27.c
 +	.init_machine = apf27_init,
 +	.restart = mxc_restart,
 +MACHINE_END
-Index: linux-3.7/arch/arm/plat-mxc/include/mach/uncompress.h
+Index: linux-3.8-rc1/arch/arm/tools/mach-types
 ===================================================================
---- linux-3.7.orig/arch/arm/plat-mxc/include/mach/uncompress.h
-+++ linux-3.7/arch/arm/plat-mxc/include/mach/uncompress.h
-@@ -85,6 +85,7 @@ static __inline__ void __arch_decomp_set
- 	case MACH_TYPE_PCA100:
- 	case MACH_TYPE_MXT_TD60:
- 	case MACH_TYPE_IMX27IPCAM:
-+	case MACH_TYPE_APF27:
- 		uart_base = MX2X_UART1_BASE_ADDR;
- 		break;
- 	case MACH_TYPE_MX31LITE:
-Index: linux-3.7/arch/arm/tools/mach-types
-===================================================================
---- linux-3.7.orig/arch/arm/tools/mach-types
-+++ linux-3.7/arch/arm/tools/mach-types
-@@ -297,6 +297,7 @@ smdk2416		MACH_SMDK2416		SMDK2416		1685
+--- linux-3.8-rc1.orig/arch/arm/tools/mach-types	2012-12-22 02:19:00.000000000 +0100
++++ linux-3.8-rc1/arch/arm/tools/mach-types	2013-01-01 21:19:56.000000000 +0100
+@@ -297,6 +297,7 @@
  wbd111			MACH_WBD111		WBD111			1690
  mv2120			MACH_MV2120		MV2120			1693
  mx51_3ds		MACH_MX51_3DS		MX51_3DS		1696
diff --git a/patches/linux/3.7/0201-armadeus-add_apf27dev_baseboard.patch b/patches/linux/3.8/0201-armadeus-add_apf27dev_baseboard.patch
similarity index 95%
copy from patches/linux/3.7/0201-armadeus-add_apf27dev_baseboard.patch
copy to patches/linux/3.8/0201-armadeus-add_apf27dev_baseboard.patch
index ff9ac9d..aa6a734 100644
--- a/patches/linux/3.7/0201-armadeus-add_apf27dev_baseboard.patch
+++ b/patches/linux/3.8/0201-armadeus-add_apf27dev_baseboard.patch
@@ -8,11 +8,11 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
 Signed-off-by: Jeremie Scheer <jer...@ar...>
 Signed-off-by: Kevin Joly <jol...@gm...>
 
-Index: linux-3.7/arch/arm/mach-imx/apf27-dev.c
+Index: linux-3.8-rc1/arch/arm/mach-imx/apf27-dev.c
 ===================================================================
---- /dev/null
-+++ linux-3.7/arch/arm/mach-imx/apf27-dev.c
-@@ -0,0 +1,1026 @@
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.8-rc1/arch/arm/mach-imx/apf27-dev.c	2013-01-01 21:19:56.000000000 +0100
+@@ -0,0 +1,1012 @@
 + /*
 + * apf27-dev.c
 + * Support for AFP27 module's development baseboard
@@ -72,7 +72,7 @@ Index: linux-3.7/arch/arm/mach-imx/apf27-dev.c
 +#ifdef CONFIG_MAX1027
 +#include <linux/spi/max1027.h>
 +#endif
-+#ifdef CONFIG_SPI_TSC2102
++#ifdef CONFIG_TSC2102
 +#include <linux/spi/tsc2102.h>
 +#endif
 +#include <linux/can/platform/mcp251x.h>
@@ -141,12 +141,8 @@ Index: linux-3.7/arch/arm/mach-imx/apf27-dev.c
 +
 +#define TSC2101_INT 17
 +#define CONFIG_SPI_MXC_SELECT1
-+#define CONFIG_SPI_MXC_SELECT2
 +
 +#define SPI1_SS0		IMX_GPIO_NR(4, 28)
-+#define SPI2_TSC2102_CS	IMX_GPIO_NR(4, 21)
-+#define SPI2_MCP251X_CS	IMX_GPIO_NR(4, 20)
-+#define SPI2_SPIDEV_SS	IMX_GPIO_NR(2,17)
 +#define TSC2101_INT_GPIO	IMX_GPIO_NR(6, TSC2101_INT)
 +#define USER_LED		IMX_GPIO_NR(6, 14)	/* PF14 */
 +#define USER_BUTTON		IMX_GPIO_NR(6, 13)	/* PF13 */
@@ -179,9 +175,6 @@ Index: linux-3.7/arch/arm/mach-imx/apf27-dev.c
 +	/* PD19_PF_CSPI2_SS2,
 +	PD20_PF_CSPI2_SS1, Preferably use CS pin as GPIO
 +	PD21_PF_CSPI2_SS0, */
-+	SPI2_TSC2102_CS|GPIO_OUT|GPIO_GPIO,
-+	SPI2_MCP251X_CS|GPIO_OUT|GPIO_GPIO,
-+	SPI2_SPIDEV_SS|GPIO_OUT|GPIO_GPIO,
 +	PD22_PF_CSPI2_SCLK,
 +	PD23_PF_CSPI2_MISO,
 +	PD24_PF_CSPI2_MOSI,
@@ -487,9 +480,9 @@ Index: linux-3.7/arch/arm/mach-imx/apf27-dev.c
 +
 +#ifdef CONFIG_SPI_MXC_SELECT2
 +static int apf27_dev_spi1_cs[] = {
-+	SPI2_TSC2102_CS, /* 0: SPI2_SS0 used as GPIO for TSC2101_CS */
-+	SPI2_MCP251X_CS, /* 1: MCP251X_CS */
-+	SPI2_SPIDEV_SS,  /* 2: SPIDEV_CS (CSI_D5) */
++	(GPIO_PORTD + 21), /* 0: SPI2_SS0 used as GPIO for TSC2101_CS */
++	(GPIO_PORTD + 20), /* 1: MCP251X_CS */
++	(GPIO_PORTB + 17), /* 2: SPIDEV_CS (CSI_D5) */
 +};
 +
 +static struct spi_imx_master apf27dev_spi1_data = {
@@ -540,7 +533,7 @@ Index: linux-3.7/arch/arm/mach-imx/apf27-dev.c
 +};
 +#endif /* CONFIG_ARMADEUS_MAX1027 */
 +
-+#ifdef CONFIG_SPI_TSC2102
++#ifdef CONFIG_TSC2102
 +/* APF27Dev has a SPI Touchscreen controller */
 +
 +static struct tsc210x_config apf27_tsc2101_config = {
@@ -593,7 +586,7 @@ Index: linux-3.7/arch/arm/mach-imx/apf27-dev.c
 +		.modalias		= "tsc210x",
 +		.max_speed_hz		= 8000000,
 +		.bus_num		= 1, /* SPI2 */
-+		/*.irq			= (TSC2101_INT_GPIO),*/
++		.irq			= IRQ_GPIOF(TSC2101_INT),
 +		.chip_select		= 0,
 +		.mode 			= 0,
 +		.platform_data		= &apf27_tsc2101_config,
@@ -952,7 +945,6 @@ Index: linux-3.7/arch/arm/mach-imx/apf27-dev.c
 +void __init apf27_baseboard_init(void)
 +{
 +	int ret;
-+	int i;
 +
 +	/* SSI unit (TBDL) */
 +//	mxc_audmux_v1_configure_port(.....);
@@ -1000,15 +992,9 @@ Index: linux-3.7/arch/arm/mach-imx/apf27-dev.c
 +	/* TSC2101 + optionnal CAN */
 +	/* Can also be used as USB2 or external SPI, with jumper J23 */
 +	/* Let hardware decide the state of CS at startup */
-+	/*mxc_gpio_mode(GPIO_PORTD | 21 | GPIO_GPIO | GPIO_IN);
++	mxc_gpio_mode(GPIO_PORTD | 21 | GPIO_GPIO | GPIO_IN);
 +	mxc_gpio_mode(GPIO_PORTD | 20 | GPIO_GPIO | GPIO_IN);
-+	mxc_gpio_mode(GPIO_PORTB | 17 | GPIO_GPIO | GPIO_IN);*/
-+	for (i=0; i< ARRAY_SIZE(apf27dev_spi_board_info);i++) {
-+		if (!strcmp(apf27dev_spi_board_info[i].modalias, "tsc210x")) {
-+			apf27dev_spi_board_info[i].irq = gpio_to_irq(TSC2101_INT_GPIO);
-+		}
-+	}
-+
++	mxc_gpio_mode(GPIO_PORTB | 17 | GPIO_GPIO | GPIO_IN);
 +	imx27_add_spi_imx1(&apf27dev_spi1_data);
 +#endif
 +#ifdef CONFIG_SPI_MXC_SELECT3
@@ -1039,10 +1025,10 @@ Index: linux-3.7/arch/arm/mach-imx/apf27-dev.c
 +#endif
 +}
 +
-Index: linux-3.7/arch/arm/mach-imx/apf27-lcd.c
+Index: linux-3.8-rc1/arch/arm/mach-imx/apf27-lcd.c
 ===================================================================
---- /dev/null
-+++ linux-3.7/arch/arm/mach-imx/apf27-lcd.c
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.8-rc1/arch/arm/mach-imx/apf27-lcd.c	2013-01-01 21:19:56.000000000 +0100
 @@ -0,0 +1,157 @@
 +/*
 + * apf27-lcd.c
@@ -1201,10 +1187,10 @@ Index: linux-3.7/arch/arm/mach-imx/apf27-lcd.c
 +}
 +
 +#endif
-Index: linux-3.7/arch/arm/mach-imx/apf27-dev-ext-apw.c
+Index: linux-3.8-rc1/arch/arm/mach-imx/apf27-dev-ext-apw.c
 ===================================================================
---- /dev/null
-+++ linux-3.7/arch/arm/mach-imx/apf27-dev-ext-apw.c
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.8-rc1/arch/arm/mach-imx/apf27-dev-ext-apw.c	2013-01-01 21:19:56.000000000 +0100
 @@ -0,0 +1,175 @@
 + /*
 + * apf27-dev-ext-apw.c
@@ -1381,10 +1367,10 @@ Index: linux-3.7/arch/arm/mach-imx/apf27-dev-ext-apw.c
 +	printk("done\n");
 +}
 +
-Index: linux-3.7/arch/arm/mach-imx/mach-apf27.c
+Index: linux-3.8-rc1/arch/arm/mach-imx/mach-apf27.c
 ===================================================================
---- linux-3.7.orig/arch/arm/mach-imx/mach-apf27.c
-+++ linux-3.7/arch/arm/mach-imx/mach-apf27.c
+--- linux-3.8-rc1.orig/arch/arm/mach-imx/mach-apf27.c	2013-01-01 21:19:56.000000000 +0100
++++ linux-3.8-rc1/arch/arm/mach-imx/mach-apf27.c	2013-01-01 21:19:56.000000000 +0100
 @@ -43,6 +43,7 @@
  
  #include "devices-imx27.h"
@@ -1393,7 +1379,7 @@ Index: linux-3.7/arch/arm/mach-imx/mach-apf27.c
  
  static const int apf27_pins[] __initconst = {
  	/* UART1 */
-@@ -270,6 +271,10 @@ static void __init apf27_init(void)
+@@ -270,6 +271,10 @@
  	i2c_register_board_info(1, apf27_i2c_devices_bus1,
  				ARRAY_SIZE(apf27_i2c_devices_bus1));
  	imx27_add_imx_i2c(1, &apf27_i2c_1_data);
@@ -1404,11 +1390,11 @@ Index: linux-3.7/arch/arm/mach-imx/mach-apf27.c
  }
  
  static void __init apf27_timer_init(void)
-Index: linux-3.7/arch/arm/mach-imx/Kconfig
+Index: linux-3.8-rc1/arch/arm/mach-imx/Kconfig
 ===================================================================
---- linux-3.7.orig/arch/arm/mach-imx/Kconfig
-+++ linux-3.7/arch/arm/mach-imx/Kconfig
-@@ -430,6 +430,103 @@ config MACH_APF27
+--- linux-3.8-rc1.orig/arch/arm/mach-imx/Kconfig	2013-01-01 21:19:56.000000000 +0100
++++ linux-3.8-rc1/arch/arm/mach-imx/Kconfig	2013-01-01 21:19:56.000000000 +0100
+@@ -515,6 +515,103 @@
  	  Include support for APF27 platform. This includes specific
  	  configurations for the module and its peripherals.
  
@@ -1511,12 +1497,12 @@ Index: linux-3.7/arch/arm/mach-imx/Kconfig
 +
  endif
  
- if ARCH_IMX_V6_V7
-Index: linux-3.7/arch/arm/mach-imx/Makefile
+ if ARCH_MULTI_V6
+Index: linux-3.8-rc1/arch/arm/mach-imx/Makefile
 ===================================================================
---- linux-3.7.orig/arch/arm/mach-imx/Makefile
-+++ linux-3.7/arch/arm/mach-imx/Makefile
-@@ -46,6 +46,9 @@ obj-$(CONFIG_MACH_MXT_TD60) += mach-mxt_
+--- linux-3.8-rc1.orig/arch/arm/mach-imx/Makefile	2013-01-01 21:19:56.000000000 +0100
++++ linux-3.8-rc1/arch/arm/mach-imx/Makefile	2013-01-01 21:19:56.000000000 +0100
+@@ -67,6 +67,9 @@
  obj-$(CONFIG_MACH_IMX27IPCAM) += mach-imx27ipcam.o
  obj-$(CONFIG_MACH_IMX27_DT) += imx27-dt.o
  obj-$(CONFIG_MACH_APF27) += mach-apf27.o
diff --git a/patches/linux/3.7/0202-armadeus-mx27_add_clk_gate_to_enable_sspl.patch b/patches/linux/3.8/0202-armadeus-mx27_add_clk_gate_to_enable_sspl.patch
similarity index 82%
copy from patches/linux/3.7/0202-armadeus-mx27_add_clk_gate_to_enable_sspl.patch
copy to patches/linux/3.8/0202-armadeus-mx27_add_clk_gate_to_enable_sspl.patch
index 987f036..b846d3c 100644
--- a/patches/linux/3.7/0202-armadeus-mx27_add_clk_gate_to_enable_sspl.patch
+++ b/patches/linux/3.8/0202-armadeus-mx27_add_clk_gate_to_enable_sspl.patch
@@ -3,11 +3,11 @@ A clock gate is mandatory to activate SPLL clock needed, at least, for usb.
 Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
 ---
 
-Index: linux-3.7-rc6/arch/arm/mach-imx/clk-imx27.c
+Index: linux-3.8-rc1/arch/arm/mach-imx/clk-imx27.c
 ===================================================================
---- linux-3.7-rc6.orig/arch/arm/mach-imx/clk-imx27.c
-+++ linux-3.7-rc6/arch/arm/mach-imx/clk-imx27.c
-@@ -62,7 +62,7 @@ static const char *clko_sel_clks[] = {
+--- linux-3.8-rc1.orig/arch/arm/mach-imx/clk-imx27.c	2012-12-22 02:19:00.000000000 +0100
++++ linux-3.8-rc1/arch/arm/mach-imx/clk-imx27.c	2013-01-01 21:22:38.000000000 +0100
+@@ -62,7 +62,7 @@
  	"32k", "usb_div", "dptc",
  };
  
@@ -16,7 +16,7 @@ Index: linux-3.7-rc6/arch/arm/mach-imx/clk-imx27.c
  
  enum mx27_clks {
  	dummy, ckih, ckil, mpll, spll, mpll_main2, ahb, ipg, nfc_div, per1_div,
-@@ -82,7 +82,7 @@ enum mx27_clks {
+@@ -82,7 +82,7 @@
  	csi_ahb_gate, brom_ahb_gate, ata_ahb_gate, wdog_ipg_gate, usb_ipg_gate,
  	uart6_ipg_gate, uart5_ipg_gate, uart4_ipg_gate, uart3_ipg_gate,
  	uart2_ipg_gate, uart1_ipg_gate, ckih_div1p5, fpm, mpll_osc_sel,
@@ -25,7 +25,7 @@ Index: linux-3.7-rc6/arch/arm/mach-imx/clk-imx27.c
  };
  
  static struct clk *clk[clk_max];
-@@ -104,6 +104,7 @@ int __init mx27_clocks_init(unsigned lon
+@@ -104,6 +104,7 @@
  			ARRAY_SIZE(mpll_sel_clks));
  	clk[mpll] = imx_clk_pllv1("mpll", "mpll_sel", CCM_MPCTL0);
  	clk[spll] = imx_clk_pllv1("spll", "ckih", CCM_SPCTL0);
@@ -33,7 +33,7 @@ Index: linux-3.7-rc6/arch/arm/mach-imx/clk-imx27.c
  	clk[mpll_main2] = imx_clk_fixed_factor("mpll_main2", "mpll", 2, 3);
  
  	if (mx27_revision() >= IMX_CHIP_REVISION_2_0) {
-@@ -121,7 +122,7 @@ int __init mx27_clocks_init(unsigned lon
+@@ -121,7 +122,7 @@
  	clk[per4_div] = imx_clk_divider("per4_div", "mpll_main2", CCM_PCDR1, 24, 6);
  	clk[vpu_sel] = imx_clk_mux("vpu_sel", CCM_CSCR, 21, 1, vpu_sel_clks, ARRAY_SIZE(vpu_sel_clks));
  	clk[vpu_div] = imx_clk_divider("vpu_div", "vpu_sel", CCM_PCDR0, 10, 6);
diff --git a/patches/linux/3.7/0203-armadeus-mx27-ehci-mxc-add_per_clk_enable.patch b/patches/linux/3.8/0203-armadeus-mx27-ehci-mxc-add_per_clk_enable.patch
similarity index 78%
copy from patches/linux/3.7/0203-armadeus-mx27-ehci-mxc-add_per_clk_enable.patch
copy to patches/linux/3.8/0203-armadeus-mx27-ehci-mxc-add_per_clk_enable.patch
index 4ebf63a..cba4fd7 100644
--- a/patches/linux/3.7/0203-armadeus-mx27-ehci-mxc-add_per_clk_enable.patch
+++ b/patches/linux/3.8/0203-armadeus-mx27-ehci-mxc-add_per_clk_enable.patch
@@ -3,11 +3,11 @@ EHCI PER clock (aka usb_div) must be enabled to have EHCI driver working.
 Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
 ---
 
-Index: linux-3.7/drivers/usb/host/ehci-mxc.c
+Index: linux-3.8-rc1/drivers/usb/host/ehci-mxc.c
 ===================================================================
---- linux-3.7.orig/drivers/usb/host/ehci-mxc.c
-+++ linux-3.7/drivers/usb/host/ehci-mxc.c
-@@ -32,7 +32,7 @@
+--- linux-3.8-rc1.orig/drivers/usb/host/ehci-mxc.c	2012-12-22 02:19:00.000000000 +0100
++++ linux-3.8-rc1/drivers/usb/host/ehci-mxc.c	2013-01-01 21:19:57.000000000 +0100
+@@ -31,7 +31,7 @@
  #define ULPI_VIEWPORT_OFFSET	0x170
  
  struct ehci_mxc_priv {
@@ -16,7 +16,7 @@ Index: linux-3.7/drivers/usb/host/ehci-mxc.c
  	struct usb_hcd *hcd;
  };
  
-@@ -159,6 +159,13 @@ static int ehci_mxc_drv_probe(struct pla
+@@ -150,6 +150,13 @@
  	}
  	clk_prepare_enable(priv->ahbclk);
  
@@ -30,7 +30,7 @@ Index: linux-3.7/drivers/usb/host/ehci-mxc.c
  	/* "dr" device has its own clock on i.MX51 */
  	priv->phyclk = devm_clk_get(&pdev->dev, "phy");
  	if (IS_ERR(priv->phyclk))
-@@ -242,6 +249,8 @@ err_init:
+@@ -233,6 +240,8 @@
  	if (priv->phyclk)
  		clk_disable_unprepare(priv->phyclk);
  
@@ -39,7 +39,7 @@ Index: linux-3.7/drivers/usb/host/ehci-mxc.c
  	clk_disable_unprepare(priv->ahbclk);
  err_clk_ahb:
  	clk_disable_unprepare(priv->usbclk);
-@@ -268,6 +277,7 @@ static int __exit ehci_mxc_drv_remove(st
+@@ -259,6 +268,7 @@
  
  	clk_disable_unprepare(priv->usbclk);
  	clk_disable_unprepare(priv->ahbclk);
diff --git a/patches/linux/3.7/0204-armadeus-mx27-imxfb-fix_pwm_contrast_issue.patch b/patches/linux/3.8/0204-armadeus-mx27-imxfb-fix_pwm_contrast_issue.patch
similarity index 77%
copy from patches/linux/3.7/0204-armadeus-mx27-imxfb-fix_pwm_contrast_issue.patch
copy to patches/linux/3.8/0204-armadeus-mx27-imxfb-fix_pwm_contrast_issue.patch
index 88008b9..e34aba8 100644
--- a/patches/linux/3.7/0204-armadeus-mx27-imxfb-fix_pwm_contrast_issue.patch
+++ b/patches/linux/3.8/0204-armadeus-mx27-imxfb-fix_pwm_contrast_issue.patch
@@ -5,11 +5,11 @@ working.
 Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
 ---
 
-Index: linux-3.7/drivers/video/imxfb.c
+Index: linux-3.8-rc1/drivers/video/imxfb.c
 ===================================================================
---- linux-3.7.orig/drivers/video/imxfb.c
-+++ linux-3.7/drivers/video/imxfb.c
-@@ -747,6 +747,7 @@ static int __init imxfb_probe(struct pla
+--- linux-3.8-rc1.orig/drivers/video/imxfb.c	2012-12-22 02:19:00.000000000 +0100
++++ linux-3.8-rc1/drivers/video/imxfb.c	2013-01-01 21:19:57.000000000 +0100
+@@ -771,6 +771,7 @@
  	struct imx_fb_platform_data *pdata;
  	struct resource *res;
  	int ret, i;
@@ -17,7 +17,7 @@ Index: linux-3.7/drivers/video/imxfb.c
  
  	dev_info(&pdev->dev, "i.MX Framebuffer driver\n");
  
-@@ -800,6 +801,13 @@ static int __init imxfb_probe(struct pla
+@@ -825,6 +826,13 @@
  		goto failed_getclock;
  	}
  
diff --git a/patches/linux/3.7/0205-armadeus-mx27-clk-imx27-rename_spi_ipg_and_add_spi_per_clk.patch b/patches/linux/3.8/0205-armadeus-mx27-clk-imx27-rename_spi_ipg_and_add_spi_per_clk.patch
similarity index 57%
copy from patches/linux/3.7/0205-armadeus-mx27-clk-imx27-rename_spi_ipg_and_add_spi_per_clk.patch
copy to patches/linux/3.8/0205-armadeus-mx27-clk-imx27-rename_spi_ipg_and_add_spi_per_clk.patch
index 2369906..58c5698 100644
--- a/patches/linux/3.7/0205-armadeus-mx27-clk-imx27-rename_spi_ipg_and_add_spi_per_clk.patch
+++ b/patches/linux/3.8/0205-armadeus-mx27-clk-imx27-rename_spi_ipg_and_add_spi_per_clk.patch
@@ -4,14 +4,14 @@ the second must be added.
 Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
 ---
 
-Index: linux-3.7/arch/arm/mach-imx/clk-imx27.c
+Index: linux-3.8-rc1/arch/arm/mach-imx/clk-imx27.c
 ===================================================================
---- linux-3.7.orig/arch/arm/mach-imx/clk-imx27.c
-+++ linux-3.7/arch/arm/mach-imx/clk-imx27.c
-@@ -229,9 +229,12 @@ int __init mx27_clocks_init(unsigned lon
- 	clk_register_clkdev(clk[sdhc2_ipg_gate], "ipg", "mxc-mmc.1");
- 	clk_register_clkdev(clk[per2_gate], "per", "mxc-mmc.2");
- 	clk_register_clkdev(clk[sdhc2_ipg_gate], "ipg", "mxc-mmc.2");
+--- linux-3.8-rc1.orig/arch/arm/mach-imx/clk-imx27.c	2013-01-01 21:19:56.000000000 +0100
++++ linux-3.8-rc1/arch/arm/mach-imx/clk-imx27.c	2013-01-01 21:19:57.000000000 +0100
+@@ -229,9 +229,12 @@
+ 	clk_register_clkdev(clk[sdhc2_ipg_gate], "ipg", "imx21-mmc.1");
+ 	clk_register_clkdev(clk[per2_gate], "per", "imx21-mmc.2");
+ 	clk_register_clkdev(clk[sdhc2_ipg_gate], "ipg", "imx21-mmc.2");
 -	clk_register_clkdev(clk[cspi1_ipg_gate], NULL, "imx27-cspi.0");
 -	clk_register_clkdev(clk[cspi2_ipg_gate], NULL, "imx27-cspi.1");
 -	clk_register_clkdev(clk[cspi3_ipg_gate], NULL, "imx27-cspi.2");
@@ -21,6 +21,6 @@ Index: linux-3.7/arch/arm/mach-imx/clk-imx27.c
 +	clk_register_clkdev(clk[cspi2_ipg_gate], "ipg", "imx27-cspi.1");
 +	clk_register_clkdev(clk[per2_gate], "per", "imx27-cspi.2");
 +	clk_register_clkdev(clk[cspi3_ipg_gate], "ipg", "imx27-cspi.2");
- 	clk_register_clkdev(clk[per3_gate], "per", "imx-fb.0");
- 	clk_register_clkdev(clk[lcdc_ipg_gate], "ipg", "imx-fb.0");
- 	clk_register_clkdev(clk[lcdc_ahb_gate], "ahb", "imx-fb.0");
+ 	clk_register_clkdev(clk[per3_gate], "per", "imx21-fb.0");
+ 	clk_register_clkdev(clk[lcdc_ipg_gate], "ipg", "imx21-fb.0");
+ 	clk_register_clkdev(clk[lcdc_ahb_gate], "ahb", "imx21-fb.0");
diff --git a/patches/linux/3.8/0420-armadeus-Add-apf28dev-dts.patch b/patches/linux/3.8/0420-armadeus-Add-apf28dev-dts.patch
new file mode 100644
index 0000000..90ceb91
--- /dev/null
+++ b/patches/linux/3.8/0420-armadeus-Add-apf28dev-dts.patch
@@ -0,0 +1,29 @@
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-3.8-rc1/arch/arm/boot/dts/imx28-apf28dev.dts
+===================================================================
+--- linux-3.8-rc1.orig/arch/arm/boot/dts/imx28-apf28dev.dts	2012-12-22 02:19:00.000000000 +0100
++++ linux-3.8-rc1/arch/arm/boot/dts/imx28-apf28dev.dts	2013-01-01 21:19:57.000000000 +0100
+@@ -32,6 +32,13 @@
+ 				pinctrl-names = "default";
+ 				pinctrl-0 = <&spi2_pins_a>;
+ 				status = "okay";
++/* Uncomment to have spidev on SPI2 (ChipSelect 0):
++				device@0 {
++					compatible = "spidev";
++					reg = <0>;
++					spi-max-frequency = <3125000>;
++				};
++*/
+ 			};
+ 
+ 			pinctrl@80018000 {
+@@ -48,6 +55,7 @@
+ 						0x1143 /* MX28_PAD_LCD_D20__GPIO_1_20 */
+ 						0x1153 /* MX28_PAD_LCD_D21__GPIO_1_21 */
+ 						0x1163 /* MX28_PAD_LCD_D22__GPIO_1_22 */
++						0x1173 /* MX28_PAD_LCD_D23__GPIO_1_23 */
+ 					>;
+ 					fsl,drive-strength = <0>;
+ 					fsl,voltage = <1>;


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-95-gf2ef6ee

From: Gwenhael Goavec-M. <gwe...@us...> - 2012-12-28 14:14:34

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  f2ef6ee142d66d14b2179624f8beb463f9dab100 (commit)
       via  bfd514c1ebba020cb8b289aec4ecf4027ae1c513 (commit)
       via  0526c9eea97f12369300fb075949eb3175f92802 (commit)
      from  3d356c3ec86c5613fb7e780d173863d44e091193 (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 f2ef6ee142d66d14b2179624f8beb463f9dab100
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date:   Fri Dec 28 15:14:10 2012 +0100

    [LINUX][3.7] apf27 config: select touchscreen by default

commit bfd514c1ebba020cb8b289aec4ecf4027ae1c513
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date:   Fri Dec 28 15:13:27 2012 +0100

    [LINUX][3.7] apf27-dev: update SPI support

commit 0526c9eea97f12369300fb075949eb3175f92802
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date:   Fri Dec 28 15:12:59 2012 +0100

    [LINUX][3.7] adapt patches 073* and 074* from 2.6.38

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

Summary of changes:
 .../device/armadeus/apf27/apf27-linux-3.7.config   |    2 +-
 .../0073-armadeus-tsc2102.patch}                   |    0
 ...2_integrate_driver_to_linux_build_system.patch} |   16 +++++-----
 ...hscreen-add_driver_to_linux_build_system.patch} |   14 ++++----
 .../0074-armadeus-tsc2102-touchscreen.patch}       |    0
 .../3.7/0201-armadeus-add_apf27dev_baseboard.patch |   32 ++++++++++++++-----
 6 files changed, 39 insertions(+), 25 deletions(-)
 copy patches/linux/{2.6.38/073-armadeus-tsc2102.patch => 3.7/0073-armadeus-tsc2102.patch} (100%)
 copy patches/linux/{2.6.38/073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch => 3.7/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch} (68%)
 copy patches/linux/{2.6.38/074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch => 3.7/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch} (78%)
 copy patches/linux/{2.6.38/074-armadeus-tsc2102-touchscreen.patch => 3.7/0074-armadeus-tsc2102-touchscreen.patch} (100%)

diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.7.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.7.config
index eb9454a..afe1dc0 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.7.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.7.config
@@ -112,6 +112,7 @@ CONFIG_KEYBOARD_IMX=m
 # CONFIG_INPUT_MOUSE is not set
 CONFIG_INPUT_JOYSTICK=y
 CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_TSC2102=y
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_SERIAL_IMX=y
 CONFIG_SERIAL_IMX_CONSOLE=y
@@ -126,7 +127,6 @@ CONFIG_GPIO_SYSFS=y
 CONFIG_W1=y
 CONFIG_W1_MASTER_MXC=y
 CONFIG_W1_SLAVE_THERM=y
-CONFIG_HWMON=m
 CONFIG_WATCHDOG=y
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
diff --git a/patches/linux/2.6.38/073-armadeus-tsc2102.patch b/patches/linux/3.7/0073-armadeus-tsc2102.patch
similarity index 100%
copy from patches/linux/2.6.38/073-armadeus-tsc2102.patch
copy to patches/linux/3.7/0073-armadeus-tsc2102.patch
diff --git a/patches/linux/2.6.38/073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch b/patches/linux/3.7/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch
similarity index 68%
copy from patches/linux/2.6.38/073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch
copy to patches/linux/3.7/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch
index 1fa3c8a..d3cad46 100644
--- a/patches/linux/2.6.38/073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch
+++ b/patches/linux/3.7/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch
@@ -17,11 +17,11 @@
  #
 --- a/drivers/spi/Makefile	2010-12-07 13:15:11.000000000 +0100
 +++ b/drivers/spi/Makefile	2010-12-07 13:15:27.000000000 +0100
-@@ -57,6 +57,7 @@
- # SPI protocol drivers (device/link on bus)
- obj-$(CONFIG_SPI_SPIDEV)	+= spidev.o
- obj-$(CONFIG_SPI_TLE62X0)	+= tle62x0.o
-+obj-$(CONFIG_SPI_TSC2102)  += tsc2102.o
- # 	... add above this line ...
- 
- # SPI slave controller drivers (upstream link)
+@@ -62,6 +62,7 @@
+ obj-$(CONFIG_SPI_STMP3XXX)		+= spi-stmp.o
+ obj-$(CONFIG_SPI_TI_SSP)		+= spi-ti-ssp.o
+ obj-$(CONFIG_SPI_TLE62X0)		+= spi-tle62x0.o
++obj-$(CONFIG_SPI_TSC2102)		+= tsc2102.o
+ obj-$(CONFIG_SPI_TOPCLIFF_PCH)		+= spi-topcliff-pch.o
+ obj-$(CONFIG_SPI_TXX9)			+= spi-txx9.o
+ obj-$(CONFIG_SPI_XCOMM)		+= spi-xcomm.o
diff --git a/patches/linux/2.6.38/074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch b/patches/linux/3.7/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch
similarity index 78%
copy from patches/linux/2.6.38/074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch
copy to patches/linux/3.7/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch
index 3c5c787..6449ec7 100644
--- a/patches/linux/2.6.38/074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch
+++ b/patches/linux/3.7/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch
@@ -25,13 +25,13 @@ Index: linux-2.6.36/drivers/input/touchscreen/Kconfig
  	depends on AC97_BUS
 Index: linux-2.6.36/drivers/input/touchscreen/Makefile
 ===================================================================
---- linux-2.6.36.orig/drivers/input/touchscreen/Makefile	2010-12-22 14:32:51.000000000 +0100
-+++ linux-2.6.36/drivers/input/touchscreen/Makefile	2010-12-22 14:33:05.000000000 +0100
-@@ -40,6 +40,7 @@
- obj-$(CONFIG_TOUCHSCREEN_TOUCHIT213)	+= touchit213.o
- obj-$(CONFIG_TOUCHSCREEN_TOUCHRIGHT)	+= touchright.o
- obj-$(CONFIG_TOUCHSCREEN_TOUCHWIN)	+= touchwin.o
-+obj-$(CONFIG_TOUCHSCREEN_TSC2102)	+= tsc2102_ts.o
+--- linux-3.7/drivers/input/touchscreen/Makefile	2012-12-11 04:30:57.000000000 +0100
++++ linux-3.7.new/drivers/input/touchscreen/Makefile	2012-12-23 12:23:37.000000000 +0100
+@@ -60,6 +60,7 @@
+ obj-$(CONFIG_TOUCHSCREEN_TSC_SERIO)	+= tsc40.o
+ obj-$(CONFIG_TOUCHSCREEN_TSC2005)	+= tsc2005.o
  obj-$(CONFIG_TOUCHSCREEN_TSC2007)	+= tsc2007.o
++obj-$(CONFIG_TOUCHSCREEN_TSC2102)	+= tsc2102_ts.o
  obj-$(CONFIG_TOUCHSCREEN_UCB1400)	+= ucb1400_ts.o
  obj-$(CONFIG_TOUCHSCREEN_WACOM_W8001)	+= wacom_w8001.o
+ obj-$(CONFIG_TOUCHSCREEN_WACOM_I2C)	+= wacom_i2c.o
diff --git a/patches/linux/2.6.38/074-armadeus-tsc2102-touchscreen.patch b/patches/linux/3.7/0074-armadeus-tsc2102-touchscreen.patch
similarity index 100%
copy from patches/linux/2.6.38/074-armadeus-tsc2102-touchscreen.patch
copy to patches/linux/3.7/0074-armadeus-tsc2102-touchscreen.patch
diff --git a/patches/linux/3.7/0201-armadeus-add_apf27dev_baseboard.patch b/patches/linux/3.7/0201-armadeus-add_apf27dev_baseboard.patch
index df0cf35..ff9ac9d 100644
--- a/patches/linux/3.7/0201-armadeus-add_apf27dev_baseboard.patch
+++ b/patches/linux/3.7/0201-armadeus-add_apf27dev_baseboard.patch
@@ -12,7 +12,7 @@ Index: linux-3.7/arch/arm/mach-imx/apf27-dev.c
 ===================================================================
 --- /dev/null
 +++ linux-3.7/arch/arm/mach-imx/apf27-dev.c
-@@ -0,0 +1,1012 @@
+@@ -0,0 +1,1026 @@
 + /*
 + * apf27-dev.c
 + * Support for AFP27 module's development baseboard
@@ -72,7 +72,7 @@ Index: linux-3.7/arch/arm/mach-imx/apf27-dev.c
 +#ifdef CONFIG_MAX1027
 +#include <linux/spi/max1027.h>
 +#endif
-+#ifdef CONFIG_TSC2102
++#ifdef CONFIG_SPI_TSC2102
 +#include <linux/spi/tsc2102.h>
 +#endif
 +#include <linux/can/platform/mcp251x.h>
@@ -141,8 +141,12 @@ Index: linux-3.7/arch/arm/mach-imx/apf27-dev.c
 +
 +#define TSC2101_INT 17
 +#define CONFIG_SPI_MXC_SELECT1
++#define CONFIG_SPI_MXC_SELECT2
 +
 +#define SPI1_SS0		IMX_GPIO_NR(4, 28)
++#define SPI2_TSC2102_CS	IMX_GPIO_NR(4, 21)
++#define SPI2_MCP251X_CS	IMX_GPIO_NR(4, 20)
++#define SPI2_SPIDEV_SS	IMX_GPIO_NR(2,17)
 +#define TSC2101_INT_GPIO	IMX_GPIO_NR(6, TSC2101_INT)
 +#define USER_LED		IMX_GPIO_NR(6, 14)	/* PF14 */
 +#define USER_BUTTON		IMX_GPIO_NR(6, 13)	/* PF13 */
@@ -175,6 +179,9 @@ Index: linux-3.7/arch/arm/mach-imx/apf27-dev.c
 +	/* PD19_PF_CSPI2_SS2,
 +	PD20_PF_CSPI2_SS1, Preferably use CS pin as GPIO
 +	PD21_PF_CSPI2_SS0, */
++	SPI2_TSC2102_CS|GPIO_OUT|GPIO_GPIO,
++	SPI2_MCP251X_CS|GPIO_OUT|GPIO_GPIO,
++	SPI2_SPIDEV_SS|GPIO_OUT|GPIO_GPIO,
 +	PD22_PF_CSPI2_SCLK,
 +	PD23_PF_CSPI2_MISO,
 +	PD24_PF_CSPI2_MOSI,
@@ -480,9 +487,9 @@ Index: linux-3.7/arch/arm/mach-imx/apf27-dev.c
 +
 +#ifdef CONFIG_SPI_MXC_SELECT2
 +static int apf27_dev_spi1_cs[] = {
-+	(GPIO_PORTD + 21), /* 0: SPI2_SS0 used as GPIO for TSC2101_CS */
-+	(GPIO_PORTD + 20), /* 1: MCP251X_CS */
-+	(GPIO_PORTB + 17), /* 2: SPIDEV_CS (CSI_D5) */
++	SPI2_TSC2102_CS, /* 0: SPI2_SS0 used as GPIO for TSC2101_CS */
++	SPI2_MCP251X_CS, /* 1: MCP251X_CS */
++	SPI2_SPIDEV_SS,  /* 2: SPIDEV_CS (CSI_D5) */
 +};
 +
 +static struct spi_imx_master apf27dev_spi1_data = {
@@ -533,7 +540,7 @@ Index: linux-3.7/arch/arm/mach-imx/apf27-dev.c
 +};
 +#endif /* CONFIG_ARMADEUS_MAX1027 */
 +
-+#ifdef CONFIG_TSC2102
++#ifdef CONFIG_SPI_TSC2102
 +/* APF27Dev has a SPI Touchscreen controller */
 +
 +static struct tsc210x_config apf27_tsc2101_config = {
@@ -586,7 +593,7 @@ Index: linux-3.7/arch/arm/mach-imx/apf27-dev.c
 +		.modalias		= "tsc210x",
 +		.max_speed_hz		= 8000000,
 +		.bus_num		= 1, /* SPI2 */
-+		.irq			= IRQ_GPIOF(TSC2101_INT),
++		/*.irq			= (TSC2101_INT_GPIO),*/
 +		.chip_select		= 0,
 +		.mode 			= 0,
 +		.platform_data		= &apf27_tsc2101_config,
@@ -945,6 +952,7 @@ Index: linux-3.7/arch/arm/mach-imx/apf27-dev.c
 +void __init apf27_baseboard_init(void)
 +{
 +	int ret;
++	int i;
 +
 +	/* SSI unit (TBDL) */
 +//	mxc_audmux_v1_configure_port(.....);
@@ -992,9 +1000,15 @@ Index: linux-3.7/arch/arm/mach-imx/apf27-dev.c
 +	/* TSC2101 + optionnal CAN */
 +	/* Can also be used as USB2 or external SPI, with jumper J23 */
 +	/* Let hardware decide the state of CS at startup */
-+	mxc_gpio_mode(GPIO_PORTD | 21 | GPIO_GPIO | GPIO_IN);
++	/*mxc_gpio_mode(GPIO_PORTD | 21 | GPIO_GPIO | GPIO_IN);
 +	mxc_gpio_mode(GPIO_PORTD | 20 | GPIO_GPIO | GPIO_IN);
-+	mxc_gpio_mode(GPIO_PORTB | 17 | GPIO_GPIO | GPIO_IN);
++	mxc_gpio_mode(GPIO_PORTB | 17 | GPIO_GPIO | GPIO_IN);*/
++	for (i=0; i< ARRAY_SIZE(apf27dev_spi_board_info);i++) {
++		if (!strcmp(apf27dev_spi_board_info[i].modalias, "tsc210x")) {
++			apf27dev_spi_board_info[i].irq = gpio_to_irq(TSC2101_INT_GPIO);
++		}
++	}
++
 +	imx27_add_spi_imx1(&apf27dev_spi1_data);
 +#endif
 +#ifdef CONFIG_SPI_MXC_SELECT3


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-92-g3d356c3

From: Gwenhael Goavec-M. <gwe...@us...> - 2012-12-28 12:07:53

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  3d356c3ec86c5613fb7e780d173863d44e091193 (commit)
      from  42728b6afed5139539dce960756b40d6eda59931 (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 3d356c3ec86c5613fb7e780d173863d44e091193
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date:   Fri Dec 28 13:07:35 2012 +0100

    [LINUX][3.7] mx27: SPI: rename ipg clock and add per clock

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

Summary of changes:
 ...-imx27-rename_spi_ipg_and_add_spi_per_clk.patch |   26 ++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 deletions(-)
 create mode 100644 patches/linux/3.7/0205-armadeus-mx27-clk-imx27-rename_spi_ipg_and_add_spi_per_clk.patch

diff --git a/patches/linux/3.7/0205-armadeus-mx27-clk-imx27-rename_spi_ipg_and_add_spi_per_clk.patch b/patches/linux/3.7/0205-armadeus-mx27-clk-imx27-rename_spi_ipg_and_add_spi_per_clk.patch
new file mode 100644
index 0000000..2369906
--- /dev/null
+++ b/patches/linux/3.7/0205-armadeus-mx27-clk-imx27-rename_spi_ipg_and_add_spi_per_clk.patch
@@ -0,0 +1,26 @@
+spi-imx driver needs two clock: ipg and per. The first clock must be named and
+the second must be added.
+
+Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
+---
+
+Index: linux-3.7/arch/arm/mach-imx/clk-imx27.c
+===================================================================
+--- linux-3.7.orig/arch/arm/mach-imx/clk-imx27.c
++++ linux-3.7/arch/arm/mach-imx/clk-imx27.c
+@@ -229,9 +229,12 @@ int __init mx27_clocks_init(unsigned lon
+ 	clk_register_clkdev(clk[sdhc2_ipg_gate], "ipg", "mxc-mmc.1");
+ 	clk_register_clkdev(clk[per2_gate], "per", "mxc-mmc.2");
+ 	clk_register_clkdev(clk[sdhc2_ipg_gate], "ipg", "mxc-mmc.2");
+-	clk_register_clkdev(clk[cspi1_ipg_gate], NULL, "imx27-cspi.0");
+-	clk_register_clkdev(clk[cspi2_ipg_gate], NULL, "imx27-cspi.1");
+-	clk_register_clkdev(clk[cspi3_ipg_gate], NULL, "imx27-cspi.2");
++	clk_register_clkdev(clk[per2_gate], "per", "imx27-cspi.0");
++	clk_register_clkdev(clk[cspi1_ipg_gate], "ipg", "imx27-cspi.0");
++	clk_register_clkdev(clk[per2_gate], "per", "imx27-cspi.1");
++	clk_register_clkdev(clk[cspi2_ipg_gate], "ipg", "imx27-cspi.1");
++	clk_register_clkdev(clk[per2_gate], "per", "imx27-cspi.2");
++	clk_register_clkdev(clk[cspi3_ipg_gate], "ipg", "imx27-cspi.2");
+ 	clk_register_clkdev(clk[per3_gate], "per", "imx-fb.0");
+ 	clk_register_clkdev(clk[lcdc_ipg_gate], "ipg", "imx-fb.0");
+ 	clk_register_clkdev(clk[lcdc_ahb_gate], "ahb", "imx-fb.0");


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-91-g42728b6

From: Gwenhael Goavec-M. <gwe...@us...> - 2012-12-28 11:19:41

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  42728b6afed5139539dce960756b40d6eda59931 (commit)
       via  d51cf847a9af87d6b32b4c1eea0349a4c17a1740 (commit)
      from  c7a9a8229d26aae1a4b0d5161ec6c1632c0b424c (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 42728b6afed5139539dce960756b40d6eda59931
Merge: d51cf84 c7a9a82
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date:   Fri Dec 28 12:19:16 2012 +0100

    Merge branch 'master' of ssh://git.code.sf.net/p/armadeus/code

commit d51cf847a9af87d6b32b4c1eea0349a4c17a1740
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date:   Fri Dec 28 12:18:47 2012 +0100

    [LINUX][3.7] mx27: backlight: fix constrast pwm issue

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

Summary of changes:
 ...rmadeus-mx27-imxfb-fix_pwm_contrast_issue.patch |   33 ++++++++++++++++++++
 1 files changed, 33 insertions(+), 0 deletions(-)
 create mode 100644 patches/linux/3.7/0204-armadeus-mx27-imxfb-fix_pwm_contrast_issue.patch

diff --git a/patches/linux/3.7/0204-armadeus-mx27-imxfb-fix_pwm_contrast_issue.patch b/patches/linux/3.7/0204-armadeus-mx27-imxfb-fix_pwm_contrast_issue.patch
new file mode 100644
index 0000000..88008b9
--- /dev/null
+++ b/patches/linux/3.7/0204-armadeus-mx27-imxfb-fix_pwm_contrast_issue.patch
@@ -0,0 +1,33 @@
+Pin contrast level is always high when LPCR PCD is equal to 0. By setting
+per3clk_div to have a 134 MHz clock, PCD is greater than 0 and the PWM is
+working.
+
+Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
+---
+
+Index: linux-3.7/drivers/video/imxfb.c
+===================================================================
+--- linux-3.7.orig/drivers/video/imxfb.c
++++ linux-3.7/drivers/video/imxfb.c
+@@ -747,6 +747,7 @@ static int __init imxfb_probe(struct pla
+ 	struct imx_fb_platform_data *pdata;
+ 	struct resource *res;
+ 	int ret, i;
++	unsigned long per3clk;
+ 
+ 	dev_info(&pdev->dev, "i.MX Framebuffer driver\n");
+ 
+@@ -800,6 +801,13 @@ static int __init imxfb_probe(struct pla
+ 		goto failed_getclock;
+ 	}
+ 
++	if (cpu_is_mx27()) {
++		per3clk = clk_round_rate(fbi->clk_per, 134000000);
++		if (clk_set_rate(fbi->clk_per, per3clk)) {
++			pr_debug("mx2fb: Unable to set clock to %lu\n", per3clk);
++		}
++	}
++
+ 	fbi->regs = ioremap(res->start, resource_size(res));
+ 	if (fbi->regs == NULL) {
+ 		dev_err(&pdev->dev, "Cannot map frame buffer registers\n");


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-89-gc7a9a82

From: Julien B a. A. <ar...@us...> - 2012-12-27 13:33:26

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  c7a9a8229d26aae1a4b0d5161ec6c1632c0b424c (commit)
      from  906eaf90edcada6619f22ea9548d1cc6969ef89e (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 c7a9a8229d26aae1a4b0d5161ec6c1632c0b424c
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Dec 27 14:25:14 2012 +0100

    [BUILDROOT] 2012.02: compat-wireless: makes 2012-11-18 patches only apply when 2012-11-18 version is selected

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

Summary of changes:
 .../2012.02/199-compat-wireless-add_package.patch  |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/patches/buildroot/2012.02/199-compat-wireless-add_package.patch b/patches/buildroot/2012.02/199-compat-wireless-add_package.patch
index 0fc6503..f80d2dd 100644
--- a/patches/buildroot/2012.02/199-compat-wireless-add_package.patch
+++ b/patches/buildroot/2012.02/199-compat-wireless-add_package.patch
@@ -89,10 +89,10 @@ Index: buildroot/package/Config.in
  source "package/cramfs/Config.in"
  source "package/cwiid/Config.in"
  source "package/dbus/Config.in"
-Index: buildroot/package/compat-wireless/compat-wireless-2012-11-18-hacks.patch
+Index: buildroot/package/compat-wireless/compat-wireless-2012-11-18/compat-wireless-2012-11-18-hacks.patch
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/compat-wireless/compat-wireless-2012-11-18-hacks.patch	2012-11-25 17:12:17.000000000 +0100
++++ buildroot/package/compat-wireless/compat-wireless-2012-11-18/compat-wireless-2012-11-18-hacks.patch	2012-11-25 17:12:17.000000000 +0100
 @@ -0,0 +1,24 @@
 +Remove x86 specific stuff.
 +Better way has to be found IMHO before sending to BR mainline.


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-78-g8a2d2a3

From: Julien B a. A. <ar...@us...> - 2012-12-27 11:05:56

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  8a2d2a31d213297ae70a5805c090e06201e32874 (commit)
       via  64384040b7fe3bfcf25e805bc95d86c165b82a0d (commit)
      from  85e4189cb79797f90cc1ff9e238d7ff2b6f1d58c (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 8a2d2a31d213297ae70a5805c090e06201e32874
Merge: 6438404 85e4189
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Dec 27 12:00:48 2012 +0100

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

commit 64384040b7fe3bfcf25e805bc95d86c165b82a0d
Author: Julien Boibessot <jul...@ar...>
Date:   Tue Nov 27 10:10:23 2012 +0100

    [BUILDROOT] 2012.02: compat-wireless: makes 2012-11-18 patches only apply when 2012-11-18 version is selected

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

Summary of changes:
 .../2012.02/199-compat-wireless-add_package.patch  |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/patches/buildroot/2012.02/199-compat-wireless-add_package.patch b/patches/buildroot/2012.02/199-compat-wireless-add_package.patch
index 0fc6503..f80d2dd 100644
--- a/patches/buildroot/2012.02/199-compat-wireless-add_package.patch
+++ b/patches/buildroot/2012.02/199-compat-wireless-add_package.patch
@@ -89,10 +89,10 @@ Index: buildroot/package/Config.in
  source "package/cramfs/Config.in"
  source "package/cwiid/Config.in"
  source "package/dbus/Config.in"
-Index: buildroot/package/compat-wireless/compat-wireless-2012-11-18-hacks.patch
+Index: buildroot/package/compat-wireless/compat-wireless-2012-11-18/compat-wireless-2012-11-18-hacks.patch
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/compat-wireless/compat-wireless-2012-11-18-hacks.patch	2012-11-25 17:12:17.000000000 +0100
++++ buildroot/package/compat-wireless/compat-wireless-2012-11-18/compat-wireless-2012-11-18-hacks.patch	2012-11-25 17:12:17.000000000 +0100
 @@ -0,0 +1,24 @@
 +Remove x86 specific stuff.
 +Better way has to be found IMHO before sending to BR mainline.


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-88-g906eaf9

From: jorasse <jo...@us...> - 2012-12-25 16:06: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  906eaf90edcada6619f22ea9548d1cc6969ef89e (commit)
      from  97d0fef32fcb6d13449621a0bc0271972c133845 (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 906eaf90edcada6619f22ea9548d1cc6969ef89e
Author: Eric Jarrige <eri...@ar...>
Date:   Tue Dec 25 17:06:35 2012 +0100

    [BUILDROOT] 2012.11: Fix dbus installation when var/lib does not exist yet

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

Summary of changes:
 .../2012.11/189-dbus-fix_installation.patch        |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/patches/buildroot/2012.11/189-dbus-fix_installation.patch b/patches/buildroot/2012.11/189-dbus-fix_installation.patch
index ab3b009..690be34 100644
--- a/patches/buildroot/2012.11/189-dbus-fix_installation.patch
+++ b/patches/buildroot/2012.11/189-dbus-fix_installation.patch
@@ -6,16 +6,22 @@ of /var/run/dbus at boot time, so it can be removed from target.
 I'll send the patch on the buildroot list, but in case it would be
 rejected upstream, I send it here too.
 
+V2: $(TARGET_DIR)/var/lib may not exist when installing dbus so
+create the car/lib folder first.
+
 Signed-off-by: Vincent Besse <vi...@ou...>
+Signed-off-by: Eric Jarrige <eri...@ar...>
 Index: buildroot/package/dbus/dbus.mk
 ===================================================================
---- buildroot.orig/package/dbus/dbus.mk	2012-08-07 16:19:30.000000000 +0200
-+++ buildroot/package/dbus/dbus.mk	2012-08-07 16:20:25.000000000 +0200
-@@ -55,6 +55,7 @@
+--- buildroot/package/dbus/dbus.mk
++++ buildroot/package/dbus/dbus.mk
+@@ -58,7 +58,9 @@ DBUS_POST_INSTALL_TARGET_HOOKS += DBUS_R
  endif
  
  define DBUS_INSTALL_TARGET_FIXUP
 +	rm -rf $(TARGET_DIR)/var/run
  	rm -rf $(TARGET_DIR)/var/lib/dbus
++	mkdir -p $(TARGET_DIR)/var/lib
  	ln -sf /tmp/dbus $(TARGET_DIR)/var/lib/dbus
  	$(INSTALL) -m 0755 -D package/dbus/S30dbus $(TARGET_DIR)/etc/init.d/S30dbus
+ endef


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-87-g97d0fef

From: jorasse <jo...@us...> - 2012-12-25 16:04:13

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  97d0fef32fcb6d13449621a0bc0271972c133845 (commit)
      from  9cbe656904eeda7ab650686da746b934fe7cde6e (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 97d0fef32fcb6d13449621a0bc0271972c133845
Author: Samuel Martin <s.m...@gm...>
Date:   Tue Dec 25 17:03:57 2012 +0100

    [BUILDROOT] 2012.11: clean-up package libcanfestival for BR upstream integration. Thx Smartin

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

Summary of changes:
 .../2012.11/168-libcanfestival-add_package.patch   |  970 +++++++++++++++++---
 1 files changed, 859 insertions(+), 111 deletions(-)

diff --git a/patches/buildroot/2012.11/168-libcanfestival-add_package.patch b/patches/buildroot/2012.11/168-libcanfestival-add_package.patch
index f56188c..75f5da2 100644
--- a/patches/buildroot/2012.11/168-libcanfestival-add_package.patch
+++ b/patches/buildroot/2012.11/168-libcanfestival-add_package.patch
@@ -1,8 +1,33 @@
-Index: buildroot/package/libcanfestival/Config.in
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/libcanfestival/Config.in	2012-02-21 16:46:12.000000000 +0100
-@@ -0,0 +1,83 @@
+Cc: Eric Jarrige <eri...@ar...>
+Signed-off-by: Samuel Martin <s.m...@gm...>
+---
+ package/Config.in                                  |   1 +
+ package/libcanfestival/Config.in                   |  90 +++
+ .../libcanfestival-allow-to-set-DESTDIR.patch      | 717 +++++++++++++++++++++
+ package/libcanfestival/libcanfestival.mk           |  45 ++
+ 4 files changed, 853 insertions(+)
+ create mode 100644 package/libcanfestival/Config.in
+ create mode 100644 package/libcanfestival/libcanfestival-allow-to-set-DESTDIR.patch
+ create mode 100644 package/libcanfestival/libcanfestival.mk
+
+diff --git a/package/Config.in b/package/Config.in
+index 88849d3..ce78f79 100644
+--- a/package/Config.in
++++ b/package/Config.in
+@@ -455,6 +455,7 @@ endmenu
+ 
+ menu "Networking"
+ source "package/glib-networking/Config.in"
++source "package/libcanfestival/Config.in"
+ source "package/libcgi/Config.in"
+ source "package/libcgicc/Config.in"
+ source "package/libcurl/Config.in"
+diff --git a/package/libcanfestival/Config.in b/package/libcanfestival/Config.in
+new file mode 100644
+index 0000000..0be45cf
+--- /dev/null
++++ b/package/libcanfestival/Config.in
+@@ -0,0 +1,90 @@
 +config BR2_PACKAGE_LIBCANFESTIVAL
 +	bool "CanFestival"
 +	help
@@ -12,102 +37,838 @@ Index: buildroot/package/libcanfestival/Config.in
 +	  http://www.canfestival.org
 +
 +if BR2_PACKAGE_LIBCANFESTIVAL
-+menu "CanFestival configuration options"
-+	config BR2_PACKAGE_LIBCANFESTIVAL_NBMMAXCAN
-+		string "Number of can bus to use"
-+		default "4"
-+
-+	choice
-+		prompt "Driver to use"
-+		default BR2_PACKAGE_LIBCANFESTIVAL_SOCKET
-+
-+	config	BR2_PACKAGE_LIBCANFESTIVAL_ANAGATE_LINUX
-+		bool "anagate_linux"
-+		help
-+		  AnaGate CAN(duo) driver for linux
-+
-+	config	BR2_PACKAGE_LIBCANFESTIVAL_PEAK_LINUX
-+		bool "peak_linux"
-+		help
-+		  Linux build host installed Peak driver and library
-+		  http://www.peak-system.com/linux/
-+
-+	config	BR2_PACKAGE_LIBCANFESTIVAL_VIRTUAL
-+		bool "virtual"
-+		help
-+		  Unix pipe based virtual can driver
-+
-+	config	BR2_PACKAGE_LIBCANFESTIVAL_VIRTUAL_KERNEL
-+		bool "virtual_kernel"
-+		help
-+		  Kernel module virtual can driver
-+
-+	config	BR2_PACKAGE_LIBCANFESTIVAL_SOCKET
-+		bool "socket"
-+		help
-+		  Socket-can
-+		  http://developer.berlios.de/projects/socketcan/
-+
-+	config	BR2_PACKAGE_LIBCANFESTIVAL_LINCAN
-+		bool "lincan"
-+		help
-+		  Lincan driver
-+		  http://www.ocera.org/download/components/WP7/lincan-0.3.3.html
-+
-+	config	BR2_PACKAGE_LIBCANFESTIVAL_CAN4LINUX
-+		bool "can4linux"
-+		help
-+		  Can4linux driver
-+		  http://www.port.de/engl/canprod/hw_can4linux.html
-+
-+	config	BR2_PACKAGE_LIBCANFESTIVAL_COPCICAN_LINUX
-+		bool "copcican_linux"
-+		help
-+		  User space driver interface for CO-PCICAN card
-+		  http://www.cosateq.com/
-+
-+	config	BR2_PACKAGE_LIBCANFESTIVAL_COPCICAN_COMEDI
-+		bool "copcican_comedi"
-+		help
-+		  COMEDI driver interface for CO-PCICAN card
-+		  http://www.cosateq.com/
-+	endchoice
-+
-+	config BR2_PACKAGE_LIBCANFESTIVAL_DRIVER
-+		string
-+		default "anagate_linux"   if BR2_PACKAGE_LIBCANFESTIVAL_ANAGATE_LINUX
-+		default "peak_linux" 	  if BR2_PACKAGE_LIBCANFESTIVAL_PEAK_LINUX
-+		default "virtual" 	  if BR2_PACKAGE_LIBCANFESTIVAL_VIRTUAL
-+		default "virtual_kernel"  if BR2_PACKAGE_LIBCANFESTIVAL_VIRTUAL_KERNEL
-+		default "socket" 	  if BR2_PACKAGE_LIBCANFESTIVAL_SOCKET
-+		default "lincan" 	  if BR2_PACKAGE_LIBCANFESTIVAL_LINCAN
-+		default "can4linux" 	  if BR2_PACKAGE_LIBCANFESTIVAL_CAN4LINUX
-+		default "copcican_linux"  if BR2_PACKAGE_LIBCANFESTIVAL_COCPICAN_LINUX
-+		default "copcican_comedi" if BR2_PACKAGE_LIBCANFESTIVAL_COPCICAN_COMEDI
-+endmenu
++
++config BR2_PACKAGE_LIBCANFESTIVAL_NBMMAXCAN
++	string "Number of can bus to use"
++	default "4"
++
++choice
++	prompt "Driver to use"
++	default BR2_PACKAGE_LIBCANFESTIVAL_SOCKET
++
++config	BR2_PACKAGE_LIBCANFESTIVAL_ANAGATE_LINUX
++	bool "anagate_linux"
++	help
++	  AnaGate CAN(duo) driver for linux
++
++config	BR2_PACKAGE_LIBCANFESTIVAL_PEAK_LINUX
++	bool "peak_linux"
++	help
++	  Linux build host installed Peak driver and library
++
++	  http://www.peak-system.com/linux/
++
++config	BR2_PACKAGE_LIBCANFESTIVAL_VIRTUAL
++	bool "virtual"
++	help
++	  Unix pipe based virtual can driver
++
++config	BR2_PACKAGE_LIBCANFESTIVAL_VIRTUAL_KERNEL
++	bool "virtual_kernel"
++	help
++	  Kernel module virtual can driver
++
++config	BR2_PACKAGE_LIBCANFESTIVAL_SOCKET
++	bool "socket"
++	help
++	  Socket-can
++
++	  http://developer.berlios.de/projects/socketcan/
++
++config	BR2_PACKAGE_LIBCANFESTIVAL_LINCAN
++	bool "lincan"
++	help
++	  Lincan driver
++
++	  http://www.ocera.org/download/components/WP7/lincan-0.3.3.html
++
++config	BR2_PACKAGE_LIBCANFESTIVAL_CAN4LINUX
++	bool "can4linux"
++	help
++	  Can4linux driver
++
++	  http://www.port.de/engl/canprod/hw_can4linux.html
++
++config	BR2_PACKAGE_LIBCANFESTIVAL_COPCICAN_LINUX
++	bool "copcican_linux"
++	help
++	  User space driver interface for CO-PCICAN card
++
++	  http://www.cosateq.com/
++
++config	BR2_PACKAGE_LIBCANFESTIVAL_COPCICAN_COMEDI
++	bool "copcican_comedi"
++	help
++	  COMEDI driver interface for CO-PCICAN card
++
++	  http://www.cosateq.com/
++
++endchoice
++
++config BR2_PACKAGE_LIBCANFESTIVAL_DRIVER
++	string
++	default "anagate_linux"	  if BR2_PACKAGE_LIBCANFESTIVAL_ANAGATE_LINUX
++	default "peak_linux"	  if BR2_PACKAGE_LIBCANFESTIVAL_PEAK_LINUX
++	default "virtual"	  if BR2_PACKAGE_LIBCANFESTIVAL_VIRTUAL
++	default "virtual_kernel"  if BR2_PACKAGE_LIBCANFESTIVAL_VIRTUAL_KERNEL
++	default "socket"	  if BR2_PACKAGE_LIBCANFESTIVAL_SOCKET
++	default "lincan"	  if BR2_PACKAGE_LIBCANFESTIVAL_LINCAN
++	default "can4linux"	  if BR2_PACKAGE_LIBCANFESTIVAL_CAN4LINUX
++	default "copcican_linux"  if BR2_PACKAGE_LIBCANFESTIVAL_COCPICAN_LINUX
++	default "copcican_comedi" if BR2_PACKAGE_LIBCANFESTIVAL_COPCICAN_COMEDI
++
 +endif
-Index: buildroot/package/libcanfestival/libcanfestival.mk
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/libcanfestival/libcanfestival.mk	2012-02-21 16:46:12.000000000 +0100
-@@ -0,0 +1,44 @@
+diff --git a/package/libcanfestival/libcanfestival-allow-to-set-DESTDIR.patch b/package/libcanfestival/libcanfestival-allow-to-set-DESTDIR.patch
+new file mode 100644
+index 0000000..7e41022
+--- /dev/null
++++ b/package/libcanfestival/libcanfestival-allow-to-set-DESTDIR.patch
+@@ -0,0 +1,717 @@
++Fix install rules to allow DESTDIR usage.
++
++Signed-off-by: Samuel Martin <s.m...@gm...>
++
++diff -purN libcanfestival-71623bbf8093.orig/drivers/can_anagate_linux/Makefile libcanfestival-71623bbf8093/drivers/can_anagate_linux/Makefile
++--- libcanfestival-71623bbf8093.orig/drivers/can_anagate_linux/Makefile	2012-11-01 22:19:09.250087305 +0100
+++++ libcanfestival-71623bbf8093/drivers/can_anagate_linux/Makefile	2012-11-01 22:19:36.936227361 +0100
++@@ -43,7 +43,7 @@ else
++ DRIVER = $(OBJS)
++ endif
++ 
++-TARGET_SOFILES = $(PREFIX)/lib/$(DRIVER)
+++TARGET_SOFILES = $(DESTDIR)$(PREFIX)/lib/$(DRIVER)
++ 
++ all: driver
++ 
++@@ -56,8 +56,8 @@ libcanfestival_$(CAN_DRIVER).so: $(OBJS)
++ 	$(CC) -shared -Wl,-soname,libcanfestival_$(CAN_DRIVER).so $(CAN_DLL_CFLAGS) -o $@ $<
++ 
++ install: libcanfestival_$(CAN_DRIVER).so
++-	mkdir -p $(PREFIX)/lib/
++-	cp $< $(PREFIX)/lib/
+++	mkdir -p $(DESTDIR)$(PREFIX)/lib/
+++	cp $< $(DESTDIR)$(PREFIX)/lib/
++ 		
++ uninstall:
++ 	rm -f $(TARGET_SOFILES)
++diff -purN libcanfestival-71623bbf8093.orig/drivers/can_anagate_linux/Makefile.in libcanfestival-71623bbf8093/drivers/can_anagate_linux/Makefile.in
++--- libcanfestival-71623bbf8093.orig/drivers/can_anagate_linux/Makefile.in	2012-11-01 22:19:09.250087305 +0100
+++++ libcanfestival-71623bbf8093/drivers/can_anagate_linux/Makefile.in	2012-11-01 22:19:36.919561011 +0100
++@@ -43,7 +43,7 @@ else
++ DRIVER = $(OBJS)
++ endif
++ 
++-TARGET_SOFILES = $(PREFIX)/lib/$(DRIVER)
+++TARGET_SOFILES = $(DESTDIR)$(PREFIX)/lib/$(DRIVER)
++ 
++ all: driver
++ 
++@@ -56,8 +56,8 @@ libcanfestival_$(CAN_DRIVER).so: $(OBJS)
++ 	$(CC) -shared -Wl,-soname,libcanfestival_$(CAN_DRIVER).so $(CAN_DLL_CFLAGS) -o $@ $<
++ 
++ install: libcanfestival_$(CAN_DRIVER).so
++-	mkdir -p $(PREFIX)/lib/
++-	cp $< $(PREFIX)/lib/
+++	mkdir -p $(DESTDIR)$(PREFIX)/lib/
+++	cp $< $(DESTDIR)$(PREFIX)/lib/
++ 		
++ uninstall:
++ 	rm -f $(TARGET_SOFILES)
++diff -purN libcanfestival-71623bbf8093.orig/drivers/can_anagate_win32/Makefile.in libcanfestival-71623bbf8093/drivers/can_anagate_win32/Makefile.in
++--- libcanfestival-71623bbf8093.orig/drivers/can_anagate_win32/Makefile.in	2012-11-01 22:19:09.250087305 +0100
+++++ libcanfestival-71623bbf8093/drivers/can_anagate_win32/Makefile.in	2012-11-01 22:19:36.902894661 +0100
++@@ -46,7 +46,7 @@ DRIVER = $(OBJS)
++ endif
++ 
++ 
++-TARGET_SOFILES = $(PREFIX)/lib/$(DRIVER)
+++TARGET_SOFILES = $(DESTDIR)$(PREFIX)/lib/$(DRIVER)
++ 
++ all: driver
++ 
++@@ -69,8 +69,8 @@ $(DRIVER): $(OBJS)
++ 	-Wl,--exclude-libs,ALL -lws2_32
++ 		
++ install: libcanfestival_$(CAN_DRIVER).so
++-	mkdir -p $(PREFIX)/lib/
++-	cp $< $(PREFIX)/lib/
+++	mkdir -p $(DESTDIR)$(PREFIX)/lib/
+++	cp $< $(DESTDIR)$(PREFIX)/lib/
++ 		
++ uninstall:
++ 	rm -f $(TARGET_SOFILES)
++diff -purN libcanfestival-71623bbf8093.orig/drivers/can_can4linux/Makefile.in libcanfestival-71623bbf8093/drivers/can_can4linux/Makefile.in
++--- libcanfestival-71623bbf8093.orig/drivers/can_can4linux/Makefile.in	2012-11-01 22:19:09.256753845 +0100
+++++ libcanfestival-71623bbf8093/drivers/can_can4linux/Makefile.in	2012-11-01 22:19:37.019559109 +0100
++@@ -42,7 +42,7 @@ else
++ DRIVER = $(OBJS)
++ endif
++ 
++-TARGET_SOFILES = $(PREFIX)/lib/$(DRIVER)
+++TARGET_SOFILES = $(DESTDIR)$(PREFIX)/lib/$(DRIVER)
++ 
++ all: driver
++ 
++@@ -55,8 +55,8 @@ libcanfestival_$(CAN_DRIVER).so: $(OBJS)
++ 	$(CC) -shared -Wl,-soname,libcanfestival_$(CAN_DRIVER).so $(CAN_DLL_CFLAGS) -o $@ $<
++ 
++ install: libcanfestival_$(CAN_DRIVER).so
++-	mkdir -p $(PREFIX)/lib/
++-	cp $< $(PREFIX)/lib/
+++	mkdir -p $(DESTDIR)$(PREFIX)/lib/
+++	cp $< $(DESTDIR)$(PREFIX)/lib/
++ 	
++ uninstall:
++ 	rm -f $(TARGET_HFILES)
++diff -purN libcanfestival-71623bbf8093.orig/drivers/can_copcican_linux/Makefile.in libcanfestival-71623bbf8093/drivers/can_copcican_linux/Makefile.in
++--- libcanfestival-71623bbf8093.orig/drivers/can_copcican_linux/Makefile.in	2012-11-01 22:19:09.246754035 +0100
+++++ libcanfestival-71623bbf8093/drivers/can_copcican_linux/Makefile.in	2012-11-01 22:19:36.846229073 +0100
++@@ -45,7 +45,7 @@ else
++ DRIVER = $(OBJS)
++ endif
++ 
++-TARGET_SOFILES = $(PREFIX)/lib/$(DRIVER)
+++TARGET_SOFILES = $(DESTDIR)$(PREFIX)/lib/$(DRIVER)
++ 
++ all: driver
++ 
++@@ -58,8 +58,8 @@ libcanfestival_$(CAN_DRIVER).so: $(OBJS)
++ 	$(CC) -shared -Wl,-soname,libcanfestival_$(CAN_DRIVER).so $(CAN_DLL_CFLAGS) -o $@ $<
++ 
++ install: libcanfestival_$(CAN_DRIVER).so
++-	mkdir -p $(PREFIX)/lib/
++-	cp $< $(PREFIX)/lib/
+++	mkdir -p $(DESTDIR)$(PREFIX)/lib/
+++	cp $< $(DESTDIR)$(PREFIX)/lib/
++ 
++ uninstall:
++ 	rm -f $(TARGET_SOFILES)
++diff -purN libcanfestival-71623bbf8093.orig/drivers/can_kvaser/Makefile.in libcanfestival-71623bbf8093/drivers/can_kvaser/Makefile.in
++--- libcanfestival-71623bbf8093.orig/drivers/can_kvaser/Makefile.in	2012-11-01 22:19:09.240087495 +0100
+++++ libcanfestival-71623bbf8093/drivers/can_kvaser/Makefile.in	2012-11-01 22:19:36.766230593 +0100
++@@ -52,7 +52,7 @@ else
++ DRIVER = $(OBJS)
++ endif
++ 
++-TARGET_SOFILES = $(PREFIX)/lib/$(DRIVER)
+++TARGET_SOFILES = $(DESTDIR)$(PREFIX)/lib/$(DRIVER)
++ 
++ all: driver
++ 
++@@ -65,8 +65,8 @@ $(DRIVER): $(OBJS)
++ 	$(CC) -shared -Wl,-soname,$(DRIVER) $(CAN_DLL_CFLAGS) -o $@ $< 
++ 
++ install: $(DRIVER)
++-	mkdir -p $(PREFIX)/lib/
++-	cp $< $(PREFIX)/lib/
+++	mkdir -p $(DESTDIR)$(PREFIX)/lib/
+++	cp $< $(DESTDIR)$(PREFIX)/lib/
++ 		
++ uninstall:
++ 	rm -f $(TARGET_SOFILES)
++diff -purN libcanfestival-71623bbf8093.orig/drivers/can_lincan/Makefile.in libcanfestival-71623bbf8093/drivers/can_lincan/Makefile.in
++--- libcanfestival-71623bbf8093.orig/drivers/can_lincan/Makefile.in	2012-11-01 22:19:09.260087115 +0100
+++++ libcanfestival-71623bbf8093/drivers/can_lincan/Makefile.in	2012-11-01 22:19:37.056225077 +0100
++@@ -42,7 +42,7 @@ else
++ DRIVER = $(OBJS)
++ endif
++ 
++-TARGET_SOFILES = $(PREFIX)/lib/$(DRIVER)
+++TARGET_SOFILES = $(DESTDIR)$(PREFIX)/lib/$(DRIVER)
++ 
++ all: driver
++ 
++@@ -55,8 +55,8 @@ libcanfestival_$(CAN_DRIVER).so: $(OBJS)
++ 	$(CC) -shared -Wl,-soname,libcanfestival_$(CAN_DRIVER).so $(CAN_DLL_CFLAGS) -o $@ $<
++ 
++ install: libcanfestival_$(CAN_DRIVER).so
++-	mkdir -p $(PREFIX)/lib/
++-	cp $< $(PREFIX)/lib/
+++	mkdir -p $(DESTDIR)$(PREFIX)/lib/
+++	cp $< $(DESTDIR)$(PREFIX)/lib/
++ 	
++ uninstall:
++ 	rm -f $(TARGET_HFILES)
++diff -purN libcanfestival-71623bbf8093.orig/drivers/can_peak_linux/Makefile.in libcanfestival-71623bbf8093/drivers/can_peak_linux/Makefile.in
++--- libcanfestival-71623bbf8093.orig/drivers/can_peak_linux/Makefile.in	2012-11-01 22:19:09.256753845 +0100
+++++ libcanfestival-71623bbf8093/drivers/can_peak_linux/Makefile.in	2012-11-01 22:19:37.046225267 +0100
++@@ -43,7 +43,7 @@ else
++ DRIVER = $(OBJS)
++ endif
++ 
++-TARGET_SOFILES = $(PREFIX)/lib/$(DRIVER)
+++TARGET_SOFILES = $(DESTDIR)$(PREFIX)/lib/$(DRIVER)
++ 
++ all: driver
++ 
++@@ -56,8 +56,8 @@ libcanfestival_$(CAN_DRIVER).so: $(OBJS)
++ 	$(CC) -shared -Wl,-soname,libcanfestival_$(CAN_DRIVER).so $(CAN_DLL_CFLAGS) -o $@ $<
++ 
++ install: libcanfestival_$(CAN_DRIVER).so
++-	mkdir -p $(PREFIX)/lib/
++-	cp $< $(PREFIX)/lib/
+++	mkdir -p $(DESTDIR)$(PREFIX)/lib/
+++	cp $< $(DESTDIR)$(PREFIX)/lib/
++ 		
++ uninstall:
++ 	rm -f $(TARGET_SOFILES)
++diff -purN libcanfestival-71623bbf8093.orig/drivers/can_peak_win32/Makefile.in libcanfestival-71623bbf8093/drivers/can_peak_win32/Makefile.in
++--- libcanfestival-71623bbf8093.orig/drivers/can_peak_win32/Makefile.in	2012-11-01 22:19:09.243420765 +0100
+++++ libcanfestival-71623bbf8093/drivers/can_peak_win32/Makefile.in	2012-11-01 22:19:36.816229643 +0100
++@@ -45,7 +45,7 @@ else
++ DRIVER = $(OBJS)
++ endif
++ 
++-TARGET_SOFILES = $(PREFIX)/lib/$(DRIVER)
+++TARGET_SOFILES = $(DESTDIR)$(PREFIX)/lib/$(DRIVER)
++ 
++ all: driver
++ 
++@@ -63,8 +63,8 @@ cyg$(CAN_DRIVER).dll: $(OBJS)
++ 	-Wl,--exclude-libs,ALL
++ 		
++ install: libcanfestival_$(CAN_DRIVER).so
++-	mkdir -p $(PREFIX)/lib/
++-	cp $< $(PREFIX)/lib/
+++	mkdir -p $(DESTDIR)$(PREFIX)/lib/
+++	cp $< $(DESTDIR)$(PREFIX)/lib/
++ 		
++ uninstall:
++ 	rm -f $(TARGET_SOFILES)
++diff -purN libcanfestival-71623bbf8093.orig/drivers/can_serial/Makefile.in libcanfestival-71623bbf8093/drivers/can_serial/Makefile.in
++--- libcanfestival-71623bbf8093.orig/drivers/can_serial/Makefile.in	2012-11-01 22:19:09.246754035 +0100
+++++ libcanfestival-71623bbf8093/drivers/can_serial/Makefile.in	2012-11-01 22:19:36.879561771 +0100
++@@ -46,8 +46,8 @@ endif
++ 
++ HUB=can_serial_hub
++ 
++-TARGET_SOFILES = $(PREFIX)/lib/$(DRIVER)
++-TARGET_BINFILES = $(PREFIX)/bin/$(HUB)
+++TARGET_SOFILES = $(DESTDIR)$(PREFIX)/lib/$(DRIVER)
+++TARGET_BINFILES = $(DESTDIR)$(PREFIX)/bin/$(HUB)
++ 
++ all: driver $(HUB)
++ 
++@@ -63,10 +63,10 @@ libcanfestival_$(CAN_DRIVER).so: $(OBJS)
++ 	$(CC) -shared -Wl,-soname,libcanfestival_$(CAN_DRIVER).so $(CAN_DLL_CFLAGS) -o $@ $<
++ 
++ install: libcanfestival_$(CAN_DRIVER).so $(HUB)
++-	mkdir -p $(PREFIX)/lib/
++-	cp libcanfestival_$(CAN_DRIVER).so $(PREFIX)/lib/
++-	mkdir -p $(PREFIX)/bin/
++-	cp $(HUB) $(PREFIX)/bin/
+++	mkdir -p $(DESTDIR)$(PREFIX)/lib/
+++	cp libcanfestival_$(CAN_DRIVER).so $(DESTDIR)$(PREFIX)/lib/
+++	mkdir -p $(DESTDIR)$(PREFIX)/bin/
+++	cp $(HUB) $(DESTDIR)$(PREFIX)/bin/
++ 	
++ uninstall:
++ 	rm -f $(TARGET_SOFILES)
++diff -purN libcanfestival-71623bbf8093.orig/drivers/can_socket/Makefile.in libcanfestival-71623bbf8093/drivers/can_socket/Makefile.in
++--- libcanfestival-71623bbf8093.orig/drivers/can_socket/Makefile.in	2012-11-01 22:19:09.283420005 +0100
+++++ libcanfestival-71623bbf8093/drivers/can_socket/Makefile.in	2012-11-01 22:19:37.079557967 +0100
++@@ -43,7 +43,7 @@ else
++ DRIVER = $(OBJS)
++ endif
++ 
++-TARGET_SOFILES = $(PREFIX)/lib/$(DRIVER)
+++TARGET_SOFILES = $(DESTDIR)$(PREFIX)/lib/$(DRIVER)
++ 
++ all: driver
++ 
++@@ -56,8 +56,8 @@ libcanfestival_$(CAN_DRIVER).so: $(OBJS)
++ 	$(CC) -shared -Wl,-soname,libcanfestival_$(CAN_DRIVER).so $(CAN_DLL_CFLAGS) -o $@ $<
++ 
++ install: libcanfestival_$(CAN_DRIVER).so
++-	mkdir -p $(PREFIX)/lib/
++-	cp $< $(PREFIX)/lib/
+++	mkdir -p $(DESTDIR)$(PREFIX)/lib/
+++	cp $< $(DESTDIR)$(PREFIX)/lib/
++ 	
++ uninstall:
++ 	rm -f $(TARGET_SOFILES)
++diff -purN libcanfestival-71623bbf8093.orig/drivers/can_tcp_win32/Makefile.in libcanfestival-71623bbf8093/drivers/can_tcp_win32/Makefile.in
++--- libcanfestival-71623bbf8093.orig/drivers/can_tcp_win32/Makefile.in	2012-11-01 22:19:09.256753845 +0100
+++++ libcanfestival-71623bbf8093/drivers/can_tcp_win32/Makefile.in	2012-11-01 22:19:37.029558919 +0100
++@@ -47,7 +47,7 @@ endif
++ 
++ SERVER = $(CAN_DRIVER)_server
++ 
++-TARGET_SOFILES = $(PREFIX)/lib/$(DRIVER)
+++TARGET_SOFILES = $(DESTDIR)$(PREFIX)/lib/$(DRIVER)
++ 
++ all: driver
++ 
++@@ -74,8 +74,8 @@ $(DRIVER): $(OBJS)
++ 	-Wl,--exclude-libs,ALL -lws2_32
++ 		
++ install: libcanfestival_$(CAN_DRIVER).so
++-	mkdir -p $(PREFIX)/lib/
++-	cp $< $(PREFIX)/lib/
+++	mkdir -p $(DESTDIR)$(PREFIX)/lib/
+++	cp $< $(DESTDIR)$(PREFIX)/lib/
++ 		
++ uninstall:
++ 	rm -f $(TARGET_SOFILES)
++diff -purN libcanfestival-71623bbf8093.orig/drivers/can_virtual/Makefile.in libcanfestival-71623bbf8093/drivers/can_virtual/Makefile.in
++--- libcanfestival-71623bbf8093.orig/drivers/can_virtual/Makefile.in	2012-11-01 22:19:09.246754035 +0100
+++++ libcanfestival-71623bbf8093/drivers/can_virtual/Makefile.in	2012-11-01 22:19:36.859562151 +0100
++@@ -43,7 +43,7 @@ else
++ DRIVER = $(OBJS)
++ endif
++ 
++-TARGET_SOFILES = $(PREFIX)/lib/$(DRIVER)
+++TARGET_SOFILES = $(DESTDIR)$(PREFIX)/lib/$(DRIVER)
++ 
++ all: driver
++ 
++@@ -56,8 +56,8 @@ libcanfestival_$(CAN_DRIVER).so: $(OBJS)
++ 	$(CC) -shared -Wl,-soname,libcanfestival_$(CAN_DRIVER).so $(CAN_DLL_CFLAGS) -o $@ $<
++ 
++ install: libcanfestival_$(CAN_DRIVER).so
++-	mkdir -p $(PREFIX)/lib/
++-	cp $< $(PREFIX)/lib/
+++	mkdir -p $(DESTDIR)$(PREFIX)/lib/
+++	cp $< $(DESTDIR)$(PREFIX)/lib/
++ 	
++ uninstall:
++ 	rm -f $(TARGET_SOFILES)
++diff -purN libcanfestival-71623bbf8093.orig/drivers/can_vscom/Makefile.in libcanfestival-71623bbf8093/drivers/can_vscom/Makefile.in
++--- libcanfestival-71623bbf8093.orig/drivers/can_vscom/Makefile.in	2012-11-01 22:19:09.283420005 +0100
+++++ libcanfestival-71623bbf8093/drivers/can_vscom/Makefile.in	2012-11-01 22:19:37.072891427 +0100
++@@ -61,7 +61,7 @@ else
++ DRIVER = $(OBJS)
++ endif
++ 
++-TARGET_SOFILES = $(PREFIX)/lib/$(DRIVER)
+++TARGET_SOFILES = $(DESTDIR)$(PREFIX)/lib/$(DRIVER)
++ 
++ all: driver
++ 
++@@ -83,8 +83,8 @@ libcanfestival_$(CAN_DRIVER).$(DLL_TYPE)
++ 	$(CC) $(PROG_CFLAGS) -shared $(CAN_VSCOM_DLL_FLAGS) -o $@ $< $(CAN_DLL_CFLAGS)
++ 
++ install: libcanfestival_$(CAN_DRIVER).so
++-	mkdir -p $(PREFIX)/lib/
++-	cp $< $(PREFIX)/lib/
+++	mkdir -p $(DESTDIR)$(PREFIX)/lib/
+++	cp $< $(DESTDIR)$(PREFIX)/lib/
++ 
++ uninstall:
++ 	rm -f $(TARGET_SOFILES)
++diff -purN libcanfestival-71623bbf8093.orig/drivers/timers_rtai/Makefile.in libcanfestival-71623bbf8093/drivers/timers_rtai/Makefile.in
++--- libcanfestival-71623bbf8093.orig/drivers/timers_rtai/Makefile.in	2012-11-01 22:19:09.246754035 +0100
+++++ libcanfestival-71623bbf8093/drivers/timers_rtai/Makefile.in	2012-11-01 22:19:36.886228311 +0100
++@@ -38,7 +38,7 @@ OBJS = $(TIMERS_DRIVER).o
++ 
++ SRC_HFILES = ../../include/$(TIMERS_DRIVER)/timerscfg.h
++ 
++-TARGET_HFILES = $(PREFIX)/include/canfestival/timerscfg.h
+++TARGET_HFILES = $(DESTDIR)$(PREFIX)/include/canfestival/timerscfg.h
++ 
++ all: driver
++ 
++@@ -48,8 +48,8 @@ driver: $(OBJS)
++ 	$(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
++ 
++ install:
++-	mkdir -p $(PREFIX)/include/canfestival
++-	cp $(SRC_HFILES) $(PREFIX)/include/canfestival
+++	mkdir -p $(DESTDIR)$(PREFIX)/include/canfestival
+++	cp $(SRC_HFILES) $(DESTDIR)$(PREFIX)/include/canfestival
++ 
++ uninstall:
++ 	rm -f $(TARGET_HFILES)
++diff -purN libcanfestival-71623bbf8093.orig/drivers/timers_unix/Makefile.in libcanfestival-71623bbf8093/drivers/timers_unix/Makefile.in
++--- libcanfestival-71623bbf8093.orig/drivers/timers_unix/Makefile.in	2012-11-01 22:19:09.243420765 +0100
+++++ libcanfestival-71623bbf8093/drivers/timers_unix/Makefile.in	2012-11-01 22:19:36.796230023 +0100
++@@ -38,7 +38,7 @@ OBJS = $(TIMERS_DRIVER).o
++ 
++ SRC_HFILES = ../../include/$(TIMERS_DRIVER)/timerscfg.h
++ 
++-TARGET_HFILES = $(PREFIX)/include/canfestival/timerscfg.h
+++TARGET_HFILES = $(DESTDIR)$(PREFIX)/include/canfestival/timerscfg.h
++ 
++ all: driver
++ 
++@@ -48,8 +48,8 @@ driver: $(OBJS)
++ 	$(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
++ 
++ install:
++-	mkdir -p $(PREFIX)/include/canfestival
++-	cp $(SRC_HFILES) $(PREFIX)/include/canfestival
+++	mkdir -p $(DESTDIR)$(PREFIX)/include/canfestival
+++	cp $(SRC_HFILES) $(DESTDIR)$(PREFIX)/include/canfestival
++ 
++ uninstall:
++ 	rm -f $(TARGET_HFILES)
++diff -purN libcanfestival-71623bbf8093.orig/drivers/timers_win32/Makefile.in libcanfestival-71623bbf8093/drivers/timers_win32/Makefile.in
++--- libcanfestival-71623bbf8093.orig/drivers/timers_win32/Makefile.in	2012-11-01 22:19:09.246754035 +0100
+++++ libcanfestival-71623bbf8093/drivers/timers_win32/Makefile.in	2012-11-01 22:19:36.866228691 +0100
++@@ -40,7 +40,7 @@ OBJS = $(TIMERS_DRIVER).o
++ 
++ SRC_HFILES = ../../include/$(TIMERS_DRIVER)/timerscfg.h
++ 
++-TARGET_HFILES = $(PREFIX)/include/canfestival/timerscfg.h
+++TARGET_HFILES = $(DESTDIR)$(PREFIX)/include/canfestival/timerscfg.h
++ 
++ all: driver
++ 
++@@ -50,8 +50,8 @@ driver: $(OBJS)
++ 	$(CXX) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
++ 
++ install:
++-	mkdir -p $(PREFIX)/include/canfestival
++-	cp $(SRC_HFILES) $(PREFIX)/include/canfestival
+++	mkdir -p $(DESTDIR)$(PREFIX)/include/canfestival
+++	cp $(SRC_HFILES) $(DESTDIR)$(PREFIX)/include/canfestival
++ 
++ uninstall:
++ 	rm -f $(TARGET_HFILES)
++diff -purN libcanfestival-71623bbf8093.orig/drivers/timers_xeno/Makefile.in libcanfestival-71623bbf8093/drivers/timers_xeno/Makefile.in
++--- libcanfestival-71623bbf8093.orig/drivers/timers_xeno/Makefile.in	2012-11-01 22:19:09.260087115 +0100
+++++ libcanfestival-71623bbf8093/drivers/timers_xeno/Makefile.in	2012-11-01 22:19:37.066224887 +0100
++@@ -38,7 +38,7 @@ OBJS = $(TIMERS_DRIVER).o
++ 
++ SRC_HFILES = ../../include/$(TIMERS_DRIVER)/timerscfg.h
++ 
++-TARGET_HFILES = $(PREFIX)/include/canfestival/timerscfg.h
+++TARGET_HFILES = $(DESTDIR)$(PREFIX)/include/canfestival/timerscfg.h
++ 
++ all: driver
++ 
++@@ -48,8 +48,8 @@ driver: $(OBJS)
++ 	$(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
++ 
++ install:
++-	mkdir -p $(PREFIX)/include/canfestival
++-	cp $(SRC_HFILES) $(PREFIX)/include/canfestival
+++	mkdir -p $(DESTDIR)$(PREFIX)/include/canfestival
+++	cp $(SRC_HFILES) $(DESTDIR)$(PREFIX)/include/canfestival
++ 
++ uninstall:
++ 	rm -f $(TARGET_HFILES)
++diff -purN libcanfestival-71623bbf8093.orig/drivers/unix/Makefile.in libcanfestival-71623bbf8093/drivers/unix/Makefile.in
++--- libcanfestival-71623bbf8093.orig/drivers/unix/Makefile.in	2012-11-01 22:19:09.250087305 +0100
+++++ libcanfestival-71623bbf8093/drivers/unix/Makefile.in	2012-11-01 22:19:36.896228121 +0100
++@@ -51,7 +51,7 @@ endif
++ 
++ SRC_HFILES = ../../include/$(TARGET)/applicfg.h ../../include/$(TARGET)/canfestival.h
++ 
++-TARGET_HFILES = $(PREFIX)/include/$(TARGET)/applicfg.h $(PREFIX)/include/$(TARGET)/canfestival.h
+++TARGET_HFILES = $(DESTDIR)$(PREFIX)/include/$(TARGET)/applicfg.h $(DESTDIR)$(PREFIX)/include/$(TARGET)/canfestival.h
++ 
++ all: driver
++ 
++@@ -104,13 +104,13 @@ libcanfestival_$(TARGET).a: $(OBJS)
++ 	$(BINUTILS_PREFIX)ranlib $@
++ 
++ install: libcanfestival_$(TARGET).a
++-	mkdir -p $(PREFIX)/lib/
++-	mkdir -p $(PREFIX)/include/canfestival
++-	cp libcanfestival_$(TARGET).a $(PREFIX)/lib/
++-	cp $(SRC_HFILES) $(PREFIX)/include/canfestival
+++	mkdir -p $(DESTDIR)$(PREFIX)/lib/
+++	mkdir -p $(DESTDIR)$(PREFIX)/include/canfestival
+++	cp libcanfestival_$(TARGET).a $(DESTDIR)$(PREFIX)/lib/
+++	cp $(SRC_HFILES) $(DESTDIR)$(PREFIX)/include/canfestival
++ 
++ uninstall:
++-	rm -f $(PREFIX)/lib/libcanfestival_$(TARGET).a
+++	rm -f $(DESTDIR)$(PREFIX)/lib/libcanfestival_$(TARGET).a
++ 	rm -f $(TARGET_HFILES)
++ 
++ clean:
++diff -purN libcanfestival-71623bbf8093.orig/drivers/win32/Makefile.in libcanfestival-71623bbf8093/drivers/win32/Makefile.in
++--- libcanfestival-71623bbf8093.orig/drivers/win32/Makefile.in	2012-11-01 22:19:09.253420575 +0100
+++++ libcanfestival-71623bbf8093/drivers/win32/Makefile.in	2012-11-01 22:19:36.976226599 +0100
++@@ -47,7 +47,7 @@ endif
++ 
++ SRC_HFILES = ../../include/$(TARGET)/applicfg.h ../../include/$(TARGET)/canfestival.h
++ 
++-TARGET_HFILES = $(PREFIX)/include/$(TARGET)/applicfg.h $(PREFIX)/include/$(TARGET)/canfestival.h
+++TARGET_HFILES = $(DESTDIR)$(PREFIX)/include/$(TARGET)/applicfg.h $(DESTDIR)$(PREFIX)/include/$(TARGET)/canfestival.h
++ 
++ all: driver
++ 
++@@ -71,13 +71,13 @@ libcanfestival_$(TARGET).a: $(OBJS)
++ 	$(BINUTILS_PREFIX)ranlib $@
++ 
++ install: libcanfestival_$(TARGET).a
++-	mkdir -p $(PREFIX)/lib/
++-	mkdir -p $(PREFIX)/include/canfestival
++-	cp libcanfestival_$(TARGET).a $(PREFIX)/lib/
++-	cp $(SRC_HFILES) $(PREFIX)/include/canfestival
+++	mkdir -p $(DESTDIR)$(PREFIX)/lib/
+++	mkdir -p $(DESTDIR)$(PREFIX)/include/canfestival
+++	cp libcanfestival_$(TARGET).a $(DESTDIR)$(PREFIX)/lib/
+++	cp $(SRC_HFILES) $(DESTDIR)$(PREFIX)/include/canfestival
++ 
++ uninstall:
++-	rm -f $(PREFIX)/lib/libcanfestival_$(TARGET).a
+++	rm -f $(DESTDIR)$(PREFIX)/lib/libcanfestival_$(TARGET).a
++ 	rm -f $(TARGET_HFILES)
++ 
++ clean:
++diff -purN libcanfestival-71623bbf8093.orig/examples/CANOpenShell/Makefile.in libcanfestival-71623bbf8093/examples/CANOpenShell/Makefile.in
++--- libcanfestival-71623bbf8093.orig/examples/CANOpenShell/Makefile.in	2012-11-01 22:19:09.313419433 +0100
+++++ libcanfestival-71623bbf8093/examples/CANOpenShell/Makefile.in	2012-11-01 22:19:37.802877543 +0100
++@@ -88,8 +88,8 @@ mrproper: clean
++ 	rm -f CANOpenShellSlaveOD.c
++ 
++ install: $(CANOPENSHELL)
++-	mkdir -p $(PREFIX)/bin/
++-	cp $< $(PREFIX)/bin/
+++	mkdir -p $(DESTDIR)$(PREFIX)/bin/
+++	cp $< $(DESTDIR)$(PREFIX)/bin/
++ 	
++ uninstall:
++-	rm -f $(PREFIX)/bin/$(CANOPENSHELL)
++\ No newline at end of file
+++	rm -f $(DESTDIR)$(PREFIX)/bin/$(CANOPENSHELL)
++\ No newline at end of file
++diff -purN libcanfestival-71623bbf8093.orig/examples/DS401_Master/Makefile.in libcanfestival-71623bbf8093/examples/DS401_Master/Makefile.in
++--- libcanfestival-71623bbf8093.orig/examples/DS401_Master/Makefile.in	2012-11-01 22:19:09.303419623 +0100
+++++ libcanfestival-71623bbf8093/examples/DS401_Master/Makefile.in	2012-11-01 22:19:37.642880585 +0100
++@@ -67,10 +67,10 @@ mrproper: clean
++ 	rm -f TestMaster.c
++ 	
++ install: DS401_Master
++-	mkdir -p $(PREFIX)/bin/
++-	cp $< $(PREFIX)/bin/
+++	mkdir -p $(DESTDIR)$(PREFIX)/bin/
+++	cp $< $(DESTDIR)$(PREFIX)/bin/
++ 	
++ uninstall:
++-	rm -f $(PREFIX)/bin/DS401_Master
+++	rm -f $(DESTDIR)$(PREFIX)/bin/DS401_Master
++ 
++ 
++diff -purN libcanfestival-71623bbf8093.orig/examples/DS401_Slave_Gui/Makefile.in libcanfestival-71623bbf8093/examples/DS401_Slave_Gui/Makefile.in
++--- libcanfestival-71623bbf8093.orig/examples/DS401_Slave_Gui/Makefile.in	2012-11-01 22:19:09.316752703 +0100
+++++ libcanfestival-71623bbf8093/examples/DS401_Slave_Gui/Makefile.in	2012-11-01 22:19:37.889542561 +0100
++@@ -76,11 +76,11 @@ mrproper: clean
++ 	$(RM) $(EXEC) $(DEPEND_FILE)
++ 	
++ install: DS401_Slave_Gui
++-	mkdir -p $(PREFIX)/bin/
++-	cp $< $(PREFIX)/bin/
+++	mkdir -p $(DESTDIR)$(PREFIX)/bin/
+++	cp $< $(DESTDIR)$(PREFIX)/bin/
++ 	
++ uninstall:
++-	rm -f $(PREFIX)/bin/DS401_Slave_Gui
+++	rm -f $(DESTDIR)$(PREFIX)/bin/DS401_Slave_Gui
++ 
++ $(EXEC): $(OBJS)
++ 	$(LD) $(OBJS) `wx-config --libs` -o $(EXEC)
++diff -purN libcanfestival-71623bbf8093.orig/examples/kerneltest/Makefile.in libcanfestival-71623bbf8093/examples/kerneltest/Makefile.in
++--- libcanfestival-71623bbf8093.orig/examples/kerneltest/Makefile.in	2012-11-01 22:19:09.320085973 +0100
+++++ libcanfestival-71623bbf8093/examples/kerneltest/Makefile.in	2012-11-01 22:19:38.102871835 +0100
++@@ -68,12 +68,12 @@ mrproper: clean
++ 
++ install:
++ 	$(MAKE) -C $(KERNELDIR) M=$(shell pwd) modules_install
++-	mkdir -p $(PREFIX)/bin/
++-	cp console/canf_ktest_console $(PREFIX)/bin/
+++	mkdir -p $(DESTDIR)$(PREFIX)/bin/
+++	cp console/canf_ktest_console $(DESTDIR)$(PREFIX)/bin/
++ 	/bin/sh insert.sh
++ 
++ uninstall:
++-	rm -f $(PREFIX)/bin/canf_ktest_console
+++	rm -f $(DESTDIR)$(PREFIX)/bin/canf_ktest_console
++ 
++ canf_ktest_console: console/console.c console/console.h
++ 	$(CC) console/console.c -o console/canf_ktest_console
++diff -purN libcanfestival-71623bbf8093.orig/examples/SillySlave/Makefile.in libcanfestival-71623bbf8093/examples/SillySlave/Makefile.in
++--- libcanfestival-71623bbf8093.orig/examples/SillySlave/Makefile.in	2012-11-01 22:19:09.293419814 +0100
+++++ libcanfestival-71623bbf8093/examples/SillySlave/Makefile.in	2012-11-01 22:19:37.372885721 +0100
++@@ -67,10 +67,10 @@ mrproper: clean
++ 	rm -f SillySlave.c
++ 	
++ install: SillySlave
++-	mkdir -p $(PREFIX)/bin/
++-	cp $< $(PREFIX)/bin/
+++	mkdir -p $(DESTDIR)$(PREFIX)/bin/
+++	cp $< $(DESTDIR)$(PREFIX)/bin/
++ 	
++ uninstall:
++-	rm -f $(PREFIX)/bin/SillySlave
+++	rm -f $(DESTDIR)$(PREFIX)/bin/SillySlave
++ 
++ 
++diff -purN libcanfestival-71623bbf8093.orig/examples/test_copcican_linux/Makefile.in libcanfestival-71623bbf8093/examples/test_copcican_linux/Makefile.in
++--- libcanfestival-71623bbf8093.orig/examples/test_copcican_linux/Makefile.in	2012-11-01 22:19:09.310086163 +0100
+++++ libcanfestival-71623bbf8093/examples/test_copcican_linux/Makefile.in	2012-11-01 22:19:37.779544653 +0100
++@@ -67,10 +67,10 @@ mrproper: clean
++ 	rm -f test_copcican_linux.c
++ 
++ install: test_copcican_linux
++-	mkdir -p $(PREFIX)/bin/
++-	cp $< $(PREFIX)/bin/
+++	mkdir -p $(DESTDIR)$(PREFIX)/bin/
+++	cp $< $(DESTDIR)$(PREFIX)/bin/
++ 
++ uninstall:
++-	rm -f $(PREFIX)/bin/test_copcican_linux
+++	rm -f $(DESTDIR)$(PREFIX)/bin/test_copcican_linux
++ 
++ 
++diff -purN libcanfestival-71623bbf8093.orig/examples/TestMasterMicroMod/Makefile.in libcanfestival-71623bbf8093/examples/TestMasterMicroMod/Makefile.in
++--- libcanfestival-71623bbf8093.orig/examples/TestMasterMicroMod/Makefile.in	2012-11-01 22:19:09.306752893 +0100
+++++ libcanfestival-71623bbf8093/examples/TestMasterMicroMod/Makefile.in	2012-11-01 22:19:37.699546175 +0100
++@@ -75,10 +75,10 @@ mrproper: clean
++ 	rm -f TestMaster.c
++ 	
++ install: TestMasterMicroMod
++-	mkdir -p $(PREFIX)/bin/
++-	cp $< $(PREFIX)/bin/
+++	mkdir -p $(DESTDIR)$(PREFIX)/bin/
+++	cp $< $(DESTDIR)$(PREFIX)/bin/
++ 	
++ uninstall:
++-	rm -f $(PREFIX)/bin/TestMasterMicroMod
+++	rm -f $(DESTDIR)$(PREFIX)/bin/TestMasterMicroMod
++ 
++ 
++diff -purN libcanfestival-71623bbf8093.orig/examples/TestMasterSlave/Makefile.in libcanfestival-71623bbf8093/examples/TestMasterSlave/Makefile.in
++--- libcanfestival-71623bbf8093.orig/examples/TestMasterSlave/Makefile.in	2012-11-01 22:19:09.300086353 +0100
+++++ libcanfestival-71623bbf8093/examples/TestMasterSlave/Makefile.in	2012-11-01 22:19:37.496216709 +0100
++@@ -88,11 +88,11 @@ mrproper: clean
++ 	rm -f TestMaster.c
++ 	
++ install: TestMasterSlave
++-	mkdir -p $(PREFIX)/bin/
++-	cp $< $(PREFIX)/bin/
+++	mkdir -p $(DESTDIR)$(PREFIX)/bin/
+++	cp $< $(DESTDIR)$(PREFIX)/bin/
++ 	
++ uninstall:
++-	rm -f $(PREFIX)/bin/TestMasterSlave
+++	rm -f $(DESTDIR)$(PREFIX)/bin/TestMasterSlave
++ 
++ 
++ 
++diff -purN libcanfestival-71623bbf8093.orig/examples/TestMasterSlaveLSS/Makefile.in libcanfestival-71623bbf8093/examples/TestMasterSlaveLSS/Makefile.in
++--- libcanfestival-71623bbf8093.orig/examples/TestMasterSlaveLSS/Makefile.in	2012-11-01 22:19:09.290086545 +0100
+++++ libcanfestival-71623bbf8093/examples/TestMasterSlaveLSS/Makefile.in	2012-11-01 22:19:37.236221653 +0100
++@@ -88,11 +88,11 @@ mrproper: clean
++ 	rm -f TestMaster.c
++ 	
++ install: TestMasterSlaveLSS
++-	mkdir -p $(PREFIX)/bin/
++-	cp $< $(PREFIX)/bin/
+++	mkdir -p $(DESTDIR)$(PREFIX)/bin/
+++	cp $< $(DESTDIR)$(PREFIX)/bin/
++ 	
++ uninstall:
++-	rm -f $(PREFIX)/bin/TestMasterSlaveLSS
+++	rm -f $(DESTDIR)$(PREFIX)/bin/TestMasterSlaveLSS
++ 
++ 
++ 
++diff -purN libcanfestival-71623bbf8093.orig/objdictgen/Makefile.in libcanfestival-71623bbf8093/objdictgen/Makefile.in
++--- libcanfestival-71623bbf8093.orig/objdictgen/Makefile.in	2012-11-01 22:19:09.326752513 +0100
+++++ libcanfestival-71623bbf8093/objdictgen/Makefile.in	2012-11-01 22:19:38.269535333 +0100
++@@ -35,19 +35,19 @@ gnosis/version.py:
++ 	rm -rf gnosis_extract
++ 
++ install: gnosis
++-	mkdir -p $(PREFIX)/objdictgen
++-	cp -r *.py* config doc doc_index locale examples gnosis *.ico $(PREFIX)/objdictgen
++-	chmod -R a+r $(PREFIX)/objdictgen
++-	mkdir -p $(PREFIX)/bin
++-	ln -sf $(PREFIX)/objdictgen/objdictedit.py $(PREFIX)/bin/objdictedit
++-	chmod 755 $(PREFIX)/objdictgen/objdictedit.py
++-	ln -sf $(PREFIX)/objdictgen/objdictgen.py $(PREFIX)/bin/objdictgen
++-	chmod 755 $(PREFIX)/objdictgen/objdictgen.py
+++	mkdir -p $(DESTDIR)$(PREFIX)/objdictgen
+++	cp -r *.py* config doc doc_index locale examples gnosis *.ico $(DESTDIR)$(PREFIX)/objdictgen
+++	chmod -R a+r $(DESTDIR)$(PREFIX)/objdictgen
+++	mkdir -p $(DESTDIR)$(PREFIX)/bin
+++	ln -sf $(DESTDIR)$(PREFIX)/objdictgen/objdictedit.py $(DESTDIR)$(PREFIX)/bin/objdictedit
+++	chmod 755 $(DESTDIR)$(PREFIX)/objdictgen/objdictedit.py
+++	ln -sf $(DESTDIR)$(PREFIX)/objdictgen/objdictgen.py $(DESTDIR)$(PREFIX)/bin/objdictgen
+++	chmod 755 $(DESTDIR)$(PREFIX)/objdictgen/objdictgen.py
++ 
++ uninstall:
++-	rm -rf $(PREFIX)/objdictgen
++-	rm -f $(PREFIX)/bin/objdictedit
++-	rm -f $(PREFIX)/bin/objdictgen
+++	rm -rf $(DESTDIR)$(PREFIX)/objdictgen
+++	rm -f $(DESTDIR)$(PREFIX)/bin/objdictedit
+++	rm -f $(DESTDIR)$(PREFIX)/bin/objdictgen
++ 
++ clean:
++ 
++diff -purN libcanfestival-71623bbf8093.orig/src/Makefile.in libcanfestival-71623bbf8093/src/Makefile.in
++--- libcanfestival-71623bbf8093.orig/src/Makefile.in	2012-11-01 22:19:09.286753275 +0100
+++++ libcanfestival-71623bbf8093/src/Makefile.in	2012-11-01 22:19:37.129557017 +0100
++@@ -94,11 +94,11 @@ clean:
++ 
++ install:
++ 	$(MAKE) -C $(KERNELDIR) M=$(shell pwd) modules_install
++-	mkdir -p $(PREFIX)/include/canfestival
++-	cp ../include/*.h $(PREFIX)/include/canfestival
+++	mkdir -p $(DESTDIR)$(PREFIX)/include/canfestival
+++	cp ../include/*.h $(DESTDIR)$(PREFIX)/include/canfestival
++ 
++ uninstall:
++-	rm -rf $(PREFIX)/include/canfestival
+++	rm -rf $(DESTDIR)$(PREFIX)/include/canfestival
++ 
++ else
++ CFLAGS = SUB_OPT_CFLAGS
++@@ -132,14 +132,14 @@ $(TARGET)_%.o: %.c
++ 	$(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
++ 
++ install: libcanfestival.a
++-	mkdir -p $(PREFIX)/lib/
++-	mkdir -p $(PREFIX)/include/canfestival
++-	cp libcanfestival.a $(PREFIX)/lib/
++-	cp ../include/*.h $(PREFIX)/include/canfestival
+++	mkdir -p $(DESTDIR)$(PREFIX)/lib/
+++	mkdir -p $(DESTDIR)$(PREFIX)/include/canfestival
+++	cp libcanfestival.a $(DESTDIR)$(PREFIX)/lib/
+++	cp ../include/*.h $(DESTDIR)$(PREFIX)/include/canfestival
++ 
++ uninstall:
++-	rm -f $(PREFIX)/lib/libcanfestival.a
++-	rm -rf $(PREFIX)/include/canfestival
+++	rm -f $(DESTDIR)$(PREFIX)/lib/libcanfestival.a
+++	rm -rf $(DESTDIR)$(PREFIX)/include/canfestival
++ 
++ clean:
++ 	rm -f $(OBJS) libcanfestival.a libcanfestival.o
+diff --git a/package/libcanfestival/libcanfestival.mk b/package/libcanfestival/libcanfestival.mk
+new file mode 100644
+index 0000000..0a2b956
+--- /dev/null
++++ b/package/libcanfestival/libcanfestival.mk
+@@ -0,0 +1,45 @@
 +#############################################################
 +#
 +# libcanfestival
 +#
 +#############################################################
-+# Revision 705:
-+LIBCANFESTIVAL_VERSION = 3bbc9aeba925
++# Revision 760:
++LIBCANFESTIVAL_VERSION = 71623bbf8093
 +LIBCANFESTIVAL_SITE_METHOD = hg
 +LIBCANFESTIVAL_SITE = http://dev.automforge.net/CanFestival-3
++# Runtime code is licensed LGPLv2, whereas accompanying developer tools are
++# licensed GPLv2.
++LIBCANFESTIVAL_LICENSE = LGPL2.1/GPLv2
++LIBCANFESTIVAL_LICENSE_FILES = COPYING LICENCE
++
 +LIBCANFESTIVAL_INSTALL_STAGING = YES
 +
 +define LIBCANFESTIVAL_CONFIGURE_CMDS
 +	cd $(@D) && \
-+	./configure --binutils=$(TARGET_CROSS) --cc="$(TARGET_CC)" \
-+	--cxx="$(TARGET_CC)" --ld="$(TARGET_CC)" --prefix=$(TARGET_DIR)/usr \
-+	--can=$(BR2_PACKAGE_LIBCANFESTIVAL_DRIVER) \
-+	--MAX_CAN_BUS_ID=$(BR2_PACKAGE_LIBCANFESTIVAL_NBMMAXCAN)
++		./configure --binutils=$(TARGET_CROSS) --cc="$(TARGET_CC)" \
++		--cxx="$(TARGET_CC)" --ld="$(TARGET_CC)" \
++		--can=$(BR2_PACKAGE_LIBCANFESTIVAL_DRIVER) \
++		--MAX_CAN_BUS_ID=$(BR2_PACKAGE_LIBCANFESTIVAL_NBMMAXCAN)
 +endef
 +
 +define LIBCANFESTIVAL_BUILD_CMDS
@@ -115,35 +876,22 @@ Index: buildroot/package/libcanfestival/libcanfestival.mk
 +endef
 +
 +define LIBCANFESTIVAL_INSTALL_TARGET_CMDS
-+	$(MAKE) -C $(@D)/src install
-+	$(MAKE) -C $(@D)/drivers install
-+	$(MAKE) -C $(@D)/examples install
++	$(MAKE) -C $(@D)/src install DESTDIR=$(TARGET_DIR)
++	$(MAKE) -C $(@D)/drivers install DESTDIR=$(TARGET_DIR)
++	$(MAKE) -C $(@D)/examples install DESTDIR=$(TARGET_DIR)
 +endef
 +
 +define LIBCANFESTIVAL_INSTALL_STAGING_CMDS
-+	$(MAKE) -C $(@D)/src install PREFIX=$(STAGING_DIR)
-+	$(MAKE) -C $(@D)/drivers install PREFIX=$(STAGING_DIR)
-+	$(MAKE) -C $(@D)/examples install PREFIX=$(STAGING_DIR)
++	$(MAKE) -C $(@D)/src install DESTDIR=$(STAGING_DIR)
++	$(MAKE) -C $(@D)/drivers install DESTDIR=$(STAGING_DIR)
++	$(MAKE) -C $(@D)/examples install DESTDIR=$(STAGING_DIR)
 +endef
 +
 +define LIBCANFESTIVAL_CLEAN_CMDS
 +	$(MAKE) -C $(@D) mrproper
 +endef
 +
-+define LIBCANFESTIVAL_UNINSTALL_TARGET_CMDS
-+	$(MAKE) -C $(@D) uninstall
-+endef
-+
 +$(eval $(generic-package))
-Index: buildroot/package/Config.in
-===================================================================
---- buildroot.orig/package/Config.in	2012-02-21 16:46:09.000000000 +0100
-+++ buildroot/package/Config.in	2012-02-21 16:46:12.000000000 +0100
-@@ -369,6 +369,7 @@
- 
- menu "Networking"
- source "package/glib-networking/Config.in"
-+source "package/libcanfestival/Config.in"
- source "package/libcgi/Config.in"
- source "package/libcgicc/Config.in"
- source "package/libcurl/Config.in"
+-- 
+1.8.0.1
+


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-86-g9cbe656

From: jorasse <jo...@us...> - 2012-12-25 16:02:01

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  9cbe656904eeda7ab650686da746b934fe7cde6e (commit)
      from  b0b1722b1c04700f2ccc133f3776f79844cadba3 (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 9cbe656904eeda7ab650686da746b934fe7cde6e
Author: Samuel Martin <s.m...@gm...>
Date:   Tue Dec 25 17:01:44 2012 +0100

    [BUILDROOT] 2012.11: clean-up URG package for BR upstream integration. Thx Smartin

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

Summary of changes:
 .../buildroot/2012.11/122-urg-add_package.patch    |   72 ++++++++++++-------
 1 files changed, 45 insertions(+), 27 deletions(-)

diff --git a/patches/buildroot/2012.11/122-urg-add_package.patch b/patches/buildroot/2012.11/122-urg-add_package.patch
index b7fcf25..7012fc7 100644
--- a/patches/buildroot/2012.11/122-urg-add_package.patch
+++ b/patches/buildroot/2012.11/122-urg-add_package.patch
@@ -1,23 +1,33 @@
 Add URG sensors control library to BR.
 
 Signed-off-by: Julien Boibessot <jul...@ar...>
+Cc: Eric Jarrige <eri...@ar...>
+Signed-off-by: Samuel Martin <s.m...@gm...>
+---
+ package/Config.in     |  1 +
+ package/urg/Config.in |  9 +++++++++
+ package/urg/urg.mk    | 26 ++++++++++++++++++++++++++
+ 3 files changed, 36 insertions(+)
+ create mode 100644 package/urg/Config.in
+ create mode 100644 package/urg/urg.mk
 
-Index: buildroot/package/Config.in
-===================================================================
---- buildroot.orig/package/Config.in	2012-02-21 16:45:30.000000000 +0100
-+++ buildroot/package/Config.in	2012-02-21 16:45:33.000000000 +0100
-@@ -235,6 +235,7 @@
- source "package/squashfs3/Config.in"
- source "package/sshfs/Config.in"
- source "package/unionfs/Config.in"
+diff --git a/package/Config.in b/package/Config.in
+index c530305..45ccbcf 100644
+--- a/package/Config.in
++++ b/package/Config.in
+@@ -426,6 +426,7 @@ source "package/libv4l/Config.in"
+ source "package/mtdev/Config.in"
+ source "package/neardal/Config.in"
+ source "package/pcsc-lite/Config.in"
 +source "package/urg/Config.in"
- source "package/xfsprogs/Config.in"
  endmenu
  
-Index: buildroot/package/urg/Config.in
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/urg/Config.in	2012-02-21 16:45:33.000000000 +0100
+ menu "Javascript"
+diff --git a/package/urg/Config.in b/package/urg/Config.in
+new file mode 100644
+index 0000000..9dd13bf
+--- /dev/null
++++ b/package/urg/Config.in
 @@ -0,0 +1,9 @@
 +config BR2_PACKAGE_URG
 +	bool "urg library"
@@ -28,29 +38,37 @@ Index: buildroot/package/urg/Config.in
 +	  Requires SDL & SDL_net.
 +
 +	  http://www.hokuyo-aut.jp/02sensor/07scanner/download/urg_programs_en/
-Index: buildroot/package/urg/urg.mk
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/urg/urg.mk	2012-02-21 16:45:33.000000000 +0100
-@@ -0,0 +1,21 @@
+diff --git a/package/urg/urg.mk b/package/urg/urg.mk
+new file mode 100644
+index 0000000..d5b752a
+--- /dev/null
++++ b/package/urg/urg.mk
+@@ -0,0 +1,26 @@
 +#############################################################
 +#
 +# urg library
 +#
 +#############################################################
-+URG_VERSION = 0.8.11
++URG_VERSION = 0.8.18
 +URG_SITE = http://www.hokuyo-aut.jp/02sensor/07scanner/download/urg_programs_en/
-+URG_SOURCE = urg-$(URG_VERSION).tar.gz
-+URG_LIBTOOL_PATCH = NO
++URG_SOURCE = urg-$(URG_VERSION).zip
++URG_LICENSE = LGPLv3
++URG_LICENSE_FILES = COPYING
++
 +URG_INSTALL_STAGING = YES
-+URG_INSTALL_TARGET = YES
++
++URG_DEPENDENCIES = sdl sdl_net
 +
 +URG_CONF_OPT = --with-sdl-prefix=$(STAGING_DIR)/usr \
 +		--with-sdl-exec-prefix=$(STAGING_DIR)/usr
 +
-+$(eval $(autotools-package))
-+
-+$(URG_HOOK_POST_EXTRACT):
-+	@$(call MESSAGE,"Post extracting")
-+	chmod a+x $(URG_DIR)/configure
++define URG_EXTRACT_CMDS
++	$(RM) -rf $(URG_DIR)
++	unzip -q -d $(BUILD_DIR)/ $(DL_DIR)/$(URG_SOURCE)
++	test -d $(URG_DIR) || \
++		mv $(BUILD_DIR)/$(subst .zip,,$(URG_SOURCE)) $(URG_DIR)
++endef
 +
++$(eval $(autotools-package))
+-- 
+1.8.0.1


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-85-gb0b1722

From: jorasse <jo...@us...> - 2012-12-25 15:32:38

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  b0b1722b1c04700f2ccc133f3776f79844cadba3 (commit)
      from  53edeeb42c5b3476c207cad07fe9c09595620018 (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 b0b1722b1c04700f2ccc133f3776f79844cadba3
Author: Samuel Martin <s.m...@gm...>
Date:   Tue Dec 25 16:32:22 2012 +0100

    [BUILDROOT] 2012.11: clean-up openobe and ussp-push for BR upstream integration. Thx Smartin

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

Summary of changes:
 .../2012.11/116-openobex-add_package.patch         |  172 +++++++++++---------
 .../2012.11/117-ussp-push-add_package.patch        |   81 +++++++---
 2 files changed, 156 insertions(+), 97 deletions(-)

diff --git a/patches/buildroot/2012.11/116-openobex-add_package.patch b/patches/buildroot/2012.11/116-openobex-add_package.patch
index 4326dcd..1d6a492 100644
--- a/patches/buildroot/2012.11/116-openobex-add_package.patch
+++ b/patches/buildroot/2012.11/116-openobex-add_package.patch
@@ -2,23 +2,39 @@ Adds OpenOBEX package to BR.
 
 Signed-off-by: Julien Boibessot <jul...@ar...>
 
-Index: buildroot/package/Config.in
-===================================================================
---- buildroot.orig/package/Config.in	2012-02-21 16:44:54.000000000 +0100
-+++ buildroot/package/Config.in	2012-02-21 16:45:01.000000000 +0100
-@@ -502,6 +502,7 @@
+Cc: Julien Boibessot <jul...@ar...>
+Cc: Eric Jarrige <eri...@ar...>
+Signed-off-by: Samuel Martin <s.m...@gm...>
+---
+ package/Config.in                                  |  1 +
+ package/openobex/Config.in                         | 28 +++++++++++++++++
+ ...penobex-libusb_check_when_cross-compiling.patch | 18 +++++++++++
+ .../openobex-replace_deprecated_functions.patch    | 30 +++++++++++++++++++
+ package/openobex/openobex.mk                       | 35 ++++++++++++++++++++++
+ 5 files changed, 112 insertions(+)
+ create mode 100644 package/openobex/Config.in
+ create mode 100644 package/openobex/openobex-libusb_check_when_cross-compiling.patch
+ create mode 100644 package/openobex/openobex-replace_deprecated_functions.patch
+ create mode 100644 package/openobex/openobex.mk
+
+diff --git a/package/Config.in b/package/Config.in
+index 74e439e..0855684 100644
+--- a/package/Config.in
++++ b/package/Config.in
+@@ -632,6 +632,7 @@ source "package/ntp/Config.in"
  source "package/nuttcp/Config.in"
  source "package/olsr/Config.in"
  source "package/openntpd/Config.in"
 +source "package/openobex/Config.in"
  source "package/openssh/Config.in"
+ source "package/openswan/Config.in"
  source "package/openvpn/Config.in"
- source "package/portmap/Config.in"
-Index: buildroot/package/openobex/Config.in
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/openobex/Config.in	2012-02-21 16:45:01.000000000 +0100
-@@ -0,0 +1,25 @@
+diff --git a/package/openobex/Config.in b/package/openobex/Config.in
+new file mode 100644
+index 0000000..06f4c7d
+--- /dev/null
++++ b/package/openobex/Config.in
+@@ -0,0 +1,28 @@
 +config BR2_PACKAGE_OPENOBEX
 +	bool "openobex"
 +	help
@@ -28,79 +44,36 @@ Index: buildroot/package/openobex/Config.in
 +	  http://www.openobex.org
 +
 +if BR2_PACKAGE_OPENOBEX
++config BR2_PACKAGE_OPENOBEX_BLUEZ
++	bool "enable bluez support"
++	select BR2_PACKAGE_BLUEZ_UTILS
++
++config BR2_PACKAGE_OPENOBEX_LIBUSB
++	bool "enable libusb support"
++	select BR2_PACKAGE_LIBUSB
 +
 +config BR2_PACKAGE_OPENOBEX_APPS
 +	bool "install test applications"
-+	default n
 +	help
 +	  Also install the openobex test applications on target.
 +
 +config BR2_PACKAGE_OPENOBEX_SYSLOG
 +	bool "enable debugging to the system logger"
-+	default n
 +
 +config BR2_PACKAGE_OPENOBEX_DUMP
 +	bool "enable protocol dumping for debugging"
-+	default n
-+
-+endif
-Index: buildroot/package/openobex/openobex.mk
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/openobex/openobex.mk	2012-02-21 16:45:02.000000000 +0100
-@@ -0,0 +1,47 @@
-+#############################################################
-+#
-+# openobex
-+#
-+#############################################################
-+OPENOBEX_VERSION = 1.5
-+OPENOBEX_SITE = http://www.kernel.org/pub/linux/bluetooth
-+OPENOBEX_AUTORECONF = YES
-+OPENOBEX_INSTALL_STAGING = YES
-+OPENOBEX_INSTALL_TARGET = YES
-+
-+ifeq ($(strip $(BR2_PACKAGE_BLUEZ_LIBS)),y)
-+WITH_BLUEZ=--with-bluez=$(STAGING_DIR)
-+else
-+WITH_BLUEZ=--disable-bluetooth
-+endif
-+
-+ifeq ($(strip $(BR2_PACKAGE_LIBUSB)),y)
-+WITH_USB=--with-usb=$(STAGING_DIR)
-+else
-+WITH_USB=--disable-usb
-+endif
-+
-+WITH_APPS=
-+ifeq ($(strip $(BR2_PACKAGE_OPENOBEX_APPS)),y)
-+WITH_APPS=--enable-apps
-+endif
-+
-+WITH_SYSLOG=
-+ifeq ($(strip $(BR2_PACKAGE_OPENOBEX_SYSLOG)),y)
-+WITH_SYSLOG=--enable-syslog
-+endif
-+
-+WITH_DUMP=
-+ifeq ($(strip $(BR2_PACKAGE_OPENOBEX_DUMP)),y)
-+WITH_DUMP=--enable-dump
 +endif
+diff --git a/package/openobex/openobex-libusb_check_when_cross-compiling.patch b/package/openobex/openobex-libusb_check_when_cross-compiling.patch
+new file mode 100644
+index 0000000..7b8056a
+--- /dev/null
++++ b/package/openobex/openobex-libusb_check_when_cross-compiling.patch
+@@ -0,0 +1,18 @@
++Fix libusb check when cross-compiling.
 +
-+OPENOBEX_CONF_OPT = \
-+		$(WITH_APPS) \
-+		$(WITH_BLUEZ) \
-+		$(WITH_USB) \
-+		$(WITH_DUMP) \
-+		$(WITH_SYSLOG)
++Signed-off-by: Julien Boibessot <jul...@ar...>
++Signed-off-by: Samuel Martin <s.m...@gm...>
 +
-+$(eval $(autotools-package))
-+
-Index: buildroot/package/openobex/openobex-libusb_check_when_cross-compiling.patch
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/openobex/openobex-libusb_check_when_cross-compiling.patch	2012-02-21 16:45:02.000000000 +0100
-@@ -0,0 +1,13 @@
 +Index: openobex-1.5/acinclude.m4
 +===================================================================
 +--- openobex-1.5.orig/acinclude.m4	2010-06-16 10:32:47.000000000 +0200
@@ -114,11 +87,17 @@ Index: buildroot/package/openobex/openobex-libusb_check_when_cross-compiling.pat
 + 		;;
 + 	esac
 + 	AC_SUBST(USB_CFLAGS)
-Index: buildroot/package/openobex/openobex-replace_deprecated_functions.patch
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/openobex/openobex-replace_deprecated_functions.patch	2012-02-21 16:45:02.000000000 +0100
-@@ -0,0 +1,25 @@
+diff --git a/package/openobex/openobex-replace_deprecated_functions.patch b/package/openobex/openobex-replace_deprecated_functions.patch
+new file mode 100644
+index 0000000..17274d3
+--- /dev/null
++++ b/package/openobex/openobex-replace_deprecated_functions.patch
+@@ -0,0 +1,30 @@
++obex_test_cable.c: avoid to use SuSv3 LEGACY APIs
++
++Signed-off-by: Julien Boibessot <jul...@ar...>
++Signed-off-by: Samuel Martin <s.m...@gm...>
++
 +Index: openobex-1.5/apps/obex_test_cable.c
 +===================================================================
 +--- openobex-1.5.orig/apps/obex_test_cable.c	2009-02-08 19:30:22.000000000 +0100
@@ -144,3 +123,46 @@ Index: buildroot/package/openobex/openobex-replace_deprecated_functions.patch
 + 	gt->newtio.c_cflag = B115200 | CS8 | CREAD | CRTSCTS;
 + 	gt->newtio.c_iflag = IGNPAR;
 + 	gt->newtio.c_oflag = 0;
+diff --git a/package/openobex/openobex.mk b/package/openobex/openobex.mk
+new file mode 100644
+index 0000000..beac5ff
+--- /dev/null
++++ b/package/openobex/openobex.mk
+@@ -0,0 +1,35 @@
++#############################################################
++#
++# openobex
++#
++#############################################################
++OPENOBEX_VERSION = 1.5
++OPENOBEX_SITE = http://ftp.osuosl.org/pub/linux/bluetooth
++# Libraries seems release under LGPLv2.1, while other material are undrer GPLv2
++OPENOBEX_LICENSE = GPLv2/LGPLv2.1
++OPENOBEX_LICENSE_FILES = COPYING COPYING.LIB
++
++OPENOBEX_AUTORECONF = YES
++OPENOBEX_INSTALL_STAGING = YES
++
++OPENOBEX_CONF_OPT += \
++	$(if $(BR2_ENABLE_DEBUG),--enable-debug) \
++	$(if $(BR2_PACKAGE_OPENOBEX_APPS),--enable-apps) \
++	$(if $(BR2_PACKAGE_OPENOBEX_SYSLOG),--enable-syslog) \
++	$(if $(BR2_PACKAGE_OPENOBEX_DUMP),--enable-dump)
++
++ifeq ($(BR2_PACKAGE_OPENOBEX_BLUEZ),y)
++OPENOBEX_DEPENDENCIES += bluez_utils
++OPENOBEX_CONF_OPT += --with-bluez=$(STAGING_DIR)
++else
++OPENOBEX_CONF_OPT += --disable-bluetooth
++endif
++
++ifeq ($(BR2_PACKAGE_OPENOBEX_LIBUSB),y)
++OPENOBEX_DEPENDENCIES += libusb
++OPENOBEX_CONF_OPT += --with-usb=$(STAGING_DIR)
++else
++OPENOBEX_CONF_OPT += --disable-usb
++endif
++
++$(eval $(autotools-package))
+-- 
+1.8.0.1
diff --git a/patches/buildroot/2012.11/117-ussp-push-add_package.patch b/patches/buildroot/2012.11/117-ussp-push-add_package.patch
index a2d1aca..0b54f74 100644
--- a/patches/buildroot/2012.11/117-ussp-push-add_package.patch
+++ b/patches/buildroot/2012.11/117-ussp-push-add_package.patch
@@ -1,39 +1,72 @@
 Adds ussp-push package to BR.
 
 Signed-off-by: Julien Boibessot <jul...@ar...>
+Cc: Eric Jarrige <eri...@ar...>
+Signed-off-by: Samuel Martin <s.m...@gm...>
+---
+ package/Config.in                                         |  1 +
+ package/ussp-push/Config.in                               |  9 +++++++++
+ .../ussp-push/ussp-push-fix-build-against-bluez-4.patch   | 15 +++++++++++++++
+ package/ussp-push/ussp-push.mk                            | 13 +++++++++++++
+ 4 files changed, 38 insertions(+)
+ create mode 100644 package/ussp-push/Config.in
+ create mode 100644 package/ussp-push/ussp-push-fix-build-against-bluez-4.patch
+ create mode 100644 package/ussp-push/ussp-push.mk
 
-Index: buildroot/package/Config.in
-===================================================================
---- buildroot.orig/package/Config.in	2012-02-21 16:45:01.000000000 +0100
-+++ buildroot/package/Config.in	2012-02-21 16:45:03.000000000 +0100
-@@ -531,6 +531,7 @@
- source "package/transmission/Config.in"
- source "package/ttcp/Config.in"
+diff --git a/package/Config.in b/package/Config.in
+index 0855684..c530305 100644
+--- a/package/Config.in
++++ b/package/Config.in
+@@ -668,6 +668,7 @@ source "package/ttcp/Config.in"
  source "package/udpcast/Config.in"
-+source "package/ussp-push/Config.in"
  source "package/ulogd/Config.in"
  source "package/ushare/Config.in"
++source "package/ussp-push/Config.in"
  source "package/vpnc/Config.in"
-Index: buildroot/package/ussp-push/Config.in
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/ussp-push/Config.in	2012-02-21 16:45:03.000000000 +0100
-@@ -0,0 +1,10 @@
+ source "package/vsftpd/Config.in"
+ source "package/vtun/Config.in"
+diff --git a/package/ussp-push/Config.in b/package/ussp-push/Config.in
+new file mode 100644
+index 0000000..324280f
+--- /dev/null
++++ b/package/ussp-push/Config.in
+@@ -0,0 +1,9 @@
 +config BR2_PACKAGE_USSP_PUSH
 +	bool "ussp-push"
 +	select BR2_PACKAGE_OPENOBEX
-+	select BR2_PACKAGE_BLUEZ_LIBS
++	select BR2_PACKAGE_BLUEZ_UTILS
 +	help
 +	  ussp-push is an OBEX object pusher for Linux, using the BlueZ
 +	  BlueTooth stack.
 +
 +	  http://www.xmailserver.org/ussp-push.html
-+	  http://freshmeat.net/projects/ussp-push/
-Index: buildroot/package/ussp-push/ussp-push.mk
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/ussp-push/ussp-push.mk	2012-02-21 16:45:03.000000000 +0100
-@@ -0,0 +1,12 @@
+diff --git a/package/ussp-push/ussp-push-fix-build-against-bluez-4.patch b/package/ussp-push/ussp-push-fix-build-against-bluez-4.patch
+new file mode 100644
+index 0000000..0694bfb
+--- /dev/null
++++ b/package/ussp-push/ussp-push-fix-build-against-bluez-4.patch
+@@ -0,0 +1,15 @@
++Fix build against bluez4.
++
++Signed-off-by: Samuel Martin <s.m...@gm...>
++
++--- ussp-push-0.11.orig/src/obex_socket.c	2012-11-01 09:58:51.049538708 +0100
+++++ ussp-push-0.11/src/obex_socket.c	2012-11-01 12:10:10.719506951 +0100
++@@ -197,7 +197,7 @@ static int bt_sock_name2bth(int devid, c
++ 	for (i = 0; i < niinf; i++) {
++ 		char devname[128];
++ 
++-		if (hci_remote_name(dd, &piinf[i].bdaddr, sizeof(devname) - 1,
+++		if (hci_read_remote_name(dd, &piinf[i].bdaddr, sizeof(devname) - 1,
++ 				    devname, 100000) >= 0) {
++ 			if (strcasecmp(devname, btname) == 0) {
++ 				*btaddr = piinf[i].bdaddr;
+diff --git a/package/ussp-push/ussp-push.mk b/package/ussp-push/ussp-push.mk
+new file mode 100644
+index 0000000..6f322ab
+--- /dev/null
++++ b/package/ussp-push/ussp-push.mk
+@@ -0,0 +1,13 @@
 +#############################################################
 +#
 +# ussp-push
@@ -41,8 +74,12 @@ Index: buildroot/package/ussp-push/ussp-push.mk
 +#############################################################
 +USSP_PUSH_VERSION = 0.11
 +USSP_PUSH_SITE = http://www.xmailserver.org
++USSP_PUSH_LICENSE = GPLv2
++USSP_PUSH_LICENSE_FILES = COPYING
 +
-+USSP_PUSH_DEPENDENCIES = bluez-libs openobex
++USSP_PUSH_DEPENDENCIES = bluez_utils openobex
 +
 +$(eval $(autotools-package))
-+
+-- 
+1.8.0.1
+


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-84-g53edeeb

From: jorasse <jo...@us...> - 2012-12-25 14:08:11

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  53edeeb42c5b3476c207cad07fe9c09595620018 (commit)
      from  1a66f8ec076d883f728b0905e14b1bf74f10c03f (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 53edeeb42c5b3476c207cad07fe9c09595620018
Author: Samuel Martin <s.m...@gm...>
Date:   Tue Dec 25 15:07:04 2012 +0100

    [BUILDROOT] 2012.11: clean-up for BR upstream integration. Thx Smartin

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

Summary of changes:
 .../buildroot/2012.11/097-adds_flite_package.patch |  117 ++++++++++++--------
 1 files changed, 72 insertions(+), 45 deletions(-)

diff --git a/patches/buildroot/2012.11/097-adds_flite_package.patch b/patches/buildroot/2012.11/097-adds_flite_package.patch
index 3e2c54c..6485b5c 100644
--- a/patches/buildroot/2012.11/097-adds_flite_package.patch
+++ b/patches/buildroot/2012.11/097-adds_flite_package.patch
@@ -1,12 +1,21 @@
 Add Flite package (speech synthesis engine).
 
 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 ++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 69 insertions(+)
+ create mode 100644 package/multimedia/flite/Config.in
+ create mode 100644 package/multimedia/flite/flite.mk
 
-Index: buildroot/package/multimedia/Config.in
-===================================================================
---- buildroot/package/multimedia/Config.in
-+++ buildroot/package/multimedia/Config.in
-@@ -4,6 +4,7 @@
+diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
+index 273d9bc..3ca0531 100644
+--- a/package/multimedia/Config.in
++++ b/package/multimedia/Config.in
+@@ -4,6 +4,7 @@ source "package/multimedia/aumix/Config.in"
  source "package/multimedia/bellagio/Config.in"
  source "package/multimedia/faad2/Config.in"
  source "package/multimedia/flac/Config.in"
@@ -14,10 +23,11 @@ Index: buildroot/package/multimedia/Config.in
  source "package/multimedia/ffmpeg/Config.in"
  source "package/multimedia/gstreamer/Config.in"
  source "package/multimedia/gst-ffmpeg/Config.in"
-Index: buildroot/package/multimedia/flite/Config.in
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/multimedia/flite/Config.in	2012-02-21 16:44:45.000000000 +0100
+diff --git a/package/multimedia/flite/Config.in b/package/multimedia/flite/Config.in
+new file mode 100644
+index 0000000..bef989c
+--- /dev/null
++++ b/package/multimedia/flite/Config.in
 @@ -0,0 +1,11 @@
 +config BR2_PACKAGE_FLITE
 +	bool "flite"
@@ -30,52 +40,69 @@ Index: buildroot/package/multimedia/flite/Config.in
 +	  building tools.
 +
 +	  http://www.speech.cs.cmu.edu/flite
-Index: buildroot/package/multimedia/flite/flite.mk
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/multimedia/flite/flite.mk	2012-02-21 16:44:45.000000000 +0100
-@@ -0,0 +1,44 @@
+diff --git a/package/multimedia/flite/flite.mk b/package/multimedia/flite/flite.mk
+new file mode 100644
+index 0000000..c72988f
+--- /dev/null
++++ b/package/multimedia/flite/flite.mk
+@@ -0,0 +1,57 @@
 +#############################################################
 +#
 +# flite
 +#
 +#############################################################
-+
 +FLITE_VERSION = 1.4
 +FLITE_SOURCE = flite-$(FLITE_VERSION)-release.tar.bz2
-+FLITE_SITE = http://www.speech.cs.cmu.edu/flite/packed/flite-$(FLITE_VERSION)/
++FLITE_SITE = http://www.speech.cs.cmu.edu/flite/packed/flite-$(FLITE_VERSION)
++FLITE_LICENSE = BSD-4c
++FLITE_LICENSE_FILES = COPYING
++
 +FLITE_INSTALL_STAGING = YES
-+FLITE_INSTALL_TARGET = YES
 +
-+FLITE_CONF_OPT = --enable-shared
-+FLITE_INSTALL_STAGING_OPT = INSTALLBINDIR=$(STAGING_DIR)/usr/bin INSTALLLIBDIR=$(STAGING_DIR)/usr/lib INSTALLINCDIR=$(STAGING_DIR)/usr/include/flite install
-+FLITE_INSTALL_TARGET_OPT = INSTALLBINDIR=$(TARGET_DIR)/usr/bin INSTALLLIBDIR=$(TARGET_DIR)/usr/lib INSTALLINCDIR=$(STAGING_DIR)/usr/include/flite install
++# Sadly, Flite does not support parallel build,
++# especially when build its shared libraries.
++FLITE_MAKE = $(MAKE1)
 +
-+$(eval $(autotools-package))
++FLITE_CONF_OPT = \
++	$(if $(BR2_PREFER_STATIC_LIB),,--enable-shared)
 +
-+# Flite (strange) archive format makes Buildroot failed to extract it (--strip-components).
-+# So do it manually:
-+$(FLITE_TARGET_EXTRACT): $(FLITE_TARGET_SOURCE)
-+	$(call MESSAGE,"Extracting")
-+	$(INFLATE$(suffix $($(PKG)_SOURCE))) $(DL_DIR)/$($(PKG)_SOURCE) | \
-+		$(TAR) -C $(BUILD_DIR) $(TAR_OPTIONS) -
-+	$(Q)mv $(@D)/.stamp* $(BUILD_DIR)/flite-$(FLITE_VERSION)-release/
-+	$(Q)rm -rf $(@D)
-+	$(Q)mv $(BUILD_DIR)/flite-$(FLITE_VERSION)-release $(@D)
-+# some packages have messed up permissions inside
-+	$(Q)chmod -R ug+rw $(@D)
-+	touch $@
++FLITE_INSTALL_STAGING_OPT = \
++	INSTALLBINDIR=$(STAGING_DIR)/usr/bin \
++	INSTALLLIBDIR=$(STAGING_DIR)/usr/lib \
++	INSTALLINCDIR=$(STAGING_DIR)/usr/include/flite \
++	install
++
++FLITE_INSTALL_TARGET_OPT = \
++	INSTALLBINDIR=$(TARGET_DIR)/usr/bin \
++	INSTALLLIBDIR=$(TARGET_DIR)/usr/lib \
++	INSTALLINCDIR=$(TARGET_DIR)/usr/include/flite \
++	install
 +
-+$(FLITE_HOOK_POST_INSTALL): $(FLITE_TARGET_INSTALL_TARGET)
-+	rm -f $(TARGET_DIR)/usr/lib/libflite*.a
-+ifeq ($(BR2_ENABLE_DEBUG),)
-+	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libflite*.so.$(FLITE_VERSION)
-+	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/flite*
-+endif
-+	touch $@
++# Flite totally screw up their tarball generation, so that:
++#
++#   $ tar tf flite-1.4-release.tar.bz2
++#   ...
++#   flite-1.4-release//install-sh
++#   flite-1.4-release//mkinstalldirs
++#   flite-1.4-release//Exports.def
++#   flite-1.4-release//flite.sln
++#   flite-1.4-release//fliteDll.vcproj
++#   flite-1.4-release/config/Makefile
++#   flite-1.4-release/config/common_make_rules
++#   flite-1.4-release/config/project.mak
++#   flite-1.4-release/config/config.in
++#   flite-1.4-release/config/system.mak.in
++#
++# So, the strip-component trick does not work at all.
++# Let's redefine the extract command.
++define FLITE_EXTRACT_CMDS
++	$(RM) -rf $(FLITE_DIR)
++	$(INFLATE$(suffix $(FLITE_SOURCE))) $(DL_DIR)/$(FLITE_SOURCE) | \
++		$(TAR) -C $(BUILD_DIR) $(TAR_OPTIONS) -
++	mv $(BUILD_DIR)/$(subst .tar.bz2,,$(FLITE_SOURCE)) $(FLITE_DIR)
++endef
 +
-+# Flite has no uninstall target
-+$(FLITE_TARGET_UNINSTALL):
-+	$(call MESSAGE,"Uninstalling")
-+	rm -f $(TARGET_DIR)/usr/lib/libflite*
-+	rm -f $(TARGET_DIR)/usr/bin/flite*
++$(eval $(autotools-package))
+-- 
+1.8.0.1
+


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-83-g1a66f8e

From: Gwenhael Goavec-M. <gwe...@us...> - 2012-12-17 16:58:48

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  1a66f8ec076d883f728b0905e14b1bf74f10c03f (commit)
       via  b92ec6f50c49ba2797bb904c3366d1e06703cbf2 (commit)
      from  dad1b245473831eb0f7d4282fc99d7f574dcf0d7 (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 1a66f8ec076d883f728b0905e14b1bf74f10c03f
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date:   Mon Dec 17 17:57:56 2012 +0100

    [LINUX][3.7] APF27: config: Add imx framebuffer support by default

commit b92ec6f50c49ba2797bb904c3366d1e06703cbf2
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date:   Mon Dec 17 17:57:32 2012 +0100

    [LINUX][3.7] APF27: Update lcd support

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

Summary of changes:
 .../device/armadeus/apf27/apf27-linux-3.7.config   |    1 +
 patches/linux/3.7/0021-armadeus-apf9328.patch      |   25 +++---
 .../linux/3.7/0200-armadeus-add_apf27_module.patch |   39 +++++-----
 .../3.7/0201-armadeus-add_apf27dev_baseboard.patch |   79 +++++++++-----------
 4 files changed, 68 insertions(+), 76 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.7.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.7.config
index a84a516..eb9454a 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.7.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.7.config
@@ -143,6 +143,7 @@ CONFIG_VIDEO_MX2=m
 # CONFIG_DVB_TUNER_DIB0070 is not set
 # CONFIG_DVB_TUNER_DIB0090 is not set
 CONFIG_FB=y
+CONFIG_FB_IMX=y
 # CONFIG_FB_MX3 is not set
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_LCD_CLASS_DEVICE=y
diff --git a/patches/linux/3.7/0021-armadeus-apf9328.patch b/patches/linux/3.7/0021-armadeus-apf9328.patch
index 4880ce3..c985daa 100644
--- a/patches/linux/3.7/0021-armadeus-apf9328.patch
+++ b/patches/linux/3.7/0021-armadeus-apf9328.patch
@@ -1,8 +1,8 @@
-Index: linux-3.7-rc6/arch/arm/mach-imx/apf9328_lcd_config.h
+Index: linux-3.7/arch/arm/mach-imx/apf9328_lcd_config.h
 ===================================================================
 --- /dev/null
-+++ linux-3.7-rc6/arch/arm/mach-imx/apf9328_lcd_config.h
-@@ -0,0 +1,349 @@
++++ linux-3.7/arch/arm/mach-imx/apf9328_lcd_config.h
+@@ -0,0 +1,350 @@
 +/*
 + *
 + * Armadeus LCD configuration file
@@ -30,7 +30,7 @@ Index: linux-3.7-rc6/arch/arm/mach-imx/apf9328_lcd_config.h
 +# define LCDC_BASE_ADDR		MX1_LCDC_BASE_ADDR
 +# define MXC_IO_ADDRESS		MX1_IO_ADDRESS
 +#else
-+# include <mach/mx2x.h>
++# include <mach/mx27.h>
 +# define LCDC_BASE_ADDR		MX27_LCDC_BASE_ADDR
 +# define MXC_IO_ADDRESS		MX27_IO_ADDRESS
 +#endif
@@ -227,12 +227,13 @@ Index: linux-3.7-rc6/arch/arm/mach-imx/apf9328_lcd_config.h
 +static struct imx_fb_platform_data apf_fb_data /*__initdata*/ = {
 +	.mode		= apf_fb_modes,
 +	.num_modes	= ARRAY_SIZE(apf_fb_modes),
-+	.dmacr		= DEFAULT_DMA_SETTINGS,
 +	.lcd_power	= apf_lcd_power,
 +	.backlight_power= apf_lcd_backlight_power,
 +#ifdef CONFIG_MACH_APF9328
++	.dmacr		= DEFAULT_DMA_SETTINGS,
 +	.init           = apf9328_fb_init,
 +#elif CONFIG_MACH_APF27
++	.dmacr      = 0x00020010,
 +	.init		= apf27_fb_init,
 +#endif
 +};
@@ -352,10 +353,10 @@ Index: linux-3.7-rc6/arch/arm/mach-imx/apf9328_lcd_config.h
 +#endif /* CONFIG_FB_IMX */
 +
 +#endif /* APF_LCD_CONFIG_H */
-Index: linux-3.7-rc6/arch/arm/mach-imx/mach-apf9328.c
+Index: linux-3.7/arch/arm/mach-imx/mach-apf9328.c
 ===================================================================
---- linux-3.7-rc6.orig/arch/arm/mach-imx/mach-apf9328.c
-+++ linux-3.7-rc6/arch/arm/mach-imx/mach-apf9328.c
+--- linux-3.7.orig/arch/arm/mach-imx/mach-apf9328.c
++++ linux-3.7/arch/arm/mach-imx/mach-apf9328.c
 @@ -20,7 +20,16 @@
  #include <linux/dm9000.h>
  #include <linux/gpio.h>
@@ -695,10 +696,10 @@ Index: linux-3.7-rc6/arch/arm/mach-imx/mach-apf9328.c
  }
  
  static void __init apf9328_timer_init(void)
-Index: linux-3.7-rc6/arch/arm/mach-imx/apf9328-dev.c
+Index: linux-3.7/arch/arm/mach-imx/apf9328-dev.c
 ===================================================================
 --- /dev/null
-+++ linux-3.7-rc6/arch/arm/mach-imx/apf9328-dev.c
++++ linux-3.7/arch/arm/mach-imx/apf9328-dev.c
 @@ -0,0 +1,309 @@
 +/*
 + * apf9328-dev.c
@@ -1009,10 +1010,10 @@ Index: linux-3.7-rc6/arch/arm/mach-imx/apf9328-dev.c
 +#endif
 +}
 +
-Index: linux-3.7-rc6/arch/arm/plat-mxc/include/mach/board-apf9328.h
+Index: linux-3.7/arch/arm/plat-mxc/include/mach/board-apf9328.h
 ===================================================================
 --- /dev/null
-+++ linux-3.7-rc6/arch/arm/plat-mxc/include/mach/board-apf9328.h
++++ linux-3.7/arch/arm/plat-mxc/include/mach/board-apf9328.h
 @@ -0,0 +1,71 @@
 +/*
 + * linux/include/asm-arm/arch-imx/apf9328.h
diff --git a/patches/linux/3.7/0200-armadeus-add_apf27_module.patch b/patches/linux/3.7/0200-armadeus-add_apf27_module.patch
index 5b5ac0b..2429f80 100644
--- a/patches/linux/3.7/0200-armadeus-add_apf27_module.patch
+++ b/patches/linux/3.7/0200-armadeus-add_apf27_module.patch
@@ -13,11 +13,11 @@ Signed-off-by: Nicolas Colombain <nic...@ar...>
  4 files changed, 273 insertions(+), 0 deletions(-)
  create mode 100644 arch/arm/mach-imx/mach-apf27.c
 
-Index: linux-3.7-rc4/arch/arm/mach-imx/Kconfig
+Index: linux-3.7/arch/arm/mach-imx/Kconfig
 ===================================================================
---- linux-3.7-rc4.orig/arch/arm/mach-imx/Kconfig	2012-11-04 20:07:39.000000000 +0100
-+++ linux-3.7-rc4/arch/arm/mach-imx/Kconfig	2012-11-05 13:44:07.000000000 +0100
-@@ -382,6 +382,20 @@
+--- linux-3.7.orig/arch/arm/mach-imx/Kconfig
++++ linux-3.7/arch/arm/mach-imx/Kconfig
+@@ -415,6 +415,21 @@ config MACH_IMX27_DT
  	  Include support for Freescale i.MX27 based platforms
  	  using the device tree for discovery
  
@@ -30,6 +30,7 @@ Index: linux-3.7-rc4/arch/arm/mach-imx/Kconfig
 +	select IMX_HAVE_PLATFORM_IMX_I2C
 +	select IMX_HAVE_PLATFORM_IMX_UART
 +	select IMX_HAVE_PLATFORM_MXC_NAND
++	select IMX_HAVE_PLATFORM_IMX_FB
 +	select MXC_ULPI if USB_ULPI
 +	help
 +	  Include support for APF27 platform. This includes specific
@@ -38,11 +39,11 @@ Index: linux-3.7-rc4/arch/arm/mach-imx/Kconfig
  endif
  
  if ARCH_IMX_V6_V7
-Index: linux-3.7-rc4/arch/arm/mach-imx/Makefile
+Index: linux-3.7/arch/arm/mach-imx/Makefile
 ===================================================================
---- linux-3.7-rc4.orig/arch/arm/mach-imx/Makefile	2012-11-04 20:07:39.000000000 +0100
-+++ linux-3.7-rc4/arch/arm/mach-imx/Makefile	2012-11-05 13:44:07.000000000 +0100
-@@ -44,6 +44,7 @@
+--- linux-3.7.orig/arch/arm/mach-imx/Makefile
++++ linux-3.7/arch/arm/mach-imx/Makefile
+@@ -45,6 +45,7 @@ obj-$(CONFIG_MACH_PCA100) += mach-pca100
  obj-$(CONFIG_MACH_MXT_TD60) += mach-mxt_td60.o
  obj-$(CONFIG_MACH_IMX27IPCAM) += mach-imx27ipcam.o
  obj-$(CONFIG_MACH_IMX27_DT) += imx27-dt.o
@@ -50,10 +51,10 @@ Index: linux-3.7-rc4/arch/arm/mach-imx/Makefile
  
  # i.MX31 based machines
  obj-$(CONFIG_MACH_MX31ADS) += mach-mx31ads.o
-Index: linux-3.7-rc4/arch/arm/mach-imx/mach-apf27.c
+Index: linux-3.7/arch/arm/mach-imx/mach-apf27.c
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7-rc4/arch/arm/mach-imx/mach-apf27.c	2012-11-05 21:29:00.000000000 +0100
+--- /dev/null
++++ linux-3.7/arch/arm/mach-imx/mach-apf27.c
 @@ -0,0 +1,294 @@
 + /*
 + * Support for the APF27 System On Module
@@ -349,11 +350,11 @@ Index: linux-3.7-rc4/arch/arm/mach-imx/mach-apf27.c
 +	.init_machine = apf27_init,
 +	.restart = mxc_restart,
 +MACHINE_END
-Index: linux-3.7-rc4/arch/arm/plat-mxc/include/mach/uncompress.h
+Index: linux-3.7/arch/arm/plat-mxc/include/mach/uncompress.h
 ===================================================================
---- linux-3.7-rc4.orig/arch/arm/plat-mxc/include/mach/uncompress.h	2012-11-04 20:07:39.000000000 +0100
-+++ linux-3.7-rc4/arch/arm/plat-mxc/include/mach/uncompress.h	2012-11-05 13:44:07.000000000 +0100
-@@ -85,6 +85,7 @@
+--- linux-3.7.orig/arch/arm/plat-mxc/include/mach/uncompress.h
++++ linux-3.7/arch/arm/plat-mxc/include/mach/uncompress.h
+@@ -85,6 +85,7 @@ static __inline__ void __arch_decomp_set
  	case MACH_TYPE_PCA100:
  	case MACH_TYPE_MXT_TD60:
  	case MACH_TYPE_IMX27IPCAM:
@@ -361,11 +362,11 @@ Index: linux-3.7-rc4/arch/arm/plat-mxc/include/mach/uncompress.h
  		uart_base = MX2X_UART1_BASE_ADDR;
  		break;
  	case MACH_TYPE_MX31LITE:
-Index: linux-3.7-rc4/arch/arm/tools/mach-types
+Index: linux-3.7/arch/arm/tools/mach-types
 ===================================================================
---- linux-3.7-rc4.orig/arch/arm/tools/mach-types	2012-11-04 20:07:39.000000000 +0100
-+++ linux-3.7-rc4/arch/arm/tools/mach-types	2012-11-05 13:44:07.000000000 +0100
-@@ -297,6 +297,7 @@
+--- linux-3.7.orig/arch/arm/tools/mach-types
++++ linux-3.7/arch/arm/tools/mach-types
+@@ -297,6 +297,7 @@ smdk2416		MACH_SMDK2416		SMDK2416		1685
  wbd111			MACH_WBD111		WBD111			1690
  mv2120			MACH_MV2120		MV2120			1693
  mx51_3ds		MACH_MX51_3DS		MX51_3DS		1696
diff --git a/patches/linux/3.7/0201-armadeus-add_apf27dev_baseboard.patch b/patches/linux/3.7/0201-armadeus-add_apf27dev_baseboard.patch
index dfd3cde..df0cf35 100644
--- a/patches/linux/3.7/0201-armadeus-add_apf27dev_baseboard.patch
+++ b/patches/linux/3.7/0201-armadeus-add_apf27dev_baseboard.patch
@@ -8,11 +8,11 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
 Signed-off-by: Jeremie Scheer <jer...@ar...>
 Signed-off-by: Kevin Joly <jol...@gm...>
 
-Index: linux-3.7-rc4/arch/arm/mach-imx/apf27-dev.c
+Index: linux-3.7/arch/arm/mach-imx/apf27-dev.c
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7-rc4/arch/arm/mach-imx/apf27-dev.c	2012-11-14 16:26:35.000000000 +0100
-@@ -0,0 +1,1011 @@
+--- /dev/null
++++ linux-3.7/arch/arm/mach-imx/apf27-dev.c
+@@ -0,0 +1,1012 @@
 + /*
 + * apf27-dev.c
 + * Support for AFP27 module's development baseboard
@@ -55,6 +55,9 @@ Index: linux-3.7-rc4/arch/arm/mach-imx/apf27-dev.c
 +#include <linux/cpufreq.h>
 +#include <linux/clk.h>
 +#include <linux/dma-mapping.h>
++#ifdef CONFIG_FB_IMX
++#include <linux/platform_data/video-imxfb.h>
++#endif
 +
 +#include <asm/io.h>
 +#include <linux/gpio.h> /* gpio_to_irq */
@@ -64,10 +67,6 @@ Index: linux-3.7-rc4/arch/arm/mach-imx/apf27-dev.c
 +#include <mach/common.h>
 +#include <mach/hardware.h>
 +#include <mach/iomux-mx27.h>
-+#ifdef CONFIG_FB_MXC /* Freescale Framebuffer */
-+#include <mach/imx_fb.h>
-+#include <mach/imxfb.h>
-+#endif
 +#include <linux/fb.h>
 +#include <mach/ulpi.h>
 +#ifdef CONFIG_MAX1027
@@ -103,7 +102,7 @@ Index: linux-3.7-rc4/arch/arm/mach-imx/apf27-dev.c
 +#include <mach/mx27.h>
 +#define VA_GPIO_BASE	MX27_IO_ADDRESS(MX27_GPIO_BASE_ADDR)
 +
-+#if defined(CONFIG_FB_MXC) || defined(CONFIG_FB_IMX)
++#if defined(CONFIG_FB_IMX)
 +extern void apf27_lcd_init(void);
 +#endif
 +#ifdef CONFIG_MACH_APF27_DEV_EXT
@@ -959,7 +958,9 @@ Index: linux-3.7-rc4/arch/arm/mach-imx/apf27-dev.c
 +//	imx27_add_imx_ssi(0, &apf27_ssi0_pdata);
 +
 +	/* APF27Dev has an LCD connector */
-+	//apf27_lcd_init();
++#ifdef CONFIG_FB_IMX
++	apf27_lcd_init();
++#endif
 +
 +//	apf27dev_pwr_ctrl_gpio_active();
 +
@@ -1024,11 +1025,11 @@ Index: linux-3.7-rc4/arch/arm/mach-imx/apf27-dev.c
 +#endif
 +}
 +
-Index: linux-3.7-rc4/arch/arm/mach-imx/apf27-lcd.c
+Index: linux-3.7/arch/arm/mach-imx/apf27-lcd.c
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7-rc4/arch/arm/mach-imx/apf27-lcd.c	2012-11-06 13:53:49.000000000 +0100
-@@ -0,0 +1,169 @@
+--- /dev/null
++++ linux-3.7/arch/arm/mach-imx/apf27-lcd.c
+@@ -0,0 +1,157 @@
 +/*
 + * apf27-lcd.c
 + *
@@ -1052,16 +1053,14 @@ Index: linux-3.7-rc4/arch/arm/mach-imx/apf27-lcd.c
 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 + */
 +
++#ifdef CONFIG_FB_IMX
 +
 +#include <linux/fb.h>
 +#include <linux/delay.h>
 +#include <linux/gpio.h>
++#include <linux/platform_data/video-imxfb.h>
 +
 +#include <mach/iomux-mx27.h>
-+#ifdef CONFIG_FB_MXC /* Freescale Framebuffer */
-+#include <mach/imx_fb.h>
-+#include <mach/imxfb.h>
-+#endif
 +#include <mach/common.h>
 +
 +#include "devices-imx27.h"
@@ -1126,16 +1125,7 @@ Index: linux-3.7-rc4/arch/arm/mach-imx/apf27-lcd.c
 +	PA31_PF_OE_ACD
 +};
 +
-+/* Freescale driver */
-+#ifdef CONFIG_FB_MXC
-+static struct mxc_fb_platform_data apf_fb_data = {
-+	.mode = LCD_NAME,
-+	.init = apf27_fb_init,
-+};
-+/* Mainline driver */
-+#elif CONFIG_FB_IMX
-+#include "../mach-imx/apf9328_lcd_config.h"
-+#endif
++#include "apf9328_lcd_config.h"
 +
 +static int apf27_fb_init(struct platform_device *pdev)
 +{
@@ -1189,19 +1179,18 @@ Index: linux-3.7-rc4/arch/arm/mach-imx/apf27-lcd.c
 +#ifdef CONFIG_FB_MXC
 +	apf27_lcd_startup();
 +#endif
-+#if 0
 +	apf_set_lcd_name(name);
 +	apf_fb_set_default_contrast();
 +	imx27_add_imx_fb(&apf_fb_data);
-+#endif
 +end:
 +	return;
 +}
 +
-Index: linux-3.7-rc4/arch/arm/mach-imx/apf27-dev-ext-apw.c
++#endif
+Index: linux-3.7/arch/arm/mach-imx/apf27-dev-ext-apw.c
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7-rc4/arch/arm/mach-imx/apf27-dev-ext-apw.c	2012-11-06 12:15:25.000000000 +0100
+--- /dev/null
++++ linux-3.7/arch/arm/mach-imx/apf27-dev-ext-apw.c
 @@ -0,0 +1,175 @@
 + /*
 + * apf27-dev-ext-apw.c
@@ -1378,10 +1367,10 @@ Index: linux-3.7-rc4/arch/arm/mach-imx/apf27-dev-ext-apw.c
 +	printk("done\n");
 +}
 +
-Index: linux-3.7-rc4/arch/arm/mach-imx/mach-apf27.c
+Index: linux-3.7/arch/arm/mach-imx/mach-apf27.c
 ===================================================================
---- linux-3.7-rc4.orig/arch/arm/mach-imx/mach-apf27.c	2012-11-06 14:15:12.000000000 +0100
-+++ linux-3.7-rc4/arch/arm/mach-imx/mach-apf27.c	2012-11-14 16:50:52.000000000 +0100
+--- linux-3.7.orig/arch/arm/mach-imx/mach-apf27.c
++++ linux-3.7/arch/arm/mach-imx/mach-apf27.c
 @@ -43,6 +43,7 @@
  
  #include "devices-imx27.h"
@@ -1390,7 +1379,7 @@ Index: linux-3.7-rc4/arch/arm/mach-imx/mach-apf27.c
  
  static const int apf27_pins[] __initconst = {
  	/* UART1 */
-@@ -269,6 +270,10 @@
+@@ -270,6 +271,10 @@ static void __init apf27_init(void)
  	i2c_register_board_info(1, apf27_i2c_devices_bus1,
  				ARRAY_SIZE(apf27_i2c_devices_bus1));
  	imx27_add_imx_i2c(1, &apf27_i2c_1_data);
@@ -1401,11 +1390,11 @@ Index: linux-3.7-rc4/arch/arm/mach-imx/mach-apf27.c
  }
  
  static void __init apf27_timer_init(void)
-Index: linux-2.6.38.1/arch/arm/mach-imx/Kconfig
+Index: linux-3.7/arch/arm/mach-imx/Kconfig
 ===================================================================
---- linux-2.6.38.1.orig/arch/arm/mach-imx/Kconfig	2011-06-01 16:00:05.000000000 +0200
-+++ linux-2.6.38.1/arch/arm/mach-imx/Kconfig	2011-06-03 12:44:42.000000000 +0200
-@@ -396,6 +396,103 @@
+--- linux-3.7.orig/arch/arm/mach-imx/Kconfig
++++ linux-3.7/arch/arm/mach-imx/Kconfig
+@@ -430,6 +430,103 @@ config MACH_APF27
  	  Include support for APF27 platform. This includes specific
  	  configurations for the module and its peripherals.
  
@@ -1509,11 +1498,11 @@ Index: linux-2.6.38.1/arch/arm/mach-imx/Kconfig
  endif
  
  if ARCH_IMX_V6_V7
-Index: linux-2.6.38.1/arch/arm/mach-imx/Makefile
+Index: linux-3.7/arch/arm/mach-imx/Makefile
 ===================================================================
---- linux-2.6.38.1.orig/arch/arm/mach-imx/Makefile	2011-06-01 16:00:05.000000000 +0200
-+++ linux-2.6.38.1/arch/arm/mach-imx/Makefile	2011-06-03 17:21:55.000000000 +0200
-@@ -45,6 +45,9 @@
+--- linux-3.7.orig/arch/arm/mach-imx/Makefile
++++ linux-3.7/arch/arm/mach-imx/Makefile
+@@ -46,6 +46,9 @@ obj-$(CONFIG_MACH_MXT_TD60) += mach-mxt_
  obj-$(CONFIG_MACH_IMX27IPCAM) += mach-imx27ipcam.o
  obj-$(CONFIG_MACH_IMX27_DT) += imx27-dt.o
  obj-$(CONFIG_MACH_APF27) += mach-apf27.o


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-81-gdad1b24

From: Gwenhael Goavec-M. <gwe...@us...> - 2012-12-17 16:53:34

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  dad1b245473831eb0f7d4282fc99d7f574dcf0d7 (commit)
       via  68fe24bdd457d47662725086fed6e203e60dc5ed (commit)
       via  6e86c53546615c5f0339510ad24f918ff807626c (commit)
      from  dcfda086d2b013b82e57f44bca156e5087a66581 (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 dad1b245473831eb0f7d4282fc99d7f574dcf0d7
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date:   Mon Dec 17 16:51:19 2012 +0100

    [LINUX][3.7] APF27: config: Add ehci and scsi disk support by default

commit 68fe24bdd457d47662725086fed6e203e60dc5ed
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date:   Mon Dec 17 16:50:47 2012 +0100

    [LINUX][3.7] mx27: enable EHCI PER clock

commit 6e86c53546615c5f0339510ad24f918ff807626c
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date:   Mon Dec 17 16:50:25 2012 +0100

    [LINUX][3.7] mx27: add a clock gate to activate SPLL clock

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

Summary of changes:
 .../device/armadeus/apf27/apf27-linux-3.7.config   |    3 +
 ...armadeus-mx27_add_clk_gate_to_enable_sspl.patch |   44 ++++++++++++++++++
 ...armadeus-mx27-ehci-mxc-add_per_clk_enable.patch |   49 ++++++++++++++++++++
 3 files changed, 96 insertions(+), 0 deletions(-)
 create mode 100644 patches/linux/3.7/0202-armadeus-mx27_add_clk_gate_to_enable_sspl.patch
 create mode 100644 patches/linux/3.7/0203-armadeus-mx27-ehci-mxc-add_per_clk_enable.patch

diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.7.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.7.config
index f26f181..a84a516 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.7.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.7.config
@@ -79,6 +79,7 @@ CONFIG_PROC_DEVICETREE=y
 CONFIG_EEPROM_AT24=y
 CONFIG_EEPROM_AT25=y
 CONFIG_SCSI=y
+CONFIG_BLK_DEV_SD=y
 CONFIG_NETDEVICES=y
 CONFIG_MII=y
 # CONFIG_NET_VENDOR_BROADCOM is not set
@@ -162,6 +163,8 @@ CONFIG_SND_PCM_OSS=m
 CONFIG_SND_SOC=m
 CONFIG_SND_IMX_SOC=m
 CONFIG_USB=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_MXC=y
 CONFIG_USB_CHIPIDEA=y
 CONFIG_USB_CHIPIDEA_HOST=y
 CONFIG_USB_CHIPIDEA_DEBUG=y
diff --git a/patches/linux/3.7/0202-armadeus-mx27_add_clk_gate_to_enable_sspl.patch b/patches/linux/3.7/0202-armadeus-mx27_add_clk_gate_to_enable_sspl.patch
new file mode 100644
index 0000000..987f036
--- /dev/null
+++ b/patches/linux/3.7/0202-armadeus-mx27_add_clk_gate_to_enable_sspl.patch
@@ -0,0 +1,44 @@
+A clock gate is mandatory to activate SPLL clock needed, at least, for usb.
+
+Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
+---
+
+Index: linux-3.7-rc6/arch/arm/mach-imx/clk-imx27.c
+===================================================================
+--- linux-3.7-rc6.orig/arch/arm/mach-imx/clk-imx27.c
++++ linux-3.7-rc6/arch/arm/mach-imx/clk-imx27.c
+@@ -62,7 +62,7 @@ static const char *clko_sel_clks[] = {
+ 	"32k", "usb_div", "dptc",
+ };
+ 
+-static const char *ssi_sel_clks[] = { "spll", "mpll", };
++static const char *ssi_sel_clks[] = { "spll_gate", "mpll", };
+ 
+ enum mx27_clks {
+ 	dummy, ckih, ckil, mpll, spll, mpll_main2, ahb, ipg, nfc_div, per1_div,
+@@ -82,7 +82,7 @@ enum mx27_clks {
+ 	csi_ahb_gate, brom_ahb_gate, ata_ahb_gate, wdog_ipg_gate, usb_ipg_gate,
+ 	uart6_ipg_gate, uart5_ipg_gate, uart4_ipg_gate, uart3_ipg_gate,
+ 	uart2_ipg_gate, uart1_ipg_gate, ckih_div1p5, fpm, mpll_osc_sel,
+-	mpll_sel, clk_max
++	mpll_sel, spll_gate, clk_max
+ };
+ 
+ static struct clk *clk[clk_max];
+@@ -104,6 +104,7 @@ int __init mx27_clocks_init(unsigned lon
+ 			ARRAY_SIZE(mpll_sel_clks));
+ 	clk[mpll] = imx_clk_pllv1("mpll", "mpll_sel", CCM_MPCTL0);
+ 	clk[spll] = imx_clk_pllv1("spll", "ckih", CCM_SPCTL0);
++	clk[spll_gate] = imx_clk_gate("spll_gate", "spll", CCM_CSCR, 1);
+ 	clk[mpll_main2] = imx_clk_fixed_factor("mpll_main2", "mpll", 2, 3);
+ 
+ 	if (mx27_revision() >= IMX_CHIP_REVISION_2_0) {
+@@ -121,7 +122,7 @@ int __init mx27_clocks_init(unsigned lon
+ 	clk[per4_div] = imx_clk_divider("per4_div", "mpll_main2", CCM_PCDR1, 24, 6);
+ 	clk[vpu_sel] = imx_clk_mux("vpu_sel", CCM_CSCR, 21, 1, vpu_sel_clks, ARRAY_SIZE(vpu_sel_clks));
+ 	clk[vpu_div] = imx_clk_divider("vpu_div", "vpu_sel", CCM_PCDR0, 10, 6);
+-	clk[usb_div] = imx_clk_divider("usb_div", "spll", CCM_CSCR, 28, 3);
++	clk[usb_div] = imx_clk_divider("usb_div", "spll_gate", CCM_CSCR, 28, 3);
+ 	clk[cpu_sel] = imx_clk_mux("cpu_sel", CCM_CSCR, 15, 1, cpu_sel_clks, ARRAY_SIZE(cpu_sel_clks));
+ 	clk[clko_sel] = imx_clk_mux("clko_sel", CCM_CCSR, 0, 5, clko_sel_clks, ARRAY_SIZE(clko_sel_clks));
+ 	if (mx27_revision() >= IMX_CHIP_REVISION_2_0)
diff --git a/patches/linux/3.7/0203-armadeus-mx27-ehci-mxc-add_per_clk_enable.patch b/patches/linux/3.7/0203-armadeus-mx27-ehci-mxc-add_per_clk_enable.patch
new file mode 100644
index 0000000..4ebf63a
--- /dev/null
+++ b/patches/linux/3.7/0203-armadeus-mx27-ehci-mxc-add_per_clk_enable.patch
@@ -0,0 +1,49 @@
+EHCI PER clock (aka usb_div) must be enabled to have EHCI driver working.
+
+Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
+---
+
+Index: linux-3.7/drivers/usb/host/ehci-mxc.c
+===================================================================
+--- linux-3.7.orig/drivers/usb/host/ehci-mxc.c
++++ linux-3.7/drivers/usb/host/ehci-mxc.c
+@@ -32,7 +32,7 @@
+ #define ULPI_VIEWPORT_OFFSET	0x170
+ 
+ struct ehci_mxc_priv {
+-	struct clk *usbclk, *ahbclk, *phyclk;
++	struct clk *usbclk, *ahbclk, *perclk, *phyclk;
+ 	struct usb_hcd *hcd;
+ };
+ 
+@@ -159,6 +159,13 @@ static int ehci_mxc_drv_probe(struct pla
+ 	}
+ 	clk_prepare_enable(priv->ahbclk);
+ 
++	priv->perclk = devm_clk_get(&pdev->dev, "per");
++	if (IS_ERR(priv->perclk)) {
++		ret = PTR_ERR(priv->perclk);
++		goto err_clk_per;
++	}
++	clk_prepare_enable(priv->perclk);
++
+ 	/* "dr" device has its own clock on i.MX51 */
+ 	priv->phyclk = devm_clk_get(&pdev->dev, "phy");
+ 	if (IS_ERR(priv->phyclk))
+@@ -242,6 +249,8 @@ err_init:
+ 	if (priv->phyclk)
+ 		clk_disable_unprepare(priv->phyclk);
+ 
++	clk_disable_unprepare(priv->perclk);
++err_clk_per:
+ 	clk_disable_unprepare(priv->ahbclk);
+ err_clk_ahb:
+ 	clk_disable_unprepare(priv->usbclk);
+@@ -268,6 +277,7 @@ static int __exit ehci_mxc_drv_remove(st
+ 
+ 	clk_disable_unprepare(priv->usbclk);
+ 	clk_disable_unprepare(priv->ahbclk);
++	clk_disable_unprepare(priv->perclk);
+ 
+ 	if (priv->phyclk)
+ 		clk_disable_unprepare(priv->phyclk);


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-76-g85e4189

From: Gwenhael Goavec-M. <gwe...@us...> - 2012-12-15 17:11:48

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  85e4189cb79797f90cc1ff9e238d7ff2b6f1d58c (commit)
       via  9e0de650cc6274452aca9929f56bdd935dc475f4 (commit)
      from  402f11431b412d52a02ecacadf6e85aded37d4b0 (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 85e4189cb79797f90cc1ff9e238d7ff2b6f1d58c
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date:   Sat Dec 15 18:10:25 2012 +0100

    [LINUX][3.7] APF27: config: Add imx framebuffer support by default

commit 9e0de650cc6274452aca9929f56bdd935dc475f4
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date:   Sat Dec 15 18:09:55 2012 +0100

    [LINUX][3.7] APF27: Update lcd support

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

Summary of changes:
 .../device/armadeus/apf27/apf27-linux-3.7.config   |    1 +
 patches/linux/3.7/0021-armadeus-apf9328.patch      |   25 +++---
 .../linux/3.7/0200-armadeus-add_apf27_module.patch |   39 +++++-----
 .../3.7/0201-armadeus-add_apf27dev_baseboard.patch |   79 +++++++++-----------
 4 files changed, 68 insertions(+), 76 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.7.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.7.config
index a84a516..eb9454a 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.7.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.7.config
@@ -143,6 +143,7 @@ CONFIG_VIDEO_MX2=m
 # CONFIG_DVB_TUNER_DIB0070 is not set
 # CONFIG_DVB_TUNER_DIB0090 is not set
 CONFIG_FB=y
+CONFIG_FB_IMX=y
 # CONFIG_FB_MX3 is not set
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_LCD_CLASS_DEVICE=y
diff --git a/patches/linux/3.7/0021-armadeus-apf9328.patch b/patches/linux/3.7/0021-armadeus-apf9328.patch
index 4880ce3..c985daa 100644
--- a/patches/linux/3.7/0021-armadeus-apf9328.patch
+++ b/patches/linux/3.7/0021-armadeus-apf9328.patch
@@ -1,8 +1,8 @@
-Index: linux-3.7-rc6/arch/arm/mach-imx/apf9328_lcd_config.h
+Index: linux-3.7/arch/arm/mach-imx/apf9328_lcd_config.h
 ===================================================================
 --- /dev/null
-+++ linux-3.7-rc6/arch/arm/mach-imx/apf9328_lcd_config.h
-@@ -0,0 +1,349 @@
++++ linux-3.7/arch/arm/mach-imx/apf9328_lcd_config.h
+@@ -0,0 +1,350 @@
 +/*
 + *
 + * Armadeus LCD configuration file
@@ -30,7 +30,7 @@ Index: linux-3.7-rc6/arch/arm/mach-imx/apf9328_lcd_config.h
 +# define LCDC_BASE_ADDR		MX1_LCDC_BASE_ADDR
 +# define MXC_IO_ADDRESS		MX1_IO_ADDRESS
 +#else
-+# include <mach/mx2x.h>
++# include <mach/mx27.h>
 +# define LCDC_BASE_ADDR		MX27_LCDC_BASE_ADDR
 +# define MXC_IO_ADDRESS		MX27_IO_ADDRESS
 +#endif
@@ -227,12 +227,13 @@ Index: linux-3.7-rc6/arch/arm/mach-imx/apf9328_lcd_config.h
 +static struct imx_fb_platform_data apf_fb_data /*__initdata*/ = {
 +	.mode		= apf_fb_modes,
 +	.num_modes	= ARRAY_SIZE(apf_fb_modes),
-+	.dmacr		= DEFAULT_DMA_SETTINGS,
 +	.lcd_power	= apf_lcd_power,
 +	.backlight_power= apf_lcd_backlight_power,
 +#ifdef CONFIG_MACH_APF9328
++	.dmacr		= DEFAULT_DMA_SETTINGS,
 +	.init           = apf9328_fb_init,
 +#elif CONFIG_MACH_APF27
++	.dmacr      = 0x00020010,
 +	.init		= apf27_fb_init,
 +#endif
 +};
@@ -352,10 +353,10 @@ Index: linux-3.7-rc6/arch/arm/mach-imx/apf9328_lcd_config.h
 +#endif /* CONFIG_FB_IMX */
 +
 +#endif /* APF_LCD_CONFIG_H */
-Index: linux-3.7-rc6/arch/arm/mach-imx/mach-apf9328.c
+Index: linux-3.7/arch/arm/mach-imx/mach-apf9328.c
 ===================================================================
---- linux-3.7-rc6.orig/arch/arm/mach-imx/mach-apf9328.c
-+++ linux-3.7-rc6/arch/arm/mach-imx/mach-apf9328.c
+--- linux-3.7.orig/arch/arm/mach-imx/mach-apf9328.c
++++ linux-3.7/arch/arm/mach-imx/mach-apf9328.c
 @@ -20,7 +20,16 @@
  #include <linux/dm9000.h>
  #include <linux/gpio.h>
@@ -695,10 +696,10 @@ Index: linux-3.7-rc6/arch/arm/mach-imx/mach-apf9328.c
  }
  
  static void __init apf9328_timer_init(void)
-Index: linux-3.7-rc6/arch/arm/mach-imx/apf9328-dev.c
+Index: linux-3.7/arch/arm/mach-imx/apf9328-dev.c
 ===================================================================
 --- /dev/null
-+++ linux-3.7-rc6/arch/arm/mach-imx/apf9328-dev.c
++++ linux-3.7/arch/arm/mach-imx/apf9328-dev.c
 @@ -0,0 +1,309 @@
 +/*
 + * apf9328-dev.c
@@ -1009,10 +1010,10 @@ Index: linux-3.7-rc6/arch/arm/mach-imx/apf9328-dev.c
 +#endif
 +}
 +
-Index: linux-3.7-rc6/arch/arm/plat-mxc/include/mach/board-apf9328.h
+Index: linux-3.7/arch/arm/plat-mxc/include/mach/board-apf9328.h
 ===================================================================
 --- /dev/null
-+++ linux-3.7-rc6/arch/arm/plat-mxc/include/mach/board-apf9328.h
++++ linux-3.7/arch/arm/plat-mxc/include/mach/board-apf9328.h
 @@ -0,0 +1,71 @@
 +/*
 + * linux/include/asm-arm/arch-imx/apf9328.h
diff --git a/patches/linux/3.7/0200-armadeus-add_apf27_module.patch b/patches/linux/3.7/0200-armadeus-add_apf27_module.patch
index 5b5ac0b..2429f80 100644
--- a/patches/linux/3.7/0200-armadeus-add_apf27_module.patch
+++ b/patches/linux/3.7/0200-armadeus-add_apf27_module.patch
@@ -13,11 +13,11 @@ Signed-off-by: Nicolas Colombain <nic...@ar...>
  4 files changed, 273 insertions(+), 0 deletions(-)
  create mode 100644 arch/arm/mach-imx/mach-apf27.c
 
-Index: linux-3.7-rc4/arch/arm/mach-imx/Kconfig
+Index: linux-3.7/arch/arm/mach-imx/Kconfig
 ===================================================================
---- linux-3.7-rc4.orig/arch/arm/mach-imx/Kconfig	2012-11-04 20:07:39.000000000 +0100
-+++ linux-3.7-rc4/arch/arm/mach-imx/Kconfig	2012-11-05 13:44:07.000000000 +0100
-@@ -382,6 +382,20 @@
+--- linux-3.7.orig/arch/arm/mach-imx/Kconfig
++++ linux-3.7/arch/arm/mach-imx/Kconfig
+@@ -415,6 +415,21 @@ config MACH_IMX27_DT
  	  Include support for Freescale i.MX27 based platforms
  	  using the device tree for discovery
  
@@ -30,6 +30,7 @@ Index: linux-3.7-rc4/arch/arm/mach-imx/Kconfig
 +	select IMX_HAVE_PLATFORM_IMX_I2C
 +	select IMX_HAVE_PLATFORM_IMX_UART
 +	select IMX_HAVE_PLATFORM_MXC_NAND
++	select IMX_HAVE_PLATFORM_IMX_FB
 +	select MXC_ULPI if USB_ULPI
 +	help
 +	  Include support for APF27 platform. This includes specific
@@ -38,11 +39,11 @@ Index: linux-3.7-rc4/arch/arm/mach-imx/Kconfig
  endif
  
  if ARCH_IMX_V6_V7
-Index: linux-3.7-rc4/arch/arm/mach-imx/Makefile
+Index: linux-3.7/arch/arm/mach-imx/Makefile
 ===================================================================
---- linux-3.7-rc4.orig/arch/arm/mach-imx/Makefile	2012-11-04 20:07:39.000000000 +0100
-+++ linux-3.7-rc4/arch/arm/mach-imx/Makefile	2012-11-05 13:44:07.000000000 +0100
-@@ -44,6 +44,7 @@
+--- linux-3.7.orig/arch/arm/mach-imx/Makefile
++++ linux-3.7/arch/arm/mach-imx/Makefile
+@@ -45,6 +45,7 @@ obj-$(CONFIG_MACH_PCA100) += mach-pca100
  obj-$(CONFIG_MACH_MXT_TD60) += mach-mxt_td60.o
  obj-$(CONFIG_MACH_IMX27IPCAM) += mach-imx27ipcam.o
  obj-$(CONFIG_MACH_IMX27_DT) += imx27-dt.o
@@ -50,10 +51,10 @@ Index: linux-3.7-rc4/arch/arm/mach-imx/Makefile
  
  # i.MX31 based machines
  obj-$(CONFIG_MACH_MX31ADS) += mach-mx31ads.o
-Index: linux-3.7-rc4/arch/arm/mach-imx/mach-apf27.c
+Index: linux-3.7/arch/arm/mach-imx/mach-apf27.c
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7-rc4/arch/arm/mach-imx/mach-apf27.c	2012-11-05 21:29:00.000000000 +0100
+--- /dev/null
++++ linux-3.7/arch/arm/mach-imx/mach-apf27.c
 @@ -0,0 +1,294 @@
 + /*
 + * Support for the APF27 System On Module
@@ -349,11 +350,11 @@ Index: linux-3.7-rc4/arch/arm/mach-imx/mach-apf27.c
 +	.init_machine = apf27_init,
 +	.restart = mxc_restart,
 +MACHINE_END
-Index: linux-3.7-rc4/arch/arm/plat-mxc/include/mach/uncompress.h
+Index: linux-3.7/arch/arm/plat-mxc/include/mach/uncompress.h
 ===================================================================
---- linux-3.7-rc4.orig/arch/arm/plat-mxc/include/mach/uncompress.h	2012-11-04 20:07:39.000000000 +0100
-+++ linux-3.7-rc4/arch/arm/plat-mxc/include/mach/uncompress.h	2012-11-05 13:44:07.000000000 +0100
-@@ -85,6 +85,7 @@
+--- linux-3.7.orig/arch/arm/plat-mxc/include/mach/uncompress.h
++++ linux-3.7/arch/arm/plat-mxc/include/mach/uncompress.h
+@@ -85,6 +85,7 @@ static __inline__ void __arch_decomp_set
  	case MACH_TYPE_PCA100:
  	case MACH_TYPE_MXT_TD60:
  	case MACH_TYPE_IMX27IPCAM:
@@ -361,11 +362,11 @@ Index: linux-3.7-rc4/arch/arm/plat-mxc/include/mach/uncompress.h
  		uart_base = MX2X_UART1_BASE_ADDR;
  		break;
  	case MACH_TYPE_MX31LITE:
-Index: linux-3.7-rc4/arch/arm/tools/mach-types
+Index: linux-3.7/arch/arm/tools/mach-types
 ===================================================================
---- linux-3.7-rc4.orig/arch/arm/tools/mach-types	2012-11-04 20:07:39.000000000 +0100
-+++ linux-3.7-rc4/arch/arm/tools/mach-types	2012-11-05 13:44:07.000000000 +0100
-@@ -297,6 +297,7 @@
+--- linux-3.7.orig/arch/arm/tools/mach-types
++++ linux-3.7/arch/arm/tools/mach-types
+@@ -297,6 +297,7 @@ smdk2416		MACH_SMDK2416		SMDK2416		1685
  wbd111			MACH_WBD111		WBD111			1690
  mv2120			MACH_MV2120		MV2120			1693
  mx51_3ds		MACH_MX51_3DS		MX51_3DS		1696
diff --git a/patches/linux/3.7/0201-armadeus-add_apf27dev_baseboard.patch b/patches/linux/3.7/0201-armadeus-add_apf27dev_baseboard.patch
index dfd3cde..df0cf35 100644
--- a/patches/linux/3.7/0201-armadeus-add_apf27dev_baseboard.patch
+++ b/patches/linux/3.7/0201-armadeus-add_apf27dev_baseboard.patch
@@ -8,11 +8,11 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
 Signed-off-by: Jeremie Scheer <jer...@ar...>
 Signed-off-by: Kevin Joly <jol...@gm...>
 
-Index: linux-3.7-rc4/arch/arm/mach-imx/apf27-dev.c
+Index: linux-3.7/arch/arm/mach-imx/apf27-dev.c
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7-rc4/arch/arm/mach-imx/apf27-dev.c	2012-11-14 16:26:35.000000000 +0100
-@@ -0,0 +1,1011 @@
+--- /dev/null
++++ linux-3.7/arch/arm/mach-imx/apf27-dev.c
+@@ -0,0 +1,1012 @@
 + /*
 + * apf27-dev.c
 + * Support for AFP27 module's development baseboard
@@ -55,6 +55,9 @@ Index: linux-3.7-rc4/arch/arm/mach-imx/apf27-dev.c
 +#include <linux/cpufreq.h>
 +#include <linux/clk.h>
 +#include <linux/dma-mapping.h>
++#ifdef CONFIG_FB_IMX
++#include <linux/platform_data/video-imxfb.h>
++#endif
 +
 +#include <asm/io.h>
 +#include <linux/gpio.h> /* gpio_to_irq */
@@ -64,10 +67,6 @@ Index: linux-3.7-rc4/arch/arm/mach-imx/apf27-dev.c
 +#include <mach/common.h>
 +#include <mach/hardware.h>
 +#include <mach/iomux-mx27.h>
-+#ifdef CONFIG_FB_MXC /* Freescale Framebuffer */
-+#include <mach/imx_fb.h>
-+#include <mach/imxfb.h>
-+#endif
 +#include <linux/fb.h>
 +#include <mach/ulpi.h>
 +#ifdef CONFIG_MAX1027
@@ -103,7 +102,7 @@ Index: linux-3.7-rc4/arch/arm/mach-imx/apf27-dev.c
 +#include <mach/mx27.h>
 +#define VA_GPIO_BASE	MX27_IO_ADDRESS(MX27_GPIO_BASE_ADDR)
 +
-+#if defined(CONFIG_FB_MXC) || defined(CONFIG_FB_IMX)
++#if defined(CONFIG_FB_IMX)
 +extern void apf27_lcd_init(void);
 +#endif
 +#ifdef CONFIG_MACH_APF27_DEV_EXT
@@ -959,7 +958,9 @@ Index: linux-3.7-rc4/arch/arm/mach-imx/apf27-dev.c
 +//	imx27_add_imx_ssi(0, &apf27_ssi0_pdata);
 +
 +	/* APF27Dev has an LCD connector */
-+	//apf27_lcd_init();
++#ifdef CONFIG_FB_IMX
++	apf27_lcd_init();
++#endif
 +
 +//	apf27dev_pwr_ctrl_gpio_active();
 +
@@ -1024,11 +1025,11 @@ Index: linux-3.7-rc4/arch/arm/mach-imx/apf27-dev.c
 +#endif
 +}
 +
-Index: linux-3.7-rc4/arch/arm/mach-imx/apf27-lcd.c
+Index: linux-3.7/arch/arm/mach-imx/apf27-lcd.c
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7-rc4/arch/arm/mach-imx/apf27-lcd.c	2012-11-06 13:53:49.000000000 +0100
-@@ -0,0 +1,169 @@
+--- /dev/null
++++ linux-3.7/arch/arm/mach-imx/apf27-lcd.c
+@@ -0,0 +1,157 @@
 +/*
 + * apf27-lcd.c
 + *
@@ -1052,16 +1053,14 @@ Index: linux-3.7-rc4/arch/arm/mach-imx/apf27-lcd.c
 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 + */
 +
++#ifdef CONFIG_FB_IMX
 +
 +#include <linux/fb.h>
 +#include <linux/delay.h>
 +#include <linux/gpio.h>
++#include <linux/platform_data/video-imxfb.h>
 +
 +#include <mach/iomux-mx27.h>
-+#ifdef CONFIG_FB_MXC /* Freescale Framebuffer */
-+#include <mach/imx_fb.h>
-+#include <mach/imxfb.h>
-+#endif
 +#include <mach/common.h>
 +
 +#include "devices-imx27.h"
@@ -1126,16 +1125,7 @@ Index: linux-3.7-rc4/arch/arm/mach-imx/apf27-lcd.c
 +	PA31_PF_OE_ACD
 +};
 +
-+/* Freescale driver */
-+#ifdef CONFIG_FB_MXC
-+static struct mxc_fb_platform_data apf_fb_data = {
-+	.mode = LCD_NAME,
-+	.init = apf27_fb_init,
-+};
-+/* Mainline driver */
-+#elif CONFIG_FB_IMX
-+#include "../mach-imx/apf9328_lcd_config.h"
-+#endif
++#include "apf9328_lcd_config.h"
 +
 +static int apf27_fb_init(struct platform_device *pdev)
 +{
@@ -1189,19 +1179,18 @@ Index: linux-3.7-rc4/arch/arm/mach-imx/apf27-lcd.c
 +#ifdef CONFIG_FB_MXC
 +	apf27_lcd_startup();
 +#endif
-+#if 0
 +	apf_set_lcd_name(name);
 +	apf_fb_set_default_contrast();
 +	imx27_add_imx_fb(&apf_fb_data);
-+#endif
 +end:
 +	return;
 +}
 +
-Index: linux-3.7-rc4/arch/arm/mach-imx/apf27-dev-ext-apw.c
++#endif
+Index: linux-3.7/arch/arm/mach-imx/apf27-dev-ext-apw.c
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7-rc4/arch/arm/mach-imx/apf27-dev-ext-apw.c	2012-11-06 12:15:25.000000000 +0100
+--- /dev/null
++++ linux-3.7/arch/arm/mach-imx/apf27-dev-ext-apw.c
 @@ -0,0 +1,175 @@
 + /*
 + * apf27-dev-ext-apw.c
@@ -1378,10 +1367,10 @@ Index: linux-3.7-rc4/arch/arm/mach-imx/apf27-dev-ext-apw.c
 +	printk("done\n");
 +}
 +
-Index: linux-3.7-rc4/arch/arm/mach-imx/mach-apf27.c
+Index: linux-3.7/arch/arm/mach-imx/mach-apf27.c
 ===================================================================
---- linux-3.7-rc4.orig/arch/arm/mach-imx/mach-apf27.c	2012-11-06 14:15:12.000000000 +0100
-+++ linux-3.7-rc4/arch/arm/mach-imx/mach-apf27.c	2012-11-14 16:50:52.000000000 +0100
+--- linux-3.7.orig/arch/arm/mach-imx/mach-apf27.c
++++ linux-3.7/arch/arm/mach-imx/mach-apf27.c
 @@ -43,6 +43,7 @@
  
  #include "devices-imx27.h"
@@ -1390,7 +1379,7 @@ Index: linux-3.7-rc4/arch/arm/mach-imx/mach-apf27.c
  
  static const int apf27_pins[] __initconst = {
  	/* UART1 */
-@@ -269,6 +270,10 @@
+@@ -270,6 +271,10 @@ static void __init apf27_init(void)
  	i2c_register_board_info(1, apf27_i2c_devices_bus1,
  				ARRAY_SIZE(apf27_i2c_devices_bus1));
  	imx27_add_imx_i2c(1, &apf27_i2c_1_data);
@@ -1401,11 +1390,11 @@ Index: linux-3.7-rc4/arch/arm/mach-imx/mach-apf27.c
  }
  
  static void __init apf27_timer_init(void)
-Index: linux-2.6.38.1/arch/arm/mach-imx/Kconfig
+Index: linux-3.7/arch/arm/mach-imx/Kconfig
 ===================================================================
---- linux-2.6.38.1.orig/arch/arm/mach-imx/Kconfig	2011-06-01 16:00:05.000000000 +0200
-+++ linux-2.6.38.1/arch/arm/mach-imx/Kconfig	2011-06-03 12:44:42.000000000 +0200
-@@ -396,6 +396,103 @@
+--- linux-3.7.orig/arch/arm/mach-imx/Kconfig
++++ linux-3.7/arch/arm/mach-imx/Kconfig
+@@ -430,6 +430,103 @@ config MACH_APF27
  	  Include support for APF27 platform. This includes specific
  	  configurations for the module and its peripherals.
  
@@ -1509,11 +1498,11 @@ Index: linux-2.6.38.1/arch/arm/mach-imx/Kconfig
  endif
  
  if ARCH_IMX_V6_V7
-Index: linux-2.6.38.1/arch/arm/mach-imx/Makefile
+Index: linux-3.7/arch/arm/mach-imx/Makefile
 ===================================================================
---- linux-2.6.38.1.orig/arch/arm/mach-imx/Makefile	2011-06-01 16:00:05.000000000 +0200
-+++ linux-2.6.38.1/arch/arm/mach-imx/Makefile	2011-06-03 17:21:55.000000000 +0200
-@@ -45,6 +45,9 @@
+--- linux-3.7.orig/arch/arm/mach-imx/Makefile
++++ linux-3.7/arch/arm/mach-imx/Makefile
+@@ -46,6 +46,9 @@ obj-$(CONFIG_MACH_MXT_TD60) += mach-mxt_
  obj-$(CONFIG_MACH_IMX27IPCAM) += mach-imx27ipcam.o
  obj-$(CONFIG_MACH_IMX27_DT) += imx27-dt.o
  obj-$(CONFIG_MACH_APF27) += mach-apf27.o


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-74-g402f114

From: Gwenhael Goavec-M. <gwe...@us...> - 2012-12-15 14:00:56

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  402f11431b412d52a02ecacadf6e85aded37d4b0 (commit)
      from  de158ce1bc561688ca3f33d726a0076c4b2ad6c8 (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 402f11431b412d52a02ecacadf6e85aded37d4b0
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date:   Sat Dec 15 14:59:22 2012 +0100

    [LINUX][3.7] APF27: config: Add ehci and scsi disk support by default

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

Summary of changes:
 .../device/armadeus/apf27/apf27-linux-3.7.config   |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.7.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.7.config
index f26f181..a84a516 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.7.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.7.config
@@ -79,6 +79,7 @@ CONFIG_PROC_DEVICETREE=y
 CONFIG_EEPROM_AT24=y
 CONFIG_EEPROM_AT25=y
 CONFIG_SCSI=y
+CONFIG_BLK_DEV_SD=y
 CONFIG_NETDEVICES=y
 CONFIG_MII=y
 # CONFIG_NET_VENDOR_BROADCOM is not set
@@ -162,6 +163,8 @@ CONFIG_SND_PCM_OSS=m
 CONFIG_SND_SOC=m
 CONFIG_SND_IMX_SOC=m
 CONFIG_USB=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_MXC=y
 CONFIG_USB_CHIPIDEA=y
 CONFIG_USB_CHIPIDEA_HOST=y
 CONFIG_USB_CHIPIDEA_DEBUG=y


hooks/post-receive
-- 
armadeus

Flat | Threaded

<< < 1 .. 64 65 66 67 68 .. 153 > >> (Page 66 of 153)