armadeus-commitlog Mailing List for armadeus (Page 67)
Brought to you by:
sszy
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
|
|
From: Gwenhael Goavec-M. <gwe...@us...> - 2012-12-15 10:52:17
|
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 de158ce1bc561688ca3f33d726a0076c4b2ad6c8 (commit)
via 3132844ef9cb234aad662528f629b822fdadc4b5 (commit)
from 74c2856539e3a7f3fa6c798fb099a293aaef6d9d (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 de158ce1bc561688ca3f33d726a0076c4b2ad6c8
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date: Sat Dec 15 11:50:54 2012 +0100
[LINUX][3.7] mx27: enable EHCI PER clock
commit 3132844ef9cb234aad662528f629b822fdadc4b5
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date: Sat Dec 15 11:50:24 2012 +0100
[LINUX][3.7] mx27: add an clock gate to activate SPLL clock
-----------------------------------------------------------------------
Summary of changes:
...armadeus-mx27_add_clk_gate_to_enable_sspl.patch | 44 ++++++++++++++++++
...armadeus-mx27-ehci-mxc-add_per_clk_enable.patch | 49 ++++++++++++++++++++
2 files changed, 93 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/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
|
|
From: jorasse <jo...@us...> - 2012-12-14 02:13:43
|
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 dcfda086d2b013b82e57f44bca156e5087a66581 (commit)
via 2ada45fe9bc9ff6fb763804358384b8096f088b7 (commit)
from 08025e48b5d2ed51c80df04b7e9156c6335e888c (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 dcfda086d2b013b82e57f44bca156e5087a66581
Author: Eric Jarrige <eri...@ar...>
Date: Fri Dec 14 03:18:20 2012 +0100
[BILDROOT] boost: copy author comment and signed-off into enclosed patch
commit 2ada45fe9bc9ff6fb763804358384b8096f088b7
Author: vic...@gm... <vic...@gm...>
Date: Wed Dec 12 12:31:24 2012 +0100
boost: bump to version 1.52.0
Signed-off-by: Victor Hiairrassary <vic...@gm...>
-----------------------------------------------------------------------
Summary of changes:
.../buildroot/2012.11/198-boost-bump-version.patch | 51 ++++++++++++++++++++
1 files changed, 51 insertions(+), 0 deletions(-)
create mode 100644 patches/buildroot/2012.11/198-boost-bump-version.patch
diff --git a/patches/buildroot/2012.11/198-boost-bump-version.patch b/patches/buildroot/2012.11/198-boost-bump-version.patch
new file mode 100644
index 0000000..86a42f2
--- /dev/null
+++ b/patches/buildroot/2012.11/198-boost-bump-version.patch
@@ -0,0 +1,51 @@
+I've bump boost version in buildroot mainline, but after 2012.11 release.
+
+Signed-off-by: Victor Hiairrassary <vic...@gm...>
+---
+diff -ruN buildroot.orig/package/boost/boost.mk buildroot/package/boost/boost.mk
+--- buildroot.orig/package/boost/boost.mk 2012-12-03 01:33:09.000000000 +0100
++++ buildroot/package/boost/boost.mk 2012-12-12 12:21:17.273204409 +0100
+@@ -4,7 +4,7 @@
+ #
+ #############################################################
+
+-BOOST_VERSION = 1.49.0
++BOOST_VERSION = 1.52.0
+ BOOST_FILE_VERSION = $(subst .,_,$(BOOST_VERSION))
+ BOOST_SOURCE = boost_$(BOOST_FILE_VERSION).tar.bz2
+ BOOST_SITE = http://downloads.sourceforge.net/project/boost/boost/$(BOOST_VERSION)
+@@ -15,7 +15,7 @@
+ BOOST_DEPENDENCIES = bzip2 zlib
+
+ BOOST_FLAGS =
+-BOOST_WITHOUT_FLAGS = python
++BOOST_WITHOUT_FLAGS = python context
+
+ BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CHRONO),,chrono)
+ BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_DATE_TIME),,date_time)
+@@ -86,3 +86,4 @@
+ endef
+
+ $(eval $(generic-package))
++
+diff -ruN buildroot.orig/package/boost/Config.in buildroot/package/boost/Config.in
+--- buildroot.orig/package/boost/Config.in 2012-12-03 01:33:09.000000000 +0100
++++ buildroot/package/boost/Config.in 2012-12-12 12:21:05.419820924 +0100
+@@ -1,9 +1,10 @@
+-comment "boost requires a toolchain with C++ support enabled"
+- depends on !BR2_INSTALL_LIBSTDCPP
++comment "boost requires a toolchain with C++ and large file support enabled"
++ depends on !BR2_INSTALL_LIBSTDCPP || !BR2_LARGEFILE
+
+ config BR2_PACKAGE_BOOST
+ bool "boost"
+ depends on BR2_INSTALL_LIBSTDCPP
++ depends on BR2_LARGEFILE
+ select BR2_PACKAGE_BZIP2
+ select BR2_PACKAGE_ZLIB
+ help
+@@ -86,3 +87,4 @@
+
+ endif
+
++
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-12-14 01:44: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 08025e48b5d2ed51c80df04b7e9156c6335e888c (commit)
via fe00c4b65246a68ecf2864f77bfd711c69988fc9 (commit)
from 8cdbca0af7c56f7defc57dd2535c3c8a48fc3e56 (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 08025e48b5d2ed51c80df04b7e9156c6335e888c
Merge: fe00c4b 8cdbca0
Author: Eric Jarrige <eri...@ar...>
Date: Fri Dec 14 02:49:26 2012 +0100
[BILDROOT] 2012.11: partial cleanup
commit fe00c4b65246a68ecf2864f77bfd711c69988fc9
Merge: 0ef82a1 b31c09f
Author: Eric Jarrige <eri...@ar...>
Date: Fri Dec 14 02:39:24 2012 +0100
[BILDROOT] 2012.11: partial cleanup
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-12-14 01:34: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 "UNNAMED PROJECT".
The branch, master has been updated
via 8cdbca0af7c56f7defc57dd2535c3c8a48fc3e56 (commit)
via 0ef82a1a38068b980d562853a34450c2d842fb0a (commit)
from b31c09f66c4720721df792297994a7b0fca99d8e (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 8cdbca0af7c56f7defc57dd2535c3c8a48fc3e56
Merge: 0ef82a1 b31c09f
Author: Eric Jarrige <eri...@ar...>
Date: Fri Dec 14 02:39:24 2012 +0100
[BILDROOT] 2012.11: partial cleanup
commit 0ef82a1a38068b980d562853a34450c2d842fb0a
Author: Eric Jarrige <eri...@ar...>
Date: Fri Dec 14 01:49:37 2012 +0100
[BILDROOT] 2012.11: partial cleanup
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
UNNAMED PROJECT
|
|
From: jorasse <jo...@us...> - 2012-12-10 18:40:52
|
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 74c2856539e3a7f3fa6c798fb099a293aaef6d9d (commit)
from b4efab436aa1eef5e5b92b95e5166ed376af5e4e (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 74c2856539e3a7f3fa6c798fb099a293aaef6d9d
Author: Eric Jarrige <eri...@ar...>
Date: Mon Dec 10 19:42:15 2012 +0100
[BILDROOT] 2012.11: update to support next BR release
-----------------------------------------------------------------------
Summary of changes:
Makefile | 7 +---
.../2012.11/001-add_armadeus_device.patch | 33 +++++++++++---------
.../buildroot/2012.11/072-xenomai-package.patch | 7 +++-
.../buildroot/2012.11/081-adds_quake_package.patch | 8 ++--
.../2012.11/117-ussp-push-add_package.patch | 2 +-
.../2012.11/121-target-arm926t_is_arm926ej-s.patch | 6 ++--
.../buildroot/2012.11/124-e-uae-add_package.patch | 4 +-
.../2012.11/125-opentyrian-add_package.patch | 6 ++--
.../2012.11/130-lbreakout-add_package.patch | 4 +-
...lection_even_when_custom_rootfs_is_chosen.patch | 20 ++++++------
10 files changed, 49 insertions(+), 48 deletions(-)
diff --git a/Makefile b/Makefile
index cd9e87f..eb9cb99 100644
--- a/Makefile
+++ b/Makefile
@@ -27,15 +27,10 @@ export ARMADEUS_TOPDIR
#--- User configurable stuff:
BUILDROOT_VERSION:=2012.02
-#BUILDROOT_VERSION:=20121030
+#BUILDROOT_VERSION:=2012.11
include ./Makefile.in
-ifeq ($(BUILDROOT_VERSION),2012.02)
BUILDROOT_SITE:=http://buildroot.uclibc.org/downloads
BUILDROOT_PATCH_DIR:=$(ARMADEUS_TOPDIR)/patches/buildroot/$(BUILDROOT_VERSION)
-else
-BUILDROOT_SITE:=http://buildroot.uclibc.org/downloads/snapshots
-BUILDROOT_PATCH_DIR:=$(ARMADEUS_TOPDIR)/patches/buildroot/2012.11
-endif
ARMADEUS_CONFIG_DIR:=$(BUILDROOT_DIR)/configs
#--- End of user conf (don't touch anything below unless you know what you're doing !! ;-) )
diff --git a/patches/buildroot/2012.11/001-add_armadeus_device.patch b/patches/buildroot/2012.11/001-add_armadeus_device.patch
index b952e5f..0e8f71f 100644
--- a/patches/buildroot/2012.11/001-add_armadeus_device.patch
+++ b/patches/buildroot/2012.11/001-add_armadeus_device.patch
@@ -1,21 +1,24 @@
Add armadeus target specific menu to BR.
-Index: buildroot/target/generic/Config.in
+Index: buildroot/Makefile
===================================================================
---- buildroot.orig/target/generic/Config.in 2012-02-21 16:43:29.000000000 +0100
-+++ buildroot/target/generic/Config.in 2012-02-21 16:43:48.000000000 +0100
-@@ -149,4 +149,5 @@
- only argument. Make sure the exit code of that script is 0,
- otherwise make will stop after calling it.
+--- buildroot/Makefile
++++ buildroot/Makefile
+@@ -336,6 +336,7 @@ endif
+ endif
-+source "target/device/armadeus/Config.in"
- endmenu
-Index: buildroot/target/Makefile.in
+ include system/system.mk
++include target/device/armadeus/Makefile.in
+ include fs/common.mk
+
+ TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))
+Index: buildroot/system/Config.in
===================================================================
---- buildroot.orig/target/Makefile.in 2012-02-21 16:43:29.000000000 +0100
-+++ buildroot/target/Makefile.in 2012-02-21 16:43:48.000000000 +0100
-@@ -1,3 +1,4 @@
- # make sure to put everything that is board-specific before the tarroot targets
- include target/generic/Makefile.in
+--- buildroot/system/Config.in
++++ buildroot/system/Config.in
+@@ -183,4 +183,5 @@ config BR2_ROOTFS_POST_BUILD_SCRIPT
+ only argument. Make sure the exit code of those scripts are 0,
+ otherwise make will stop after calling them.
-+include target/device/armadeus/Makefile.in
++source "target/device/armadeus/Config.in"
+ endmenu
diff --git a/patches/buildroot/2012.11/072-xenomai-package.patch b/patches/buildroot/2012.11/072-xenomai-package.patch
index f41b12b..2bdfba8 100644
--- a/patches/buildroot/2012.11/072-xenomai-package.patch
+++ b/patches/buildroot/2012.11/072-xenomai-package.patch
@@ -197,14 +197,17 @@ Index: buildroot/package/xenomai/xeno-kernel.config
+# CONFIG_IPIPE_DEBUG is not set
Index: buildroot/package/xenomai/xenomai.mk
===================================================================
---- buildroot.orig/package/xenomai/xenomai.mk
+--- buildroot/package/xenomai/xenomai.mk
+++ buildroot/package/xenomai/xenomai.mk
-@@ -12,9 +12,17 @@ endif
+@@ -12,12 +12,20 @@ endif
XENOMAI_SITE = http://download.gna.org/xenomai/stable/
XENOMAI_SOURCE = xenomai-$(XENOMAI_VERSION).tar.bz2
+XENOMAI_ADEOS_PATCH = $(call qstri |
|
From: jorasse <jo...@us...> - 2012-12-08 11: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 b4efab436aa1eef5e5b92b95e5166ed376af5e4e (commit)
from b788cfd2c6f3850f7ad2fa6187d5a2dd60aa207d (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 b4efab436aa1eef5e5b92b95e5166ed376af5e4e
Author: Eric Jarrige <eri...@ar...>
Date: Sat Dec 8 12:11:00 2012 +0100
[LINUX] apf28: fix capabilities to drive multiple PWM lines
-----------------------------------------------------------------------
Summary of changes:
target/linux/modules/pwm/mxs-pwm.c | 38 +++++++++++++++++++++--------------
1 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/target/linux/modules/pwm/mxs-pwm.c b/target/linux/modules/pwm/mxs-pwm.c
index d705769..131f208 100644
--- a/target/linux/modules/pwm/mxs-pwm.c
+++ b/target/linux/modules/pwm/mxs-pwm.c
@@ -71,6 +71,7 @@ struct pwm_device {
};
int gMajor = 0;
+static void __iomem *pwm_membase = NULL;
static struct pwm_device *dev_table[CONFIG_MXS_PWM_CHANNELS];
static const int div_shift[8] = {0, 1, 2, 3, 4, 6, 8, 10};
static struct class *pwm_class; /* forward declaration only */
@@ -384,7 +385,7 @@ static DEVICE_ATTR(active, S_IWUSR | S_IRUGO, pwm_show_state, pwm_store_state);
static int imx_pwm_drv_probe(struct platform_device *pdev)
{
int err = -ENODEV;
- struct resource *res;
+ struct resource *res = NULL;
struct pwm_device *pwm;
if (pdev->id >= CONFIG_MXS_PWM_CHANNELS)
@@ -408,25 +409,32 @@ static int imx_pwm_drv_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, pwm);
dev_table[pdev->id] = pwm;
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- if (!res) {
- dev_err(&pdev->dev, "unable to get mem ressource\n");
- err = -ENOENT;
- goto error_malloc;
- }
+ if (!pwm_membase) {
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ if (!res) {
+ dev_err(&pdev->dev, "unable to get mem ressource\n");
+ err = -ENOENT;
+ goto error_malloc;
+ }
- pwm->membase = (void __iomem *)IO_ADDRESS(res->start);
- if (!pwm->membase) {
- err = -ENOMEM;
+ pwm_membase = (void __iomem *)IO_ADDRESS(res->start);
+ if (!pwm_membase) {
+ err = -ENOMEM;
goto error_memreg;
+ }
}
+ pwm->membase = pwm_membase;
+
/* Register our char device */
- err = register_chrdev(gMajor, DRIVER_NAME, &pwm_fops);
- if (err < 0) {
- dev_err(&pdev->dev, "unable to register char driver\n");
- goto error_iounmap;
+ if (gMajor == 0) {
+ err = register_chrdev(gMajor, DRIVER_NAME, &pwm_fops);
+ if (err < 0) {
+ dev_err(&pdev->dev, "unable to register char driver\n");
+ goto error_iounmap;
+ }
}
+
/* Dynamic Major allocation */
if (gMajor == 0) {
gMajor = err;
@@ -487,7 +495,7 @@ error_platform_init:
error_iounmap:
iounmap(pwm->membase);
error_memreg:
- release_mem_region(res->start, resource_size(res));
+ if (res) release_mem_region(res->start, resource_size(res));
error_malloc:
kfree(pwm);
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-12-08 11:02:21
|
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 b788cfd2c6f3850f7ad2fa6187d5a2dd60aa207d (commit)
from d269b8cab162103a5753c8e5eec5ed0b7bbf6e7b (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 b788cfd2c6f3850f7ad2fa6187d5a2dd60aa207d
Author: Philippe Reynes <tr...@ya...>
Date: Thu Dec 6 20:54:11 2012 +0100
apf27: add support of kernel 3.7-rc8
Signed-off-by: Philippe Reynes <tr...@ya...>
-----------------------------------------------------------------------
Summary of changes:
...x-3.7-rc4.config => apf27-linux-3.7-rc8.config} | 0
patches/linux/{3.7-rc3 => 3.7-rc8} | 0
2 files changed, 0 insertions(+), 0 deletions(-)
copy buildroot/target/device/armadeus/apf27/{apf27-linux-3.7-rc4.config => apf27-linux-3.7-rc8.config} (100%)
copy patches/linux/{3.7-rc3 => 3.7-rc8} (100%)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.7-rc4.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.7-rc8.config
similarity index 100%
copy from buildroot/target/device/armadeus/apf27/apf27-linux-3.7-rc4.config
copy to buildroot/target/device/armadeus/apf27/apf27-linux-3.7-rc8.config
diff --git a/patches/linux/3.7-rc3 b/patches/linux/3.7-rc8
similarity index 100%
copy from patches/linux/3.7-rc3
copy to patches/linux/3.7-rc8
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2012-12-06 16:48:21
|
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 d269b8cab162103a5753c8e5eec5ed0b7bbf6e7b (commit)
via 027125ca394105b5af9bfa67a4ad16a3a9a9623f (commit)
from b04cb6a64247b103defb7faa80830bbc5b296e46 (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 d269b8cab162103a5753c8e5eec5ed0b7bbf6e7b
Merge: 027125c b04cb6a
Author: Fabien Marteau <fab...@ar...>
Date: Thu Dec 6 17:48:06 2012 +0100
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 027125ca394105b5af9bfa67a4ad16a3a9a9623f
Author: Fabien Marteau <fab...@ar...>
Date: Thu Dec 6 16:35:53 2012 +0100
[debug][imxregs] adding some registers for apf51
-----------------------------------------------------------------------
Summary of changes:
target/linux/debug/imxregs/imx5regs.h | 41 +++++++++++++++++++++++++++++++++
1 files changed, 41 insertions(+), 0 deletions(-)
diff --git a/target/linux/debug/imxregs/imx5regs.h b/target/linux/debug/imxregs/imx5regs.h
index 543133d..21b9557 100644
--- a/target/linux/debug/imxregs/imx5regs.h
+++ b/target/linux/debug/imxregs/imx5regs.h
@@ -137,6 +137,30 @@ static struct reg_info regs[] =
{ "GPIO1_IMR", 0x73f84014, 0, 0xffffffff, 'x', "GPIO Bank1 Interrupt Mask Register" },
{ "GPIO1_ISR", 0x73f84018, 0, 0xffffffff, 'x', "GPIO Bank1 Interrupt Status Register" },
{ "GPIO1_EDGE", 0x73f8401c, 0, 0xffffffff, 'x', "GPIO Bank1 Edge Detect Register" },
+{ "GPIO2_DR", 0x73f88000, 0, 0xffffffff, 'x', "GPIO Bank2 Data Register" },
+{ "GPIO2_DIR", 0x73f88004, 0, 0xffffffff, 'x', "GPIO Bank2 Direction Register" },
+{ "GPIO2_PSR", 0x73f88008, 0, 0xffffffff, 'x', "GPIO Bank2 Pad Status Register" },
+{ "GPIO2_ICR1", 0x73f8800c, 0, 0xffffffff, 'x', "GPIO Bank2 Interrupt Configuration Register 1" },
+{ "GPIO2_ICR2", 0x73f88010, 0, 0xffffffff, 'x', "GPIO Bank2 Interrupt Configuration Register 2" },
+{ "GPIO2_IMR", 0x73f88014, 0, 0xffffffff, 'x', "GPIO Bank2 Interrupt Mask Register" },
+{ "GPIO2_ISR", 0x73f88018, 0, 0xffffffff, 'x', "GPIO Bank2 Interrupt Status Register" },
+{ "GPIO2_EDGE", 0x73f8801c, 0, 0xffffffff, 'x', "GPIO Bank2 Edge Detect Register" },
+{ "GPIO3_DR", 0x73f8C000, 0, 0xffffffff, 'x', "GPIO Bank3 Data Register" },
+{ "GPIO3_DIR", 0x73f8C004, 0, 0xffffffff, 'x', "GPIO Bank3 Direction Register" },
+{ "GPIO3_PSR", 0x73f8C008, 0, 0xffffffff, 'x', "GPIO Bank3 Pad Status Register" },
+{ "GPIO3_ICR1", 0x73f8C00c, 0, 0xffffffff, 'x', "GPIO Bank3 Interrupt Configuration Register 1" },
+{ "GPIO3_ICR2", 0x73f8C010, 0, 0xffffffff, 'x', "GPIO Bank3 Interrupt Configuration Register 2" },
+{ "GPIO3_IMR", 0x73f8C014, 0, 0xffffffff, 'x', "GPIO Bank3 Interrupt Mask Register" },
+{ "GPIO3_ISR", 0x73f8C018, 0, 0xffffffff, 'x', "GPIO Bank3 Interrupt Status Register" },
+{ "GPIO3_EDGE", 0x73f8C01c, 0, 0xffffffff, 'x', "GPIO Bank3 Edge Detect Register" },
+{ "GPIO4_DR", 0x73f90000, 0, 0xffffffff, 'x', "GPIO Bank4 Data Register" },
+{ "GPIO4_DIR", 0x73f90004, 0, 0xffffffff, 'x', "GPIO Bank4 Direction Register" },
+{ "GPIO4_PSR", 0x73f90008, 0, 0xffffffff, 'x', "GPIO Bank4 Pad Status Register" },
+{ "GPIO4_ICR1", 0x73f9000c, 0, 0xffffffff, 'x', "GPIO Bank4 Interrupt Configuration Register 1" },
+{ "GPIO4_ICR2", 0x73f90010, 0, 0xffffffff, 'x', "GPIO Bank4 Interrupt Configuration Register 2" },
+{ "GPIO4_IMR", 0x73f90014, 0, 0xffffffff, 'x', "GPIO Bank4 Interrupt Mask Register" },
+{ "GPIO4_ISR", 0x73f90018, 0, 0xffffffff, 'x', "GPIO Bank4 Interrupt Status Register" },
+{ "GPIO4_EDGE", 0x73f9001c, 0, 0xffffffff, 'x', "GPIO Bank4 Edge Detect Register" },
/* GPT */
{ "GPTCR_1", 0x73fa0000, 0, 0xffffffff, 'x', "GPT1 Control Register" },
{ "GPTPR_1", 0x73fa0004, 0, 0xffffffff, 'x', "GPT1 Prescaler Register" },
@@ -162,6 +186,20 @@ static struct reg_info regs[] =
{ "PWMSAR_2", 0x73fb800c, 0, 0xffffffff, 'x', "PWM2 Sample Register" },
{ "PWMPR_2", 0x73fb8010, 0, 0xffffffff, 'x', "PWM2 Period Register" },
{ "PWMCNR_2", 0x73fb8014, 0, 0xffffffff, 'x', "PWM2 Counter Register" },
+/* HSI2C */
+{ "HISADR", 0x70038000, 0, 0xffffffff, 'x', "HS_I2C Slave Address Register R/W 0X0000 39.3.3.1/39-8"},
+{ "HIMADR", 0x70038004, 0, 0xffffffff, 'x', "HS_I2C Master Address Register R/W 0x0000 39.3.3.2/39-9"},
+{ "HICR", 0x70038008, 0, 0xffffffff, 'x', "HS_I2C Control Register R/W 0x0000 39.3.3.3/39-9"},
+{ "HISR", 0x7003800C, 0, 0xffffffff, 'x', "HS_I2C Status Register R/W 0x0002 39.3.3.4/39-12"},
+{ "HIIMR", 0x70038010, 0, 0xffffffff, 'x', "HS_I2C Interrupt Mask Register R/W 0x00FF 39.3.3.5/39-13"},
+{ "HITDR", 0x70038014, 0, 0xffffffff, 'x', "HS_I2C Tx Data Register W 0x0000 39.3.3.6/39-15"},
+{ "HIRDR", 0x70038018, 0, 0xffffffff, 'x', "HS_I2C Rx Data Register R 0x0000 39.3.3.7/39-15"},
+{ "HIFSFDR", 0x7003801C, 0, 0xffffffff, 'x', "HS_I2C F/S-Mode Frequency Divider Register R/W 0x0000 39.3.3.8/39-16"},
+{ "HIHSFDR", 0x70038020, 0, 0xffffffff, 'x', "HS_I2C HS-Mode Frequency Divider Register R/W 0X0000 39.3.3.9/39-17"},
+{ "HITFR", 0x70038024, 0, 0xffffffff, 'x', "HS_I2C Tx FIFO Control/Status Register R/W 0x0000 39.3.3.10/39-18"},
+{ "HIRFR", 0x70038028, 0, 0xffffffff, 'x', "HS_I2C Rx FIFO Control/Status Register R/W 0x0000 39.3.3.11/39-20"},
+{ "HITDCR", 0x7003802C, 0, 0xffffffff, 'x', "HS_I2C Transmit Data Count register R/W 0x00FF 39.3.3.12/39-21"},
+{ "HIRDCR", 0x70038030, 0, 0xffffffff, 'x', "HS_I2C Receive Data Count register R/W 0x00FF 39.3.3.13/39-22"},
/* I2C1 */
{ "IADR_1", 0x83fc8000, 0, 0xffffffff, 'x', "I2C1 Address Register" },
{ "IFDR_1", 0x83fc8004, 0, 0xffffffff, 'x', "I2C1 Frequency Divider Register" },
@@ -329,4 +367,7 @@ static struct reg_info regs[] =
{ "SACCST_3", 0x83fe8050, 0, 0xffffffff, 'x', "SSI3 AC97 Channel Status Register" },
{ "SACCEN_3", 0x83fe8054, 0, 0xffffffff, 'x', "SSI3 AC97 Channel Enable Register" },
{ "SACCDIS_3", 0x83fe8058, 0, 0xffffffff, 'x', "SSI3 AC97 Channel Disable Register" },
+/* IOMUX */
+{ "IOMUXC_SW_MUX_CTL_PAD_I2C1_CLK", 0x73FA81F8, 0, 0xffffffff, 'x', "Mux control for I2C1_CLK pad" },
+{ "IOMUXC_SW_MUX_CTL_PAD_I2C1_DAT", 0x73FA81FC, 0, 0xffffffff, 'x', "Mux control for I2C1_DAT pad" },
};
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-11-27 09:03:04
|
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 b04cb6a64247b103defb7faa80830bbc5b296e46 (commit)
from 379b4cff083af2723839153ffc0bd8a4979cfda5 (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 b04cb6a64247b103defb7faa80830bbc5b296e46
Author: Philippe Reynes <tr...@ya...>
Date: Mon Nov 26 19:24:08 2012 +0100
[LINUX] apf27: add support of kernel 3.7-rc7
Signed-off-by: Philippe Reynes <tr...@ya...>
-----------------------------------------------------------------------
Summary of changes:
...x-3.7-rc4.config => apf27-linux-3.7-rc7.config} | 0
patches/linux/{3.7-rc3 => 3.7-rc7} | 0
2 files changed, 0 insertions(+), 0 deletions(-)
copy buildroot/target/device/armadeus/apf27/{apf27-linux-3.7-rc4.config => apf27-linux-3.7-rc7.config} (100%)
copy patches/linux/{3.7-rc3 => 3.7-rc7} (100%)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.7-rc4.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.7-rc7.config
similarity index 100%
copy from buildroot/target/device/armadeus/apf27/apf27-linux-3.7-rc4.config
copy to buildroot/target/device/armadeus/apf27/apf27-linux-3.7-rc7.config
diff --git a/patches/linux/3.7-rc3 b/patches/linux/3.7-rc7
similarity index 100%
copy from patches/linux/3.7-rc3
copy to patches/linux/3.7-rc7
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2012-11-27 08:38:57
|
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 379b4cff083af2723839153ffc0bd8a4979cfda5 (commit)
from 7d6cc50a5a76d33a5ee622d8d1a970d34d879849 (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 379b4cff083af2723839153ffc0bd8a4979cfda5
Author: Julien Boibessot <jul...@ar...>
Date: Tue Nov 27 09:36:08 2012 +0100
[BUILDROOT] 2012.02: Fixes compat-wireless continuous rebuild
-----------------------------------------------------------------------
Summary of changes:
.../2012.02/199-compat-wireless-add_package.patch | 2 +-
1 files changed, 1 insertions(+), 1 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 0aa72e2..0fc6503 100644
--- a/patches/buildroot/2012.02/199-compat-wireless-add_package.patch
+++ b/patches/buildroot/2012.02/199-compat-wireless-add_package.patch
@@ -14,7 +14,7 @@ Index: buildroot/package/compat-wireless/compat-wireless.mk
+#
+#############################################################
+
-+COMPAT_WIRELESS_VERSION = $(BR2_PACKAGE_COMPAT_WIRELESS_VERSION)
++COMPAT_WIRELESS_VERSION = $(call qstrip,$(BR2_PACKAGE_COMPAT_WIRELESS_VERSION))
+COMPAT_WIRELESS_SITE = http://wireless.kernel.org/download/compat-wireless-2.6/
+COMPAT_WIRELESS_SOURCE = compat-wireless-$(COMPAT_WIRELESS_VERSION).tar.bz2
+
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2012-11-25 18:35:21
|
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 7d6cc50a5a76d33a5ee622d8d1a970d34d879849 (commit)
via e9c7ff7396113c3f093aca9cbd26f36be87132e3 (commit)
from 502ac7dc2b57fdfcb5afaa39a9025a22e518ff1d (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 7d6cc50a5a76d33a5ee622d8d1a970d34d879849
Author: Julien Boibessot <jul...@ar...>
Date: Sun Nov 25 19:32:58 2012 +0100
[BUILD] Fixes make linux-clean target
commit e9c7ff7396113c3f093aca9cbd26f36be87132e3
Author: Julien Boibessot <jul...@ar...>
Date: Sun Nov 25 18:55:44 2012 +0100
[BUILDROOT] 2012.02: Improves 199-compat-wireless-add_package.patch
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 +-
.../2012.02/199-compat-wireless-add_package.patch | 18 +++++++++---------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Makefile b/Makefile
index 7260a81..cd9e87f 100644
--- a/Makefile
+++ b/Makefile
@@ -140,7 +140,7 @@ linux26 linux: $(BUILDROOT_DIR)/.configured
@$(MAKE) -C $(BUILDROOT_DIR) linux-rebuild
linux26-clean linux-clean: $(BUILDROOT_DIR)/.configured
- @$(MAKE) -C $(BUILDROOT_DIR) linux26clean
+ @$(MAKE) -C $(BUILDROOT_DIR) linux-clean
%_defconfig: $(BUILDROOT_DIR)/.patched
@if [ -e "$(ARMADEUS_CONFIG_DIR)/$@" ] || [ -e "$(ARMADEUS_CONFIG_DIR)/$(patsubst %_defconfig,%,$@)/$@" ]; then \
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 a64b60b..0aa72e2 100644
--- a/patches/buildroot/2012.02/199-compat-wireless-add_package.patch
+++ b/patches/buildroot/2012.02/199-compat-wireless-add_package.patch
@@ -6,7 +6,7 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/compat-wireless/compat-wireless.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/compat-wireless/compat-wireless.mk 2012-11-20 11:46:18.000000000 +0100
++++ buildroot/package/compat-wireless/compat-wireless.mk 2012-11-25 17:21:58.000000000 +0100
@@ -0,0 +1,42 @@
+#############################################################
+#
@@ -29,7 +29,7 @@ Index: buildroot/package/compat-wireless/compat-wireless.mk
+ KLIB_BUILD="$(BUILD_DIR)/linux-$(BR2_LINUX_KERNEL_VERSION)" \
+ KLIB="$(TARGET_DIR)/lib/modules/$(BR2_LINUX_KERNEL_VERSION)" \
+ ARCH=$(BR2_ARCH) \
-+ -C $(@D) $(COMPAT_WIRELESS_MAKE_OPT)
++ -C $(@D) modules
+endef
+
+define COMPAT_WIRELESS_CLEAN_CMDS
@@ -44,8 +44,8 @@ Index: buildroot/package/compat-wireless/compat-wireless.mk
+define COMPAT_WIRELESS_INSTALL_TARGET_CMDS
+ $(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_LD)" COPTS="$(TARGET_CFLAGS)" \
+ KLIB_BUILD="$(BUILD_DIR)/linux-$(BR2_LINUX_KERNEL_VERSION)" \
-+ KLIB="$(TARGET_DIR)/lib/modules/$(BR2_LINUX_KERNEL_VERSION)" \
-+ DEPMOD=echo DESTDIR=$(TARGET_DIR) INSTALL_MOD_PATH=$(TARGET_DIR) \
++ KLIB="$(TARGET_DIR)" \
++ DEPMOD=$(HOST_DIR)/usr/sbin/depmod DESTDIR=$(TARGET_DIR) INSTALL_MOD_PATH=$(TARGET_DIR) \
+ LDFLAGS="" -C $(@D) install-modules
+endef
+
@@ -53,7 +53,7 @@ Index: buildroot/package/compat-wireless/compat-wireless.mk
Index: buildroot/package/compat-wireless/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/compat-wireless/Config.in 2012-11-20 11:22:54.000000000 +0100
++++ buildroot/package/compat-wireless/Config.in 2012-11-25 17:12:17.000000000 +0100
@@ -0,0 +1,22 @@
+config BR2_PACKAGE_COMPAT_WIRELESS
+ bool "compat-wireless"
@@ -79,8 +79,8 @@ Index: buildroot/package/compat-wireless/Config.in
+endif
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2012-11-20 11:14:46.000000000 +0100
-+++ buildroot/package/Config.in 2012-11-20 11:15:20.000000000 +0100
+--- buildroot.orig/package/Config.in 2012-11-25 17:12:17.000000000 +0100
++++ buildroot/package/Config.in 2012-11-25 17:12:17.000000000 +0100
@@ -180,6 +180,7 @@
menu "Hardware handling"
source "package/acpid/Config.in"
@@ -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-hacks.patch
+Index: buildroot/package/compat-wireless/compat-wireless-2012-11-18-hacks.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/compat-wireless/compat-wireless-hacks.patch 2012-11-20 11:39:37.000000000 +0100
++++ buildroot/package/compat-wireless/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
|
|
From: Gwenhael Goavec-M. <gwe...@us...> - 2012-11-25 17:56: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 502ac7dc2b57fdfcb5afaa39a9025a22e518ff1d (commit)
via 1aadcf0bd916cd1ebabe50a28f8460f006960fa7 (commit)
via bee7258e681cc650ef6727bd126a6ea09b60325f (commit)
via 900167527b55cc1bd86b0594123a3cbe56ad6865 (commit)
from db67b6beaef7a94b67cd2c0c0aacdcefdca236c3 (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 502ac7dc2b57fdfcb5afaa39a9025a22e518ff1d
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date: Sun Nov 25 18:55:49 2012 +0100
[LINUX][3.7] apf9328: add linux 3.7 and 3.7-rc6 kernel config
commit 1aadcf0bd916cd1ebabe50a28f8460f006960fa7
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date: Sun Nov 25 18:54:40 2012 +0100
[LINUX][3.7] apf9328: fix patch 0029b
commit bee7258e681cc650ef6727bd126a6ea09b60325f
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date: Sun Nov 25 18:54:01 2012 +0100
[LINUX][3.7] apf9328: correct dma clock shift register
commit 900167527b55cc1bd86b0594123a3cbe56ad6865
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date: Sun Nov 25 18:52:26 2012 +0100
[LINUX][3.7] apf9328: adapt patches 0021, 0024 from 2.6.38
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf9328/apf9328-linux-3.7-rc6.config | 1 +
...inux-2.6.38.config => apf9328-linux-3.7.config} | 24 +-
.../0021-armadeus-apf9328.patch} | 1225 ++++++++------------
...s-apf9328-add_board_to_linux_build_system.patch | 60 +
.../3.7/0025-armadeus-imx-correct_dma_shift.patch | 18 +
...ofix => 0029b-armadeus-add_csi_registers.patch} | 10 +-
6 files changed, 578 insertions(+), 760 deletions(-)
create mode 120000 buildroot/target/device/armadeus/apf9328/apf9328-linux-3.7-rc6.config
copy buildroot/target/device/armadeus/apf9328/{apf9328-linux-2.6.38.config => apf9328-linux-3.7.config} (92%)
copy patches/linux/{2.6.38/021-armadeus-apf9328.patch => 3.7/0021-armadeus-apf9328.patch} (69%)
create mode 100644 patches/linux/3.7/0024-armadeus-apf9328-add_board_to_linux_build_system.patch
create mode 100644 patches/linux/3.7/0025-armadeus-imx-correct_dma_shift.patch
rename patches/linux/3.7/{0029b-armadeus-add_csi_registers.tofix => 0029b-armadeus-add_csi_registers.patch} (78%)
diff --git a/buildroot/target/device/armadeus/apf9328/apf9328-linux-3.7-rc6.config b/buildroot/target/device/armadeus/apf9328/apf9328-linux-3.7-rc6.config
new file mode 120000
index 0000000..52e3475
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf9328/apf9328-linux-3.7-rc6.config
@@ -0,0 +1 @@
+apf9328-linux-3.7.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.38.config b/buildroot/target/device/armadeus/apf9328/apf9328-linux-3.7.config
similarity index 92%
copy from buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.38.config
copy to buildroot/target/device/armadeus/apf9328/apf9328-linux-3.7.config
index 420c38a..ee8fc64 100644
--- a/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.38.config
+++ b/buildroot/target/device/armadeus/apf9328/apf9328-linux-3.7.config
@@ -6,15 +6,17 @@ CONFIG_IKCONFIG_PROC=y
CONFIG_LOG_BUF_SHIFT=14
CONFIG_SYSFS_DEPRECATED=y
CONFIG_SYSFS_DEPRECATED_V2=y
-CONFIG_EMBEDDED=y
# CONFIG_KALLSYMS is not set
+CONFIG_EMBEDDED=y
CONFIG_SLAB=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_MX1=y
+CONFIG_ARCH_IMX_V4_V5=y
CONFIG_MACH_APF9328=y
CONFIG_IMX_APF9328_FLASH_8MB=y
CONFIG_MXC_PWM=y
@@ -66,8 +68,6 @@ CONFIG_NET_ETHERNET=y
CONFIG_DM9000=y
CONFIG_DM9000_DEBUGLEVEL=2
CONFIG_DM9000_FORCE_SIMPLE_PHY_POLL=y
-# CONFIG_NETDEV_1000 is not set
-# CONFIG_NETDEV_10000 is not set
# CONFIG_WLAN is not set
CONFIG_INPUT_FF_MEMLESS=y
CONFIG_INPUT_POLLDEV=y
@@ -83,21 +83,20 @@ CONFIG_KEYBOARD_SUNKBD=y
CONFIG_KEYBOARD_XTKBD=y
# CONFIG_INPUT_MOUSE is not set
CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_TSC2102=y
CONFIG_SERIO_RAW=y
CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
CONFIG_SERIAL_8250=m
CONFIG_SERIAL_IMX=y
CONFIG_SERIAL_IMX_CONSOLE=y
-CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
CONFIG_HW_RANDOM=y
CONFIG_I2C=y
CONFIG_I2C_CHARDEV=y
CONFIG_I2C_IMX=y
CONFIG_SPI=y
CONFIG_SPI_IMX=y
+CONFIG_SPI_SPIDEV=m
CONFIG_GPIO_SYSFS=y
-# CONFIG_MFD_SUPPORT is not set
CONFIG_VIDEO_OUTPUT_CONTROL=y
CONFIG_FB=y
CONFIG_FIRMWARE_EDID=y
@@ -114,20 +113,22 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
CONFIG_FONTS=y
-CONFIG_FONT_6x11=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
CONFIG_FONT_7x14=y
CONFIG_FONT_PEARL_8x8=y
CONFIG_FONT_ACORN_8x8=y
CONFIG_FONT_SUN8x16=y
-CONFIG_FONT_SUN12x22=y
-CONFIG_FONT_10x18=y
CONFIG_LOGO=y
# CONFIG_LOGO_LINUX_MONO is not set
# CONFIG_LOGO_LINUX_VGA16 is not set
# CONFIG_LOGO_LINUX_CLUT224 is not set
CONFIG_HIDRAW=y
CONFIG_HID_PID=y
-# CONFIG_USB_SUPPORT is not set
+CONFIG_USB_GADGET=y
+CONFIG_USB_IMX=y
+CONFIG_USB_ETH=m
+CONFIG_USB_G_NCM=m
CONFIG_ARMADEUS_DRIVERS=y
CONFIG_NEW_LEDS=y
CONFIG_LEDS_CLASS=y
@@ -152,7 +153,6 @@ CONFIG_BSD_DISKLABEL=y
CONFIG_NLS_CODEPAGE_437=y
CONFIG_NLS_CODEPAGE_850=y
CONFIG_NLS_ISO8859_1=y
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
# CONFIG_ARM_UNWIND is not set
CONFIG_CRYPTO_ECB=m
# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/patches/linux/2.6.38/021-armadeus-apf9328.patch b/patches/linux/3.7/0021-armadeus-apf9328.patch
similarity index 69%
copy from patches/linux/2.6.38/021-armadeus-apf9328.patch
copy to patches/linux/3.7/0021-armadeus-apf9328.patch
index 15adb6d..4880ce3 100644
--- a/patches/linux/2.6.38/021-armadeus-apf9328.patch
+++ b/patches/linux/3.7/0021-armadeus-apf9328.patch
@@ -1,597 +1,8 @@
-Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf9328.c
+Index: linux-3.7-rc6/arch/arm/mach-imx/apf9328_lcd_config.h
===================================================================
--- /dev/null
-+++ linux-2.6.38-rc3/arch/arm/mach-imx/apf9328.c
-@@ -0,0 +1,584 @@
-+/*
-+ * linux/arch/arm/mach-imx/apf9328.c
-+ *
-+ * Copyright (c) 2005-2011 Armadeus systems
-+ * This work is based on scb9328.c from Sascha Hauer
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ */
-+
-+#include <asm/mach/arch.h>
-+#include <asm/mach/time.h>
-+#include <mach/common.h>
-+#include <linux/device.h>
-+#include <linux/platform_device.h>
-+#include <linux/mtd/physmap.h>
-+#include <linux/init.h>
-+#include <linux/interrupt.h>
-+#include <linux/serial_8250.h>
-+#include <linux/serial.h>
-+#include <linux/spi/spi.h>
-+
-+#include <asm/system.h>
-+#include <mach/hardware.h>
-+#include <linux/irq.h>
-+#include <asm/pgtable.h>
-+#include <asm/page.h>
-+
-+#include <asm/mach/map.h>
-+#include <asm/mach-types.h>
-+#include <mach/gpio.h>
-+#include <mach/imx-uart.h>
-+#include <mach/mmc.h>
-+#include <mach/usb.h>
-+#include <mach/spi.h>
-+#include <mach/mx1.h> /* mxc_gpio_mode() */
-+#include <linux/spi/max1027.h>
-+#include <mach/ssi.h>
-+#include <mach/dma-mx1-mx2.h>
-+#include "../../../drivers/armadeus/pwm/pwm.h"
-+#include <linux/dm9000.h>
-+#include <mach/iomux-v1.h>
-+#include <mach/iomux-mx1.h>
-+#include <mach/board-apf9328.h>
-+#ifdef CONFIG_MACH_APF9328_FPGA
-+#include "../plat-mxc/include/mach/fpga.h" /* To be removed when MX1 arch is fully integrated */
-+#endif
-+#include <mach/imxfb.h>
-+#include "devices-imx1.h"
-+
-+#define IMX_FB_VIRT 0xF1000000
-+#define IMX_FB_SIZE (256*1024)
-+#ifdef CONFIG_ARMADEUS_MAX1027_MODULE
-+#define CONFIG_ARMADEUS_MAX1027 1
-+#endif
-+#ifdef CONFIG_SPI_IMX_MODULE
-+#define CONFIG_SPI_IMX 1
-+#endif
-+#ifdef CONFIG_SND_IMX_PCM_MODULE
-+#define CONFIG_SND_IMX_PCM 1
-+#endif
-+#ifdef CONFIG_IMX_BACKLIGHT_MODULE
-+#define CONFIG_IMX_BACKLIGHT 1
-+#endif
-+#ifdef CONFIG_ARMADEUS_PWM_DRIVER_MODULE
-+#define CONFIG_PWM
-+#endif
-+#ifdef CONFIG_ARMADEUS_PWM_DRIVER
-+#define CONFIG_PWM
-+#endif
-+
-+
-+static int apf9328_pins[] = {
-+ /* SPI0 */
-+ PC14_PF_SPI1_SCLK,
-+ PC16_PF_SPI1_MISO,
-+ PC17_PF_SPI1_MOSI,
-+};
-+
-+/*
-+ * APF9328 has a DM9000 Ethernet controller
-+ */
-+static struct resource dm9000_resources[] = {
-+ [0] = {
-+ .start = (APF9328_ETH_PHYS + 0),
-+ .end = (APF9328_ETH_PHYS + 1),
-+ .flags = IORESOURCE_MEM,
-+ },
-+ [1] = {
-+ .start = (APF9328_ETH_PHYS + 2),
-+ .end = (APF9328_ETH_PHYS + 3),
-+ .flags = IORESOURCE_MEM,
-+ },
-+ [2] = {
-+ .start = (APF9328_ETH_IRQ),
-+ .end = (APF9328_ETH_IRQ),
-+ .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL,
-+ },
-+};
-+
-+static struct dm9000_plat_data dm9000_setup = {
-+ .flags = DM9000_PLATF_16BITONLY
-+};
-+
-+static struct platform_device dm9000x_device = {
-+ .name = "dm9000",
-+ .id = 0,
-+ .num_resources = ARRAY_SIZE(dm9000_resources),
-+ .resource = dm9000_resources,
-+ .dev = { .platform_data = &dm9000_setup, },
-+};
-+
-+#ifdef CONFIG_MXC_PWM
-+static struct resource pwm_resources[] = {
-+ [0] = {
-+ .start = 0x00208000,
-+ .end = 0x0020800c,
-+ .flags = IORESOURCE_MEM,
-+ },
-+ [1] = {
-+ .start = (MX1_PWM_INT),
-+ .end = (MX1_PWM_INT),
-+ .flags = IORESOURCE_IRQ,
-+ },
-+};
-+
-+static int apf9328_pwm_0_init(void)
-+{
-+ /* Init Port PA[2] : PWMO*/
-+ mxc_gpio_mode(PA2_PF_PWM0);
-+ return 0;
-+}
-+
-+static int apf9328_pwm_0_exit(void)
-+{
-+ return 0;
-+}
-+
-+static struct imx_pwm_platform_data apf9328_pwm_0_data = {
-+ .init = apf9328_pwm_0_init,
-+ .exit = apf9328_pwm_0_exit,
-+};
-+
-+static struct platform_device imx_pwm_device = {
-+ .name = "imx-pwm",
-+ .id = 0,
-+ .num_resources = ARRAY_SIZE(pwm_resources),
-+ .resource = pwm_resources,
-+ .dev = {
-+ .platform_data = &apf9328_pwm_0_data,
-+ }
-+};
-+#endif /* CONFIG_MXC_PWM */
-+
-+#ifdef CONFIG_USB_GADGET_IMX
-+static int apf9328_udc_0_init(struct device * dev)
-+{
-+ mxc_gpio_mode(PC3_PF_SSI_RXFS);
-+ mxc_gpio_mode(PB20_PF_USBD_AFE);
-+ mxc_gpio_mode(PB21_PF_USBD_OE);
-+ mxc_gpio_mode(PB22_PF_USBD_RCV);
-+ mxc_gpio_mode(PB23_PF_USBD_SUSPND);
-+ mxc_gpio_mode(PB24_PF_USBD_VP);
-+ mxc_gpio_mode(PB25_PF_USBD_VM);
-+ mxc_gpio_mode(PB26_PF_USBD_VPO);
-+ mxc_gpio_mode(PB27_PF_USBD_VMO);
-+
-+ return 0;
-+}
-+
-+static void apf9328_udc_0_exit(struct device * dev)
-+{
-+}
-+
-+static struct imxusb_platform_data apf9328_udc_0_data = {
-+ .init = apf9328_udc_0_init,
-+ .exit = apf9328_udc_0_exit,
-+};
-+#endif /* CONFIG_USB_GADGET_IMX */
-+
-+// TBD GGM
-+#if 0
-+#if defined(CONFIG_SND_IMX_PCM) || defined(CONFIG_SND_IMX_PCM_MODULE)
-+int apf9328_ssi_gpio_init(struct platform_device *pdev)
-+{
-+ /* Activate SSI on PortC */
-+ mxc_gpio_mode(PC3_PF_SSI_RXFS);
-+ FMCR &= ~(SSI_RXFS_SEL);
-+ mxc_gpio_mode(PC4_PF_SSI_RXCLK);
-+ FMCR &= ~(SSI_RXCLK_SEL);
-+ mxc_gpio_mode(PC5_PF_SSI_RXDAT);
-+ FMCR &= ~(SSI_RXDAT_SEL);
-+ mxc_gpio_mode(PC6_PF_SSI_TXDAT);
-+ mxc_gpio_mode(PC7_PF_SSI_TXFS);
-+ FMCR &= ~(SSI_TXFS_SEL);
-+ mxc_gpio_mode(PC8_PF_SSI_TXCLK);
-+ FMCR &= ~(SSI_TXCLK_SEL);
-+
-+ printk("SSI pins configured\n");
-+ return 0;
-+}
-+
-+static struct imx_ssi_platform_data apf9328_ssi_pdata = {
-+ .init = apf9328_ssi_gpio_init,
-+};
-+
-+static struct resource ssi_resources[] = {
-+ [0] = {
-+ .start = (0x00218000),
-+ .end = (0x00218000 + 0x28),
-+ .flags = IORESOURCE_MEM,
-+ },
-+ [1] = {
-+ .start = SSI_TX_INT,
-+ .end = SSI_TX_INT,
-+ .flags = IORESOURCE_IRQ
-+ },
-+ [2] = {
-+ .start = SSI_TX_ERR_INT,
-+ .end = SSI_TX_ERR_INT,
-+ .flags = IORESOURCE_IRQ
-+ },
-+ [3] = {
-+ .start = SSI_RX_INT,
-+ .end = SSI_RX_INT,
-+ .flags = IORESOURCE_IRQ
-+ },
-+ [4] = {
-+ .start = SSI_RX_ERR_INT,
-+ .end = SSI_RX_ERR_INT,
-+ .flags = IORESOURCE_IRQ
-+ },
-+ [5] = {
-+ .name = "tx0",
-+ .start = DMA_REQ_SSI_T,
-+ .end = DMA_REQ_SSI_T,
-+ .flags = IORESOURCE_DMA
-+ },
-+ [6] = {
-+ .name = "rx0",
-+ .start = DMA_REQ_SSI_R,
-+ .end = DMA_REQ_SSI_R,
-+ .flags = IORESOURCE_DMA
-+ },
-+};
-+
-+static struct platform_device apf9328_ssi_device = {
-+ .name = "imx-ssi",
-+ .id = 0,
-+ .num_resources = ARRAY_SIZE(ssi_resources),
-+ .resource = ssi_resources,
-+ .dev = {
-+ .platform_data = &apf9328_ssi_pdata,
-+ }
-+};
-+
-+#endif /* defined(CONFIG_SND_IMX_PCM) || defined(CONFIG_SND_IMX_PCM_MODULE) */
-+#endif
-+
-+/* --- SERIAL RESSOURCE --- */
-+static int mxc_uart0_pins[] = {
-+ PC9_PF_UART1_CTS,
-+ PC10_PF_UART1_RTS,
-+ PC11_PF_UART1_TXD,
-+ PC12_PF_UART1_RXD
-+};
-+
-+static int uart_mxc_port0_init(struct platform_device *pdev)
-+{
-+ return mxc_gpio_setup_multiple_pins(mxc_uart0_pins, ARRAY_SIZE(mxc_uart0_pins), "UART1");
-+}
-+
-+static void uart_mxc_port0_exit(struct platform_device *pdev)
-+{
-+ mxc_gpio_release_multiple_pins(mxc_uart0_pins, ARRAY_SIZE(mxc_uart0_pins));
-+}
-+
-+static struct imxuart_platform_data uart0_pdata = {
-+ .init = uart_mxc_port0_init,
-+ .exit = uart_mxc_port0_exit,
-+ .flags = 0,
-+};
-+
-+static int mxc_uart1_pins[] = {
-+ PB28_PF_UART2_CTS,
-+ PB29_PF_UART2_RTS,
-+ PB30_PF_UART2_TXD,
-+ PB31_PF_UART2_RXD
-+};
-+
-+static int uart_mxc_port1_init(struct platform_device *pdev)
-+{
-+ return mxc_gpio_setup_multiple_pins(mxc_uart1_pins, ARRAY_SIZE(mxc_uart1_pins), "UART2");
-+}
-+
-+static void uart_mxc_port1_exit(struct platform_device *pdev)
-+{
-+ mxc_gpio_release_multiple_pins(mxc_uart1_pins, ARRAY_SIZE(mxc_uart1_pins));
-+}
-+
-+static struct imxuart_platform_data uart1_pdata = {
-+ .init = uart_mxc_port1_init,
-+ .exit = uart_mxc_port1_exit,
-+ .flags = IMXUART_HAVE_RTSCTS,
-+};
-+
-+#ifdef CONFIG_SPI_IMX
-+#define SPIDEV_CS (GPIO_PORTB + 18)
-+#define MAX1027_CS (GPIO_PORTC + 15)
-+
-+static int apf9328_spi1_cs[] = {
-+ MAX1027_CS,
-+ SPIDEV_CS,
-+};
-+
-+static const struct spi_imx_master imx_spi1_master_info = {
-+ .chipselect = apf9328_spi1_cs,
-+ .num_chipselect = ARRAY_SIZE(apf9328_spi1_cs),
-+};
-+
-+#define MCP251X_CS (GPIO_PORTB + 19)
-+#define TSC2102_CS (GPIO_PORTB + 17)
-+
-+static int apf9328_spi2_cs[] = {
-+ TSC2102_CS,
-+ MCP251X_CS,
-+};
-+
-+static const struct spi_imx_master imx_spi2_master_info = {
-+ .chipselect = apf9328_spi2_cs,
-+ .num_chipselect = ARRAY_SIZE(apf9328_spi2_cs),
-+};
-+#endif /* CONFIG_SPI_IMX */
-+
-+/*
-+ * APF9328 can have an optionnal MAX1027 ADC
-+ */
-+#ifdef CONFIG_ARMADEUS_MAX1027
-+#define IMX_SPI1_SS_PIN 15
-+#define MAX1027_EOC_INT (GPIO_PORTA | 13)
-+#define MAX1027_CNVST (GPIO_PORTA | 14)
-+
-+static int max1027_init(struct spi_device *spi)
-+{
-+ mxc_gpio_mode(MAX1027_EOC_INT | GPIO_IN | GPIO_GPIO);
-+ mxc_gpio_mode(MAX1027_CNVST | GPIO_OUT | GPIO_GPIO);
-+ return 0;
-+}
-+
-+static int max1027_exit(struct spi_device *spi)
-+{
-+ return 0;
-+}
-+
-+static struct max1027_config apf9328_max1027_config = {
-+ .conv = MAX1027_CONV_DEFAULT,
-+ .setup = MAX1027_SETUP_DEFAULT,
-+ .avg = MAX1027_AVG_DEFAULT,
-+ .cnvst_pin = (int)(MAX1027_CNVST|GPIO_PORTA),
-+ .init = max1027_init,
-+ .exit = max1027_exit
-+};
-+#endif /* CONFIG_ARMADEUS_MAX1027 */
-+
-+
-+#ifdef CONFIG_ARMADEUS_MAX1027
-+static struct spi_board_info spi_board_info[] __initdata = {
-+{
-+ .modalias = "max1027",
-+ .max_speed_hz = 8000000,
-+ .bus_num = 0, /* SPI1 */
-+ .chip_select = 0,
-+ .mode = 0,
-+ .irq = IRQ_GPIOA(MAX1027_EOC_INT),
-+ .platform_data = &apf9328_max1027_config,
-+},
-+};
-+#endif
-+
-+#ifdef CONFIG_IMX_BACKLIGHT
-+static struct imxbl_machinfo imx_bl_machinfo = {
-+ .max_intensity = 0xff,
-+ .default_intensity = 0x90,
-+ .limit_mask = 0x7f, /* When battery is low */
-+/* set_bl_intensity = put a function here if you want to overload default one, */
-+};
-+
-+static struct platform_device imxbl_device = {
-+ .name = "imx-bl",
-+ .dev = {
-+ // .parent = &imxfb_device.dev, crash kernel even if EXPORT_SYMBOL() is done in generic.c
-+ .platform_data = &imx_bl_machinfo,
-+ },
-+ .id = 0,
-+};
-+#endif /* CONFIG_IMX_BACKLIGHT */
-+
-+/*
-+ * The APF9328 can have up to 32MB NOR Flash
-+ */
-+static struct resource flash_resource = {
-+ .start = MX1_CS0_PHYS,
-+ .end = MX1_CS0_PHYS + (32 * 1024 * 1024) - 1,
-+ .flags = IORESOURCE_MEM,
-+};
-+
-+static struct physmap_flash_data apf9328_flash_data = {
-+ .width = 2,
-+};
-+
-+static struct platform_device apf9328_flash_device = {
-+ .name = "physmap-flash",
-+ .id = 0,
-+ .dev = {
-+ .platform_data = &apf9328_flash_data,
-+ },
-+ .resource = &flash_resource,
-+ .num_resources = 1,
-+};
-+
-+/*
-+ * The APF9328 can have an optionnal Xilinx's Spartan3 FPGA
-+ * directly connected to its address/data busses
-+ */
-+#ifdef CONFIG_MACH_APF9328_FPGA
-+static int apf9328_fpga_irq_init(struct platform_device *pdev)
-+{
-+ int res = 0;
-+
-+ /* TODO */
-+ set_irq_type(APF9328_FPGA_IRQ, IRQF_TRIGGER_RISING);
-+
-+ return res;
-+}
-+
-+static void apf9328_fpga_irq_exit(struct platform_device *pdev)
-+{
-+ /* TODO */
-+}
-+
-+struct fpga_irq_mng_platform_data apf9328_fpga_irq = {
-+ .init = apf9328_fpga_irq_init,
-+ .exit = apf9328_fpga_irq_exit,
-+};
-+
-+struct platform_device apf9328_ocore_irq_mng_device = {
-+ .name = "ocore_irq_mng",
-+ .id = 0,
-+ .dev = { .platform_data = &apf9328_fpga_irq, },
-+};
-+#endif /* CONFIG_MACH_APF9328_FPGA */
-+
-+#ifdef CONFIG_I2C_IMX
-+static int mxc_i2c_pins[] = {
-+ PA15_PF_I2C_SDA,
-+ PA16_PF_I2C_SCL,
-+};
-+
-+static int apf9328_i2c_init(struct platform_device *pdev)
-+{
-+ return mxc_gpio_setup_multiple_pins(mxc_i2c_pins,
-+ ARRAY_SIZE(mxc_i2c_pins), "I2C");
-+}
-+
-+static int apf9328_i2c_exit(struct platform_device *pdev)
-+{
-+ mxc_gpio_release_multiple_pins(mxc_i2c_pins, ARRAY_SIZE(mxc_i2c_pins));
-+ return 0;
-+}
-+
-+static const struct imxi2c_platform_data apf9328_i2c_data __initconst = {
-+ .bitrate = 100000,
-+ .init = apf9328_i2c_init,
-+ .exit = apf9328_i2c_exit,
-+};
-+#endif /* CONFIG_I2C_IMX */
-+
-+static struct platform_device *devices[] __initdata = {
-+ &dm9000x_device,
-+#ifdef CONFIG_PWM
-+ &imx_pwm_device,
-+#endif
-+#ifdef CONFIG_IMX_BACKLIGHT
-+ &imxbl_device,
-+#endif
-+#if defined(CONFIG_SND_IMX_PCM) || defined(CONFIG_SND_IMX_PCM_MODULE)
-+ &apf9328_ssi_device,
-+#endif
-+ &apf9328_flash_device,
-+#ifdef CONFIG_MACH_APF9328_FPGA
-+ &apf9328_ocore_irq_mng_device,
-+#endif
-+};
-+
-+static void __init apf9328_init(void)
-+{
-+ mxc_gpio_setup_multiple_pins(apf9328_pins,
-+ ARRAY_SIZE(apf9328_pins), "apf9328");
-+
-+ imx1_add_imx_uart0(&uart0_pdata); /* console */
-+ imx1_add_imx_uart1(&uart1_pdata);
-+
-+#ifdef CONFIG_SPI_IMX
-+#if defined (CONFIG_ARMADEUS_MAX1027) || defined (CONFIG_SPIDEV)
-+ mxc_gpio_mode(GPIO_PORTC | IMX_SPI1_SS_PIN | GPIO_OUT | GPIO_GPIO);
-+ mxc_gpio_mode(GPIO_PORTA | 4 | GPIO_GPIO | GPIO_OUT);
-+#endif
-+ imx1_add_spi_imx0(&imx_spi1_master_info);
-+ imx1_add_spi_imx1(&imx_spi2_master_info);
-+#if defined (CONFIG_ARMADEUS_MAX1027)
-+ spi_register_board_info(spi_board_info, ARRAY_SIZE(spi_board_info));
-+#endif
-+#endif
-+#ifdef CONFIG_I2C_IMX
-+ imx1_add_i2c_imx(&apf9328_i2c_data);
-+#endif
-+#ifdef CONFIG_USB_GADGET_IMX
-+ mxc_register_device(&imx_usb_device, &apf9328_udc_0_data);
-+#endif
-+ platform_add_devices(devices, ARRAY_SIZE(devices));
-+ apf9328_baseboard_init();
-+}
-+
-+/*
-+ * Register here the memory addresses we want to access from our drivers and
-+ * which are not already registered in generic.c
-+ */
-+
-+static struct map_desc apf9328_io_desc[] __initdata = {
-+#ifdef CONFIG_MACH_APF9328_FPGA
-+ /* FPGA Memory mapping */
-+ {
-+ .virtual = MX1_CS1_VIRT,
-+ .pfn = __phys_to_pfn(MX1_CS1_PHYS),
-+ .length = MX1_CS1_SIZE,
-+ .type = MT_DEVICE
-+ },
-+#endif
-+};
-+
-+void __init apf9328_map_io(void)
-+{
-+ mx1_map_io();
-+ iotable_init(apf9328_io_desc, ARRAY_SIZE(apf9328_io_desc));
-+
-+}
-+
-+static void __init apf9328_init_irq(void)
-+{
-+ /* Init generic IRQs */
-+ mx1_init_irq();
-+
-+ /* Init our custom IRQs (DM9000) */
-+
-+ mxc_gpio_mode(GPIO_PORTB | 14 | GPIO_IN | GPIO_GPIO);
-+ set_irq_type(APF9328_ETH_IRQ, IRQF_TRIGGER_FALLING);
-+}
-+static void __init apf9328_timer_init(void)
-+{
-+ mx1_clocks_init(32768);
-+}
-+static struct sys_timer apf9328_timer = {
-+ .init = apf9328_timer_init,
-+};
-+
-+MACHINE_START(APF9328, "Armadeus APF9328")
-+ /* Maintainer: Julien Boibessot, Armadeus */
-+ .boot_params = MX1_PHYS_OFFSET + 0x100,
-+ .map_io = apf9328_map_io,
-+ .init_irq = apf9328_init_irq,
-+ .timer = &apf9328_timer,
-+ .init_machine = apf9328_init,
-+MACHINE_END
-Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf9328_lcd_config.h
-===================================================================
---- /dev/null
-+++ linux-2.6.38-rc3/arch/arm/mach-imx/apf9328_lcd_config.h
-@@ -0,0 +1,348 @@
++++ linux-3.7-rc6/arch/arm/mach-imx/apf9328_lcd_config.h
+@@ -0,0 +1,349 @@
+/*
+ *
+ * Armadeus LCD configuration file
@@ -611,8 +22,9 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf9328_lcd_config.h
+
+#include <linux/delay.h>
+
-+#include <mach/gpio.h>
-+#include <mach/imxfb.h>
++#include <mach/iomux-v1.h>
++#include <linux/platform_data/video-imxfb.h>
++#include <mach/hardware.h>
+#ifdef CONFIG_ARCH_MX1
+# include <mach/mx1.h>
+# define LCDC_BASE_ADDR MX1_LCDC_BASE_ADDR
@@ -627,15 +39,15 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf9328_lcd_config.h
+
+#ifdef CONFIG_MACH_APF9328
+# define OPTREX_F51900_POWER_DOWN (GPIO_PORTD | 7) /* PD7_REV */
-+# define SHARP_LQ043_POWER_DOWN (GPIO_PORTD | 12) /* PD12_ACD_OE */
++# define SHARP_LQ043_POWER_DOWN (GPIO_PORTD | 12) /* PD12_ACD_OE */
+# define CONTRAST_LINE (GPIO_PORTD | 11) /* PD11_CONTRAST */
+#elif defined(CONFIG_MACH_APF27)
+# define OPTREX_F51900_POWER_DOWN (GPIO_PORTA | 24) /* PA24_REV */
-+# define SHARP_LQ043_POWER_DOWN (GPIO_PORTA | 31) /* PA31_OE_ACD */
++# define SHARP_LQ043_POWER_DOWN (GPIO_PORTA | 31) /* PA31_OE_ACD */
+# define CONTRAST_LINE (GPIO_PORTA | 30) /* PA30_CONTRAST */
+#endif
+
-+#define DEFAULT_DMA_SETTINGS (DMACR_BURST | DMACR_HM(8) | DMACR_TM(4))
++#define DEFAULT_DMA_SETTINGS (DMACR_BURST | DMACR_HM(8) | DMACR_TM(4))
+
+#ifdef CONFIG_MACH_APF9328
+static int apf9328_fb_init(struct platform_device *pdev);
@@ -654,7 +66,7 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf9328_lcd_config.h
+{
+ u32 isr;
+
-+ printk(KERN_DEBUG "%s: %s, %s\n", __func__, on ? "on":"off", lcd_name);
++ printk(KERN_DEBUG "%s: %s, %s\n", __func__, on ? "on" : "off", lcd_name);
+ isr = 0;
+
+ if (!strcmp("Optrex-FS1900", lcd_name)) {
@@ -670,7 +82,7 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf9328_lcd_config.h
+ enabling the display */
+ /* Waits end of current frame */
+ isr = readl(MXC_IO_ADDRESS(LCDC_BASE_ADDR) + 0x40);
-+ printk("isr %08x\n", isr);
++ printk(KERN_DEBUG "isr %08x\n", isr);
+ do {
+ isr = readl(MXC_IO_ADDRESS(LCDC_BASE_ADDR) + 0x40);
+ pr_debug("isr %08x\n", isr);
@@ -904,123 +316,390 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf9328_lcd_config.h
+ mxc_gpio_mode(PD10_PF_SPL_SPR);
+ }
+
-+ /* GPIO Function for CONTRAST pin */
-+ gpio_set_value(CONTRAST_LINE, 0); /* Initializes it Low */
-+ mxc_gpio_mode(CONTRAST_LINE | GPIO_OUT /*| GPIO_GPIO*/ | 1<<16 | 3<<10);
-+
-+ return 0;
-+}
-+
-+static void apf9328_init_lcd(void)
-+{
-+ char *opt, *name = NULL, *options = NULL;
++ /* GPIO Function for CONTRAST pin */
++ gpio_set_value(CONTRAST_LINE, 0); /* Initializes it Low */
++ mxc_gpio_mode(CONTRAST_LINE | GPIO_OUT /*| GPIO_GPIO*/ | 1<<16 | 3<<10);
++
++ return 0;
++}
++
++static void apf9328_init_lcd(void)
++{
++ char *opt, *name = NULL, *options = NULL;
++
++ if (fb_get_options("imxfb", &options))
++ goto end;
++
++ if (!options || !*options)
++ goto end;
++
++ while ((opt = strsep(&options, ",")) != NULL) {
++ if (!*opt)
++ continue;
++ else
++ name = opt;
++ }
++
++ apf_set_lcd_name(name);
++ apf_fb_set_default_contrast();
++
++ imx1_add_imx_fb(&apf_fb_data);
++end:
++ return;
++}
++#endif /* CONFIG_MACH_APF9328 */
++
++#endif /* CONFIG_FB_IMX */
++
++#endif /* APF_LCD_CONFIG_H */
+Index: linux-3.7-rc6/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
+@@ -20,7 +20,16 @@
+ #include <linux/dm9000.h>
+ #include <linux/gpio.h>
+ #include <linux/i2c.h>
++#include <linux/irq.h>
++#include <linux/serial_8250.h>
++#include <linux/serial.h>
++#include <linux/spi/spi.h>
++
++#include <asm/system.h>
++#include <asm/pgtable.h>
++#include <asm/page.h>
+
++#include <asm/mach/map.h>
+ #include <asm/mach-types.h>
+ #include <asm/mach/arch.h>
+ #include <asm/mach/time.h>
+@@ -30,6 +39,43 @@
+ #include <mach/iomux-mx1.h>
+
+ #include "devices-imx1.h"
++#include <linux/gpio.h>
++#include <linux/platform_data/serial-imx.h>
++/*#include <mach/mmc.h>
++#include <mach/usb.h>*/
++#include <linux/platform_data/spi-imx.h>
++#include <mach/mx1.h> /* mxc_gpio_mode() */
++//#include <mach/ssi.h>
++//#include <mach/dma-mx1-mx2.h>
++#include "../../../drivers/armadeus/pwm/pwm.h"
++#include <mach/iomux-v1.h>
++#include <mach/board-apf9328.h>
++#include <linux/platform_data/video-imxfb.h>
++
++#define IMX_FB_VIRT 0xF1000000
++#define IMX_FB_SIZE (256*1024)
++#ifdef CONFIG_ARMADEUS_MAX1027_MODULE
++#define CONFIG_ARMADEUS_MAX1027 1
++#endif
++#ifdef CONFIG_SPI_IMX_MODULE
++#define CONFIG_SPI_IMX 1
++#endif
++#ifdef CONFIG_SND_IMX_PCM_MODULE
++#define CONFIG_SND_IMX_PCM 1
++#endif
++#ifdef CONFIG_IMX_BACKLIGHT_MODULE
++#define CONFIG_IMX_BACKLIGHT 1
++#endif
++#ifdef CONFIG_ARMADEUS_PWM_DRIVER_MODULE
++#define CONFIG_PWM
++#endif
++#ifdef CONFIG_ARMADEUS_PWM_DRIVER
++#define CONFIG_PWM
++#endif
++
++#ifdef CONFIG_ARMADEUS_MAX1027
++#include <linux/spi/max1027.h>
++#endif
+
+ static const int apf9328_pins[] __initconst = {
+ /* UART1 */
+@@ -42,10 +88,225 @@ static const int apf9328_pins[] __initco
+ PB29_PF_UART2_RTS,
+ PB30_PF_UART2_TXD,
+ PB31_PF_UART2_RXD,
++#ifdef CONFIG_I2C_IMX
+ /* I2C */
+ PA15_PF_I2C_SDA,
+ PA16_PF_I2C_SCL,
++#endif
++#ifdef CONFIG_MXC_PWM
++ PA2_PF_PWM0,
++#endif
++ /* SPI0 */
++ PC14_PF_SPI1_SCLK,
++ PC16_PF_SPI1_MISO,
++ PC17_PF_SPI1_MOSI,
++/*#ifdef CONFIG_USB_GADGET_IMX
++ PC3_PF_SSI_RXFS,
++ PB20_PF_USBD_AFE,
++ PB21_PF_USBD_OE,
++ PB22_PF_USBD_RCV,
++ PB23_PF_USBD_SUSPND,
++ PB24_PF_USBD_VP,
++ PB25_PF_USBD_VM,
++ PB26_PF_USBD_VPO,
++ PB27_PF_USBD_VMO,
++#endif*/
++};
++
++#ifdef CONFIG_USB_IMX
++static int apf9328_udc_0_init(struct device *dev)
++{
++ mxc_gpio_mode(PC3_PF_SSI_RXFS);
++ mxc_gpio_mode(PB20_PF_USBD_AFE);
++ mxc_gpio_mode(PB21_PF_USBD_OE);
++ mxc_gpio_mode(PB22_PF_USBD_RCV);
++ mxc_gpio_mode(PB23_PF_USBD_SUSPND);
++ mxc_gpio_mode(PB24_PF_USBD_VP);
++ mxc_gpio_mode(PB25_PF_USBD_VM);
++ mxc_gpio_mode(PB26_PF_USBD_VPO);
++ mxc_gpio_mode(PB27_PF_USBD_VMO);
++
++ return 0;
++}
++
++static void apf9328_udc_0_exit(struct device *dev)
++{
++}
++
++static struct imxusb_platform_data apf9328_udc_0_data = {
++ .init = apf9328_udc_0_init,
++ .exit = apf9328_udc_0_exit,
++};
++#endif /* CONFIG_USB_GADGET_IMX */
++
++/* TBD GGM */
++#if 0
++#if defined(CONFIG_SND_IMX_PCM) || defined(CONFIG_SND_IMX_PCM_MODULE)
++int apf9328_ssi_gpio_init(struct platform_device *pdev)
++{
++ /* Activate SSI on PortC */
++ mxc_gpio_mode(PC3_PF_SSI_RXFS);
++ FMCR &= ~(SSI_RXFS_SEL);
++ mxc_gpio_mode(PC4_PF_SSI_RXCLK);
++ FMCR &= ~(SSI_RXCLK_SEL);
++ mxc_gpio_mode(PC5_PF_SSI_RXDAT);
++ FMCR &= ~(SSI_RXDAT_SEL);
++ mxc_gpio_mode(PC6_PF_SSI_TXDAT);
++ mxc_gpio_mode(PC7_PF_SSI_TXFS);
++ FMCR &= ~(SSI_TXFS_SEL);
++ mxc_gpio_mode(PC8_PF_SSI_TXCLK);
++ FMCR &= ~(SSI_TXCLK_SEL);
++
++ printk(KERN_DEBUG "SSI pins configured\n");
++ return 0;
++}
++
++static struct imx_ssi_platform_data apf9328_ssi_pdata = {
++ .init = apf9328_ssi_gpio_init,
++};
++
++static struct resource ssi_resources[] = {
++ [0] = {
++ .start = (0x00218000),
++ .end = (0x00218000 + 0x28),
++ .flags = IORESOURCE_MEM,
++ },
++ [1] = {
++ .start = SSI_TX_INT,
++ .end = SSI_TX_INT,
++ .flags = IORESOURCE_IRQ
++ },
++ [2] = {
++ .start = SSI_TX_ERR_INT,
++ .end = SSI_TX_ERR_INT,
++ .flags = IORESOURCE_IRQ
++ },
++ [3] = {
++ .start = SSI_RX_INT,
++ .end = SSI_RX_INT,
++ .flags = IORESOURCE_IRQ
++ },
++ [4] = {
++ .start = SSI_RX_ERR_INT,
++ .end = SSI_RX_ERR_INT,
++ .flags = IORESOURCE_IRQ
++ },
++ [5] = {
++ .name = "tx0",
++ .start = DMA_REQ_SSI_T,
++ .end = DMA_REQ_SSI_T,
++ .flags = IORESOURCE_DMA
++ },
++ [6] = {
++ .name = "rx0",
++ .start = DMA_REQ_SSI_R,
++ .end = DMA_REQ_SSI_R,
++ .flags = IORESOURCE_DMA
++ },
++};
++
++static struct platform_device apf9328_ssi_device = {
++ .name = "imx-ssi",
++ .id = 0,
++ .num_resources = ARRAY_SIZE(ssi_resources),
++ .resource = ssi_resources,
++ .dev = {
++ .platform_data = &apf9328_ssi_pdata,
++ }
++};
++
++#endif /* defined(CONFIG_SND_IMX_PCM) || defined(CONFIG_SND_IMX_PCM_MODULE) */
++#endif
+
-+ if (fb_get_options("imxfb", &options))
-+ goto end;
++#ifdef CONFIG_SPI_IMX
++#define SPIDEV_CS (GPIO_PORTB + 18)
++#define MAX1027_CS (GPIO_PORTC + 15)
+
-+ if (!options || !*options)
-+ goto end;
++static int apf9328_spi1_cs[] = {
++ MAX1027_CS,
++ SPIDEV_CS,
++};
+
-+ while ((opt = strsep(&options, ",")) != NULL) {
-+ if (!*opt)
-+ continue;
-+ else
-+ name = opt;
-+ }
++static const struct spi_imx_master imx_spi1_master_info = {
++ .chipselect = apf9328_spi1_cs,
++ .num_chipselect = ARRAY_SIZE(apf9328_spi1_cs),
++};
+
-+ apf_set_lcd_name(name);
-+ apf_fb_set_default_contrast();
++#define MCP251X_CS (GPIO_PORTB + 19)
++#define TSC2102_CS (GPIO_PORTB + 17)
+
-+ imx1_add_imx_fb(&apf_fb_data);
-+end:
-+ return;
-+}
-+#endif /* CONFIG_MACH_APF9328 */
++static int apf9328_spi2_cs[] = {
++ TSC2102_CS,
++ MCP251X_CS,
++};
+
-+#endif /* CONFIG_FB_IMX */
++static const struct spi_imx_master imx_spi2_master_info = {
++ .chipselect = apf9328_spi2_cs,
++ .num_chipselect = ARRAY_SIZE(apf9328_spi2_cs),
++};
++#endif /* CONFIG_SPI_IMX */
+
-+#endif /* APF_LCD_CONFIG_H */
-Index: linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/board-apf9328.h
-===================================================================
---- /dev/null
-+++ linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/board-apf9328.h
-@@ -0,0 +1,71 @@
+/*
-+ * linux/include/asm-arm/arch-imx/apf9328.h
-+ *
-+ * Copyright (c) 2005 Armadeus
-+ * This work is based on scb9328.h from Sascha Hauer
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
++ * APF9328 can have an optionnal MAX1027 ADC
+ */
++#ifdef CONFIG_ARMADEUS_MAX1027
++#define IMX_SPI1_SS_PIN 15
++#define MAX1027_EOC_INT (GPIO_PORTA | 13)
++#define MAX1027_CNVST (GPIO_PORTA | 14)
+
-+#ifndef __ASM_ARCH_APF9328_H
-+#define __ASM_ARCH_APF9328_H
++static int max1027_init(struct spi_device *spi)
++{
++ mxc_gpio_mode(MAX1027_EOC_INT | GPIO_IN | GPIO_GPIO);
++ mxc_gpio_mode(MAX1027_CNVST | GPIO_OUT | GPIO_GPIO);
++ return 0;
++}
+
-+/* ------------------------------------------------------------------------ */
-+/* Memory Map for the APF9328 Board */
-+/* ------------------------------------------------------------------------ */
++static int max1027_exit(struct spi_device *spi)
++{
++ return 0;
++}
+
-+/* Ethernet */
-+#define IMX_CS4_VIRT 0xed000000
-+#define IMX_CS0_VIRT 0xe8000000
-+#define IMX_CS1_VIRT 0xea000000
-+#define APF9328_ETH_VIRT ( IMX_CS4_VIRT + 0x00C00000 )
-+#define APF9328_ETH_PHYS ( MX1_CS4_PHYS + 0x00C00000 )
-+#define APF9328_ETH_IRQ ( IRQ_GPIOB(14) )
++static struct max1027_config apf9328_max1027_config = {
++ .conv = MAX1027_CONV_DEFAULT,
++ .setup = MAX1027_SETUP_DEFAULT,
++ .avg = MAX1027_AVG_DEFAULT,
++ .cnvst_pin = (int)(MAX1027_CNVST|GPIO_PORTA),
++ .init = max1027_init,
++ .exit = max1027_exit
++};
++#endif /* CONFIG_ARMADEUS_MAX1027 */
+
-+/* FLASH */
-+#define APF9328_FLASH_PHYS MX1_CS0_PHYS
-+#ifdef CONFIG_IMX_APF9328_FLASH_8MB
-+# define APF9328_FLASH_SIZE 0x00800000
-+#endif
-+#ifdef CONFIG_IMX_APF9328_FLASH_16MB
-+# define APF9328_FLASH_SIZE 0x01000000
++#ifdef CONFIG_ARMADEUS_MAX1027
++static struct spi_board_info spi_board_info[] __initdata = {
++{
++ .modalias = "max1027",
++ .max_speed_hz = 8000000,
++ .bus_num = 0, /* SPI1 */
++ .chip_select = 0,
++ .mode = 0,
++ .irq = IRQ_GPIOA(MAX1027_EOC_INT),
++ .platform_data = &apf9328_max1027_config,
++},
++};
+#endif
-+#define APF9328_FLASH_BASE IMX_CS0_VIRT
-+
-+/* FPGA */
-+#define ARMADEUS_FPGA_BASE_ADDR_VIRT ( APF9328_FPGA_VIRT )
-+#define ARMADEUS_FPGA_BASE_ADDR_PHYS ( APF9328_FPGA_PHYS )
-+#define ARMADEUS_FPGA_IRQ ( APF9328_FPGA_IRQ )
-+
-+#define APF9328_FPGA_VIRT ( IMX_CS1_VIRT )
-+#define APF9328_FPGA_PHYS ( MX1_CS1_PHYS )
-+#define APF9328_FPGA_IRQ ( IRQ_GPIOA(1) )
-+
-+#define CLK32 32768
+
-+#ifndef __ASSEMBLY__
-+/*
-+ * The APF9328 module needs a baseboard to work. After basic initializing
-+ * its own devices, it calls baseboard's init function.
-+ * TODO: Add your own baseboard init function and call it from
-+ * inside apf9328_init().
-+ *
-+ * This example here is for the DevLight/Full development boards. Refer apf9328-dev.c.
-+ */
++#ifdef CONFIG_IMX_BACKLIGHT
++static struct imxbl_machinfo imx_bl_machinfo = {
++ .max_intensity = 0xff,
++ .default_intensity = 0x90,
++ .limit_mask = 0x7f, /* When battery is low */
++/* set_bl_intensity = put a function here if you want to overload default one, */
++};
+
-+extern void apf9328_baseboard_init(void);
++static struct platform_device imxbl_device = {
++ .name = "imx-bl",
++ .dev = {
++ // .parent = &imxfb_device.dev, crash kernel even if EXPORT_SYMBOL() is done in generic.c
++ .platform_data = &imx_bl_machinfo,
++ },
++ .id = 0,
+ };
++#endif /* CONFIG_IMX_BACKLIGHT */
+
+ /*
+ * The APF9328 can have up to 32MB NOR Flash
+@@ -106,11 +367,19 @@ static const struct imxuart_platform_dat
+ .flags = IMXUART_HAVE_RTSCTS,
+ };
+
++#ifdef CONFIG_I2C_IMX
+ static const struct imxi2c_platform_data apf9328_i2c_data __initconst = {
+ .bitrate = 100000,
+ };
++#endif /* CONFIG_I2C_IMX */
+
+ static struct platform_device *devices[] __initdata = {
++#ifdef CONFIG_IMX_BACKLIGHT
++ &imxbl_device,
+#endif
-+
-+#endif /* __ASM_ARCH_APF9328_H */
-Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf9328-dev.c
++#if defined(CONFIG_SND_IMX_PCM) || defined(CONFIG_SND_IMX_PCM_MODULE)
++ &apf9328_ssi_device,
++#endif
+ &apf9328_flash_device,
+ &dm9000x_device,
+ };
+@@ -126,11 +395,31 @@ static void __init apf9328_init(void)
+ imx1_add_imx_uart0(NULL);
+ imx1_add_imx_uart1(&uart1_pdata);
+
++#ifdef CONFIG_SPI_IMX
++#if defined(CONFIG_ARMADEUS_MAX1027) || defined(CONFIG_SPIDEV)
++ mxc_gpio_mode(GPIO_PORTC | IMX_SPI1_SS_PIN | GPIO_OUT | GPIO_GPIO);
++ mxc_gpio_mode(GPIO_PORTB | 18 | GPIO_GPIO | GPIO_OUT);
++#endif
++ imx1_add_spi_imx0(&imx_spi1_master_info);
++ imx1_add_spi_imx1(&imx_spi2_master_info);
++#if defined(CONFIG_ARMADEUS_MAX1027)
++ spi_register_board_info(spi_board_info, ARRAY_SIZE(spi_board_info));
++#endif
++#endif
++#ifdef CONFIG_I2C_IMX
+ imx1_add_imx_i2c(&apf9328_i2c_data);
++#endif
++#ifdef CONFIG_USB_IMX
++ imx1_add_udc(&apf9328_udc_0_data);
++#endif
++/*#ifdef CONFIG_MXC_PWM
++ imx1_add_mxc_pwm();
++#endif*/
+
+ dm9000_resources[2].start = gpio_to_irq(IMX_GPIO_NR(2, 14));
+ dm9000_resources[2].end = gpio_to_irq(IMX_GPIO_NR(2, 14));
+ platform_add_devices(devices, ARRAY_SIZE(devices));
++ apf9328_baseboard_init();
+ }
+
+ static void __init apf9328_timer_init(void)
+Index: linux-3.7-rc6/arch/arm/mach-imx/apf9328-dev.c
===================================================================
--- /dev/null
-+++ linux-2.6.38-rc3/arch/arm/mach-imx/apf9328-dev.c
-@@ -0,0 +1,325 @@
++++ linux-3.7-rc6/arch/arm/mach-imx/apf9328-dev.c
+@@ -0,0 +1,309 @@
+/*
+ * apf9328-dev.c
+ * Declares hardware present on APF9328_DevLight or DevFull boards
@@ -1050,8 +729,8 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf9328-dev.c
+#include <linux/spi/spi.h>
+#include <linux/spi/spidev.h>
+#include <mach/common.h>
-+#include <mach/gpio.h>
-+#include <linux/spi/tsc2102.h>
++#include <linux/gpio.h>
++/*#include <linux/spi/tsc2102.h>*/
+#include <linux/can/platform/mcp251x.h>
+
+#include <asm/system.h>
@@ -1063,21 +742,20 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf9328-dev.c
+#include <asm/mach/map.h>
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
-+#include <mach/imx-uart.h>
-+#include <mach/mmc.h>
-+#include <mach/usb.h>
-+#include <mach/spi.h>
++#include <linux/platform_data/serial-imx.h>
++//#include <mach/mmc.h>
++//#include <mach/usb.h>
++#include <linux/platform_data/spi-imx.h>
+#include <mach/mx1.h> /* mxc_gpio_mode() */
-+#include <mach/gpio.h>
-+//#include <mach/imx-alsa.h>
-+//#include <linux/usb/isp116x.h>
-+#include <linux/usb/isp1760.h>
-+#include <mach/ssi.h>
++/*#include <mach/imx-alsa.h>
++#include <linux/usb/isp116x.h>
++#include <linux/usb/isp1760.h>*/
++//#include <mach/ssi.h>
+#include <mach/iomux-mx1.h>
+#include <mach/iomux-v1.h>
+#include "devices-imx1.h"
-+#include <mach/imxfb.h>
-+//#include "generic.h"
++#include <linux/platform_data/video-imxfb.h>
++/*#include "generic.h"*/
+
+
+#ifdef CONFIG_SPI_TSC2102_MODULE
@@ -1135,8 +813,8 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf9328-dev.c
+#ifdef CONFIG_SPI_TSC2102
+#define TSC2102_CS_GPIOB 17
+#define TSC2102_INT_GPIOD 8
-+#define SPI2_RXD_SEL (1<<8)
-+#define FMCR MX1_IO_ADDRESS(MX1_SCM_BASE_ADDR)+4
++#define SPI2_RXD_SEL (1 << 8)
++#define FMCR (MX1_IO_ADDRESS(MX1_SCM_BASE_ADDR)+4)
+static int tsc2102_init_gpio(void)
+{
+ /* Activate SPI2 port ---- */
@@ -1144,13 +822,14 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf9328-dev.c
+ mxc_gpio_mode(PD7_AIN_SPI2_SCLK);
+ mxc_gpio_mode(PD10_AIN_SPI2_TXD);
+ mxc_gpio_mode(PD9_AOUT_SPI2_RXD);
-+ __raw_writel(__raw_readl(FMCR)|SPI2_RXD_SEL,FMCR);
++ __raw_writel(__raw_readl(FMCR)|SPI2_RXD_SEL, FMCR);
+
+ /* PortD 8 is used as PINTDAV interrupt */
+ mxc_gpio_mode(GPIO_PORTD | TSC2102_INT_GPIOD | GPIO_IN | GPIO_GPIO);
-+ set_irq_type(IRQ_GPIOD(TSC2102_INT_GPIOD), IRQF_TRIGGER_FALLING);
++ /*set_irq_type(IRQ_GPIOD(TSC2102_INT_GPIOD), IRQF_TRIGGER_FALLING);*/
++ irq_set_irq_type(IRQ_GPIOD(TSC2102_INT_GPIOD), IRQ_TYPE_EDGE_FALLING);
+
-+ printk("TSC2102 GPIOs initialized\n");
++ printk(KERN_DEBUG "TSC2102 GPIOs initialized\n");
+ return 0;
+}
+
@@ -1191,9 +870,9 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf9328-dev.c
+{
+ /* PortB 19 is used as chip select */
+ if (command == SPI_CS_DEASSERT)
-+ DR(1) |= 1<< CAN_MPC251X_CS_GPIOB;
++ DR(1) |= 1 << CAN_MPC251X_CS_GPIOB;
+ else
-+ DR(1) &= ~(1<< CAN_MPC251X_CS_GPIOB);
++ DR(1) &= ~(1 << CAN_MPC251X_CS_GPIOB);
+}
+
+static struct spi_imx_chip mcp251X_hw = {
@@ -1222,38 +901,22 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf9328-dev.c
+ .oscillator_frequency = 16000000,
+ .model = CAN_MCP251X_MCP2515,
+ .board_specific_setup = NULL,
-+ //.device_reset = NULL,
++ /*.device_reset = NULL,*/
+ .transceiver_enable = NULL,
+};
+
+#endif /* CONFIG_CAN_MCP251X */
+
-+/*
-+ * APF9328 CONFIG SPIDEV
-+ */
-+#ifdef CONFIG_SPI_SPIDEV
-+static int spidev_init_gpio(void)
-+{
-+ return 0;
-+}
-+
-+static struct spidev_platform_data apf9328_spidev_config = {
-+ .init = spidev_init_gpio,
-+};
-+
-+#endif /* CONFIG_SPI_SPIDEV */
-+
-+
+static struct spi_board_info spi_dev_board_info[] __initdata = {
+#ifdef CONFIG_SPI_TSC2102
+{
+ .modalias = "tsc210x",
-+// .controller_data= &tsc2102_hw,
++/* .controller_data= &tsc2102_hw,*/
+ .max_speed_hz = 8000000,
+ .bus_num = 1, /* SPI2 */
+ .irq = IRQ_GPIOD(TSC2102_INT_GPIOD),
+ .chip_select = 0,
-+ .mode = 0,
++ .mode = 0,
+ .platform_data = &apf9328_tsc2102_config,
+},
+#endif
@@ -1261,11 +924,11 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf9328-dev.c
+{
+ .modalias = "mcp251x",
+ .max_speed_hz = 8000000, /* 8MHz */
-+ //.controller_data= &mcp251X_hw,
++ /*.controller_data= &mcp251X_hw,*/
+ .bus_num = 1,
+ .mode = SPI_MODE_0,
+ .chip_select = 1,
-+ .irq = IRQ_GPIOC( CAN_MPC251X_INT_GPIOC ),
++ .irq = IRQ_GPIOC(CAN_MPC251X_INT_GPIOC),
+ .platform_data = &apf9328_mcp251x_config,
+},
+#endif
@@ -1276,7 +939,6 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf9328-dev.c
+ .bus_num = 0, /* SPI1 */
+ .mode = SPI_MODE_0,
+ .chip_select = 1,
-+ .platform_data = &apf9328_spidev_config,
+},
+#endif /* CONFIG_SPI_SPIDEV */
+};
@@ -1315,7 +977,7 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf9328-dev.c
+
+void __init apf9328_baseboard_init(void)
+{
-+ printk(" APF9328_Dev\n");
++ printk(KERN_INFO " APF9328_Dev\n");
+
+ /* Initializes serial port 2 GPIOs */
+ mxc_gpio_mode(PB30_PF_UART2_TXD);
@@ -1330,19 +992,96 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf9328-dev.c
+ mcp251X_init_gpio();
+#endif
+#ifdef CONFIG_I2C
-+ i2c_register_board_info(0,apf9328_i2c_devices_bus0,
++ i2c_register_board_info(0, apf9328_i2c_devices_bus0,
+ ARRAY_SIZE(apf9328_i2c_devices_bus0));
+#endif
+#ifdef CONFIG_ARMADEUS_ISP1761
+ mxc_gpio_mode(ISP1761_GPIO_IRQ | GPIO_IN | GPIO_GPIO);
-+ set_irq_type(ISP1761_IRQ, IRQF_TRIGGER_FALLING);
++ /*set_irq_type(ISP1761_IRQ, IRQF_TRIGGER_FALLING);*/
++ irq_set_irq_type(ISP1761_IRQ, IRQ_TYPE_EDGE_FALLING);
+#endif
+ platform_add_devices(devices, ARRAY_SIZE(devices));
+
-+#if defined (CONFIG_SPI_TSC2102) || defined (CONFIG_CAN_MCP251X) || defined(CONFIG_SPI_SPIDEV)
++#if defined(CONFIG_SPI_TSC2102) || defined(CONFIG_CAN_MCP251X) || defined(CONFIG_SPI_SPIDEV)
+ mxc_gpio_mode(GPIO_PORTB | 19 | GPIO_GPIO | GPIO_OUT);
+ mxc_gpio_mode(GPIO_PORTB | 17 | GPIO_GPIO | GPIO_OUT);
+ spi_register_board_info(spi_dev_board_info, ARRAY_SIZE(spi_dev_board_info));
+#endif
+}
+
+Index: linux-3.7-rc6/arch/arm/plat-mxc/include/mach/board-apf9328.h
+===================================================================
+--- /dev/null
++++ linux-3.7-rc6/arch/arm/plat-mxc/include/mach/board-apf9328.h
+@@ -0,0 +1,71 @@
++/*
++ * linux/include/asm-arm/arch-imx/apf9328.h
++ *
++ * Copyright (c) 2005 Armadeus
++ * This work is based on scb9328.h from Sascha Hauer
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ *
++ */
++
++#ifndef __ASM_ARCH_APF9328_H
++#define __ASM_ARCH_APF9328_H
++
++/* ------------------------------------------------------------------------ */
++/* Memory Map for the APF9328 Board */
++/* ------------------------------------------------------------------------ */
++
++/* Ethernet */
++#define IMX_CS4_VIRT 0xed000000
++#define IMX_CS0_VIRT 0xe8000000
++#define IMX_CS1_VIRT 0xea000000
++#define APF9328_ETH_VIRT (IMX_CS4_VIRT + 0x00C00000)
++#define APF9328_ETH_PHYS (MX1_CS4_PHYS + 0x00C00000)
++#define APF9328_ETH_IRQ (IRQ_GPIOB(14))
++
++/* FLASH */
++#define APF9328_FLASH_PHYS MX1_CS0_PHYS
++#ifdef CONFIG_IMX_APF9328_FLASH_8MB
++# define APF9328_FLASH_SIZE 0x00800000
++#endif
++#ifdef CONFIG_IMX_APF9328_FLASH_16MB
++# define APF9328_FLASH_SIZE 0x01000000
++#endif
++#define APF9328_FLASH_BASE IMX_CS0_VIRT
++
++/* FPGA */
++#define ARMADEUS_FPGA_BASE_ADDR_VIRT (APF9328_FPGA_VIRT)
++#define ARMADEUS_FPGA_BASE_ADDR_PHYS (APF9328_FPGA_PHYS)
++#define ARMADEUS_FPGA_IRQ (APF9328_FPGA_IRQ)
++
++#define APF9328_FPGA_VIRT (IMX_CS1_VIRT)
++#define APF9328_FPGA_PHYS (MX1_CS1_PHYS)
++#define APF9328_FPGA_IRQ (IRQ_GPIOA(1))
++
++#define CLK32 32768
++
++#ifndef __ASSEMBLY__
++/*
++ * The APF9328 module needs a baseboard to work. After basic initializing
++ * its own devices, it calls baseboard's init function.
++ * TODO: Add your own baseboard init function and call it from
++ * inside apf9328_init().
++ *
++ * This example here is for the DevLight/Full development boards. Refer apf9328-dev.c.
++ */
++
++extern void apf9328_baseboard_init(void);
++#endif
++
++#endif /* __ASM_ARCH_APF9328_H */
diff --git a/patches/linux/3.7/0024-armadeus-apf9328-add_board_to_linux_build_system.patch b/patches/linux/3.7/0024-armadeus-apf9328-add_board_to_linux_build_system.patch
new file mode 100644
index 0000000..15f3b75
--- /dev/null
+++ b/patches/linux/3.7/0024-armadeus-apf9328-add_board_to_linux_build_system.patch
@@ -0,0 +1,60 @@
+Index: linux-3.7-rc6/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
+ bool "APF9328"
+ select IMX_HAVE_PLATFORM_IMX_I2C
+ select IMX_HAVE_PLATFORM_IMX_UART
++ select IMX_HAVE_PLATFORM_SPI_IMX
++ select IMX_HAVE_PLATFORM_IMX_FB
++ select IMX_HAVE_PLATFORM_MXC_PWM
++ select IMX_HAVE_PLATFORM_IMX_UDC
++ select SERIAL_IMX_UART1
+ select SOC_IMX1
+ help
+ Say Yes here if you are using the Armadeus APF9328 development board
+
++choice
++ prompt "Flash available on board"
++ depends on MACH_APF9328
++ default IMX_APF9328_FLASH_16MB
++
++config IMX_APF9328_FLASH_8MB
++ bool "8MB"
++
++config IMX_APF9328_FLASH_16MB
++ bool "16MB"
++
++endchoice
++
++choice
++ prompt "Baseboard"
++ depends on MACH_APF9328
++ default MACH_APF9328_DEV
++
++config MACH_APF9328_DEV
++ prompt "DevLight/DevFull"
++ bool
++ help
++ This selects the APF9328_DevLight/DevFull as baseboard. You have
++ to manually activates the devices you want to use if you have a
++ DevFull.
++
++endchoice
++
+ comment "MX21 platforms:"
+
+ config MACH_MX21ADS
+Index: linux-3.7-rc6/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
+ obj-$(CONFIG_ARCH_MX1ADS) += mach-mx1ads.o
+ obj-$(CONFIG_MACH_SCB9328) += mach-scb9328.o
+ obj-$(CONFIG_MACH_APF9328) += mach-apf9328.o
++obj-$(CONFIG_MACH_APF9328_DEV) += apf9328-dev.o
+
+ # i.MX21 based machines
+ obj-$(CONFIG_MACH_MX21ADS) += mach-mx21ads.o
diff --git a/patches/linux/3.7/0025-armadeus-imx-correct_dma_shift.patch b/patches/linux/3.7/0025-armadeus-imx-correct_dma_shift.patch
new file mode 100644
index 0000000..1c9a4e0
--- /dev/null
+++ b/patches/linux/3.7/0025-armadeus-imx-correct_dma_shift.patch
@@ -0,0 +1,18 @@
+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
+===================================================================
+--- 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
+ 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));
+- clk[dma_gate] = imx_clk_gate("dma_gate", "hclk", SCM_GCCR, 4);
++ clk[dma_gate] = imx_clk_gate("dma_gate", "hclk", SCM_GCCR, 3);
+ clk[csi_gate] = imx_clk_gate("csi_gate", "hclk", SCM_GCCR, 2);
+ clk[mma_gate] = imx_clk_gate("mma_gate", "hclk", SCM_GCCR, 1);
+ clk[usbd_gate] = imx_clk_gate("usbd_gate", "clk48m", SCM_GCCR, 0);
diff --git a/patches/linux/3.7/0029b-armadeus-add_csi_registers.tofix b/patches/linux/3.7/0029b-armadeus-add_csi_registers.patch
similarity index 78%
rename from patches/linux/3.7/0029b-armadeus-add_csi_registers.tofix
rename to patches/linux/3.7/0029b-armadeus-add_csi_registers.patch
index 7b19c47..7f3b277 100644
--- a/patches/linux/3.7/0029b-armadeus-add_csi_registers.tofix
+++ b/patches/linux/3.7/0029b-armadeus-add_csi_registers.patch
@@ -1,8 +1,8 @@
-Index: linux-3.3.5/drivers/media/video/mx1_camera.c
+Index: linux-3.7-rc6/drivers/media/platform/soc_camera/mx1_camera.c
===================================================================
---- linux-3.3.5.orig/drivers/media/video/mx1_camera.c
-+++ linux-3.3.5/drivers/media/video/mx1_camera.c
-@@ -49,9 +49,13 @@
+--- 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
+@@ -50,9 +50,13 @@
* CSI registers
*/
#define CSICR1 0x00 /* CSI Control Register 1 */
@@ -16,7 +16,7 @@ Index: linux-3.3.5/drivers/media/video/mx1_camera.c
#define CSICR1_RXFF_LEVEL(x) (((x) & 0x3) << 19)
#define CSICR1_SOF_POL (1 << 17)
#define CSICR1_SOF_INTEN (1 << 16)
-@@ -59,8 +63,10 @@
+@@ -60,8 +64,10 @@
#define CSICR1_MCLKEN (1 << 9)
#define CSICR1_FCC (1 << 8)
#define CSICR1_BIG_ENDIAN (1 << 7)
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2012-11-23 22:19:55
|
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 db67b6beaef7a94b67cd2c0c0aacdcefdca236c3 (commit)
from 97dda632b2207df99509ab9ec5db26d1280ef073 (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 db67b6beaef7a94b67cd2c0c0aacdcefdca236c3
Author: Julien Boibessot <jul...@ar...>
Date: Fri Nov 23 23:18:54 2012 +0100
[TOOLS] (Minor) Fix of uboot_recover instructions on APF27 & APF9328 (U-Boot filename)
-----------------------------------------------------------------------
Summary of changes:
software/uboot_recover/apf27_recover.py | 2 +-
software/uboot_recover/apf9328_recover.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/software/uboot_recover/apf27_recover.py b/software/uboot_recover/apf27_recover.py
index 0c8e379..aa039a2 100644
--- a/software/uboot_recover/apf27_recover.py
+++ b/software/uboot_recover/apf27_recover.py
@@ -350,7 +350,7 @@ if __name__ == "__main__":
print "\nAPF27 Bootstrap Tool\n"
print "/!\\ Do not forget to put the bootstrap jumper and to reset your board /!\\"
- print "(be sure to have a u-boot.bin file in current dir too)\n"
+ print "(be sure to have a file named apf27-u-boot-nand.bin in current dir too)\n"
print("/!\\ U-Boot recover eat lot of CPU, be sure that no process trust your CPU\n")
port = raw_input('Enter serial port number or name to use (/dev/ttySx under Linux and COMx under Windows): ')
try:
diff --git a/software/uboot_recover/apf9328_recover.py b/software/uboot_recover/apf9328_recover.py
index f0992cc..1d5535b 100644
--- a/software/uboot_recover/apf9328_recover.py
+++ b/software/uboot_recover/apf9328_recover.py
@@ -31,7 +31,7 @@ if __name__ == "__main__":
ramSize = 16
print "APF Recover Tool"
print "Do not forget to place the bootstrap jumper !!"
- print "and be sure to have a u-boot.bin file in current dir"
+ print "and be sure to have a file named apf9328-u-boot.bin in current dir"
port = raw_input('Enter serial port number or name to use (/dev/ttySx under Linux and COMx under Windows: ')
input = raw_input('Enter RAM size (default 16): ')
if input.isdigit():
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2012-11-22 17:18:28
|
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 97dda632b2207df99509ab9ec5db26d1280ef073 (commit)
from f583020f5869d12d86e81e58b0f7b23670d74c47 (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 97dda632b2207df99509ab9ec5db26d1280ef073
Author: Julien Boibessot <jul...@ar...>
Date: Thu Nov 22 18:16:36 2012 +0100
[BUILD] Refine some APF28 specific hacks in scripts/quiltify.sh
-----------------------------------------------------------------------
Summary of changes:
scripts/quiltify.sh | 34 +++++++++++-----------------------
1 files changed, 11 insertions(+), 23 deletions(-)
diff --git a/scripts/quiltify.sh b/scripts/quiltify.sh
index 177b695..8f7da8e 100755
--- a/scripts/quiltify.sh
+++ b/scripts/quiltify.sh
@@ -165,30 +165,18 @@ for patch in $PATCHES; do
quilt import $patch
done
-# Hacks for APF28 2.6.35 kernel
-if [ "$QUILT_TARGET_NAME" == "Linux kernel" ] && [ "$ARMADEUS_BOARD_NAME" == "apf28" ] && [ "$ARMADEUS_LINUX_VERSION" == "2.6.35.3" ]; then
- tar -zxvf $ARMADEUS_DL_DIR/MX28-FEC-PROBLEM-PATCH.tar.gz
- PATCHES=`ls -ar *.patch`
- for patch in $PATCHES; do
- quilt import $patch
- done
- rm *.patch
-
- tar -zxvf $ARMADEUS_DL_DIR/patches_for_L2.6.35_MX28_SDK_10.12_SOURCE.tar.gz
- PATCHES=`ls -ar patches_for_L2.6.35_MX28_SDK_10.12_SOURCE/kernel/*.patch`
- for patch in $PATCHES; do
- quilt import $patch
- done
- rm -rf patches_for_L2.6.35_MX28_SDK_10.12_SOURCE/kernel/
-
- tar -zxvf $ARMADEUS_DL_DIR/L2.6.35_10.12_EMI_FREQ_PATCH_UP.tar.gz
- PATCHES=`ls -ar *.patch`
- for patch in $PATCHES; do
- quilt import $patch
+# Linux kernel may have additional (external) patches in archive form :
+if [ "$QUILT_TARGET_NAME" == "Linux kernel" ]; then
+ LINUX_PATCHES=`grep BR2_LINUX_KERNEL_PATCH $ARMADEUS_BUILDROOT_DIR/.config | cut -d = -f 2 | tr -d '\"'`
+ # Revert list order:
+ LINUX_PATCHES=`echo $LINUX_PATCHES | tac -s' '`
+ for patch_source in $LINUX_PATCHES; do
+ patch_source=`echo $patch_source | cut -d / -f 5`
+ if [ -f "$ARMADEUS_DL_DIR/$patch_source" ]; then
+ echo "--- $patch_source is an archive"
+ quilt import $ARMADEUS_DL_DIR/$patch_source
+ fi
done
- rm *.patch
-
- quilt import $ARMADEUS_DL_DIR/linux-2.6.35.3-imx_10.12.01.patch.tar.gz
fi
quilt push -a
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2012-11-20 15:33:52
|
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 f583020f5869d12d86e81e58b0f7b23670d74c47 (commit)
from ad68af045c9d977421953a3429350991815f6edb (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 f583020f5869d12d86e81e58b0f7b23670d74c47
Author: Julien Boibessot <jul...@ar...>
Date: Tue Nov 20 16:26:52 2012 +0100
[BUILDROOT] 2012.02: Add compat-wireless package (experimental)
-----------------------------------------------------------------------
Summary of changes:
.../2012.02/199-compat-wireless-add_package.patch | 120 ++++++++++++++++++++
patches/buildroot/2012.02/cleanup_buildroot.sh | 1 +
2 files changed, 121 insertions(+), 0 deletions(-)
create mode 100644 patches/buildroot/2012.02/199-compat-wireless-add_package.patch
diff --git a/patches/buildroot/2012.02/199-compat-wireless-add_package.patch b/patches/buildroot/2012.02/199-compat-wireless-add_package.patch
new file mode 100644
index 0000000..a64b60b
--- /dev/null
+++ b/patches/buildroot/2012.02/199-compat-wireless-add_package.patch
@@ -0,0 +1,120 @@
+Add compat-wireless package.
+Note: meanwhile project has moved to compat-drivers...
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/compat-wireless/compat-wireless.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/compat-wireless/compat-wireless.mk 2012-11-20 11:46:18.000000000 +0100
+@@ -0,0 +1,42 @@
++#############################################################
++#
++# compat-wireless: latest Linux kernel wireless drivers
++#
++#############################################################
++
++COMPAT_WIRELESS_VERSION = $(BR2_PACKAGE_COMPAT_WIRELESS_VERSION)
++COMPAT_WIRELESS_SITE = http://wireless.kernel.org/download/compat-wireless-2.6/
++COMPAT_WIRELESS_SOURCE = compat-wireless-$(COMPAT_WIRELESS_VERSION).tar.bz2
++
++COMPAT_WIRELESS_DEPENDENCIES += linux
++
++define COMPAT_WIRELESS_CONFIGURE_CMDS
++ ( cd $(@D); ./scripts/driver-select $(BR2_PACKAGE_COMPAT_WIRELESS_DRIVER) )
++endef
++
++define COMPAT_WIRELESS_BUILD_CMDS
++ $(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_LD)" COPTS="$(TARGET_CFLAGS)" \
++ KLIB_BUILD="$(BUILD_DIR)/linux-$(BR2_LINUX_KERNEL_VERSION)" \
++ KLIB="$(TARGET_DIR)/lib/modules/$(BR2_LINUX_KERNEL_VERSION)" \
++ ARCH=$(BR2_ARCH) \
++ -C $(@D) $(COMPAT_WIRELESS_MAKE_OPT)
++endef
++
++define COMPAT_WIRELESS_CLEAN_CMDS
++ $(MAKE) -C $(@D) clean
++endef
++
++define COMPAT_WIRELESS_UNINSTALL_TARGET_CMDS
++ $(MAKE) KLIB="$(TARGET_DIR)/lib/modules/$(BR2_LINUX_KERNEL_VERSION)" \
++ -C $(@D) uninstall
++endef
++
++define COMPAT_WIRELESS_INSTALL_TARGET_CMDS
++ $(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_LD)" COPTS="$(TARGET_CFLAGS)" \
++ KLIB_BUILD="$(BUILD_DIR)/linux-$(BR2_LINUX_KERNEL_VERSION)" \
++ KLIB="$(TARGET_DIR)/lib/modules/$(BR2_LINUX_KERNEL_VERSION)" \
++ DEPMOD=echo DESTDIR=$(TARGET_DIR) INSTALL_MOD_PATH=$(TARGET_DIR) \
++ LDFLAGS="" -C $(@D) install-modules
++endef
++
++$(eval $(call GENTARGETS))
+Index: buildroot/package/compat-wireless/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/compat-wireless/Config.in 2012-11-20 11:22:54.000000000 +0100
+@@ -0,0 +1,22 @@
++config BR2_PACKAGE_COMPAT_WIRELESS
++ bool "compat-wireless"
++ help
++ Latest Linux wireless drivers for use with older kernels.
++
++ http://wireless.kernel.org/en/users/Download/stable/
++
++if BR2_PACKAGE_COMPAT_WIRELESS
++
++config BR2_PACKAGE_COMPAT_WIRELESS_VERSION
++ string "compat-wireless version"
++ default "2012-11-18"
++ help
++ Version of the compat-wireless package to use.
++
++config BR2_PACKAGE_COMPAT_WIRELESS_DRIVER
++ string "compat-wireless driver"
++ default "wl12xx"
++ help
++ Driver of the compat-wireless package to build & install.
++
++endif
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2012-11-20 11:14:46.000000000 +0100
++++ buildroot/package/Config.in 2012-11-20 11:15:20.000000000 +0100
+@@ -180,6 +180,7 @@
+ menu "Hardware handling"
+ source "package/acpid/Config.in"
+ source "package/cdrkit/Config.in"
++source "package/compat-wireless/Config.in"
+ source "package/cramfs/Config.in"
+ source "package/cwiid/Config.in"
+ source "package/dbus/Config.in"
+Index: buildroot/package/compat-wireless/compat-wireless-hacks.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/compat-wireless/compat-wireless-hacks.patch 2012-11-20 11:39:37.000000000 +0100
+@@ -0,0 +1,24 @@
++Remove x86 specific stuff.
++Better way has to be found IMHO before sending to BR mainline.
++
++Signed-off-by: Julien Boibessot <jul...@ar...>
++
++diff -urN compat-wireless-2012-11-18/Makefile compat-wireless-2012-11-18.mod//Makefile
++--- compat-wireless-2012-11-18/Makefile 2012-11-20 11:25:37.000000000 +0100
+++++ compat-wireless-2012-11-18.mod//Makefile 2012-11-20 10:53:19.000000000 +0100
++@@ -41,7 +41,6 @@
++ obj-y := compat/
++
++ obj-$(CONFIG_COMPAT_RFKILL) += net/rfkill/
++-obj-$(CONFIG_COMPAT_VIDEO_MODULES) += drivers/gpu/drm/
++
++ ifeq ($(BT),)
++ obj-$(CONFIG_COMPAT_WIRELESS) += net/wireless/ net/mac80211/
++@@ -235,7 +234,6 @@
++ @rm -f $(KLIB)/$(KMODDIR)/drivers/misc/eeprom/eeprom_93cx6.ko*
++ @rm -f $(KLIB)/$(KMODDIR)/drivers/misc/eeprom_93cx6.ko*
++ @rm -f $(KLIB)/$(KMODDIR)/drivers/net/b44.ko*
++- @/sbin/depmod -a
++ @./scripts/update-initramfs
++ @echo
++
diff --git a/patches/buildroot/2012.02/cleanup_buildroot.sh b/patches/buildroot/2012.02/cleanup_buildroot.sh
index 1b0b961..11c392b 100755
--- a/patches/buildroot/2012.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2012.02/cleanup_buildroot.sh
@@ -79,3 +79,4 @@ rm -rf buildroot/package/m4/m4-1.4.16-no-gets.patch
rm -rf buildroot/package/tar/tar-1.26-no-gets.patch
rm -rf buildroot/package/cunit/
rm -rf buildroot/package/qextserialport/
+rm -rf buildroot/package/compat-wireless/
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2012-11-19 09:33: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 ad68af045c9d977421953a3429350991815f6edb (commit)
from 02ece5fb22480148efeab7241ee0b7684ea6fda6 (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 ad68af045c9d977421953a3429350991815f6edb
Author: Julien Boibessot <jul...@ar...>
Date: Mon Nov 19 10:32:34 2012 +0100
Revert commit 01aa78625af2fa48c062bac12c0167ab7c430f2b
-----------------------------------------------------------------------
Summary of changes:
arch/arm/boot/dts/imx27-apf27.dts | 96 -------------------------------------
1 files changed, 0 insertions(+), 96 deletions(-)
delete mode 100644 arch/arm/boot/dts/imx27-apf27.dts
diff --git a/arch/arm/boot/dts/imx27-apf27.dts b/arch/arm/boot/dts/imx27-apf27.dts
deleted file mode 100644
index b7d11e0..0000000
--- a/arch/arm/boot/dts/imx27-apf27.dts
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright 2012 Philippe Reynes <tr...@ya...>
- * Copyright 2012 Armadeus Systems <su...@ar...>
- *
- * Based on code which is: Copyright 2012 Sascha Hauer, Pengutronix
- *
- * 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/ "imx27.dtsi"
-
-/ {
- model = "Armadeus apf27";
- compatible = "armadeus,imx27-apf27", "fsl,imx27";
-
- memory {
- reg = <0xa0000000 0x04000000>;
- };
-
- clocks {
- #address-cells = <1>;
- #size-cells = <0>;
-
- osc26m {
- compatible = "fsl,imx-osc26m", "fixed-clock";
- clock-frequency = <33554432>;
- };
- };
-
- soc {
- aipi@10000000 {
- wdog@10002000 {
- status = "okay";
- };
-
- serial@1000a000 {
- status = "okay";
- };
-
- ethernet@1002b000 {
- status = "okay";
- };
-
- };
-
- nand@d8000000 {
- status = "okay";
- nand-bus-width = <16>;
- nand-ecc-mode = "hw";
- nand-on-flash-bbt;
-
- partition@0 {
- label = "u-boot";
- reg = <0x0 0x100000>;
- };
-
- partition@100000 {
- label = "env";
- reg = <0x100000 0x80000>;
- };
-
- partition@180000 {
- label = "env2";
- reg = <0x180000 0x80000>;
- };
-
- partition@200000 {
- label = "firmware";
- reg = <0x200000 0x80000>;
- };
-
- partition@280000 {
- label = "dtb";
- reg = <0x280000 0x80000>;
- };
-
- partition@300000 {
- label = "kernel";
- reg = <0x300000 0x500000>;
- };
-
- partition@800000 {
- label = "rootfs";
- reg = <0x800000 0xf800000>;
- };
- };
-
- };
-
-};
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2012-11-19 09:29:31
|
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 02ece5fb22480148efeab7241ee0b7684ea6fda6 (commit)
via ac7a258f35b66ca000e91c4c8975d2b02670e856 (commit)
via 01aa78625af2fa48c062bac12c0167ab7c430f2b (commit)
via 16724813c99104c4c2d33be78ce05a7075bc52dc (commit)
from 9511ad23cdd6f7fe97a42c0151f8cce19895015e (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 02ece5fb22480148efeab7241ee0b7684ea6fda6
Author: Philippe Reynes <tr...@ya...>
Date: Sun Nov 18 12:34:54 2012 +0100
Add support of linux-3.7-rc6
Signed-off-by: Julien Boibessot <jul...@ar...>
commit ac7a258f35b66ca000e91c4c8975d2b02670e856
Author: Philippe Reynes <tr...@ya...>
Date: Thu Nov 15 19:32:13 2012 +0100
update apf27 kernel 3.7 patch to v4
Signed-off-by: Julien Boibessot <jul...@ar...>
commit 01aa78625af2fa48c062bac12c0167ab7c430f2b
Author: Philippe Reynes <tr...@ya...>
Date: Wed Oct 24 18:47:01 2012 +0200
Add device tree file for the armadeus apf27
Signed-off-by: Philippe Reynes <tr...@ya...>
Signed-off-by: Eric Jarrige <eri...@ar...>
Signed-off-by: Julien Boibessot <jul...@ar...>
commit 16724813c99104c4c2d33be78ce05a7075bc52dc
Author: Julien Boibessot <jul...@ar...>
Date: Mon Nov 19 10:13:19 2012 +0100
[LINUX] 3.7: Add (incomplete) minimal APF27Dev support (non DT)
-----------------------------------------------------------------------
Summary of changes:
arch/arm/boot/dts/imx27-apf27.dts | 96 +++
...x-3.7-rc4.config => apf27-linux-3.7-rc6.config} | 0
.../device/armadeus/apf27/apf27-linux-3.7.config | 6 +-
patches/linux/{3.7-rc3 => 3.7-rc6} | 0
...d-device-tree-file-for-the-armadeus-apf27.patch | 19 +-
.../linux/3.7/0200-armadeus-add_apf27_module.patch | 3 +-
.../0201-armadeus-add_apf27dev_baseboard.patch} | 873 +++++---------------
7 files changed, 310 insertions(+), 687 deletions(-)
create mode 100644 arch/arm/boot/dts/imx27-apf27.dts
copy buildroot/target/device/armadeus/apf27/{apf27-linux-3.7-rc4.config => apf27-linux-3.7-rc6.config} (100%)
copy patches/linux/{3.7-rc3 => 3.7-rc6} (100%)
copy patches/linux/{2.6.38/281-apf27-armadeus-add_apf27.c.patch => 3.7/0201-armadeus-add_apf27dev_baseboard.patch} (64%)
diff --git a/arch/arm/boot/dts/imx27-apf27.dts b/arch/arm/boot/dts/imx27-apf27.dts
new file mode 100644
index 0000000..b7d11e0
--- /dev/null
+++ b/arch/arm/boot/dts/imx27-apf27.dts
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2012 Philippe Reynes <tr...@ya...>
+ * Copyright 2012 Armadeus Systems <su...@ar...>
+ *
+ * Based on code which is: Copyright 2012 Sascha Hauer, Pengutronix
+ *
+ * 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/ "imx27.dtsi"
+
+/ {
+ model = "Armadeus apf27";
+ compatible = "armadeus,imx27-apf27", "fsl,imx27";
+
+ memory {
+ reg = <0xa0000000 0x04000000>;
+ };
+
+ clocks {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ osc26m {
+ compatible = "fsl,imx-osc26m", "fixed-clock";
+ clock-frequency = <33554432>;
+ };
+ };
+
+ soc {
+ aipi@10000000 {
+ wdog@10002000 {
+ status = "okay";
+ };
+
+ serial@1000a000 {
+ status = "okay";
+ };
+
+ ethernet@1002b000 {
+ status = "okay";
+ };
+
+ };
+
+ nand@d8000000 {
+ status = "okay";
+ nand-bus-width = <16>;
+ nand-ecc-mode = "hw";
+ nand-on-flash-bbt;
+
+ partition@0 {
+ label = "u-boot";
+ reg = <0x0 0x100000>;
+ };
+
+ partition@100000 {
+ label = "env";
+ reg = <0x100000 0x80000>;
+ };
+
+ partition@180000 {
+ label = "env2";
+ reg = <0x180000 0x80000>;
+ };
+
+ partition@200000 {
+ label = "firmware";
+ reg = <0x200000 0x80000>;
+ };
+
+ partition@280000 {
+ label = "dtb";
+ reg = <0x280000 0x80000>;
+ };
+
+ partition@300000 {
+ label = "kernel";
+ reg = <0x300000 0x500000>;
+ };
+
+ partition@800000 {
+ label = "rootfs";
+ reg = <0x800000 0xf800000>;
+ };
+ };
+
+ };
+
+};
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.7-rc4.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.7-rc6.config
similarity index 100%
copy from buildroot/target/device/armadeus/apf27/apf27-linux-3.7-rc4.config
copy to buildroot/target/device/armadeus/apf27/apf27-linux-3.7-rc6.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 47eb026..f26f181 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.7.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.7.config
@@ -19,6 +19,7 @@ CONFIG_MODULE_UNLOAD=y
CONFIG_ARCH_MXC=y
CONFIG_ARCH_IMX_V4_V5=y
CONFIG_MACH_IMX27_DT=y
+CONFIG_MACH_APF27=y
CONFIG_MXC_IRQ_PRIOR=y
CONFIG_MXC_DEBUG_BOARD=y
CONFIG_PREEMPT=y
@@ -161,8 +162,9 @@ 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
CONFIG_USB_ACM=y
CONFIG_USB_PRINTER=y
CONFIG_USB_STORAGE=y
diff --git a/patches/linux/3.7-rc3 b/patches/linux/3.7-rc6
similarity index 100%
copy from patches/linux/3.7-rc3
copy to patches/linux/3.7-rc6
diff --git a/patches/linux/3.7/0003-Add-device-tree-file |
|
From: Fabien M <fa...@us...> - 2012-11-16 17:12:30
|
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 9511ad23cdd6f7fe97a42c0151f8cce19895015e (commit)
from 867c29554202c221217894ecf18d9f5efe8d8f32 (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 9511ad23cdd6f7fe97a42c0151f8cce19895015e
Author: Fabien Marteau <fab...@ar...>
Date: Fri Nov 16 18:04:57 2012 +0100
[kernel] Adding mcp7940x rtc driver
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf51/apf51-linux-2.6.38.config | 1 +
.../450-armadeus-add_mcp7940x_rtc_driver.patch | 357 ++++++++++++++++++++
2 files changed, 358 insertions(+), 0 deletions(-)
create mode 100644 patches/linux/2.6.38/450-armadeus-add_mcp7940x_rtc_driver.patch
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config b/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config
index bb22dc4..ab62206 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config
+++ b/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config
@@ -249,6 +249,7 @@ CONFIG_LEDS_TRIGGER_BACKLIGHT=y
CONFIG_LEDS_TRIGGER_GPIO=y
CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
CONFIG_RTC_CLASS=y
+# CONFIG_RTC_DRV_MCP7940X is not set
CONFIG_RTC_MXC=y
CONFIG_RTC_DRV_WM831X=y
CONFIG_STAGING=y
diff --git a/patches/linux/2.6.38/450-armadeus-add_mcp7940x_rtc_driver.patch b/patches/linux/2.6.38/450-armadeus-add_mcp7940x_rtc_driver.patch
new file mode 100644
index 0000000..d3ac48d
--- /dev/null
+++ b/patches/linux/2.6.38/450-armadeus-add_mcp7940x_rtc_driver.patch
@@ -0,0 +1,357 @@
+Add mcp79400 Linux driver
+
+Signed-off-by: Fabien Marteau <fab...@ar...>
+
+---
+
+Index: linux-2.6.38.8/drivers/rtc/Kconfig
+===================================================================
+--- linux-2.6.38.8.orig/drivers/rtc/Kconfig 2012-11-16 17:52:01.000000000 +0100
++++ linux-2.6.38.8/drivers/rtc/Kconfig 2012-11-16 17:54:51.000000000 +0100
+@@ -282,6 +282,17 @@
+ If you say Y here you will get support for the
+ watchdog timer in the ST M41T60 and M41T80 RTC chips series.
+
++config RTC_DRV_MCP7940X
++ tristate "Microchip MCP7940X"
++ depends on RTC_CLASS && I2C
++ help
++ If you say yes here you get support for Microchip
++ MCP7940x real-time clock chips.
++ The alarm functionality is not supported.
++
++ This driver can also be built as a module. If so, the module
++ will be called rtc-mcp7940x.
++
+ config RTC_DRV_BQ32K
+ tristate "TI BQ32000"
+ help
+Index: linux-2.6.38.8/drivers/rtc/Makefile
+===================================================================
+--- linux-2.6.38.8.orig/drivers/rtc/Makefile 2012-11-16 17:51:56.000000000 +0100
++++ linux-2.6.38.8/drivers/rtc/Makefile 2012-11-16 17:52:28.000000000 +0100
+@@ -64,6 +64,7 @@
+ obj-$(CONFIG_RTC_DRV_MAX8998) += rtc-max8998.o
+ obj-$(CONFIG_RTC_DRV_MAX6902) += rtc-max6902.o
+ obj-$(CONFIG_RTC_DRV_MC13XXX) += rtc-mc13xxx.o
++obj-$(CONFIG_RTC_DRV_MCP7940X) += rtc-mcp7940x.o
+ obj-$(CONFIG_RTC_DRV_MSM6242) += rtc-msm6242.o
+ obj-$(CONFIG_RTC_DRV_MPC5121) += rtc-mpc5121.o
+ obj-$(CONFIG_RTC_DRV_MV) += rtc-mv.o
+Index: linux-2.6.38.8/drivers/rtc/rtc-mcp7940x.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.38.8/drivers/rtc/rtc-mcp7940x.c 2012-11-16 17:54:34.000000000 +0100
+@@ -0,0 +1,312 @@
++/*
++ * RTC client/driver for the Microchip MCP7940x Real-Time Clock over I2C
++ *
++ * Based on code by Scott Wood <sco...@fr...>
++ * which was based on code by Randy Vinson <rv...@mv...>,
++ * which was based on the m41t00.c by Mark Greer <mg...@mv...>.
++ *
++ * Copyright (C) 2012 Armadeus Systems
++ *
++ * This file is licensed under the terms of the GNU General Public License
++ * version 2. This program is licensed "as is" without any warranty of any
++ * kind, whether express or implied.
++ */
++/*
++ * It would be more efficient to use i2c msgs/i2c_transfer directly but, as
++ * recommened in .../Documentation/i2c/writing-clients section
++ * "Sending and receiving", using SMBus level communication is preferred.
++ */
++
++#include <linux/kernel.h>
++#include <linux/module.h>
++#include <linux/interrupt.h>
++#include <linux/i2c.h>
++#include <linux/rtc.h>
++#include <linux/bcd.h>
++#include <linux/slab.h>
++
++/* Time of Day */
++#define MCP7940X_REG_TD_SECONDS 0x00
++#define MCP7940X_REG_TD_MINUTES 0x01
++#define MCP7940X_REG_TD_HOURS 0x02
++#define MCP7940X_REG_TD_DAY 0x03
++#define MCP7940X_REG_TD_DATE 0x04
++#define MCP7940X_REG_TD_MONTH 0x05
++#define MCP7940X_REG_TD_YEAR 0x06
++/* Controls */
++#define MCP7940X_REG_CONTROL 0x07
++#define MCP7940X_REG_CALIBRATION 0x08
++#define MCP7940X_REG_UNLOCK_ID 0x08
++/* Alarm 0 */
++#define MCP7940X_REG_ALRM0_SECONDS 0x0A
++#define MCP7940X_REG_ALRM0_MINUTES 0x0B
++#define MCP7940X_REG_ALRM0_HOURS 0x0C
++#define MCP7940X_REG_ALRM0_DAY 0x0D
++#define MCP7940X_REG_ALRM0_DATE 0x0E
++#define MCP7940X_REG_ALRM0_MONTH 0x0F
++/* Alarm 1 */
++#define MCP7940X_REG_ALRM1_SECONDS 0x11
++#define MCP7940X_REG_ALRM1_MINUTES 0x12
++#define MCP7940X_REG_ALRM1_HOURS 0x13
++#define MCP7940X_REG_ALRM1_DAY 0x14
++#define MCP7940X_REG_ALRM1_DATE 0x15
++#define MCP7940X_REG_ALRM1_MONTH 0x16
++/* Timestamp 0 */
++#define MCP7940X_REG_TS0_MINUTES 0x18
++#define MCP7940X_REG_TS0_HOURS 0x19
++#define MCP7940X_REG_TS0_DATE 0x1A
++#define MCP7940X_REG_TS0_MONTH 0x1B
++/* Timestamp 1 */
++#define MCP7940X_REG_TS1_MINUTES 0x1C
++#define MCP7940X_REG_TS1_HOURS 0x1D
++#define MCP7940X_REG_TS1_DATE 0x1E
++#define MCP7940X_REG_TS1_MONTH 0x1F
++
++
++/* bits definitions */
++#define MCP7940X_START_BITS 0x80
++#define MCP7940X_24H_BITS 0x40
++#define MCP7940X_VBATEN 0x08
++
++static const struct i2c_device_id mcp7940x_id[] = {
++ { "mcp79400", 0 }, /* no unique ID */
++ { "mcp79401", 1 }, /* EUI-48 */
++ { "mcp79402", 2 }, /* EUI-64 */
++ { }
++};
++MODULE_DEVICE_TABLE(i2c, mcp7940x_id);
++
++struct mcp7940x {
++ struct i2c_client *client;
++ struct rtc_device *rtc;
++ int exiting;
++};
++
++static struct i2c_driver mcp7940x_driver;
++
++//struct rtc_time {
++// int tm_sec;
++// int tm_min;
++// int tm_hour;
++// int tm_mday;
++// int tm_mon;
++// int tm_year;
++// int tm_wday;
++// int tm_yday;
++// int tm_isdst;
++//};
++
++static int mcp7940x_read_time(struct device *dev, struct rtc_time *time)
++{
++ struct i2c_client *client = to_i2c_client(dev);
++ int ret;
++
++ ret = i2c_smbus_read_byte_data(client, MCP7940X_REG_TD_SECONDS);
++ if (ret < 0)
++ return ret;
++ time->tm_sec = ((ret&0x70)>>4)*10 + (ret&0x0F);
++
++ ret = i2c_smbus_read_byte_data(client, MCP7940X_REG_TD_MINUTES);
++ if (ret < 0)
++ return ret;
++ time->tm_min = ((ret&0x70)>>4)*10 + (ret&0x0F);
++
++ ret = i2c_smbus_read_byte_data(client, MCP7940X_REG_TD_HOURS);
++ if (ret < 0)
++ return ret;
++ time->tm_hour = ((ret&0x30)>>4)*10 + (ret&0x0F);
++
++ ret = i2c_smbus_read_byte_data(client, MCP7940X_REG_TD_DATE);
++ if (ret < 0)
++ return ret;
++ time->tm_mday = ((ret&0x30)>>4)*10 + (ret&0x0F);
++
++ ret = i2c_smbus_read_byte_data(client, MCP7940X_REG_TD_MONTH);
++ if (ret < 0)
++ return ret;
++ time->tm_mon = (((ret&0x10)>>4)*10 + (ret&0x0F)) - 1;
++
++ ret = i2c_smbus_read_byte_data(client, MCP7940X_REG_TD_YEAR);
++ if (ret < 0)
++ return ret;
++ time->tm_year = ((((ret&0xF0)>>4)*10 + (ret&0x0F))) + 100;
++
++ return 0;
++}
++
++static int mcp7940x_set_time(struct device *dev, struct rtc_time *time)
++{
++ struct i2c_client *client = to_i2c_client(dev);
++ int ret;
++ int value;
++
++ value = ((((time->tm_sec/10)&0x07)<<4)|(time->tm_sec % 10))|
++ MCP7940X_START_BITS;
++ ret = i2c_smbus_write_byte_data(client,
++ MCP7940X_REG_TD_SECONDS,
++ value);
++ if (ret < 0)
++ return ret;
++
++ value = (((time->tm_min/10)&0x07)<<4)|(time->tm_min % 10);
++ ret = i2c_smbus_write_byte_data(client,
++ MCP7940X_REG_TD_MINUTES,
++ value);
++ if (ret < 0)
++ return ret;
++
++ value = ((((time->tm_hour/10)&0x03)<<4)|(time->tm_hour % 10));
++ ret = i2c_smbus_write_byte_data(client,
++ MCP7940X_REG_TD_HOURS,
++ value);
++ if (ret < 0)
++ return ret;
++
++ value = (((time->tm_mday/10)&0x03)<<4)|(time->tm_mday % 10);
++ ret = i2c_smbus_write_byte_data(client,
++ MCP7940X_REG_TD_DATE,
++ value);
++ if (ret < 0)
++ return ret;
++
++ value = ((((time->tm_mon+1)/10)&0x01)<<4)|((time->tm_mon+1) % 10);
++ ret = i2c_smbus_write_byte_data(client,
++ MCP7940X_REG_TD_MONTH,
++ value);
++ if (ret < 0)
++ return ret;
++
++ value = ((((time->tm_year-100)/10)&0x0F)<<4)|((time->tm_year-100) % 10);
++ ret = i2c_smbus_write_byte_data(client,
++ MCP7940X_REG_TD_YEAR,
++ value);
++ if (ret < 0)
++ return ret;
++
++ return 0;
++}
++
++static const struct rtc_class_ops mcp7940x_rtc_ops = {
++ .read_time = mcp7940x_read_time,
++ .set_time = mcp7940x_set_time,
++};
++
++static int mcp7940x_probe(struct i2c_client *client,
++ const struct i2c_device_id *id)
++{
++ struct mcp7940x *mcp7940x;
++ int ret;
++
++ mcp7940x = kzalloc(sizeof(struct mcp7940x), GFP_KERNEL);
++ if (!mcp7940x)
++ return -ENOMEM;
++
++ mcp7940x->client = client;
++ i2c_set_clientdata(client, mcp7940x);
++
++ ret = i2c_smbus_read_byte_data(mcp7940x->client, MCP7940X_REG_TD_HOURS);
++ if (ret < 0)
++ goto out_free;
++
++ /* set rtc to 24h format */
++ if ((ret & MCP7940X_24H_BITS)) {
++ ret = i2c_smbus_write_byte_data(mcp7940x->client,
++ MCP7940X_REG_TD_HOURS,
++ (u8)(ret & ~MCP7940X_24H_BITS));
++ if(ret < 0)
++ goto out_free;
++ }
++
++ ret = i2c_smbus_read_byte_data(mcp7940x->client, MCP7940X_REG_TD_DAY);
++ if (ret < 0)
++ goto out_free;
++ /* Use external baterie if Vcc fails */
++ if (!(ret & MCP7940X_VBATEN)) {
++ ret = i2c_smbus_write_byte_data(mcp7940x->client,
++ MCP7940X_REG_TD_DAY,
++ (u8)(ret | MCP7940X_VBATEN));
++ if(ret < 0)
++ goto out_free;
++ }
++
++ ret = i2c_smbus_read_byte_data(mcp7940x->client, MCP7940X_REG_TD_SECONDS);
++ if (ret < 0)
++ goto out_free;
++
++ /* If time counter not launched, launch it */
++ if (!(ret & MCP7940X_START_BITS)) {
++ ret = i2c_smbus_write_byte_data(mcp7940x->client,
++ MCP7940X_REG_TD_SECONDS,
++ (u8)(ret | MCP7940X_START_BITS));
++ if(ret < 0)
++ goto out_free;
++
++ }
++
++ mcp7940x->rtc = rtc_device_register(client->name, &client->dev,
++ &mcp7940x_rtc_ops, THIS_MODULE);
++ if (IS_ERR(mcp7940x->rtc)) {
++ ret = PTR_ERR(mcp7940x->rtc);
++ dev_err(&client->dev, "unable to register the class device\n");
++ goto out_free;
++ }
++
++ return 0;
++
++out_free:
++ kfree(mcp7940x);
++ return ret;
++}
++
++static int __devexit mcp7940x_remove(struct i2c_client *client)
++{
++ struct mcp7940x *mcp7940x = i2c_get_clientdata(client);
++
++ rtc_device_unregister(mcp7940x->rtc);
++ kfree(mcp7940x);
++ return 0;
++}
++
++#ifdef CONFIG_PM
++static int mcp7940x_suspend(struct i2c_client *client, pm_message_t state)
++{
++ return 0;
++}
++
++static int mcp7940x_resume(struct i2c_client *client)
++{
++ return 0;
++}
++#else
++#define mcp7940x_suspend NULL
++#define mcp7940x_resume NULL
++#endif
++
++static struct i2c_driver mcp7940x_driver = {
++ .driver = {
++ .name = "rtc-mcp7940x",
++ .owner = THIS_MODULE,
++ },
++ .probe = mcp7940x_probe,
++ .suspend = mcp7940x_suspend,
++ .resume = mcp7940x_resume,
++ .remove = __devexit_p(mcp7940x_remove),
++ .id_table = mcp7940x_id,
++};
++
++static int __init mcp7940x_init(void)
++{
++ return i2c_add_driver(&mcp7940x_driver);
++}
++
++static void __exit mcp7940x_exit(void)
++{
++ i2c_del_driver(&mcp7940x_driver);
++}
++
++module_init(mcp7940x_init);
++module_exit(mcp7940x_exit);
++
++MODULE_AUTHOR("Fabien Marteau <fab...@ar...>");
++MODULE_DESCRIPTION("Microchip mcp7940x RTC Driver");
++MODULE_LICENSE("GPL");
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2012-11-14 08:31:25
|
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 867c29554202c221217894ecf18d9f5efe8d8f32 (commit)
from 47d2450037fb35fe55326f8539a67bc05e63b63f (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 867c29554202c221217894ecf18d9f5efe8d8f32
Author: Julien Boibessot <jul...@ar...>
Date: Wed Nov 14 09:30:49 2012 +0100
[U-BOOT] 2012.10: remove : character in patches name
-----------------------------------------------------------------------
Summary of changes:
... => 100-SPL-Add-u-boot-nand-build-option.patch} | 0
...tant-to-support-the-armadeus-APF27-board.patch} | 0
...add-support-for-the-armadeus-APF27-board.patch} | 0
... 303-apf27-Add-spl-support-for-the-apf27.patch} | 0
...f27-Add-FPGA-support-for-the-apf27-board.patch} | 0
5 files changed, 0 insertions(+), 0 deletions(-)
rename patches/u-boot/2012.10/{100-SPL:-Add-u-boot-nand-build-option.patch => 100-SPL-Add-u-boot-nand-build-option.patch} (100%)
rename patches/u-boot/2012.10/{301-imx27:-Add-missing-constant-to-support-the-armadeus-APF27-board.patch => 301-imx27-Add-missing-constant-to-support-the-armadeus-APF27-board.patch} (100%)
rename patches/u-boot/2012.10/{302-apf27:-add-support-for-the-armadeus-APF27-board.patch => 302-apf27-add-support-for-the-armadeus-APF27-board.patch} (100%)
rename patches/u-boot/2012.10/{303-apf27:-Add-spl-support-for-the-apf27.patch => 303-apf27-Add-spl-support-for-the-apf27.patch} (100%)
rename patches/u-boot/2012.10/{304-apf27:-Add-FPGA-support-for-the-apf27-board.patch => 304-apf27-Add-FPGA-support-for-the-apf27-board.patch} (100%)
diff --git a/patches/u-boot/2012.10/100-SPL:-Add-u-boot-nand-build-option.patch b/patches/u-boot/2012.10/100-SPL-Add-u-boot-nand-build-option.patch
similarity index 100%
rename from patches/u-boot/2012.10/100-SPL:-Add-u-boot-nand-build-option.patch
rename to patches/u-boot/2012.10/100-SPL-Add-u-boot-nand-build-option.patch
diff --git a/patches/u-boot/2012.10/301-imx27:-Add-missing-constant-to-support-the-armadeus-APF27-board.patch b/patches/u-boot/2012.10/301-imx27-Add-missing-constant-to-support-the-armadeus-APF27-board.patch
similarity index 100%
rename from patches/u-boot/2012.10/301-imx27:-Add-missing-constant-to-support-the-armadeus-APF27-board.patch
rename to patches/u-boot/2012.10/301-imx27-Add-missing-constant-to-support-the-armadeus-APF27-board.patch
diff --git a/patches/u-boot/2012.10/302-apf27:-add-support-for-the-armadeus-APF27-board.patch b/patches/u-boot/2012.10/302-apf27-add-support-for-the-armadeus-APF27-board.patch
similarity index 100%
rename from patches/u-boot/2012.10/302-apf27:-add-support-for-the-armadeus-APF27-board.patch
rename to patches/u-boot/2012.10/302-apf27-add-support-for-the-armadeus-APF27-board.patch
diff --git a/patches/u-boot/2012.10/303-apf27:-Add-spl-support-for-the-apf27.patch b/patches/u-boot/2012.10/303-apf27-Add-spl-support-for-the-apf27.patch
similarity index 100%
rename from patches/u-boot/2012.10/303-apf27:-Add-spl-support-for-the-apf27.patch
rename to patches/u-boot/2012.10/303-apf27-Add-spl-support-for-the-apf27.patch
diff --git a/patches/u-boot/2012.10/304-apf27:-Add-FPGA-support-for-the-apf27-board.patch b/patches/u-boot/2012.10/304-apf27-Add-FPGA-support-for-the-apf27-board.patch
similarity index 100%
rename from patches/u-boot/2012.10/304-apf27:-Add-FPGA-support-for-the-apf27-board.patch
rename to patches/u-boot/2012.10/304-apf27-Add-FPGA-support-for-the-apf27-board.patch
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2012-11-06 18:36:35
|
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 47d2450037fb35fe55326f8539a67bc05e63b63f (commit)
via 0a7a2639ad03192a50ffcb5a2ea9e789f1204b42 (commit)
via c21b9f07081c5b6fc8111c874ea6e65292191e33 (commit)
from 1821bbae6c50e6bc166b8947d4c27bd1c9856927 (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 47d2450037fb35fe55326f8539a67bc05e63b63f
Merge: 0a7a263 1821bba
Author: Julien Boibessot <jul...@ar...>
Date: Tue Nov 6 19:35:17 2012 +0100
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 0a7a2639ad03192a50ffcb5a2ea9e789f1204b42
Author: Julien Boibessot <jul...@ar...>
Date: Tue Nov 6 11:29:33 2012 +0100
[LINUX] renamed patches/linux/3.7/200-armadeus-add_apf27_module.patch
commit c21b9f07081c5b6fc8111c874ea6e65292191e33
Author: Julien Boibessot <jul...@ar...>
Date: Tue Nov 6 09:30:06 2012 +0100
We don't want DOS format on text files
-----------------------------------------------------------------------
Summary of changes:
....patch => 0200-armadeus-add_apf27_module.patch} | 30 ++++++++++----------
1 files changed, 15 insertions(+), 15 deletions(-)
rename patches/linux/3.7/{200-armadeus-add_apf27_module.patch => 0200-armadeus-add_apf27_module.patch} (99%)
diff --git a/patches/linux/3.7/200-armadeus-add_apf27_module.patch b/patches/linux/3.7/0200-armadeus-add_apf27_module.patch
similarity index 99%
rename from patches/linux/3.7/200-armadeus-add_apf27_module.patch
rename to patches/linux/3.7/0200-armadeus-add_apf27_module.patch
index 349ab4e..512136b 100644
--- a/patches/linux/3.7/200-armadeus-add_apf27_module.patch
+++ b/patches/linux/3.7/0200-armadeus-add_apf27_module.patch
@@ -1,18 +1,18 @@
-The APF27 is an i.M27 based SOM (System On Module) that can be plugged on
-several docking/development boards. Here only basic module support
-is added (Ethernet, Serial, NAND Flash, USB OTG).
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
-Signed-off-by: Eric Jarrige <eri...@ar...>
-Signed-off-by: Nicolas Colombain <nic...@ar...>
----
- arch/arm/mach-imx/Kconfig | 13 ++
- arch/arm/mach-imx/Makefile | 1 +
- arch/arm/mach-imx/mach-apf27.c | 258 +++++++++++++++++++++++++++
- arch/arm/plat-mxc/include/mach/uncompress.h | 1 +
- 4 files changed, 273 insertions(+), 0 deletions(-)
- create mode 100644 arch/arm/mach-imx/mach-apf27.c
-
+The APF27 is an i.M27 based SOM (System On Module) that can be plugged on
+several docking/development boards. Here only basic module support
+is added (Ethernet, Serial, NAND Flash, USB OTG).
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+Signed-off-by: Eric Jarrige <eri...@ar...>
+Signed-off-by: Nicolas Colombain <nic...@ar...>
+---
+ arch/arm/mach-imx/Kconfig | 13 ++
+ arch/arm/mach-imx/Makefile | 1 +
+ arch/arm/mach-imx/mach-apf27.c | 258 +++++++++++++++++++++++++++
+ arch/arm/plat-mxc/include/mach/uncompress.h | 1 +
+ 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
===================================================================
--- linux-3.7-rc4.orig/arch/arm/mach-imx/Kconfig 2012-11-04 20:07:39.000000000 +0100
hooks/post-receive
--
armadeus
|
|
From: jscheer <js...@us...> - 2012-11-06 10:29: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 1821bbae6c50e6bc166b8947d4c27bd1c9856927 (commit)
from 5404290cf26766e76d62ec312cc6ecb47b8cd9d1 (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 1821bbae6c50e6bc166b8947d4c27bd1c9856927
Author: Jeremie Scheer <jer...@ar...>
Date: Tue Nov 6 11:28:24 2012 +0100
[BUILDROOT] Add package qextserialport.
-----------------------------------------------------------------------
Summary of changes:
.../2012.02/198-qextserialport-add_package.patch | 56 ++++++++++++++++++++
patches/buildroot/2012.02/cleanup_buildroot.sh | 1 +
2 files changed, 57 insertions(+), 0 deletions(-)
create mode 100644 patches/buildroot/2012.02/198-qextserialport-add_package.patch
diff --git a/patches/buildroot/2012.02/198-qextserialport-add_package.patch b/patches/buildroot/2012.02/198-qextserialport-add_package.patch
new file mode 100644
index 0000000..73b7c99
--- /dev/null
+++ b/patches/buildroot/2012.02/198-qextserialport-add_package.patch
@@ -0,0 +1,56 @@
+Add qextserialport library package to Buildroot.
+
+Signed-off-by: Jérémie Scheer <jer...@ar...>
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2012-11-05 18:10:49.000000000 +0100
++++ buildroot/package/Config.in 2012-11-05 18:18:25.000000000 +0100
+@@ -141,6 +141,7 @@
+ source "package/efl/Config.in"
+ source "package/qt/Config.in"
+ source "package/qwt/Config.in"
++source "package/qextserialport/Config.in"
+ source "package/marble/Config.in"
+ source "package/x11r7/Config.in"
+
+Index: buildroot/package/qextserialport/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/qextserialport/Config.in 2012-11-05 18:18:25.000000000 +0100
+@@ -0,0 +1,6 @@
++config BR2_PACKAGE_QEXTSERIALPORT
++ bool "qextserialport"
++ select BR2_PACKAGE_QT
++ help
++ Qt library for serial port communication.
++
+Index: buildroot/package/qextserialport/qextserialport.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/qextserialport/qextserialport.mk 2012-11-05 18:19:31.000000000 +0100
+@@ -0,0 +1,24 @@
++#############################################################
++#
++# qextserialport
++#
++#############################################################
++QEXTSERIALPORT_VERSION = f83b4e7ca922e533a6cf9c337a02bbfa2f32cc08
++QEXTSERIALPORT_SOURCE = qextserialport-$(QEXTSERIALPORT_VERSION).tar.gz
++QEXTSERIALPORT_SITE = https://code.google.com/p/qextserialport/
++QEXTSERIALPORT_SITE_METHOD = git
++
++QEXTSERIALPORT_DEPENDENCIES = qt
++
++define QEXTSERIALPORT_CONFIGURE_CMDS
++ (cd $(@D) && \
++ $(HOST_DIR)/usr/bin/qmake)
++endef
++
++define QEXTSERIALPORT_INSTALL_TARGET_CMDS
++ cp -Pf $(STAGING_DIR)/usr/lib/libqextserialport.* $(TARGET_DIR)/usr/lib
++endef
++
++QEXTSERIALPORT_INSTALL_STAGING = YES
++
++$(eval $(call AUTOTARGETS, package, qextserialport))
diff --git a/patches/buildroot/2012.02/cleanup_buildroot.sh b/patches/buildroot/2012.02/cleanup_buildroot.sh
index 20c3256..1b0b961 100755
--- a/patches/buildroot/2012.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2012.02/cleanup_buildroot.sh
@@ -78,3 +78,4 @@ rm -rf buildroot/package/marble/
rm -rf buildroot/package/m4/m4-1.4.16-no-gets.patch
rm -rf buildroot/package/tar/tar-1.26-no-gets.patch
rm -rf buildroot/package/cunit/
+rm -rf buildroot/package/qextserialport/
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2012-11-06 08:25: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 5404290cf26766e76d62ec312cc6ecb47b8cd9d1 (commit)
via c0fdab8d4739ccbcc6c09d7af894d42c210f5af5 (commit)
via 1a92e143180f4ed2ea61b6b142d803c351592d4d (commit)
via 38cd087f9fdc07d68f7a731554109b75eed5db4e (commit)
via dedcc66796087a8f47c183bca20a29af14c65a76 (commit)
via afa6d7030b9a653e027da1d34faae46e0f135b08 (commit)
via 7e7dd77d98fc90406cf43ee04f2ed3246f6a4fe6 (commit)
from 9e22603010f69eeee929ffacca90ba84fd418e5b (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 5404290cf26766e76d62ec312cc6ecb47b8cd9d1
Author: Julien Boibessot <jul...@ar...>
Date: Tue Nov 6 09:22:46 2012 +0100
[LINUX] Removes 3.6 support (now default experimental kernel is 3.7)
commit c0fdab8d4739ccbcc6c09d7af894d42c210f5af5
Author: Julien Boibessot <jul...@ar...>
Date: Tue Nov 6 09:17:43 2012 +0100
Linux configs are symlinks
commit 1a92e143180f4ed2ea61b6b142d803c351592d4d
Author: Julien Boibessot <jul...@ar...>
Date: Tue Nov 6 09:15:50 2012 +0100
[LINUX] Remove 3.4 support
commit 38cd087f9fdc07d68f7a731554109b75eed5db4e
Author: Julien Boibessot <jul...@ar...>
Date: Mon Nov 5 22:20:30 2012 +0100
[LINUX] APF27: remove 3.6 support (default experimental one in now 3.7)
commit dedcc66796087a8f47c183bca20a29af14c65a76
Author: Julien Boibessot <jul...@ar...>
Date: Mon Nov 5 22:17:00 2012 +0100
[LINUX] APF27: remove 3.7-rc3 support
commit afa6d7030b9a653e027da1d34faae46e0f135b08
Author: Julien Boibessot <jul...@ar...>
Date: Mon Nov 5 22:15:59 2012 +0100
[LINUX] APF27: remove 3.5 support
commit 7e7dd77d98fc90406cf43ee04f2ed3246f6a4fe6
Author: Julien Boibessot <jul...@ar...>
Date: Mon Nov 5 22:14:51 2012 +0100
[LINUX] APF28: remove 3.4 support, APF27: move 3.4 support to 3.7-rc4
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf27/apf27-linux-3.4.2.config | 1 -
.../device/armadeus/apf27/apf27-linux-3.4.config | 196 ------
.../armadeus/apf27/apf27-linux-3.5-rc4.config | 132 ----
.../device/armadeus/apf27/apf27-linux-3.6.3.config | 1 -
.../device/armadeus/apf27/apf27-linux-3.6.config | 140 ----
...x-3.7-rc3.config => apf27-linux-3.7-rc4.config} | 0
.../device/armadeus/apf27/apf27-linux-3.7.config | 137 ++++-
.../device/armadeus/apf28/apf28-linux-3.4.2.config | 1 -
.../device/armadeus/apf28/apf28-linux-3.4.config | 191 ------
.../device/armadeus/apf28/apf28-linux-3.6.2.config | 1 -
.../device/armadeus/apf28/apf28-linux-3.6.config | 186 ------
.../armadeus/apf28/apf28-linux-3.7-rc3.config | 185 +------
patches/linux/3.4.2 | 1 -
.../3.4/030-armadeus-imx_udc-change_clk_get.patch | 12 -
...7-armadeus-imx_udc-add_printk_when_probed.patch | 16 -
patches/linux/3.6.2 | 1 -
patches/linux/3.6.3 | 1 -
...002-Add-nand-platform-on-imx27-devicetree.patch | 25 -
...d-device-tree-file-for-the-armadeus-apf27.patch | 112 ----
.../3.6/0403-armadeus-Add-apf28-support-dts.patch | 144 -----
...406-armadeus-mx28-add_SPI_support_kconfig.patch | 12 -
...P_register_definitions_into_separate_file.patch | 254 --------
...x28-mmc_spi_Rename_IMX2x_MMC_to_IMX2x_SSP.patch | 116 ----
...mmc_spi_Add_necessary_bits_into_mxs-spi-h.patch | 95 ---
...Pull_out_parts_shared_between_MMC_and_SPI.patch | 372 -----------
..._out_the_SSP_clock_configuration_function.patch | 178 -----
...ix-mx28-spi_Add_SPI_driver_for_mx233_mx28.patch | 503 ---------------
...pi_Pull_out_common_DMA_parts_from_MXS_MMC.patch | 318 ---------
...-mx28-spi_Add_DMA_support_into_SPI_driver.patch | 345 ----------
...spi_Add_SSP_SPI_device_tree_documentation.patch | 49 --
...ronix-mx28_Add_SPI_pinmux_into_imx28_dtsi.patch | 72 --
.../0417-pengutronix-mx28-Add_SPI_ressources.patch | 154 -----
...rmadeus-mx28-Add-pwm-pinmux-to-imx28-dtsi.patch | 35 -
...eus-mx28-Add-lcdif16-pinmux-to-imx28-dtsi.patch | 39 --
.../linux/3.6/0420-armadeus-Add-apf28dev-dts.patch | 219 -------
...tronix-mxs-IIO-Add_basic_MXS_LRADC_driver.patch | 678 --------------------
...ts-Add_compatible_and_interrupt_for_LRADC.patch | 33 -
patches/linux/{3.7-rc3 => 3.7-rc4} | 0
.../0029-armadeus-add_csi_and_spi_registers.patch | 14 +
.../0029b-armadeus-add_csi_registers.tofix} | 14 -
...madeus-devices-imx1-add_udc_registration.patch} | 8 +-
.../3.7/0030-armadeus-imx_udc-change_clk_get.patch | 14 +
...5-armadeus-re_add_pwm_and_correct_driver.tofix} | 0
...7-armadeus-imx_udc-add_printk_when_probed.patch | 16 +
...-imx_udc-prevent_crash_after_soft_reboot.patch} | 12 +-
.../0075-armadeus-spi2-reg-defines.patch} | 6 +-
...us-clock_correct_mxc_decode_pll_for_imx1.tofix} | 0
...adeus-clock-imx1_avoid_crash_with_module.tofix} | 0
.../200-armadeus-add_apf27_module.patch | 93 ++-
....4-450-armadeus-add_apf28_module_support.patch} | 0
...-armadeus-add_apf28dev_baseboard_support.patch} | 0
51 files changed, 238 insertions(+), 4894 deletions(-)
delete mode 120000 buildroot/target/device/armadeus/apf27/apf27-linux-3.4.2.config
delete mode 100644 buildroot/target/device/armadeus/apf27/apf27-linux-3.4.config
delete mode 100644 buildroot/target/device/armadeus/apf27/apf27-linux-3.5-rc4.config
delete mode 120000 buildroot/target/device/armadeus/apf27/apf27-linux-3.6.3.config
delete mode 100644 buildroot/target/device/armadeus/apf27/apf27-linux-3.6.config
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.7-rc3.config => apf27-linux-3.7-rc4.config} (100%)
delete mode 120000 buildroot/target/device/armadeus/apf28/apf28-linux-3.4.2.config
delete mode 100644 buildroot/target/device/armadeus/apf28/apf28-linux-3.4.config
delete mode 120000 buildroot/target/device/armadeus/apf28/apf28-linux-3.6.2.config
delete mode 100644 buildroot/target/device/armadeus/apf28/apf28-linux-3.6.config
mode change 100644 => 120000 buildroot/target/device/armadeus/apf28/apf28-linux-3.7-rc3.config
delete mode 120000 patches/linux/3.4.2
delete mode 100644 patches/linux/3.4/030-armadeus-imx_udc-change_clk_get.patch
delete mode 100644 patches/linux/3.4/037-armadeus-imx_udc-add_printk_when_probed.patch
delete mode 120000 patches/linux/3.6.2
delete mode 120000 patches/linux/3.6.3
delete mode 100644 patches/linux/3.6/0002-Add-nand-platform-on-imx27-devicetree.patch
delete mode 100644 patches/linux/3.6/0003-Add-device-tree-file-for-the-armadeus-apf27.patch
delete mode 100644 patches/linux/3.6/0403-armadeus-Add-apf28-support-dts.patch
delete mode 100644 patches/linux/3.6/0406-armadeus-mx28-add_SPI_support_kconfig.patch
delete mode 100644 patches/linux/3.6/0407-pengutronix-mx28-Move_SSP_register_definitions_into_separate_file.patch
delete mode 100644 patches/linux/3.6/0408-pengutronix-mx28-mmc_spi_Rename_IMX2x_MMC_to_IMX2x_SSP.patch
delete mode 100644 patches/linux/3.6/0409-pengutronix-mx28-mmc_spi_Add_necessary_bits_into_mxs-spi-h.patch
delete mode 100644 patches/linux/3.6/0410-pengutronix-mx28-mmc_spi_Pull_out_parts_shared_between_MMC_and_SPI.patch
delete mode 100644 patches/linux/3.6/0411-pengutronix-mx28-mmc_spi_Pull_out_the_SSP_clock_configuration_function.patch
delete mode 100644 patches/linux/3.6/0412-pengutronix-mx28-spi_Add_SPI_driver_for_mx233_mx28.patch
delete mode 100644 patches/linux/3.6/0413-pengutronix-mx28-mmc_spi_Pull_out_common_DMA_parts_from_MXS_MMC.patch
delete mode 100644 patches/linux/3.6/0414-pengutronix-mx28-spi_Add_DMA_support_into_SPI_driver.patch
delete mode 100644 patches/linux/3.6/0415-pengutronix-mx28-spi_Add_SSP_SPI_device_tree_documentation.patch
delete mode 100644 patches/linux/3.6/0416-pengutronix-mx28_Add_SPI_pinmux_into_imx28_dtsi.patch
delete mode 100644 patches/linux/3.6/0417-pengutronix-mx28-Add_SPI_ressources.patch
delete mode 100644 patches/linux/3.6/0418-armadeus-mx28-Add-pwm-pinmux-to-imx28-dtsi.patch
delete mode 100644 patches/linux/3.6/0419-armadeus-mx28-Add-lcdif16-pinmux-to-imx28-dtsi.patch
delete mode 100644 patches/linux/3.6/0420-armadeus-Add-apf28dev-dts.patch
delete mode 100644 patches/linux/3.6/421-pengutronix-mxs-IIO-Add_basic_MXS_LRADC_driver.patch
delete mode 100644 patches/linux/3.6/422-pengutronix-mx28-dts-Add_compatible_and_interrupt_for_LRADC.patch
copy patches/linux/{3.7-rc3 => 3.7-rc4} (100%)
create mode 100644 patches/linux/3.7/0029-armadeus-add_csi_and_spi_registers.patch
rename patches/linux/{3.4/029-armadeus-add_csi_and_spi_registers.patch => 3.7/0029b-armadeus-add_csi_registers.tofix} (69%)
rename patches/linux/{3.4/030-armadeus-devices-imx1-add_udc_registration.patch => 3.7/0030-armadeus-devices-imx1-add_udc_registration.patch} (62%)
create mode 100644 patches/linux/3.7/0030-armadeus-imx_udc-change_clk_get.patch
rename patches/linux/{3.4/035-armadeus-re_add_pwm_and_correct_driver.patch => 3.7/0035-armadeus-re_add_pwm_and_correct_driver.tofix} (100%)
create mode 100644 patches/linux/3.7/0037-armadeus-imx_udc-add_printk_when_probed.patch
rename patches/linux/{3.4/038-armadeus-imx_udc-prevent_crash_after_soft_reboot.patch => 3.7/0038-armadeus-imx_udc-prevent_crash_after_soft_reboot.patch} (65%)
rename patches/linux/{3.4/075-armadeus-spi2-reg-defines.patch => 3.7/0075-armadeus-spi2-reg-defines.patch} (59%)
rename patches/linux/{3.4/100-armadeus-clock_correct_mxc_decode_pll_for_imx1.patch => 3.7/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix} (100%)
rename patches/linux/{3.4/101-armadeus-clock-imx1_avoid_crash_with_module.patch => 3.7/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix} (100%)
rename patches/linux/{3.4 => 3.7}/200-armadeus-add_apf27_module.patch (77%)
rename patches/linux/{3.4/450-armadeus-add_apf28_module_support.patch => museum/linux-3.4-450-armadeus-add_apf28_module_support.patch} (100%)
rename patches/linux/{3.4/451-armadeus-add_apf28dev_baseboard_support.patch => museum/linux-3.4-451-armadeus-add_apf28dev_baseboard_support.patch} (100%)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.4.2.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.4.2.config
deleted file mode 120000
index 7beb63d..0000000
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.4.2.config
+++ /dev/null
@@ -1 +0,0 @@
-apf27-linux-3.4.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.4.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.4.config
deleted file mode 100644
index ccd6313..0000000
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.4.config
+++ /dev/null
@@ -1,196 +0,0 @@
-CONFIG_EXPERIMENTAL=y
-# CONFIG_LOCALVERSION_AUTO is not set
-# CONFIG_SWAP is not set
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_EMBEDDED=y
-# CONFIG_COMPAT_BRK is not set
-CONFIG_SLAB=y
-CONFIG_PROFILING=y
-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_IMX_V4_V5=y
-CONFIG_MACH_IMX27_DT=y
-CONFIG_MACH_APF27=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_PREEMPT=y
-CONFIG_AEABI=y
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CPU_IDLE=y
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_PM_DEBUG=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_PNP=y
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_LRO is not set
-# CONFIG_INET_DIAG is not set
-CONFIG_IPV6=y
-CONFIG_CAN=m
-CONFIG_CAN_RAW=m
-CONFIG_CAN_BCM=m
-CONFIG_CAN_VCAN=m
-CONFIG_CAN_MCP251X=m
-CONFIG_BT=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_HIDP=m
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_CFG80211=m
-CONFIG_MAC80211=m
-CONFIG_MAC80211_RC_PID=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_FW_LOADER=m
-CONFIG_MTD=y
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_UBI=y
-CONFIG_EEPROM_AT24=y
-CONFIG_EEPROM_AT25=y
-CONFIG_SCSI=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_CHR_DEV_ST=y
-CONFIG_BLK_DEV_SR=y
-CONFIG_CHR_DEV_SG=y
-CONFIG_CHR_DEV_SCH=y
-CONFIG_SCSI_MULTI_LUN=y
-CONFIG_SCSI_LOGGING=y
-CONFIG_SCSI_SCAN_ASYNC=y
-CONFIG_NETDEVICES=y
-# CONFIG_NET_VENDOR_BROADCOM is not set
-# CONFIG_NET_VENDOR_CHELSIO is not set
-# CONFIG_NET_VENDOR_CIRRUS is not set
-# CONFIG_NET_VENDOR_FARADAY is not set
-# CONFIG_NET_VENDOR_INTEL is not set
-# CONFIG_NET_VENDOR_MARVELL is not set
-# CONFIG_NET_VENDOR_MICREL is not set
-# CONFIG_NET_VENDOR_MICROCHIP is not set
-# CONFIG_NET_VENDOR_NATSEMI is not set
-# CONFIG_NET_VENDOR_SEEQ is not set
-# CONFIG_NET_VENDOR_SMSC is not set
-# CONFIG_NET_VENDOR_STMICRO is not set
-CONFIG_SMSC_PHY=y
-CONFIG_RTL8187=m
-CONFIG_LIBERTAS=m
-CONFIG_LIBERTAS_SDIO=m
-CONFIG_RT2X00=m
-CONFIG_RT73USB=m
-CONFIG_ZD1211RW=m
-CONFIG_INPUT_JOYDEV=y
-CONFIG_INPUT_EVDEV=y
-CONFIG_KEYBOARD_IMX=m
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_UINPUT=m
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_SERIAL_IMX=y
-CONFIG_SERIAL_IMX_CONSOLE=y
-# CONFIG_HW_RANDOM is not set
-CONFIG_I2C=y
-CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_IMX=y
-CONFIG_SPI=y
-CONFIG_SPI_IMX=y
-CONFIG_SPI_SPIDEV=m
-CONFIG_GPIO_SYSFS=y
-CONFIG_HWMON=m
-CONFIG_WATCHDOG=y
-CONFIG_MEDIA_SUPPORT=m
-CONFIG_VIDEO_DEV=m
-# CONFIG_RC_CORE is not set
-# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-# CONFIG_RADIO_ADAPTERS is not set
-CONFIG_FB=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-# CONFIG_BACKLIGHT_GENERIC is not set
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FONTS=y
-CONFIG_FONT_8x8=y
-CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_SOUND=m
-CONFIG_SND=m
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-# CONFIG_SND_DRIVERS is not set
-# CONFIG_SND_ARM is not set
-# CONFIG_SND_SPI is not set
-# CONFIG_SND_USB is not set
-CONFIG_SND_SOC=m
-CONFIG_SND_IMX_SOC=m
-CONFIG_USB=y
-CONFIG_USB_DEBUG=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_DEVICE_CLASS is not set
-CONFIG_USB_MON=y
-CONFIG_USB_EHCI_HCD=y
-# CONFIG_USB_EHCI_TT_NEWSCHED is not set
-CONFIG_USB_EHCI_MXC=y
-CONFIG_USB_ACM=y
-CONFIG_USB_PRINTER=y
-CONFIG_USB_WDM=y
-CONFIG_USB_STORAGE=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_DEBUG_FILES=y
-CONFIG_USB_ETH=m
-CONFIG_USB_ULPI=y
-CONFIG_MMC=y
-CONFIG_MMC_MXC=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_DS1374=y
-CONFIG_RTC_MXC=m
-CONFIG_EXT2_FS=y
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-CONFIG_EXT2_FS_XIP=y
-CONFIG_EXT3_FS=y
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-CONFIG_AUTOFS4_FS=y
-CONFIG_ISO9660_FS=y
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=y
-CONFIG_TMPFS=y
-CONFIG_JFFS2_FS=y
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_LZO=y
-CONFIG_JFFS2_CMODE_NONE=y
-CONFIG_UBIFS_FS=y
-CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
-CONFIG_NFS_V4=y
-CONFIG_ROOT_NFS=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_CODEPAGE_850=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_DEBUG_FS=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-# CONFIG_CRYPTO_HW is not set
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.5-rc4.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.5-rc4.config
deleted file mode 100644
index ef43bc3..0000000
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.5-rc4.config
+++ /dev/null
@@ -1,132 +0,0 @@
-CONFIG_EXPERIMENTAL=y
-# CONFIG_SWAP is not set
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_CGROUPS=y
-CONFIG_EXPERT=y
-CONFIG_PERF_EVENTS=y
-# CONFIG_COMPAT_BRK is not set
-CONFIG_SLAB=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_ARCH_MXC=y
-CONFIG_ARCH_IMX_V4_V5=y
-CONFIG_MACH_IMX27_DT=y
-CONFIG_MXC_IRQ_PRIOR=y
-CONFIG_MXC_DEBUG_BOARD=y
-CONFIG_PREEMPT=y
-CONFIG_AEABI=y
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_FPE_NWFPE=y
-CONFIG_FPE_NWFPE_XP=y
-CONFIG_PM_DEBUG=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_LRO is not set
-# CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
-# CONFIG_WIRELESS is not set
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_MTD=y
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_CFI_ADV_OPTIONS=y
-CONFIG_MTD_CFI_GEOMETRY=y
-# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set
-# CONFIG_MTD_CFI_I2 is not set
-CONFIG_MTD_CFI_INTELEXT=y
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_MXC=y
-CONFIG_MTD_UBI=y
-CONFIG_EEPROM_AT24=y
-CONFIG_EEPROM_AT25=y
-CONFIG_NETDEVICES=y
-CONFIG_CS89x0=y
-CONFIG_CS89x0_PLATFORM=y
-CONFIG_DM9000=y
-CONFIG_SMC91X=y
-CONFIG_SMC911X=y
-CONFIG_SMSC911X=y
-# CONFIG_WLAN is not set
-# CONFIG_INPUT_MOUSEDEV is not set
-CONFIG_INPUT_EVDEV=y
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_ADS7846=m
-# CONFIG_SERIO is not set
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_SERIAL_IMX=y
-CONFIG_SERIAL_IMX_CONSOLE=y
-# CONFIG_HW_RANDOM is not set
-CONFIG_I2C=y
-CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_IMX=y
-CONFIG_SPI=y
-CONFIG_SPI_IMX=y
-CONFIG_SPI_SPIDEV=y
-CONFIG_W1=y
-CONFIG_W1_MASTER_MXC=y
-CONFIG_W1_SLAVE_THERM=y
-CONFIG_WATCHDOG=y
-CONFIG_REGULATOR=y
-CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_FB=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=y
-CONFIG_LCD_L4F00242T03=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FONTS=y
-CONFIG_FONT_8x8=y
-CONFIG_LOGO=y
-# CONFIG_HID_SUPPORT is not set
-# CONFIG_USB_SUPPORT is not set
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_PCF8563=y
-CONFIG_DMADEVICES=y
-CONFIG_IMX_SDMA=y
-CONFIG_IMX_DMA=y
-# CONFIG_IOMMU_SUPPORT is not set
-CONFIG_EXT2_FS=y
-# CONFIG_DNOTIFY is not set
-# CONFIG_PROC_PAGE_MONITOR is not set
-CONFIG_TMPFS=y
-CONFIG_JFFS2_FS=y
-CONFIG_UBIFS_FS=y
-CONFIG_NFS_FS=y
-CONFIG_ROOT_NFS=y
-CONFIG_NLS=y
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_ISO8859_15=m
-CONFIG_PRINTK_TIME=y
-CONFIG_DEBUG_FS=y
-# CONFIG_SCHED_DEBUG is not set
-# CONFIG_DEBUG_PREEMPT is not set
-CONFIG_DEBUG_INFO=y
-# CONFIG_FTRACE is not set
-CONFIG_DEBUG_LL=y
-CONFIG_EARLY_PRINTK=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.6.3.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.6.3.config
deleted file mode 120000
index 8113448..0000000
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.6.3.config
+++ /dev/null
@@ -1 +0,0 @@
-apf27-linux-3.6.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.6.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.6.config
deleted file mode 100644
index 82c4440..0000000
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.6.config
+++ /dev/null
@@ -1,140 +0,0 @@
-CONFIG_EXPERIMENTAL=y
-# CONFIG_SWAP is not set
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_CGROUPS=y
-CONFIG_EXPERT=y
-CONFIG_PERF_EVENTS=y
-# CONFIG_COMPAT_BRK is not set
-CONFIG_SLAB=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_ARCH_MXC=y
-CONFIG_ARCH_IMX_V4_V5=y
-CONFIG_MACH_IMX27_DT=y
-CONFIG_MXC_IRQ_PRIOR=y
-CONFIG_MXC_DEBUG_BOARD=y
-CONFIG_PREEMPT=y
-CONFIG_AEABI=y
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_FPE_NWFPE=y
-CONFIG_FPE_NWFPE_XP=y
-CONFIG_PM_DEBUG=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_LRO is not set
-# CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
-# CONFIG_WIRELESS is not set
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_MTD=y
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_CFI_ADV_OPTIONS=y
-CONFIG_MTD_CFI_GEOMETRY=y
-# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set
-# CONFIG_MTD_CFI_I2 is not set
-CONFIG_MTD_CFI_INTELEXT=y
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_MXC=y
-CONFIG_MTD_UBI=y
-CONFIG_EEPROM_AT24=y
-CONFIG_EEPROM_AT25=y
-CONFIG_NETDEVICES=y
-CONFIG_MII=y
-# CONFIG_NET_VENDOR_BROADCOM is not set
-# CONFIG_NET_VENDOR_CHELSIO is not set
-# CONFIG_NET_VENDOR_CIRRUS is not set
-# CONFIG_NET_VENDOR_FARADAY is not set
-# CONFIG_NET_VENDOR_INTEL is not set
-# CONFIG_NET_VENDOR_MARVELL is not set
-# CONFIG_NET_VENDOR_MICREL is not set
-# CONFIG_NET_VENDOR_MICROCHIP is not set
-# CONFIG_NET_VENDOR_NATSEMI is not set
-# CONFIG_NET_VENDOR_SEEQ is not set
-# CONFIG_NET_VENDOR_SMSC is not set
-# CONFIG_NET_VENDOR_STMICRO is not set
-# CONFIG_NET_VENDOR_WIZNET is not set
-CONFIG_SMSC_PHY=y
-# CONFIG_WLAN is not set
-# CONFIG_INPUT_MOUSEDEV is not set
-CONFIG_INPUT_EVDEV=y
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_ADS7846=m
-# CONFIG_SERIO is not set
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_SERIAL_IMX=y
-CONFIG_SERIAL_IMX_CONSOLE=y
-# CONFIG_HW_RANDOM is not set
-CONFIG_I2C=y
-CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_IMX=y
-CONFIG_SPI=y
-CONFIG_SPI_IMX=y
-CONFIG_SPI_SPIDEV=y
-CONFIG_W1=y
-CONFIG_W1_MASTER_MXC=y
-CONFIG_W1_SLAVE_THERM=y
-CONFIG_WATCHDOG=y
-CONFIG_REGULATOR=y
-CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_FB=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=y
-CONFIG_LCD_L4F00242T03=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FONTS=y
-CONFIG_FONT_8x8=y
-CONFIG_LOGO=y
-# CONFIG_USB_SUPPORT is not set
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_PCF8563=y
-CONFIG_DMADEVICES=y
-CONFIG_IMX_SDMA=y
-CONFIG_IMX_DMA=y
-# CONFIG_IOMMU_SUPPORT is not set
-CONFIG_EXT2_FS=y
-# CONFIG_DNOTIFY is not set
-# CONFIG_PROC_PAGE_MONITOR is not set
-CONFIG_TMPFS=y
-CONFIG_JFFS2_FS=y
-CONFIG_UBIFS_FS=y
-CONFIG_NFS_FS=y
-CONFIG_ROOT_NFS=y
-CONFIG_NLS=y
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_ISO8859_15=m
-CONFIG_PRINTK_TIME=y
-CONFIG_DEBUG_FS=y
-# CONFIG_SCHED_DEBUG is not set
-# CONFIG_DEBUG_PREEMPT is not set
-CONFIG_DEBUG_INFO=y
-# CONFIG_FTRACE is not set
-CONFIG_DEBUG_LL=y
-CONFIG_EARLY_PRINTK=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.7-rc3.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.7-rc4.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.7-rc3.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.7-rc4.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 a9f3911..47eb026 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.7.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.7.config
@@ -6,10 +6,11 @@ CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
CONFIG_LOG_BUF_SHIFT=14
CONFIG_CGROUPS=y
-CONFIG_EXPERT=y
-CONFIG_PERF_EVENTS=y
+CONFIG_EMBEDDED=y
# CONFIG_COMPAT_BRK is not set
CONFIG_SLAB=y
+CONFIG_PROFILING=y
+CONFIG_OPROFILE=m
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
# CONFIG_BLK_DEV_BSG is not set
@@ -39,8 +40,23 @@ CONFIG_IP_PNP_DHCP=y
# CONFIG_INET_XFRM_MODE_BEET is not set
# CONFIG_INET_LRO is not set
# CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
-# CONFIG_WIRELESS is not set
+CONFIG_IPV6=y
+CONFIG_CAN=m
+CONFIG_CAN_RAW=m
+CONFIG_CAN_BCM=m
+CONFIG_CAN_VCAN=m
+CONFIG_CAN_MCP251X=m
+CONFIG_BT=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_HIDP=m
+CONFIG_BT_HCIBTUSB=m
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_CFG80211=m
+CONFIG_MAC80211=m
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
@@ -58,23 +74,42 @@ CONFIG_MTD_PHYSMAP=y
CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_MXC=y
CONFIG_MTD_UBI=y
+CONFIG_PROC_DEVICETREE=y
CONFIG_EEPROM_AT24=y
CONFIG_EEPROM_AT25=y
+CONFIG_SCSI=y
CONFIG_NETDEVICES=y
-CONFIG_CS89x0=y
-CONFIG_CS89x0_PLATFORM=y
-CONFIG_DM9000=y
-CONFIG_SMC91X=y
-CONFIG_SMC911X=y
-CONFIG_SMSC911X=y
-# CONFIG_WLAN is not set
-# CONFIG_INPUT_MOUSEDEV is not set
+CONFIG_MII=y
+# CONFIG_NET_VENDOR_BROADCOM is not set
+# CONFIG_NET_VENDOR_CHELSIO is not set
+# CONFIG_NET_VENDOR_CIRRUS is not set
+# CONFIG_NET_VENDOR_FARADAY is not set
+# CONFIG_NET_VENDOR_INTEL is not set
+# CONFIG_NET_VENDOR_MARVELL is not set
+# CONFIG_NET_VENDOR_MICREL is not set
+# CONFIG_NET_VENDOR_MICROCHIP is not set
+# CONFIG_NET_VENDOR_NATSEMI is not set
+# CONFIG_NET_VENDOR_SEEQ is not set
+# CONFIG_NET_VENDOR_SMSC is not set
+# CONFIG_NET_VENDOR_STMICRO is not set
+# CONFIG_NET_VENDOR_WIZNET is not set
+CONFIG_SMSC_PHY=y
+CONFIG_RTL8187=m
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_SDIO=m
+CONFIG_RT2X00=m
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RTL8192CU=m
+CONFIG_ZD1211RW=m
+CONFIG_INPUT_JOYDEV=y
CONFIG_INPUT_EVDEV=y
-# CONFIG_INPUT_KEYBOARD is not set
+CONFIG_KEYBOARD_GPIO=y
+CONFIG_KEYBOARD_IMX=m
# CONFIG_INPUT_MOUSE is not set
+CONFIG_INPUT_JOYSTICK=y
CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_ADS7846=m
-# CONFIG_SERIO is not set
# CONFIG_LEGACY_PTYS is not set
CONFIG_SERIAL_IMX=y
CONFIG_SERIAL_IMX_CONSOLE=y
@@ -84,14 +119,29 @@ CONFIG_I2C_CHARDEV=y
CONFIG_I2C_IMX=y
CONFIG_SPI=y
CONFIG_SPI_IMX=y
-CONFIG_SPI_SPIDEV=y
+CONFIG_SPI_SPIDEV=m
+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
+CONFIG_MEDIA_SUPPORT=m
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_MEDIA_USB_SUPPORT=y
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_PWC=m
+CONFIG_V4L_PLATFORM_DRIVERS=y
+CONFIG_SOC_CAMERA=m
+CONFIG_VIDEO_MX2=m
+# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
+# CONFIG_DVB_AU8522_V4L is not set
+# CONFIG_DVB_TUNER_DIB0070 is not set
+# CONFIG_DVB_TUNER_DIB0090 is not set
CONFIG_FB=y
+# CONFIG_FB_MX3 is not set
CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_LCD_CLASS_DEVICE=y
CONFIG_LCD_L4F00242T03=y
@@ -100,24 +150,69 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_FONTS=y
CONFIG_FONT_8x8=y
CONFIG_LOGO=y
-# CONFIG_USB_SUPPORT is not set
+CONFIG_SOUND=m
+CONFIG_SND=m
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+# CONFIG_SND_DRIVERS is not set
+# CONFIG_SND_ARM is not set
+# CONFIG_SND_SPI is not set
+# CONFIG_SND_USB is not set
+CONFIG_SND_SOC=m
+CONFIG_SND_IMX_SOC=m
+CONFIG_USB=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_MXC=y
+CONFIG_USB_ACM=y
+CONFIG_USB_PRINTER=y
+CONFIG_USB_STORAGE=y
+CONFIG_USB_SERIAL=y
+CONFIG_USB_SERIAL_FTDI_SIO=y
+CONFIG_USB_SERIAL_PL2303=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_ETH=m
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_MASS_STORAGE=m
+CONFIG_USB_G_HID=m
+CONFIG_USB_ULPI=y
+CONFIG_MMC=y
+CONFIG_MMC_MXC=y
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_ONESHOT=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+CONFIG_LEDS_TRIGGER_BACKLIGHT=y
+CONFIG_LEDS_TRIGGER_CPU=y
+CONFIG_LEDS_TRIGGER_GPIO=y
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
+CONFIG_LEDS_TRIGGER_TRANSIENT=y
CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_PCF8563=y
+CONFIG_RTC_DRV_DS1374=y
+CONFIG_RTC_DRV_MXC=m
CONFIG_DMADEVICES=y
CONFIG_IMX_SDMA=y
CONFIG_IMX_DMA=y
# CONFIG_IOMMU_SUPPORT is not set
+CONFIG_IIO=m
CONFIG_EXT2_FS=y
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_POSIX_ACL=y
+CONFIG_EXT3_FS_SECURITY=y
# CONFIG_DNOTIFY is not set
+CONFIG_MSDOS_FS=y
+CONFIG_VFAT_FS=y
# CONFIG_PROC_PAGE_MONITOR is not set
CONFIG_TMPFS=y
CONFIG_JFFS2_FS=y
CONFIG_UBIFS_FS=y
CONFIG_NFS_FS=y
+CONFIG_NFS_V4=y
CONFIG_ROOT_NFS=y
-CONFIG_NLS=y
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_850=y
CONFIG_NLS_ISO8859_1=y
CONFIG_NLS_ISO8859_15=m
CONFIG_PRINTK_TIME=y
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.4.2.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.4.2.config
deleted file mode 120000
index ba0c3a3..0000000
--- a/buildroot/target/device/armadeus/apf28/apf28-linux-3.4.2.config
+++ /dev/null
@@ -1 +0,0 @@
-apf28-linux-3.4.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.4.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.4.config
deleted file mode 100644
index 3ac10f1..0000000
--- a/buildroot/target/device/armadeus/apf28/apf28-linux-3.4.config
+++ /dev/null
@@ -1,191 +0,0 @@
-CONFIG_EXPERIMENTAL=y
-# CONFIG_LOCALVERSION_AUTO is not set
-# CONFIG_SWAP is not set
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_EMBEDDED=y
-# CONFIG_COMPAT_BRK is not set
-CONFIG_SLAB=y
-CONFIG_PROFILING=y
-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_MXS=y
-CONFIG_MACH_MX28EVK=y
-CONFIG_MACH_APF28=y
-CONFIG_MACH_APF28_DEV=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_PREEMPT=y
-CONFIG_AEABI=y
-# CONFIG_OABI_COMPAT is not set
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CPU_IDLE=y
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_PNP=y
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_LRO is not set
-# CONFIG_INET_DIAG is not set
-CONFIG_IPV6=y
-CONFIG_CAN=m
-CONFIG_CAN_RAW=m
-CONFIG_CAN_BCM=m
-CONFIG_CAN_VCAN=m
-CONFIG_CAN_FLEXCAN=m
-CONFIG_BT=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNE |
|
From: Julien B a. A. <ar...@us...> - 2012-11-05 10:14:18
|
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 9e22603010f69eeee929ffacca90ba84fd418e5b (commit)
from 566b3542515c08338e6eb8f772faa2b12d327710 (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 9e22603010f69eeee929ffacca90ba84fd418e5b
Author: Julien Boibessot <jul...@ar...>
Date: Thu Oct 25 17:26:22 2012 +0200
[LINUX] APF27 / 3.6: fixes net devices support in default config
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf27/apf27-linux-3.6.config | 21 ++++++++++++++-----
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.6.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.6.config
index a9f3911..82c4440 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.6.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.6.config
@@ -61,12 +61,21 @@ CONFIG_MTD_UBI=y
CONFIG_EEPROM_AT24=y
CONFIG_EEPROM_AT25=y
CONFIG_NETDEVICES=y
-CONFIG_CS89x0=y
-CONFIG_CS89x0_PLATFORM=y
-CONFIG_DM9000=y
-CONFIG_SMC91X=y
-CONFIG_SMC911X=y
-CONFIG_SMSC911X=y
+CONFIG_MII=y
+# CONFIG_NET_VENDOR_BROADCOM is not set
+# CONFIG_NET_VENDOR_CHELSIO is not set
+# CONFIG_NET_VENDOR_CIRRUS is not set
+# CONFIG_NET_VENDOR_FARADAY is not set
+# CONFIG_NET_VENDOR_INTEL is not set
+# CONFIG_NET_VENDOR_MARVELL is not set
+# CONFIG_NET_VENDOR_MICREL is not set
+# CONFIG_NET_VENDOR_MICROCHIP is not set
+# CONFIG_NET_VENDOR_NATSEMI is not set
+# CONFIG_NET_VENDOR_SEEQ is not set
+# CONFIG_NET_VENDOR_SMSC is not set
+# CONFIG_NET_VENDOR_STMICRO is not set
+# CONFIG_NET_VENDOR_WIZNET is not set
+CONFIG_SMSC_PHY=y
# CONFIG_WLAN is not set
# CONFIG_INPUT_MOUSEDEV is not set
CONFIG_INPUT_EVDEV=y
hooks/post-receive
--
armadeus
|
|
From: Gwenhael Goavec-M. <gwe...@us...> - 2012-11-01 16:53:42
|
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 566b3542515c08338e6eb8f772faa2b12d327710 (commit)
via dfe4dae5cd8342f72d333755967abadbdccd1419 (commit)
via 0244b43f8a2cd6b3a1b17b5089bf575d7f3d16d6 (commit)
from 73568040163a18dfd048d56438eda2f4c16fefda (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 566b3542515c08338e6eb8f772faa2b12d327710
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date: Thu Nov 1 17:51:34 2012 +0100
[LINUX][3.7-rc3] APF28: adapt patches 0403, 0418, 0419 from 3.6
commit dfe4dae5cd8342f72d333755967abadbdccd1419
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date: Thu Nov 1 17:50:41 2012 +0100
[LINUX][3.7-rc3] APF28: import patch 0419
commit 0244b43f8a2cd6b3a1b17b5089bf575d7f3d16d6
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date: Thu Nov 1 17:49:56 2012 +0100
[LINUX] APF28: Add 3.7-rc3 kernel config file
-----------------------------------------------------------------------
Summary of changes:
...linux-3.6.config => apf28-linux-3.7-rc3.config} | 2 -
...f28-linux-3.6.config => apf28-linux-3.7.config} | 2 -
.../0403-armadeus-Add-apf28-support-dts.patch | 79 +++++++++-----------
...rmadeus-mx28-Add-pwm-pinmux-to-imx28-dtsi.patch | 25 ++++++
...eus-mx28-Add-lcdif16-pinmux-to-imx28-dtsi.patch | 8 +-
.../0420-armadeus-Add-apf28dev-dts.patch | 41 ++++++-----
6 files changed, 85 insertions(+), 72 deletions(-)
copy buildroot/target/device/armadeus/apf28/{apf28-linux-3.6.config => apf28-linux-3.7-rc3.config} (98%)
copy buildroot/target/device/armadeus/apf28/{apf28-linux-3.6.config => apf28-linux-3.7.config} (98%)
copy patches/linux/{3.6 => 3.7}/0403-armadeus-Add-apf28-support-dts.patch (66%)
create mode 100644 patches/linux/3.7/0418-armadeus-mx28-Add-pwm-pinmux-to-imx28-dtsi.patch
copy patches/linux/{3.6 => 3.7}/0419-armadeus-mx28-Add-lcdif16-pinmux-to-imx28-dtsi.patch (82%)
copy patches/linux/{3.6 => 3.7}/0420-armadeus-Add-apf28dev-dts.patch (84%)
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.6.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.7-rc3.config
similarity index 98%
copy from buildroot/target/device/armadeus/apf28/apf28-linux-3.6.config
copy to buildroot/target/device/armadeus/apf28/apf28-linux-3.7-rc3.config
index edb8bee..0044f03 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-linux-3.6.config
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-3.7-rc3.config
@@ -19,7 +19,6 @@ CONFIG_BSD_DISKLABEL=y
# CONFIG_IOSCHED_CFQ is not set
CONFIG_ARCH_MXS=y
CONFIG_MACH_MXS_DT=y
-CONFIG_MACH_MX28EVK=y
CONFIG_PREEMPT=y
CONFIG_AEABI=y
# CONFIG_OABI_COMPAT is not set
@@ -106,7 +105,6 @@ CONFIG_HWMON=m
CONFIG_WATCHDOG=y
CONFIG_MEDIA_SUPPORT=m
CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_VIDEO_VIVI=m
CONFIG_FB=y
CONFIG_FB_MXS=y
CONFIG_BACKLIGHT_LCD_SUPPORT=y
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.6.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.7.config
similarity index 98%
copy from buildroot/target/device/armadeus/apf28/apf28-linux-3.6.config
copy to buildroot/target/device/armadeus/apf28/apf28-linux-3.7.config
index edb8bee..0044f03 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-linux-3.6.config
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-3.7.config
@@ -19,7 +19,6 @@ CONFIG_BSD_DISKLABEL=y
# CONFIG_IOSCHED_CFQ is not set
CONFIG_ARCH_MXS=y
CONFIG_MACH_MXS_DT=y
-CONFIG_MACH_MX28EVK=y
CONFIG_PREEMPT=y
CONFIG_AEABI=y
# CONFIG_OABI_COMPAT is not set
@@ -106,7 +105,6 @@ CONFIG_HWMON=m
CONFIG_WATCHDOG=y
CONFIG_MEDIA_SUPPORT=m
CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_VIDEO_VIVI=m
CONFIG_FB=y
CONFIG_FB_MXS=y
CONFIG_BACKLIGHT_LCD_SUPPORT=y
diff --git a/patches/linux/3.6/0403-armadeus-Add-apf28-support-dts.patch b/patches/linux/3.7/0403-armadeus-Add-apf28-support-dts.patch
similarity index 66%
copy from patches/linux/3.6/0403-armadeus-Add-apf28-support-dts.patch
copy to patches/linux/3.7/0403-armadeus-Add-apf28-support-dts.patch
index 2a5614a..5d6d904 100644
--- a/patches/linux/3.6/0403-armadeus-Add-apf28-support-dts.patch
+++ b/patches/linux/3.7/0403-armadeus-Add-apf28-support-dts.patch
@@ -4,11 +4,23 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
---
-Index: linux-3.6-rc6/arch/arm/boot/dts/imx28-apf28.dts
+Index: linux-3.7-rc3/arch/arm/boot/dts/Makefile
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6-rc6/arch/arm/boot/dts/imx28-apf28.dts 2012-09-24 17:38:15.000000000 +0200
-@@ -0,0 +1,79 @@
+--- linux-3.7-rc3.orig/arch/arm/boot/dts/Makefile
++++ linux-3.7-rc3/arch/arm/boot/dts/Makefile
+@@ -56,6 +56,7 @@ dtb-$(CONFIG_ARCH_MXC) += imx51-babbage.
+ dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb \
+ imx23-olinuxino.dtb \
+ imx23-stmp378x_devb.dtb \
++ imx28-apf28.dtb \
+ imx28-apx4devkit.dtb \
+ imx28-cfa10036.dtb \
+ imx28-cfa10049.dtb \
+Index: linux-3.7-rc3/arch/arm/boot/dts/imx2 |
|
From: jorasse <jo...@us...> - 2012-11-01 14:27:59
|
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 73568040163a18dfd048d56438eda2f4c16fefda (commit)
from d574b800afe1bedd57104009fbece7a7ccfae8b1 (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 73568040163a18dfd048d56438eda2f4c16fefda
Author: Eric Jarrige <eri...@ar...>
Date: Thu Nov 1 15:30:37 2012 +0100
[BUILD] Add the missing file busybox-1.20.config - Thx Victor
-----------------------------------------------------------------------
Summary of changes:
.../{busybox-1.19.config => busybox-1.20.config} | 0
1 files changed, 0 insertions(+), 0 deletions(-)
copy buildroot/target/device/armadeus/{busybox-1.19.config => busybox-1.20.config} (100%)
diff --git a/buildroot/target/device/armadeus/busybox-1.19.config b/buildroot/target/device/armadeus/busybox-1.20.config
similarity index 100%
copy from buildroot/target/device/armadeus/busybox-1.19.config
copy to buildroot/target/device/armadeus/busybox-1.20.config
hooks/post-receive
--
armadeus
|