armadeus-commitlog Mailing List for armadeus (Page 61)
Brought to you by:
sszy
Menu
▾
▴
armadeus-commitlog — Armadeus GIT commit logs
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(43) |
Feb
(8) |
Mar
(7) |
Apr
(8) |
May
(14) |
Jun
(6) |
Jul
(4) |
Aug
(17) |
Sep
(18) |
Oct
(19) |
Nov
(52) |
Dec
(30) |
| 2008 |
Jan
(6) |
Feb
(6) |
Mar
(15) |
Apr
(22) |
May
(13) |
Jun
(11) |
Jul
(41) |
Aug
(10) |
Sep
(14) |
Oct
(21) |
Nov
(4) |
Dec
(66) |
| 2009 |
Jan
(67) |
Feb
(57) |
Mar
(90) |
Apr
(54) |
May
(64) |
Jun
(76) |
Jul
(14) |
Aug
(18) |
Sep
(18) |
Oct
(20) |
Nov
(15) |
Dec
(36) |
| 2010 |
Jan
(28) |
Feb
(25) |
Mar
(32) |
Apr
(23) |
May
(22) |
Jun
(62) |
Jul
(36) |
Aug
(16) |
Sep
(12) |
Oct
(20) |
Nov
(44) |
Dec
(25) |
| 2011 |
Jan
(36) |
Feb
(49) |
Mar
(28) |
Apr
(38) |
May
(26) |
Jun
(52) |
Jul
(33) |
Aug
(32) |
Sep
(19) |
Oct
(26) |
Nov
(13) |
Dec
(32) |
| 2012 |
Jan
(38) |
Feb
(34) |
Mar
(91) |
Apr
(35) |
May
(31) |
Jun
(72) |
Jul
(23) |
Aug
(13) |
Sep
(33) |
Oct
(47) |
Nov
(18) |
Dec
(22) |
| 2013 |
Jan
(31) |
Feb
(22) |
Mar
(26) |
Apr
(11) |
May
(38) |
Jun
(15) |
Jul
(37) |
Aug
(68) |
Sep
(34) |
Oct
(11) |
Nov
(26) |
Dec
(31) |
| 2014 |
Jan
(60) |
Feb
(55) |
Mar
(21) |
Apr
(31) |
May
(17) |
Jun
(35) |
Jul
(24) |
Aug
(17) |
Sep
(11) |
Oct
(23) |
Nov
(10) |
Dec
(23) |
| 2015 |
Jan
(15) |
Feb
(34) |
Mar
(46) |
Apr
(23) |
May
(12) |
Jun
(14) |
Jul
(18) |
Aug
(22) |
Sep
(6) |
Oct
(2) |
Nov
(1) |
Dec
(6) |
| 2016 |
Jan
(5) |
Feb
(7) |
Mar
(10) |
Apr
(10) |
May
(17) |
Jun
(6) |
Jul
(4) |
Aug
(6) |
Sep
(22) |
Oct
(8) |
Nov
(9) |
Dec
(5) |
| 2017 |
Jan
(11) |
Feb
(12) |
Mar
(27) |
Apr
(9) |
May
(1) |
Jun
(5) |
Jul
(11) |
Aug
(10) |
Sep
(6) |
Oct
(10) |
Nov
(4) |
Dec
(6) |
| 2018 |
Jan
(6) |
Feb
(13) |
Mar
(9) |
Apr
(7) |
May
(10) |
Jun
(9) |
Jul
(21) |
Aug
(13) |
Sep
(10) |
Oct
(4) |
Nov
(6) |
Dec
(1) |
| 2019 |
Jan
(6) |
Feb
(2) |
Mar
(5) |
Apr
(6) |
May
(19) |
Jun
(14) |
Jul
(18) |
Aug
(3) |
Sep
(5) |
Oct
(7) |
Nov
(8) |
Dec
(4) |
| 2020 |
Jan
(10) |
Feb
(3) |
Mar
(9) |
Apr
(7) |
May
(2) |
Jun
(18) |
Jul
(3) |
Aug
|
Sep
|
Oct
(7) |
Nov
|
Dec
(1) |
| 2021 |
Jan
(9) |
Feb
(6) |
Mar
(4) |
Apr
(11) |
May
(7) |
Jun
(5) |
Jul
(2) |
Aug
(4) |
Sep
(10) |
Oct
(9) |
Nov
(5) |
Dec
|
| 2022 |
Jan
(2) |
Feb
(12) |
Mar
(3) |
Apr
(5) |
May
(1) |
Jun
(3) |
Jul
(2) |
Aug
(1) |
Sep
(4) |
Oct
(4) |
Nov
(1) |
Dec
(3) |
| 2023 |
Jan
(5) |
Feb
(3) |
Mar
(3) |
Apr
(2) |
May
(1) |
Jun
(3) |
Jul
(3) |
Aug
(2) |
Sep
(1) |
Oct
(1) |
Nov
|
Dec
(4) |
| 2024 |
Jan
(2) |
Feb
(3) |
Mar
(8) |
Apr
(4) |
May
(1) |
Jun
(13) |
Jul
(7) |
Aug
(1) |
Sep
(6) |
Oct
(5) |
Nov
(11) |
Dec
(7) |
| 2025 |
Jan
(3) |
Feb
(1) |
Mar
(6) |
Apr
(4) |
May
(4) |
Jun
(1) |
Jul
(1) |
Aug
(7) |
Sep
(4) |
Oct
(4) |
Nov
(4) |
Dec
(1) |
| 2026 |
Jan
(3) |
Feb
(7) |
Mar
(3) |
Apr
(1) |
May
(6) |
Jun
(3) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: jorasse <jo...@us...> - 2013-06-18 03:53:45
|
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 68c135c46b47af412e3124b2f0cacdd9abe13d9f (commit)
via 5d4fb54016aad2e554e3c84b0e4a37698d2de13b (commit)
from d9e290c3653d4c4efcde87afa410b408a5ea8006 (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 68c135c46b47af412e3124b2f0cacdd9abe13d9f
Author: Philippe Reynes <tr...@ya...>
Date: Sun Jun 16 10:27:09 2013 +0200
[LINUX] 3.10: apf27dev: add rtc ds1374 to the dts
Signed-off-by: Philippe Reynes <tr...@ya...>
commit 5d4fb54016aad2e554e3c84b0e4a37698d2de13b
Author: Philippe Reynes <tr...@ya...>
Date: Sun Jun 16 19:18:07 2013 +0200
[LINUX] 3.10: apf27: move to 3.10-rc6
Signed-off-by: Philippe Reynes <tr...@ya...>
-----------------------------------------------------------------------
Summary of changes:
...3.10-rc5.config => apf27-linux-3.10-rc6.config} | 0
patches/linux/{3.10-rc5 => 3.10-rc6} | 0
...pf27dev-add-rtc-ds1374-to-the-device-tree.patch | 30 ++++++++++++++++++++
3 files changed, 30 insertions(+), 0 deletions(-)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.10-rc5.config => apf27-linux-3.10-rc6.config} (100%)
rename patches/linux/{3.10-rc5 => 3.10-rc6} (100%)
create mode 100644 patches/linux/3.10/0205-armadeus-apf27dev-add-rtc-ds1374-to-the-device-tree.patch
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.10-rc5.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.10-rc6.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.10-rc5.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.10-rc6.config
diff --git a/patches/linux/3.10-rc5 b/patches/linux/3.10-rc6
similarity index 100%
rename from patches/linux/3.10-rc5
rename to patches/linux/3.10-rc6
diff --git a/patches/linux/3.10/0205-armadeus-apf27dev-add-rtc-ds1374-to-the-device-tree.patch b/patches/linux/3.10/0205-armadeus-apf27dev-add-rtc-ds1374-to-the-device-tree.patch
new file mode 100644
index 0000000..40f6261
--- /dev/null
+++ b/patches/linux/3.10/0205-armadeus-apf27dev-add-rtc-ds1374-to-the-device-tree.patch
@@ -0,0 +1,30 @@
+From 85e466fd3f5420bd2798bb85c2c07497eda04686 Mon Sep 17 00:00:00 2001
+From: Philippe Reynes <tr...@ya...>
+Date: Sat, 15 Jun 2013 23:30:25 +0200
+Subject: [PATCH] apf27dev: add rtc ds1374 to the device tree
+
+
+Signed-off-by: Philippe Reynes <tr...@ya...>
+---
+ arch/arm/boot/dts/imx27-apf27dev.dts | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/arch/arm/boot/dts/imx27-apf27dev.dts b/arch/arm/boot/dts/imx27-apf27dev.dts
+index 66b8e1c..2a377ca 100644
+--- a/arch/arm/boot/dts/imx27-apf27dev.dts
++++ b/arch/arm/boot/dts/imx27-apf27dev.dts
+@@ -53,6 +53,11 @@
+ &i2c1 {
+ clock-frequency = <400000>;
+ status = "okay";
++
++ rtc@68 {
++ compatible = "dallas,ds1374";
++ reg = <0x68>;
++ };
+ };
+
+ &i2c2 {
+--
+1.7.4.4
+
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2013-06-15 10:53:16
|
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 d9e290c3653d4c4efcde87afa410b408a5ea8006 (commit)
via fe4bf169a066ce5d0b13cf4178c218e1a7fd54b8 (commit)
from 8de1f775cbdc345ee55283902e14070c4f82ab1c (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 d9e290c3653d4c4efcde87afa410b408a5ea8006
Author: Philippe Reynes <tr...@ya...>
Date: Sat Jun 15 11:01:07 2013 +0200
[LINUX] apf27: 3.9: move to 3.9.6
Signed-off-by: Philippe Reynes <tr...@ya...>
commit fe4bf169a066ce5d0b13cf4178c218e1a7fd54b8
Author: Philippe Reynes <tr...@ya...>
Date: Sat Jun 15 11:01:06 2013 +0200
[LINUX] apf27: 3.10: move to 3.10-rc5
Signed-off-by: Philippe Reynes <tr...@ya...>
-----------------------------------------------------------------------
Summary of changes:
...3.10-rc2.config => apf27-linux-3.10-rc5.config} | 0
...linux-3.9.4.config => apf27-linux-3.9.6.config} | 0
patches/linux/{3.10-rc2 => 3.10-rc5} | 0
patches/linux/{3.9.4 => 3.9.6} | 0
4 files changed, 0 insertions(+), 0 deletions(-)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.10-rc2.config => apf27-linux-3.10-rc5.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.9.4.config => apf27-linux-3.9.6.config} (100%)
rename patches/linux/{3.10-rc2 => 3.10-rc5} (100%)
rename patches/linux/{3.9.4 => 3.9.6} (100%)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.10-rc2.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.10-rc5.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.10-rc2.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.10-rc5.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.9.4.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.9.6.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.9.4.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.9.6.config
diff --git a/patches/linux/3.10-rc2 b/patches/linux/3.10-rc5
similarity index 100%
rename from patches/linux/3.10-rc2
rename to patches/linux/3.10-rc5
diff --git a/patches/linux/3.9.4 b/patches/linux/3.9.6
similarity index 100%
rename from patches/linux/3.9.4
rename to patches/linux/3.9.6
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2013-06-13 14:04:15
|
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 8de1f775cbdc345ee55283902e14070c4f82ab1c (commit)
from 594285fbff5ab5a45e1d2ed0088fc24eb2a25a26 (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 8de1f775cbdc345ee55283902e14070c4f82ab1c
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jun 13 16:03:56 2013 +0200
[BUILDROOT] 2013.05: ti-utils: fix github tarball to use commit id (backport from BR mainline)
-----------------------------------------------------------------------
Summary of changes:
...utils-fix-github-tarball-to-use-commit-id.patch | 25 ++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
create mode 100644 patches/buildroot/2013.05/004-gilliland-ti-utils-fix-github-tarball-to-use-commit-id.patch
diff --git a/patches/buildroot/2013.05/004-gilliland-ti-utils-fix-github-tarball-to-use-commit-id.patch b/patches/buildroot/2013.05/004-gilliland-ti-utils-fix-github-tarball-to-use-commit-id.patch
new file mode 100644
index 0000000..cc6c513
--- /dev/null
+++ b/patches/buildroot/2013.05/004-gilliland-ti-utils-fix-github-tarball-to-use-commit-id.patch
@@ -0,0 +1,25 @@
+From 7869f83bda815279f8245913d33062e525d4efe1 Mon Sep 17 00:00:00 2001
+From: Spenser Gilliland <sp...@gi...>
+Date: Thu, 06 Jun 2013 06:47:28 +0000
+Subject: ti-utils: fix github tarball to use commit id
+
+Signed-off-by: Spenser Gilliland <sp...@gi...>
+Signed-off-by: Peter Korsgaard <ja...@su...>
+---
+(limited to 'package/ti-utils/ti-utils.mk')
+
+diff --git a/package/ti-utils/ti-utils.mk b/package/ti-utils/ti-utils.mk
+index d739f3c..a76fde1 100644
+--- a/package/ti-utils/ti-utils.mk
++++ b/package/ti-utils/ti-utils.mk
+@@ -5,7 +5,7 @@
+ ################################################################################
+
+ TI_UTILS_VERSION = 06dbdb2
+-TI_UTILS_SITE = http://github.com/gxk/ti-utils/tarball/master
++TI_UTILS_SITE = http://github.com/gxk/ti-utils/tarball/$(TI_UTILS_VERSION)
+ TI_UTILS_DEPENDENCIES = libnl
+
+ define TI_UTILS_BUILD_CMDS
+--
+cgit v0.9.1
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2013-06-13 13:51: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 594285fbff5ab5a45e1d2ed0088fc24eb2a25a26 (commit)
from eb8293bbc332014a7d19bb95112350662b5eb32a (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 594285fbff5ab5a45e1d2ed0088fc24eb2a25a26
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jun 13 15:51:00 2013 +0200
[BUILDROOT] 2013.05: ltrace: fix download URL
-----------------------------------------------------------------------
Summary of changes:
.../003-armadeus-ltrace-fix-download-url.patch | 26 ++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
create mode 100644 patches/buildroot/2013.05/003-armadeus-ltrace-fix-download-url.patch
diff --git a/patches/buildroot/2013.05/003-armadeus-ltrace-fix-download-url.patch b/patches/buildroot/2013.05/003-armadeus-ltrace-fix-download-url.patch
new file mode 100644
index 0000000..603d0bd
--- /dev/null
+++ b/patches/buildroot/2013.05/003-armadeus-ltrace-fix-download-url.patch
@@ -0,0 +1,26 @@
+From 6cc3f1ef239c712e204960a7511d04e450bdf325 Mon Sep 17 00:00:00 2001
+From: Julien Boibessot <jul...@ar...>
+Date: Thu, 13 Jun 2013 14:58:36 +0200
+Subject: [PATCH] ltrace: fix download URL
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+---
+ package/ltrace/ltrace.mk | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/package/ltrace/ltrace.mk b/package/ltrace/ltrace.mk
+index 78b5a9d..7b8d859 100644
+--- a/package/ltrace/ltrace.mk
++++ b/package/ltrace/ltrace.mk
+@@ -5,7 +5,7 @@
+ ################################################################################
+
+ LTRACE_VERSION = 0.7.2
+-LTRACE_SITE = http://alioth.debian.org/frs/download.php/3848
++LTRACE_SITE = http://alioth.debian.org/frs/download.php/file/3848
+ LTRACE_SOURCE = ltrace-$(LTRACE_VERSION).tar.bz2
+ LTRACE_DEPENDENCIES = libelf
+ LTRACE_AUTORECONF = YES
+--
+1.7.5.4
+
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2013-06-11 19:22:39
|
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 eb8293bbc332014a7d19bb95112350662b5eb32a (commit)
from 69d9a4e0096a27b85d24321e024348676b0a014f (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 eb8293bbc332014a7d19bb95112350662b5eb32a
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jun 11 21:21:39 2013 +0200
[LINUX] 3.4: add spidev on SPI2 of APF28Dev
-----------------------------------------------------------------------
Summary of changes:
...1-armadeus-add_apf28dev_baseboard_support.patch | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/patches/linux/3.4/451-armadeus-add_apf28dev_baseboard_support.patch b/patches/linux/3.4/451-armadeus-add_apf28dev_baseboard_support.patch
index cf141f1..5b88133 100644
--- a/patches/linux/3.4/451-armadeus-add_apf28dev_baseboard_support.patch
+++ b/patches/linux/3.4/451-armadeus-add_apf28dev_baseboard_support.patch
@@ -44,8 +44,8 @@ Index: linux-3.4.48/arch/arm/mach-mxs/Makefile
Index: linux-3.4.48/arch/arm/mach-mxs/apf28dev-baseboard.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.48/arch/arm/mach-mxs/apf28dev-baseboard.c 2013-06-11 06:54:21.086222359 +0200
-@@ -0,0 +1,209 @@
++++ linux-3.4.48/arch/arm/mach-mxs/apf28dev-baseboard.c 2013-06-11 21:18:24.095298046 +0200
+@@ -0,0 +1,222 @@
+/*
+ * Copyright 2011-2013 Armadeus systems.
+ *
@@ -69,6 +69,7 @@ Index: linux-3.4.48/arch/arm/mach-mxs/apf28dev-baseboard.c
+#include <linux/leds.h>
+#include <linux/irq.h>
+#include <linux/clk.h>
++#include <linux/spi/spi.h>
+
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
@@ -231,6 +232,15 @@ Index: linux-3.4.48/arch/arm/mach-mxs/apf28dev-baseboard.c
+ .flags = SLOTF_4_BIT_CAPABLE,
+};
+
++static struct spi_board_info spi_board_info[] __initdata = {
++ {
++ .modalias = "spidev",
++ .max_speed_hz = 8000000,
++ .bus_num = 2, /* SSPI2 */
++ .chip_select = 0,
++ }
++};
++
+void __init apf28dev_init(void)
+{
+ printk("--- %s\n", __func__);
@@ -253,6 +263,9 @@ Index: linux-3.4.48/arch/arm/mach-mxs/apf28dev-baseboard.c
+ mx28_add_mxs_mmc(0, &apf28dev_mmc0_pdata);
+
+ mx28_add_mxs_i2c(0);
++
++ spi_register_board_info(spi_board_info, ARRAY_SIZE(spi_board_info));
++ mx28_add_mxs_spi(2);
+}
+EXPORT_SYMBOL_GPL(apf28dev_init);
Index: linux-3.4.48/arch/arm/mach-mxs/mach-apf28.c
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2013-06-11 05:02: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 69d9a4e0096a27b85d24321e024348676b0a014f (commit)
from c6ead1e594061691245b2be8312849251dbae31c (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 69d9a4e0096a27b85d24321e024348676b0a014f
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jun 11 07:01:13 2013 +0200
[LINUX] 3.4: re-introduce 3.4 Linux support (for APF28 only), to have a xenomai working version on APF28.
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf28/apf28-linux-3.4.48.config | 1 +
.../device/armadeus/apf28/apf28-linux-3.4.config | 192 ++++
patches/linux/3.4.48 | 1 +
...50-fix-signed-12bits-to-32bits-conversion.patch | 33 +
...o-mxs-add_support_for_both_edge_interrupt.patch | 77 ++
...50-armadeus-add_custom_drivers_to_kconfig.patch | 24 +
..._star_completion_for_source_in_menuconfig.patch | 77 ++
.../450-armadeus-add_apf28_module_support.patch | 184 ++++
...1-armadeus-add_apf28dev_baseboard_support.patch | 294 ++++++
.../linux/3.4/454-armadeus-add-spi-support.patch | 19 +
...a-raw-and-processed-elements-to-info-mask.patch | 72 ++
...ix-lib-add-support-for-stmp-style-devices.patch | 184 ++++
...nction-for-initializing-triggered-buffers.patch | 186 ++++
.../800-armadeus-staging-iio-add_mxs_lradc.patch | 737 ++++++++++++++
...-armadeus-spi-add-spi-mxs-mainline-driver.patch | 1015 ++++++++++++++++++++
...device-tree-mapping-table-parsing-support.patch | 537 +++++++++++
...kumar-pinctrl-replace-list-with-get_count.patch | 634 ++++++++++++
...05-brown-clkdev-implement-managed-clk-get.patch | 137 +++
...ree-move-devicetree-support-code-into-spi.patch | 353 +++++++
...inctrl-implement-pinctrl-deferred-probing.patch | 82 ++
...n-pinctrl-implement-devm_pintctrl_get-put.patch | 296 ++++++
...epare-unprepare-transfer-if-not-populated.patch | 44 +
...-out-the-ssp-clock-configuration-function.patch | 100 ++
...2-armadeus-adding_rtc_stmp3xx_declaration.patch | 20 +
24 files changed, 5299 insertions(+), 0 deletions(-)
create mode 120000 buildroot/target/device/armadeus/apf28/apf28-linux-3.4.48.config
create mode 100644 buildroot/target/device/armadeus/apf28/apf28-linux-3.4.config
create mode 120000 patches/linux/3.4.48
create mode 100644 patches/linux/3.4/0001-Input-mma8450-fix-signed-12bits-to-32bits-conversion.patch
create mode 100644 patches/linux/3.4/0206-armadeus-mxs-gpio-mxs-add_support_for_both_edge_interrupt.patch
create mode 100644 patches/linux/3.4/050-armadeus-add_custom_drivers_to_kconfig.patch
create mode 100644 patches/linux/3.4/441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
create mode 100644 patches/linux/3.4/450-armadeus-add_apf28_module_support.patch
create mode 100644 patches/linux/3.4/451-armadeus-add_apf28dev_baseboard_support.patch
create mode 100644 patches/linux/3.4/454-armadeus-add-spi-support.patch
create mode 100644 patches/linux/3.4/799-2012-04-18-kernel-staging-iio-add-a-raw-and-processed-elements-to-info-mask.patch
create mode 100644 patches/linux/3.4/799-2012-04-20-pengutronix-lib-add-support-for-stmp-style-devices.patch
create mode 100644 patches/linux/3.4/799-2012-06-19-metafoo-iio-add-helper-function-for-initializing-triggered-buffers.patch
create mode 100644 patches/linux/3.4/800-armadeus-staging-iio-add_mxs_lradc.patch
create mode 100644 patches/linux/3.4/801-armadeus-spi-add-spi-mxs-mainline-driver.patch
create mode 100644 patches/linux/3.4/801a-2012-03-23-warren-pinctrl-core-device-tree-mapping-table-parsing-support.patch
create mode 100644 patches/linux/3.4/801a-2012-03-30-kumar-pinctrl-replace-list-with-get_count.patch
create mode 100644 patches/linux/3.4/801a-2012-04-05-brown-clkdev-implement-managed-clk-get.patch
create mode 100644 patches/linux/3.4/801a-2012-04-07-secretlab-spi-devicetree-move-devicetree-support-code-into-spi.patch
create mode 100644 patches/linux/3.4/801a-2012-04-10-walleij-pinctrl-implement-pinctrl-deferred-probing.patch
create mode 100644 patches/linux/3.4/801a-2012-04-16-warren-pinctrl-implement-devm_pintctrl_get-put.patch
create mode 100644 patches/linux/3.4/801a-2012-05-10-ti-spi-dont-call-prepare-unprepare-transfer-if-not-populated.patch
create mode 100644 patches/linux/3.4/801a-2012-08-03-denx-mmc-spi-pull-out-the-ssp-clock-configuration-function.patch
create mode 100644 patches/linux/3.4/802-armadeus-adding_rtc_stmp3xx_declaration.patch
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.4.48.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.4.48.config
new file mode 120000
index 0000000..ba0c3a3
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-3.4.48.config
@@ -0,0 +1 @@
+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
new file mode 100644
index 0000000..c50a91d
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-3.4.config
@@ -0,0 +1,192 @@
+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_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_HIDP=m
+CONFIG_BT_HCIBTUSB=m
+CONFIG_CFG80211=m
+CONFIG_NL80211_TESTMODE=y
+CONFIG_LIB80211=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_NAND_GPMI_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_RTL8187=m
+CONFIG_RT2X00=m
+CONFIG_RT73USB=m
+CONFIG_WL12XX_MENU=m
+CONFIG_WL12XX=m
+CONFIG_WL12XX_SDIO=m
+CONFIG_ZD1211RW=m
+CONFIG_INPUT_JOYDEV=y
+CONFIG_INPUT_EVDEV=y
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_UINPUT=m
+# CONFIG_LEGACY_PTYS is not set
+CONFIG_SERIAL_AMBA_PL011=y
+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
+CONFIG_SERIAL_MXS_AUART=y
+# CONFIG_HW_RANDOM is not set
+CONFIG_I2C=y
+CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_MXS=y
+CONFIG_SPI=y
+CONFIG_SPI_BITBANG=m
+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_SIMPLE is not set
+# CONFIG_MEDIA_TUNER_TDA8290 is not set
+# CONFIG_MEDIA_TUNER_TDA827X is not set
+# CONFIG_MEDIA_TUNER_TDA18271 is not set
+# CONFIG_MEDIA_TUNER_TDA9887 is not set
+# CONFIG_MEDIA_TUNER_TEA5761 is not set
+# CONFIG_MEDIA_TUNER_TEA5767 is not set
+# CONFIG_MEDIA_TUNER_MT20XX is not set
+# CONFIG_MEDIA_TUNER_MT2060 is not set
+# CONFIG_MEDIA_TUNER_MT2266 is not set
+# CONFIG_MEDIA_TUNER_MT2131 is not set
+# CONFIG_MEDIA_TUNER_QT1010 is not set
+# CONFIG_MEDIA_TUNER_XC2028 is not set
+# CONFIG_MEDIA_TUNER_XC5000 is not set
+# CONFIG_MEDIA_TUNER_XC4000 is not set
+# CONFIG_MEDIA_TUNER_MXL5005S is not set
+# CONFIG_MEDIA_TUNER_MXL5007T is not set
+# CONFIG_MEDIA_TUNER_MC44S803 is not set
+# CONFIG_MEDIA_TUNER_MAX2165 is not set
+# CONFIG_MEDIA_TUNER_TDA18218 is not set
+# CONFIG_MEDIA_TUNER_TDA18212 is not set
+CONFIG_VIDEO_VIVI=m
+# CONFIG_RADIO_ADAPTERS is not set
+CONFIG_FB=y
+CONFIG_FB_MXS=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_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_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_MXS=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_STMP=y
+CONFIG_DMADEVICES=y
+CONFIG_MXS_DMA=y
+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_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/patches/linux/3.4.48 b/patches/linux/3.4.48
new file mode 120000
index 0000000..af1817b
--- /dev/null
+++ b/patches/linux/3.4.48
@@ -0,0 +1 @@
+3.4
\ No newline at end of file
diff --git a/patches/linux/3.4/0001-Input-mma8450-fix-signed-12bits-to-32bits-conversion.patch b/patches/linux/3.4/0001-Input-mma8450-fix-signed-12bits-to-32bits-conversion.patch
new file mode 100644
index 0000000..a0ffc77
--- /dev/null
+++ b/patches/linux/3.4/0001-Input-mma8450-fix-signed-12bits-to-32bits-conversion.patch
@@ -0,0 +1,33 @@
+From da435877e057ed18d8a053685bbee1c85abea7fc Mon Sep 17 00:00:00 2001
+From: seb <seb...@ar...>
+Date: Thu, 28 Mar 2013 09:58:54 +0100
+Subject: [PATCH 1/1] Input: mma8450 - fix signed 12bits to 32bits conversion
+
+Event value is wrong. Should be in range -2048 to 2047, but is in range 0 to 4095.
+Use s8 to int conversion and remove 0xfff mask.
+
+Signed-off-by: Sebastien Royen <seb...@ar...>
+---
+ drivers/input/misc/mma8450.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/input/misc/mma8450.c b/drivers/input/misc/mma8450.c
+index 480557f..f330969 100644
+--- a/drivers/input/misc/mma8450.c
++++ b/drivers/input/misc/mma8450.c
+@@ -123,9 +123,9 @@ static void mma8450_poll(struct input_polled_dev *dev)
+ if (ret < 0)
+ return;
+
+- x = ((buf[1] << 4) & 0xff0) | (buf[0] & 0xf);
+- y = ((buf[3] << 4) & 0xff0) | (buf[2] & 0xf);
+- z = ((buf[5] << 4) & 0xff0) | (buf[4] & 0xf);
++ x = ((int)(s8)buf[1] << 4) | (buf[0] & 0xf);
++ y = ((int)(s8)buf[3] << 4) | (buf[2] & 0xf);
++ z = ((int)(s8)buf[5] << 4) | (buf[4] & 0xf);
+
+ input_report_abs(dev->input, ABS_X, x);
+ input_report_abs(dev->input, ABS_Y, y);
+--
+1.7.9.5
+
diff --git a/patches/linux/3.4/0206-armadeus-mxs-gpio-mxs-add_support_for_both_edge_interrupt.patch b/patches/linux/3.4/0206-armadeus-mxs-gpio-mxs-add_support_for_both_edge_interrupt.patch
new file mode 100644
index 0000000..d9d7a0b
--- /dev/null
+++ b/patches/linux/3.4/0206-armadeus-mxs-gpio-mxs-add_support_for_both_edge_interrupt.patch
@@ -0,0 +1,77 @@
+This patch adds support for IRQ_TYPE_EDGE_BOTH needed for some driver
+(gpio-keys).
+Inspired from gpio-mxc.c
+
+Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou at armadeus.com>
+---
+Index: linux-3.4.28/drivers/gpio/gpio-mxs.c
+===================================================================
+--- linux-3.4.28.orig/drivers/gpio/gpio-mxs.c 2013-02-08 17:00:23.000000000 +0100
++++ linux-3.4.28/drivers/gpio/gpio-mxs.c 2013-02-08 18:18:01.000000000 +0100
+@@ -58,20 +58,32 @@
+ int irq;
+ int virtual_irq_start;
+ struct bgpio_chip bgc;
++ u32 both_edges;
+ };
+
+ /* Note: This driver assumes 32 GPIOs are handled in one register */
+
+ static int mxs_gpio_set_irq_type(struct irq_data *d, unsigned int type)
+ {
++ u32 val;
+ u32 gpio = irq_to_gpio(d->irq);
++ u32 gpio_idx = d->hwirq;
+ u32 pin_mask = 1 << (gpio & 31);
+ struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
+ struct mxs_gpio_port *port = gc->private;
+ void __iomem *pin_addr;
+ int edge;
+
++ port->both_edges &= ~(1 << gpio_idx);
+ switch (type) {
++ case IRQ_TYPE_EDGE_BOTH:
++ val = gpio_get_value(port->bgc.gc.base + gpio_idx);
++ if (val)
++ edge = GPIO_INT_FALL_EDGE;
++ else
++ edge = GPIO_INT_RISE_EDGE;
++ port->both_edges |= pin_mask;
++ break;
+ case IRQ_TYPE_EDGE_RISING:
+ edge = GPIO_INT_RISE_EDGE;
+ break;
+@@ -108,6 +120,23 @@
+ return 0;
+ }
+
++static void mxs_flip_edge(struct mxs_gpio_port *port, u32 gpio)
++{
++ u32 bit, val, edge;
++ void __iomem *pin_addr;
++
++ bit = 1 << gpio;
++
++ pin_addr = port->base + PINCTRL_IRQPOL(port->id);
++ val = readl(pin_addr);
++ edge = val & bit;
++
++ if (edge)
++ writel(bit, pin_addr + MXS_CLR);
++ else
++ writel(bit, pin_addr + MXS_SET);
++}
++
+ /* MXS has one interrupt *per* gpio port */
+ static void mxs_gpio_irq_handler(u32 irq, struct irq_desc *desc)
+ {
+@@ -122,6 +151,9 @@
+
+ while (irq_stat != 0) {
+ int irqoffset = fls(irq_stat) - 1;
++ if (port->both_edges & (1 << irqoffset))
++ mxs_flip_edge(port, irqoffset);
++
+ generic_handle_irq(gpio_irq_no_base + irqoffset);
+ irq_stat &= ~(1 << irqoffset);
+ }
diff --git a/patches/linux/3.4/050-armadeus-add_custom_drivers_to_kconfig.patch b/patches/linux/3.4/050-armadeus-add_custom_drivers_to_kconfig.patch
new file mode 100644
index 0000000..9839872
--- /dev/null
+++ b/patches/linux/3.4/050-armadeus-add_custom_drivers_to_kconfig.patch
@@ -0,0 +1,24 @@
+This patch adds the possibility to have custom Armadeus drivers built in kernel or compiled as modules
+
+Index: linux-3.4.28/drivers/usb/Kconfig
+===================================================================
+--- linux-3.4.28.orig/drivers/usb/Kconfig 2013-01-28 05:51:45.000000000 +0100
++++ linux-3.4.28/drivers/usb/Kconfig 2013-03-25 10:45:08.000000000 +0100
+@@ -184,3 +184,5 @@
+ source "drivers/usb/otg/Kconfig"
+
+ endif # USB_SUPPORT
++
++source "drivers/armadeus/Kconfig"
+Index: linux-3.4.28/drivers/Makefile
+===================================================================
+--- linux-3.4.28.orig/drivers/Makefile 2013-03-25 10:34:50.000000000 +0100
++++ linux-3.4.28/drivers/Makefile 2013-03-25 10:45:08.000000000 +0100
+@@ -113,6 +113,7 @@
+ obj-$(CONFIG_HID) += hid/
+ obj-$(CONFIG_PPC_PS3) += ps3/
+ obj-$(CONFIG_OF) += of/
++obj-$(CONFIG_ARMADEUS_DRIVERS) += armadeus/
+ obj-$(CONFIG_SSB) += ssb/
+ obj-$(CONFIG_BCMA) += bcma/
+ obj-$(CONFIG_VHOST_NET) += vhost/
diff --git a/patches/linux/3.4/441-armadeus-adding_star_completion_for_source_in_menuconfig.patch b/patches/linux/3.4/441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
new file mode 100644
index 0000000..77841d2
--- /dev/null
+++ b/patches/linux/3.4/441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
@@ -0,0 +1,77 @@
+Index: linux-3.4.28/scripts/kconfig/zconf.tab.c_shipped
+===================================================================
+--- linux-3.4.28.orig/scripts/kconfig/zconf.tab.c_shipped 2013-03-25 11:05:01.000000000 +0100
++++ linux-3.4.28/scripts/kconfig/zconf.tab.c_shipped 2013-03-25 11:05:07.000000000 +0100
+@@ -86,6 +86,8 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <stdbool.h>
++#include <dirent.h>
++#include <sys/stat.h>
+
+ #include "lkc.h"
+
+@@ -93,6 +95,7 @@
+
+ #define PRINTD 0x0001
+ #define DEBUG_PARSE 0x0002
++#define BUFF_SIZE 300
+
+ int cdebug = PRINTD;
+
+@@ -106,8 +109,23 @@
+
+ static struct menu *current_menu, *current_entry;
+
++int isDir(const char *fullpath, const char *dname) {
++ struct stat sbuf;
+
++ if (*dname == '.')
++ return 0;
+
++ if (lstat(fullpath, &sbuf) == -1) {
++ fprintf(stderr, "lstat() Failed.\n");
++ return 0;
++ }
++
++ if(S_ISDIR(sbuf.st_mode)) {
++ return 1;
++ }
++
++return 0;
++}
+
+ /* Enabling traces. */
+ #ifndef YYDEBUG
+@@ -1900,8 +1918,30 @@
+ case 83:
+
+ {
++ char *name;
++ char *ptr;
++ char dirname[BUFF_SIZE];
++ char filename[BUFF_SIZE];
++ struct dirent *lecture;
++ DIR *rep;
++
+ printd(DEBUG_PARSE, "%s:%d:source %s\n", zconf_curname(), zconf_lineno(), (yyvsp[(2) - (3)].string));
+- zconf_nextfile((yyvsp[(2) - (3)].string));
++ name = (yyvsp[(2) -(3)].string);
++ ptr = strchr(name, '*');
++ if(ptr != NULL) {
++ *ptr = '\0';
++ snprintf(dirname, BUFF_SIZE, "%s/%s", getenv(SRCTREE), name);
++ rep = opendir(dirname);
++ while ((lecture = readdir(rep))) {
++ snprintf(filename, BUFF_SIZE, "%s/%s/%s", getenv(SRCTREE), name, lecture->d_name);
++ if(isDir(filename, lecture->d_name)){
++ snprintf(filename, BUFF_SIZE, "%s/%s/%s/%s", getenv(SRCTREE), name, lecture->d_name, ptr+1);
++ zconf_nextfile(filename);
++ }
++ }
++ } else {
++ zconf_nextfile((yyvsp[(2) - (3)].string));
++ }
+ ;}
+ break;
+
diff --git a/patches/linux/3.4/450-armadeus-add_apf28_module_support.patch b/patches/linux/3.4/450-armadeus-add_apf28_module_support.patch
new file mode 100644
index 0000000..57fe584
--- /dev/null
+++ b/patches/linux/3.4/450-armadeus-add_apf28_module_support.patch
@@ -0,0 +1,184 @@
+Add Armadeus systems APF28 SOM support.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-3.4.37/arch/arm/mach-mxs/Kconfig
+===================================================================
+--- linux-3.4.37.orig/arch/arm/mach-mxs/Kconfig 2013-03-20 21:05:12.000000000 +0100
++++ linux-3.4.37/arch/arm/mach-mxs/Kconfig 2013-04-08 14:27:12.000000000 +0200
+@@ -107,4 +107,15 @@
+ bool "Support Bluegiga APX4 Development Kit"
+ select MODULE_APX4
+
++config MACH_APF28
++ bool "Armadeus APF28 module"
++ select SOC_IMX28
++ select MXS_HAVE_AMBA_DUART
++ select MXS_HAVE_PLATFORM_FEC
++ select MXS_HAVE_PLATFORM_MXS_SPI
++ select MXS_HAVE_PLATFORM_GPMI_NAND
++ help
++ Include support for the Armadeus systems APF28 SOM. This includes
++ specific configurations for the module and its peripherals.
++
+ endif
+Index: linux-3.4.37/arch/arm/mach-mxs/Makefile
+===================================================================
+--- linux-3.4.37.orig/arch/arm/mach-mxs/Makefile 2013-03-20 21:05:12.000000000 +0100
++++ linux-3.4.37/arch/arm/mach-mxs/Makefile 2013-04-08 14:26:43.000000000 +0200
+@@ -14,5 +14,6 @@
+ obj-$(CONFIG_MACH_APX4DEVKIT) += mach-apx4devkit.o
+ obj-$(CONFIG_MODULE_TX28) += module-tx28.o
+ obj-$(CONFIG_MACH_TX28) += mach-tx28.o
++obj-$(CONFIG_MACH_APF28) += mach-apf28.o
+
+ obj-y += devices/
+Index: linux-3.4.37/arch/arm/mach-mxs/mach-apf28.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.37/arch/arm/mach-mxs/mach-apf28.c 2013-04-08 14:26:43.000000000 +0200
+@@ -0,0 +1,144 @@
++/*
++ * Copyright 2011 Armadeus systems.
++ *
++ * Based on code which is:
++ * Copyright 2010 Freescale Semiconductor, Inc. All Rights Reserved.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * 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.
++ */
++
++#include <linux/delay.h>
++#include <linux/platform_device.h>
++#include <linux/gpio.h>
++#include <linux/clk.h>
++
++#include <asm/mach-types.h>
++#include <asm/mach/arch.h>
++#include <asm/mach/time.h>
++
++#include <mach/common.h>
++#include <mach/iomux-mx28.h>
++
++#include "devices-mx28.h"
++
++#define APF28_FEC_PHY_RESET MXS_GPIO_NR(4, 13)
++
++static const iomux_cfg_t apf28_pads[] __initconst = {
++ /* duart */
++ MX28_PAD_PWM0__DUART_RX | MXS_PAD_CTRL,
++ MX28_PAD_PWM1__DUART_TX | MXS_PAD_CTRL,
++
++#define MXS_PAD_FEC (MXS_PAD_8MA | MXS_PAD_3V3 | MXS_PAD_PULLUP)
++ /* FEC0 */
++ MX28_PAD_ENET0_MDC__ENET0_MDC | MXS_PAD_FEC,
++ MX28_PAD_ENET0_MDIO__ENET0_MDIO | MXS_PAD_FEC,
++ MX28_PAD_ENET0_RX_EN__ENET0_RX_EN | MXS_PAD_FEC,
++ MX28_PAD_ENET0_RXD0__ENET0_RXD0 | MXS_PAD_FEC,
++ MX28_PAD_ENET0_RXD1__ENET0_RXD1 | MXS_PAD_FEC,
++ MX28_PAD_ENET0_TX_EN__ENET0_TX_EN | MXS_PAD_FEC,
++ MX28_PAD_ENET0_TXD0__ENET0_TXD0 | MXS_PAD_FEC,
++ MX28_PAD_ENET0_TXD1__ENET0_TXD1 | MXS_PAD_FEC,
++ MX28_PAD_ENET_CLK__CLKCTRL_ENET | MXS_PAD_FEC,
++ /* phy reset line */
++ MX28_PAD_ENET0_RX_CLK__GPIO_4_13 | MXS_PAD_CTRL,
++
++#define MXS_NAND_PAD_VOLTAGE MXS_PAD_3V3
++ /* NAND */
++ MX28_PAD_GPMI_D00__GPMI_D0 |
++ (MXS_PAD_4MA | MXS_NAND_PAD_VOLTAGE | MXS_PAD_NOPULL),
++ MX28_PAD_GPMI_D01__GPMI_D1 |
++ (MXS_PAD_4MA | MXS_NAND_PAD_VOLTAGE | MXS_PAD_NOPULL),
++ MX28_PAD_GPMI_D02__GPMI_D2 |
++ (MXS_PAD_4MA | MXS_NAND_PAD_VOLTAGE | MXS_PAD_NOPULL),
++ MX28_PAD_GPMI_D03__GPMI_D3 |
++ (MXS_PAD_4MA | MXS_NAND_PAD_VOLTAGE | MXS_PAD_NOPULL),
++ MX28_PAD_GPMI_D04__GPMI_D4 |
++ (MXS_PAD_4MA | MXS_NAND_PAD_VOLTAGE | MXS_PAD_NOPULL),
++ MX28_PAD_GPMI_D05__GPMI_D5 |
++ (MXS_PAD_4MA | MXS_NAND_PAD_VOLTAGE | MXS_PAD_NOPULL),
++ MX28_PAD_GPMI_D06__GPMI_D6 |
++ (MXS_PAD_4MA | MXS_NAND_PAD_VOLTAGE | MXS_PAD_NOPULL),
++ MX28_PAD_GPMI_D07__GPMI_D7 |
++ (MXS_PAD_4MA | MXS_NAND_PAD_VOLTAGE | MXS_PAD_NOPULL),
++ MX28_PAD_GPMI_CE0N__GPMI_CE0N |
++ (MXS_PAD_4MA | MXS_NAND_PAD_VOLTAGE | MXS_PAD_NOPULL),
++ MX28_PAD_GPMI_RDY0__GPMI_READY0 |
++ (MXS_PAD_4MA | MXS_NAND_PAD_VOLTAGE | MXS_PAD_NOPULL),
++ MX28_PAD_GPMI_RDN__GPMI_RDN |
++ (MXS_PAD_8MA | MXS_NAND_PAD_VOLTAGE | MXS_PAD_PULLUP),
++ MX28_PAD_GPMI_WRN__GPMI_WRN |
++ (MXS_PAD_8MA | MXS_NAND_PAD_VOLTAGE | MXS_PAD_PULLUP),
++ MX28_PAD_GPMI_ALE__GPMI_ALE |
++ (MXS_PAD_4MA | MXS_NAND_PAD_VOLTAGE | MXS_PAD_PULLUP),
++ MX28_PAD_GPMI_CLE__GPMI_CLE |
++ (MXS_PAD_4MA | MXS_NAND_PAD_VOLTAGE | MXS_PAD_PULLUP),
++ MX28_PAD_GPMI_RESETN__GPMI_RESETN |
++ (MXS_PAD_4MA | MXS_NAND_PAD_VOLTAGE | MXS_PAD_PULLUP),
++};
++
++/* FEC */
++static void __init apf28_fec_reset(void)
++{
++ int ret;
++ struct clk *clk;
++
++ /* Enable fec phy clock */
++ clk = clk_get_sys("pll2", NULL);
++ if (!IS_ERR(clk))
++ clk_enable(clk);
++
++ /* Reset fec phy */
++ ret = gpio_request(APF28_FEC_PHY_RESET, "fec-phy-reset");
++ if (ret) {
++ pr_err("Failed to request gpio fec-phy-reset: %d\n", ret);
++ return;
++ }
++
++ gpio_direction_output(APF28_FEC_PHY_RESET, 0);
++ mdelay(1);
++ gpio_set_value(APF28_FEC_PHY_RESET, 1);
++}
++
++static struct fec_platform_data mx28_fec0_pdata __initdata = {
++ .phy = PHY_INTERFACE_MODE_RMII,
++};
++
++static struct gpmi_nand_platform_data apf28_nand_pdata __initdata = {
++ .max_chip_count = 1,
++};
++
++static void __init apf28_init(void)
++{
++ mxs_iomux_setup_multiple_pads(apf28_pads, ARRAY_SIZE(apf28_pads));
++
++ mx28_add_duart();
++ mx28_add_gpmi_nand(&apf28_nand_pdata);
++
++ apf28_fec_reset();
++ mx28_add_fec(0, &mx28_fec0_pdata);
++}
++
++static void __init apf28_timer_init(void)
++{
++ mx28_clocks_init();
++}
++
++static struct sys_timer apf28_timer = {
++ .init = apf28_timer_init,
++};
++
++MACHINE_START(APF28, "Armadeus APF28")
++ /* Maintainer: Julien Boibessot <jul...@ar...> */
++ .map_io = mx28_map_io,
++ .init_irq = mx28_init_irq,
++ .init_machine = apf28_init,
++ .timer = &apf28_timer,
++MACHINE_END
diff --git a/patches/linux/3.4/451-armadeus-add_apf28dev_baseboard_support.patch b/patches/linux/3.4/451-armadeus-add_apf28dev_baseboard_support.patch
new file mode 100644
index 0000000..cf141f1
--- /dev/null
+++ b/patches/linux/3.4/451-armadeus-add_apf28dev_baseboard_support.patch
@@ -0,0 +1,294 @@
+Add Armadeus systems APF28Dev development board support.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-3.4.48/arch/arm/mach-mxs/Kconfig
+===================================================================
+--- linux-3.4.48.orig/arch/arm/mach-mxs/Kconfig 2013-06-11 06:31:03.183290567 +0200
++++ linux-3.4.48/arch/arm/mach-mxs/Kconfig 2013-06-11 06:39:35.465830838 +0200
+@@ -118,4 +118,23 @@
+ Include support for the Armadeus systems APF28 SOM. This includes
+ specific configurations for the module and its peripherals.
+
++comment "APF28 baseboard support"
++ depends on MACH_APF28
++
++config MACH_APF28_DEV
++ bool "Armadeus APF28Dev development board"
++ depends on MACH_APF28
++ select MXS_HAVE_PLATFORM_AUART
++ select MXS_HAVE_PLATFORM_FLEXCAN
++ select MXS_HAVE_PLATFORM_MXS_MMC
++ select MXS_HAVE_PLATFORM_MXSFB
++ select MXS_HAVE_PLATFORM_MXS_I2C
++ select MXS_HAVE_PLATFORM_MXS_PWM
++ select MXS_HAVE_PLATFORM_MXS_SAIF
++ select MXS_HAVE_PLATFORM_MXS_LRADC
++ help
++ This selects the Armadeus systems APF28Dev as baseboard and adds board's
++ specific devices. "baseboard=apf28dev" bootargs will this board effective
++ at runtime.
++
+ endif
+Index: linux-3.4.48/arch/arm/mach-mxs/Makefile
+===================================================================
+--- linux-3.4.48.orig/arch/arm/mach-mxs/Makefile 2013-06-11 06:31:03.183290567 +0200
++++ linux-3.4.48/arch/arm/mach-mxs/Makefile 2013-06-11 06:31:03.195290632 +0200
+@@ -15,5 +15,6 @@
+ obj-$(CONFIG_MODULE_TX28) += module-tx28.o
+ obj-$(CONFIG_MACH_TX28) += mach-tx28.o
+ obj-$(CONFIG_MACH_APF28) += mach-apf28.o
++obj-$(CONFIG_MACH_APF28_DEV) += apf28dev-baseboard.o
+
+ obj-y += devices/
+Index: linux-3.4.48/arch/arm/mach-mxs/apf28dev-baseboard.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48/arch/arm/mach-mxs/apf28dev-baseboard.c 2013-06-11 06:54:21.086222359 +0200
+@@ -0,0 +1,209 @@
++/*
++ * Copyright 2011-2013 Armadeus systems.
++ *
++ * Based on code which is:
++ * Copyright 2010 Freescale Semiconductor, Inc. All Rights Reserved.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * 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.
++ */
++
++#include <linux/delay.h>
++#include <linux/platform_device.h>
++#include <linux/gpio.h>
++#include <linux/leds.h>
++#include <linux/irq.h>
++#include <linux/clk.h>
++
++#include <asm/mach-types.h>
++#include <asm/mach/arch.h>
++#include <asm/mach/time.h>
++
++#include <mach/common.h>
++#include <mach/iomux-mx28.h>
++
++#include "devices-mx28.h"
++
++#define APF28DEV_CAN
++#define MX28EVK_FLEXCAN_SWITCH MXS_GPIO_NR(2, 13)
++#define APF28DEV_FEC_PHY_RESET MXS_GPIO_NR(0, 23)
++
++static const iomux_cfg_t apf28dev_pads[] __initconst = {
++ /* AUART0 */
++ MX28_PAD_AUART0_RX__AUART0_RX | MXS_PAD_CTRL,
++ MX28_PAD_AUART0_TX__AUART0_TX | MXS_PAD_CTRL,
++ MX28_PAD_AUART0_CTS__AUART0_CTS | MXS_PAD_CTRL,
++ MX28_PAD_AUART0_RTS__AUART0_RTS | MXS_PAD_CTRL,
++ /* AUART1 */
++ MX28_PAD_AUART1_RX__AUART1_RX | MXS_PAD_CTRL,
++ MX28_PAD_AUART1_TX__AUART1_TX | MXS_PAD_CTRL,
++ MX28_PAD_AUART1_CTS__AUART1_CTS | MXS_PAD_CTRL,
++ MX28_PAD_AUART1_RTS__AUART1_RTS | MXS_PAD_CTRL,
++ /* AUART2 */
++ MX28_PAD_AUART2_RX__AUART2_RX | MXS_PAD_CTRL,
++ MX28_PAD_AUART2_TX__AUART2_TX | MXS_PAD_CTRL,
++ MX28_PAD_AUART2_CTS__AUART2_CTS | MXS_PAD_CTRL,
++ MX28_PAD_AUART2_RTS__AUART2_RTS | MXS_PAD_CTRL,
++#ifndef APF28DEV_CAN
++ /* AUART3 */
++ MX28_PAD_AUART3_RX__AUART3_RX | MXS_PAD_CTRL,
++ MX28_PAD_AUART3_TX__AUART3_TX | MXS_PAD_CTRL,
++ MX28_PAD_AUART3_CTS__AUART3_CTS | MXS_PAD_CTRL,
++ MX28_PAD_AUART3_RTS__AUART3_RTS | MXS_PAD_CTRL,
++#else
++ /* CAN0 */
++ MX28_PAD_AUART3_RX__CAN0_TX,
++ MX28_PAD_AUART3_TX__CAN0_RX,
++#endif
++
++#define MXS_PAD_FEC (MXS_PAD_8MA | MXS_PAD_3V3 | MXS_PAD_PULLUP)
++ /* FEC1 */
++ MX28_PAD_ENET0_CRS__ENET1_RX_EN | MXS_PAD_FEC,
++ MX28_PAD_ENET0_RXD2__ENET1_RXD0 | MXS_PAD_FEC,
++ MX28_PAD_ENET0_RXD3__ENET1_RXD1 | MXS_PAD_FEC,
++ MX28_PAD_ENET0_COL__ENET1_TX_EN | MXS_PAD_FEC,
++ MX28_PAD_ENET0_TXD2__ENET1_TXD0 | MXS_PAD_FEC,
++ MX28_PAD_ENET0_TXD3__ENET1_TXD1 | MXS_PAD_FEC,
++ /* phy reset line */
++ MX28_PAD_GPMI_RDY3__GPIO_0_23 | MXS_PAD_CTRL,
++
++ /* LCD */
++ MX28_PAD_LCD_D00__LCD_D0 | MXS_PAD_CTRL,
++ MX28_PAD_LCD_D01__LCD_D1 | MXS_PAD_CTRL,
++ MX28_PAD_LCD_D02__LCD_D2 | MXS_PAD_CTRL,
++ MX28_PAD_LCD_D03__LCD_D3 | MXS_PAD_CTRL,
++ MX28_PAD_LCD_D04__LCD_D4 | MXS_PAD_CTRL,
++ MX28_PAD_LCD_D05__LCD_D5 | MXS_PAD_CTRL,
++ MX28_PAD_LCD_D06__LCD_D6 | MXS_PAD_CTRL,
++ MX28_PAD_LCD_D07__LCD_D7 | MXS_PAD_CTRL,
++ MX28_PAD_LCD_D08__LCD_D8 | MXS_PAD_CTRL,
++ MX28_PAD_LCD_D09__LCD_D9 | MXS_PAD_CTRL,
++ MX28_PAD_LCD_D10__LCD_D10 | MXS_PAD_CTRL,
++ MX28_PAD_LCD_D11__LCD_D11 | MXS_PAD_CTRL,
++ MX28_PAD_LCD_D12__LCD_D12 | MXS_PAD_CTRL,
++ MX28_PAD_LCD_D13__LCD_D13 | MXS_PAD_CTRL,
++ MX28_PAD_LCD_D14__LCD_D14 | MXS_PAD_CTRL,
++ MX28_PAD_LCD_D15__LCD_D15 | MXS_PAD_CTRL,
++ MX28_PAD_LCD_D16__LCD_D16 | MXS_PAD_CTRL,
++ MX28_PAD_LCD_D17__LCD_D17 | MXS_PAD_CTRL,
++ MX28_PAD_LCD_D18__LCD_D18 | MXS_PAD_CTRL,
++ MX28_PAD_LCD_D19__LCD_D19 | MXS_PAD_CTRL,
++ MX28_PAD_LCD_D20__LCD_D20 | MXS_PAD_CTRL,
++ MX28_PAD_LCD_D21__LCD_D21 | MXS_PAD_CTRL,
++ MX28_PAD_LCD_D22__LCD_D22 | MXS_PAD_CTRL,
++ MX28_PAD_LCD_D23__LCD_D23 | MXS_PAD_CTRL,
++ MX28_PAD_LCD_RD_E__LCD_VSYNC | MXS_PAD_CTRL,
++ MX28_PAD_LCD_WR_RWN__LCD_HSYNC | MXS_PAD_CTRL,
++ MX28_PAD_LCD_RS__LCD_DOTCLK | MXS_PAD_CTRL,
++ MX28_PAD_LCD_CS__LCD_ENABLE | MXS_PAD_CTRL,
++
++ /* MMC0 */
++ MX28_PAD_SSP0_DATA0__SSP0_D0 |
++ (MXS_PAD_8MA | MXS_PAD_3V3 | MXS_PAD_PULLUP),
++ MX28_PAD_SSP0_DATA1__SSP0_D1 |
++ (MXS_PAD_8MA | MXS_PAD_3V3 | MXS_PAD_PULLUP),
++ MX28_PAD_SSP0_DATA2__SSP0_D2 |
++ (MXS_PAD_8MA | MXS_PAD_3V3 | MXS_PAD_PULLUP),
++ MX28_PAD_SSP0_DATA3__SSP0_D3 |
++ (MXS_PAD_8MA | MXS_PAD_3V3 | MXS_PAD_PULLUP),
++ MX28_PAD_SSP0_SCK__SSP0_SCK |
++ (MXS_PAD_12MA | MXS_PAD_3V3 | MXS_PAD_NOPULL),
++ MX28_PAD_SSP0_CMD__SSP0_CMD |
++ (MXS_PAD_8MA | MXS_PAD_3V3 | MXS_PAD_PULLUP),
++ MX28_PAD_SSP0_DETECT__SSP0_CARD_DETECT |
++ (MXS_PAD_8MA | MXS_PAD_3V3 | MXS_PAD_NOPULL),
++
++ /* User LED */
++ MX28_PAD_GPMI_RDY1__GPIO_0_21 | MXS_PAD_CTRL,
++ /* User button */
++ MX28_PAD_GPMI_RDY2__GPIO_0_22 | MXS_PAD_CTRL,
++
++ /* I2C0 */
++ MX28_PAD_I2C0_SCL__I2C0_SCL |
++ (MXS_PAD_3V3 | MXS_PAD_8MA | MXS_PAD_PULLUP),
++ MX28_PAD_I2C0_SDA__I2C0_SDA |
++ (MXS_PAD_3V3 | MXS_PAD_8MA | MXS_PAD_PULLUP),
++};
++
++/* fec */
++static void __init apf28dev_fec1_reset(void)
++{
++ int ret;
++
++ /* Reset fec phy */
++ ret = gpio_request(APF28DEV_FEC_PHY_RESET, "fec-phy-reset");
++ if (ret) {
++ pr_err("Failed to request gpio fec-phy-%s: %d\n", "reset", ret);
++ return;
++ }
++
++ gpio_direction_output(APF28DEV_FEC_PHY_RESET, 0);
++ mdelay(1);
++ gpio_set_value(APF28DEV_FEC_PHY_RESET, 1);
++}
++
++static struct fec_platform_data mx28_fec1_pdata __initdata = {
++ .phy = PHY_INTERFACE_MODE_RMII,
++};
++
++/* mxsfb (lcdif) */
++static struct fb_videomode apf28dev_video_modes[] = {
++ {
++ .name = "Chimei-LW700AT9003",
++ .refresh = 60,
++ .xres = 800,
++ .yres = 480,
++ .pixclock = 30303, /* picosecond */
++ .left_margin = 96,
++ .right_margin = 96,
++ .upper_margin = 20,
++ .lower_margin = 21,
++ .hsync_len = 64,
++ .vsync_len = 4,
++ /* .sync = FB_SYNC_CLK_IDLE_EN, ?? */
++ .vmode = FB_VMODE_NONINTERLACED,
++ },
++};
++
++static const struct mxsfb_platform_data apf28dev_mxsfb_pdata __initconst = {
++ .mode_list = apf28dev_video_modes,
++ .mode_count = ARRAY_SIZE(apf28dev_video_modes),
++ .default_bpp = 16,
++ .ld_intf_width = STMLCDIF_18BIT,
++};
++
++static struct mxs_mmc_platform_data apf28dev_mmc0_pdata __initdata = {
++ .flags = SLOTF_4_BIT_CAPABLE,
++};
++
++void __init apf28dev_init(void)
++{
++ printk("--- %s\n", __func__);
++
++ mxs_iomux_setup_multiple_pads(apf28dev_pads, ARRAY_SIZE(apf28dev_pads));
++
++ mx28_add_auart0();
++ mx28_add_auart1();
++ mx28_add_auart2();
++
++ apf28dev_fec1_reset();
++ mx28_add_fec(1, &mx28_fec1_pdata);
++#ifdef APF28DEV_CAN
++ mx28_add_flexcan(0, NULL);
++#else
++ mx28_add_auart3();
++#endif
++ mx28_add_mxsfb(&apf28dev_mxsfb_pdata);
++
++ mx28_add_mxs_mmc(0, &apf28dev_mmc0_pdata);
++
++ mx28_add_mxs_i2c(0);
++}
++EXPORT_SYMBOL_GPL(apf28dev_init);
+Index: linux-3.4.48/arch/arm/mach-mxs/mach-apf28.c
+===================================================================
+--- linux-3.4.48.orig/arch/arm/mach-mxs/mach-apf28.c 2013-06-11 06:31:03.183290567 +0200
++++ linux-3.4.48/arch/arm/mach-mxs/mach-apf28.c 2013-06-11 06:31:03.195290632 +0200
+@@ -115,6 +115,19 @@
+ .max_chip_count = 1,
+ };
+
++/* Get baseboard */
++static char apf28_baseboard[16] = "apf28dev";
++
++static int __init apf28_get_baseboard(char *options)
++{
++ strncpy(apf28_baseboard, options, sizeof(apf28_baseboard));
++
++ return 0;
++}
++__setup("baseboard=", apf28_get_baseboard);
++
++extern void __init apf28dev_init(void);
++
+ static void __init apf28_init(void)
+ {
+ mxs_iomux_setup_multiple_pads(apf28_pads, ARRAY_SIZE(apf28_pads));
+@@ -124,6 +137,12 @@
+
+ apf28_fec_reset();
+ mx28_add_fec(0, &mx28_fec0_pdata);
++
++ printk("--- APF28 baseboard: (%s)\n", apf28_baseboard);
++#ifdef CONFIG_MACH_APF28_DEV
++ if (!strcmp(apf28_baseboard, "apf28dev"))
++ apf28dev_init();
++#endif
+ }
+
+ static void __init apf28_timer_init(void)
diff --git a/patches/linux/3.4/454-armadeus-add-spi-support.patch b/patches/linux/3.4/454-armadeus-add-spi-support.patch
new file mode 100644
index 0000000..4e5daed
--- /dev/null
+++ b/patches/linux/3.4/454-armadeus-add-spi-support.patch
@@ -0,0 +1,19 @@
+Activate clock for SPI
+
+Signed-off-by: Fabien Marteau <fab...@ar...>
+---
+Index: linux-3.4.28/arch/arm/mach-mxs/clock-mx28.c
+===================================================================
+--- linux-3.4.28.orig/arch/arm/mach-mxs/clock-mx28.c 2013-03-01 14:39:38.000000000 +0100
++++ linux-3.4.28/arch/arm/mach-mxs/clock-mx28.c 2013-03-05 09:38:51.000000000 +0100
+@@ -629,8 +629,8 @@
+ _REGISTER_CLOCK("mxs-dma-apbx", NULL, xbus_clk)
+ _REGISTER_CLOCK("mxs-mmc.0", NULL, ssp0_clk)
+ _REGISTER_CLOCK("mxs-mmc.1", NULL, ssp1_clk)
+- _REGISTER_CLOCK("mxs-mmc.2", NULL, ssp2_clk)
+- _REGISTER_CLOCK("mxs-mmc.3", NULL, ssp3_clk)
++ _REGISTER_CLOCK("mxs-spi.2", NULL, ssp2_clk)
++ _REGISTER_CLOCK("mxs-spi.3", NULL, ssp3_clk)
+ _REGISTER_CLOCK("flexcan.0", NULL, can0_clk)
+ _REGISTER_CLOCK("flexcan.1", NULL, can1_clk)
+ _REGISTER_CLOCK(NULL, "usb0", usb0_clk)
diff --git a/patches/linux/3.4/799-2012-04-18-kernel-staging-iio-add-a-raw-and-processed-elements-to-info-mask.patch b/patches/linux/3.4/799-2012-04-18-kernel-staging-iio-add-a-raw-and-processed-elements-to-info-mask.patch
new file mode 100644
index 0000000..396a97a
--- /dev/null
+++ b/patches/linux/3.4/799-2012-04-18-kernel-staging-iio-add-a-raw-and-processed-elements-to-info-mask.patch
@@ -0,0 +1,72 @@
+From 5ccb3adbd7593b69d1355454b0c6d2dffdad51d9 Mon Sep 17 00:00:00 2001
+From: Jonathan Cameron <ji...@ke...>
+Date: Sun, 15 Apr 2012 17:41:16 +0100
+Subject: [PATCH] staging:iio: add a raw and processed elements to info_mask
+
+This will allow us to have drivers where the channel value
+may not be read or written but other information is available.
+Also adds the ability to have both processed and raw access
+to a given channel, though in most cases this doesn't make
+sense.
+
+Ultimately will lead to simpler code by allowing us to drop
+the special case handling for the value reading cases.
+
+Signed-off-by: Jonathan Cameron <ji...@ke...>
+Acked-by: Lars-Peter Clausen <la...@me...>
+Signed-off-by: Greg Kroah-Hartman <gr...@li...>
+---
+ drivers/staging/iio/iio.h | 9 +++++++--
+ drivers/staging/iio/industrialio-core.c | 5 +++--
+ 2 files changed, 10 insertions(+), 4 deletions(-)
+
+Index: linux-3.4.28/drivers/staging/iio/iio.h
+===================================================================
+--- linux-3.4.28.orig/drivers/staging/iio/iio.h 2013-01-28 05:51:45.000000000 +0100
++++ linux-3.4.28/drivers/staging/iio/iio.h 2013-02-11 20:00:03.000000000 +0100
+@@ -26,8 +26,9 @@
+
+ /* Could add the raw attributes as well - allowing buffer only devices */
+ enum iio_chan_info_enum {
+- /* 0 is reserved for raw attributes */
+- IIO_CHAN_INFO_SCALE = 1,
++ IIO_CHAN_INFO_RAW = 0,
++ IIO_CHAN_INFO_PROCESSED,
++ IIO_CHAN_INFO_SCALE,
+ IIO_CHAN_INFO_OFFSET,
+ IIO_CHAN_INFO_CALIBSCALE,
+ IIO_CHAN_INFO_CALIBBIAS,
+@@ -41,6 +42,10 @@
+ #define IIO_CHAN_INFO_SHARED_BIT(type) BIT(type*2)
+ #define IIO_CHAN_INFO_SEPARATE_BIT(type) BIT(type*2 + 1)
+
++#define IIO_CHAN_INFO_RAW_SEPARATE_BIT \
++ IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_RAW)
++#define IIO_CHAN_INFO_PROCESSED_SEPARATE_BIT \
++ IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_PROCESSED)
+ #define IIO_CHAN_INFO_SCALE_SEPARATE_BIT \
+ IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_SCALE)
+ #define IIO_CHAN_INFO_SCALE_SHARED_BIT \
+Index: linux-3.4.28/drivers/staging/iio/industrialio-core.c
+===================================================================
+--- linux-3.4.28.orig/drivers/staging/iio/industrialio-core.c 2013-01-28 05:51:45.000000000 +0100
++++ linux-3.4.28/drivers/staging/iio/industrialio-core.c 2013-02-11 20:00:03.000000000 +0100
+@@ -575,7 +575,8 @@
+ static int iio_device_add_channel_sysfs(struct iio_dev *indio_dev,
+ struct iio_chan_spec const *chan)
+ {
+- int ret, i, attrcount = 0;
++ int ret, attrcount = 0;
++ int i = 4;
+ const struct iio_chan_spec_ext_info *ext_info;
+
+ if (chan->channel < 0)
+@@ -594,7 +595,7 @@
+ goto error_ret;
+ attrcount++;
+
+- for_each_set_bit(i, &chan->info_mask, sizeof(long)*8) {
++ for_each_set_bit_from(i, &chan->info_mask, sizeof(long)*8) {
+ ret = __iio_add_chan_devattr(iio_chan_info_postfix[i/2],
+ chan,
+ &iio_read_channel_info,
diff --git a/patches/linux/3.4/799-2012-04-20-pengutronix-lib-add-support-for-stmp-style-devices.patch b/patches/linux/3.4/799-2012-04-20-pengutronix-lib-add-support-for-stmp-style-devices.patch
new file mode 100644
index 0000000..227b897
--- /dev/null
+++ b/patches/linux/3.4/799-2012-04-20-pengutronix-lib-add-support-for-stmp-style-devices.patch
@@ -0,0 +1,184 @@
+From 4ccf4beab8c447f8cd33d46afb6e10e1aa3befc6 Mon Sep 17 00:00:00 2001
+From: Wolfram Sang <w....@pe...>
+Date: Wed, 31 Aug 2011 20:35:40 +0200
+Subject: [PATCH] lib: add support for stmp-style devices
+
+MX23/28 use IP cores which follow a register layout I have first seen on
+STMP3xxx SoCs. In this layout, every register actually has four u32:
+
+ 1.) to store a value directly
+ 2.) a SET register where every 1-bit sets the corresponding bit,
+ others are unaffected
+ 3.) same with a CLR register
+ 4.) same with a TOG (toggle) register
+
+Also, the 2 MSBs in register 0 are always the same and can be used to reset
+the IP core.
+
+All this is strictly speaking not mach-specific (but IP core specific) and,
+thus, doesn't need to be in mach-mxs/include. At least mx6 also uses IP cores
+following this stmp-style. So:
+
+Introduce a stmp-style device, put the code and defines for that in a public
+place (lib/), and let drivers for stmp-style devices select that code.
+To avoid regressions and ease reviewing, the actual code is simply copied from
+mach-mxs. It definately wants updates, but those need a seperate patch series.
+
+Voila, mach dependency gone, reusable code introduced. Note that I didn't
+remove the duplicated code from mach-mxs yet, first the drivers have to be
+converted.
+
+Signed-off-by: Wolfram Sang <w....@pe...>
+Acked-by: Shawn Guo <sha...@li...>
+Acked-by: Dong Aisheng <don...@li...>
+---
+ include/linux/stmp_device.h | 20 +++++++++++
+ lib/Kconfig | 3 ++
+ lib/Makefile | 2 +
+ lib/stmp_device.c | 80 +++++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 105 insertions(+), 0 deletions(-)
+ create mode 100644 include/linux/stmp_device.h
+ create mode 100644 lib/stmp_device.c
+
+diff --git a/include/linux/stmp_device.h b/include/linux/stmp_device.h
+new file mode 100644
+index 0000000..6cf7ec9
+--- /dev/null
++++ b/include/linux/stmp_device.h
+@@ -0,0 +1,20 @@
++/*
++ * basic functions for devices following the "stmp" style register layout
++ *
++ * Copyright (C) 2011 Wolfram Sang, Pengutronix e.K.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ */
++
++#ifndef __STMP_DEVICE_H__
++#define __STMP_DEVICE_H__
++
++#define STMP_OFFSET_REG_SET 0x4
++#define STMP_OFFSET_REG_CLR 0x8
++#define STMP_OFFSET_REG_TOG 0xc
++
++extern int stmp_reset_block(void __iomem *);
++#endif /* __STMP_DEVICE_H__ */
+diff --git a/lib/Kconfig b/lib/Kconfig
+index 4a8aba2..c5da154 100644
+--- a/lib/Kconfig
++++ b/lib/Kconfig
+@@ -33,6 +33,9 @@ config GENERIC_IO
+ boolean
+ default n
+
++config STMP_DEVICE
++ bool
++
+ config CRC_CCITT
+ tristate "CRC-CCITT functions"
+ help
+diff --git a/lib/Makefile b/lib/Makefile
+index 18515f0..f78dbcd 100644
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -123,6 +123,8 @@ obj-$(CONFIG_SIGNATURE) += digsig.o
+
+ obj-$(CONFIG_CLZ_TAB) += clz_tab.o
+
++obj-$(CONFIG_STMP_DEVICE) += stmp_device.o
++
+ hostprogs-y := gen_crc32table
+ clean-files := crc32table.h
+
+diff --git a/lib/stmp_device.c b/lib/stmp_device.c
+new file mode 100644
+index 0000000..8ac9bcc
+--- /dev/null
++++ b/lib/stmp_device.c
+@@ -0,0 +1,80 @@
++/*
++ * Copyright (C) 1999 ARM Limited
++ * Copyright (C) 2000 Deep Blue Solutions Ltd
++ * Copyright 2006-2007,2010 Freescale Semiconductor, Inc. All Rights Reserved.
++ * Copyright 2008 Juergen Beisert, ke...@pe...
++ * Copyright 2009 Ilya Yanok, Emcraft Systems Ltd, ya...@em...
++ * Copyright (C) 2011 Wolfram Sang, Pengutronix e.K.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ */
++
++#include <linux/io.h>
++#include <linux/errno.h>
++#include <linux/delay.h>
++#include <linux/module.h>
++#include <linux/stmp_device.h>
++
++#define STMP_MODULE_CLKGATE (1 << 30)
++#define STMP_MODULE_SFTRST (1 << 31)
++
++/*
++ * Clear the bit and poll it cleared. This is usually called with
++ * a reset address and mask being either SFTRST(bit 31) or CLKGATE
++ * (bit 30).
++ */
++static int stmp_clear_poll_bit(void __iomem *addr, u32 mask)
++{
++ int timeout = 0x400;
++
++ writel(mask, addr + STMP_OFFSET_REG_CLR);
++ udelay(1);
++ while ((readl(addr) & mask) && --timeout)
++ /* nothing */;
++
++ return !timeout;
++}
++
++int stmp_reset_block(void __iomem *reset_addr)
++{
++ int ret;
++ int timeout = 0x400;
++
++ /* clear and poll SFTRST */
++ ret = stmp_clear_poll_bit(reset_addr, STMP_MODULE_SFTRST);
++ if (unlikely(ret))
++ goto error;
++
++ /* clear CLKGATE */
++ writel(STMP_MODULE_CLKGATE, reset_addr + STMP_OFFSET_REG_CLR);
++
++ /* set SFTRST to reset the block */
++ writel(STMP_MODULE_SFTRST, reset_addr + STMP_OFFSET_REG_SET);
++ udelay(1);
++
++ /* poll CLKGATE becoming set */
++ while ((!(readl(reset_addr) & STMP_MODULE_CLKGATE)) && --timeout)
++ /* nothing */;
++ if (unlikely(!timeout))
++ goto error;
++
++ /* clear and poll SFTRST */
++ ret = stmp_clear_poll_bit(reset_addr, STMP_MODULE_SFTRST);
++ if (unlikely(ret))
++ goto error;
++
++ /* clear and poll CLKGATE */
++ ret = stmp_clear_poll_bit(reset_addr, STMP_MODULE_CLKGATE);
++ if (unlikely(ret))
++ goto error;
++
++ return 0;
++
++error:
++ pr_err("%s(%p): module reset timeout\n", __func__, reset_addr);
++ return -ETIMEDOUT;
++}
++EXPORT_SYMBOL(stmp_reset_block);
+--
+1.7.6.5
+
diff --git a/patches/linux/3.4/799-2012-06-19-metafoo-iio-add-helper-function-for-initializing-triggered-buffers.patch b/patches/linux/3.4/799-2012-06-19-metafoo-iio-add-helper-function-for-initializing-triggered-buffers.patch
new file mode 100644
index 0000000..ca6e844
--- /dev/null
+++ b/patches/linux/3.4/799-2012-06-19-metafoo-iio-add-helper-function-for-initializing-triggered-buffers.patch
@@ -0,0 +1,186 @@
+From 23f2d735a932c7833d2d00da5e3ecdf4a6836210 Mon Sep 17 00:00:00 2001
+From: Lars-Peter Clausen <la...@me...>
+Date: Mon, 18 Jun 2012 18:33:48 +0200
+Subject: [PATCH] iio: Add helper function for initializing triggered buffers
+
+Add a helper function for executing the common tasks which are usually involved
+in setting up a simple software ringbuffer. It will allocate the buffer,
+allocate the pollfunc and register the buffer.
+
+Signed-off-by: Lars-Peter Clausen <la...@me...>
+Acked-by: Jonathan Cameron <ji...@ke...>
+Signed-off-by: Greg Kroah-Hartman <gr...@li...>
+---
+ drivers/staging/iio/Kconfig | 7 ++
+ drivers/staging/iio/Makefile | 1 +
+ drivers/staging/iio/industrialio-triggered-buffer.c | 110 +++++++++++++++++++++++++++
+ drivers/staging/iio/triggered_buffer.h | 15 ++++
+ 4 files changed, 133 insertions(+), 0 deletions(-)
+ create mode 100644 drivers/staging/iio/industrialio-triggered-buffer.c
+ create mode 100644 drivers/staging/iio/triggered_buffer.h
+
+Index: linux-3.4.28/drivers/staging/iio/Kconfig
+===================================================================
+--- linux-3.4.28.orig/drivers/staging/iio/Kconfig 2013-01-28 05:51:45.000000000 +0100
++++ linux-3.4.28/drivers/staging/iio/Kconfig 2013-02-11 22:17:59.000000000 +0100
+@@ -45,6 +45,13 @@
+ no buffer events so it is up to userspace to work out how
+ often to read from the buffer.
+
++config IIO_TRIGGERED_BUFFER
++ tristate
++ select IIO_TRIGGER
++ select IIO_KFIFO_BUF
++ help
++ Provides helper functions for setting up triggered buffers.
++
+ endif # IIO_BUFFER
+
+ config IIO_TRIGGER
+Index: linux-3.4.28/drivers/staging/iio/Makefile
+===================================================================
+--- linux-3.4.28.orig/drivers/staging/iio/Makefile 2013-01-28 05:51:45.000000000 +0100
++++ linux-3.4.28/drivers/staging/iio/Makefile 2013-02-11 22:17:59.000000000 +0100
+@@ -7,6 +7,7 @@
+ industrialio-$(CONFIG_IIO_BUFFER) += industrialio-buffer.o
+ industrialio-$(CONFIG_IIO_TRIGGER) += industrialio-trigger.o
+
++obj-$(CONFIG_IIO_TRIGGERED_BUFFER) += industrialio-triggered-buffer.o
+ obj-$(CONFIG_IIO_SW_RING) += ring_sw.o
+ obj-$(CONFIG_IIO_KFIFO_BUF) += kfifo_buf.o
+
+Index: linux-3.4.28/drivers/staging/iio/industrialio-triggered-buffer.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.28/drivers/staging/iio/industrialio-triggered-buffer.c 2013-02-11 22:25:18.000000000 +0100
+@@ -0,0 +1,110 @@
++ /*
++ * Copyright (c) 2012 Analog Devices, Inc.
++ * Author: Lars-Peter Clausen <la...@me...>
++ *
++ * 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.
++ */
++
++#include <linux/kernel.h>
++#include <linux/export.h>
++#include <linux/module.h>
++#include "iio.h"
++#include "buffer.h"
++#include "kfifo_buf.h"
++#include "triggered_buffer.h"
++#include "trigger_consumer.h"
++
++static const struct iio_buffer_setup_ops iio_triggered_buffer_setup_ops = {
++ .preenable = &iio_sw_buffer_preenable,
++ .postenable = &iio_triggered_buffer_postenable,
++ .predisable = &iio_triggered_buffer_predisable,
++};
++
++/**
++ * iio_triggered_buffer_setup() - Setup triggered buffer and pollfunc
++ * @indio_dev: IIO device structure
++ * @pollfunc_bh: Function which will be used as pollfunc bottom half
++ * @pollfunc_th: Function which will be used as pollfunc top half
++ * @setup_ops: Buffer setup functions to use for this device.
++ * If NULL the default setup functions for triggered
++ * buffers will be used.
++ *
++ * This function combines some common tasks which will normally be performed
++ * when setting up a triggered buffer. It will allocate the buffer and the
++ * pollfunc, as well as register the buffer with the IIO core.
++ *
++ * Before calling this function the indio_dev structure should already be
++ * completely initialized, but not yet registered. In practice this means that
++ * this function should be called right before iio_device_register().
++ *
++ * To free the resources allocated by this function call
++ * iio_triggered_buffer_cleanup().
++ */
++int iio_triggered_buffer_setup(struct iio_dev *indio_dev,
++ irqreturn_t (*pollfunc_bh)(int irq, void *p),
++ irqreturn_t (*pollfunc_th)(int irq, void *p),
++ const struct iio_buffer_setup_ops *setup_ops)
++{
++ int ret;
++
++ indio_dev->buffer = iio_kfifo_allocate(indio_dev);
++ if (!indio_dev->buffer) {
++ ret = -ENOMEM;
++ goto error_ret;
++ }
++
++ indio_dev->pollfunc = iio_alloc_pollfunc(pollfunc_bh,
++ pollfunc_th,
++ IRQF_ONESHOT,
++ indio_dev,
++ "%s_consumer%d",
++ indio_dev->name,
++ indio_dev->id);
++ if (indio_dev->pollfunc == NULL) {
++ ret = -ENOMEM;
++ goto error_kfifo_free;
++ }
++
++ /* Ring buffer functions - here trigger setup related */
++ if (setup_ops)
++ indio_dev->setup_ops = setup_ops;
++ else
++ indio_dev->setup_ops = &iio_triggered_buffer_setup_ops;
++
++ /* Flag that polled ring buffering is possible */
++ indio_dev->modes |= INDIO_BUFFER_TRIGGERED;
++
++ ret = iio_buffer_register(indio_dev,
++ indio_dev->channels,
++ indio_dev->num_channels);
++ if (ret)
++ goto error_dealloc_pollfunc;
++
++ return 0;
++
++error_dealloc_pollfunc:
++ iio_dealloc_pollfunc(indio_dev->pollfunc);
++error_kfifo_free:
++ iio_kfifo_free(indio_dev->buffer);
++error_ret:
++ return ret;
++}
++EXPORT_SYMBOL(iio_triggered_buffer_setup);
++
++/**
++ * iio_triggered_buffer_cleanup() - Free resources allocated by iio_triggered_buffer_setup()
++ * @indio_dev: IIO device structure
++ */
++void iio_triggered_buffer_cleanup(struct iio_dev *indio_dev)
++{
++ iio_buffer_unregister(indio_dev);
++ iio_dealloc_pollfunc(indio_dev->pollfunc);
++ iio_kfifo_free(indio_dev->buffer);
++}
++EXPORT_SYMBOL(iio_triggered_buffer_cleanup);
++
++MODULE_AUTHOR("Lars-Peter Clausen <la...@me...>");
++MODULE_DESCRIPTION("IIO helper functions for setting up triggered buffers");
++MODULE_LICENSE("GPL");
+Index: linux-3.4.28/drivers/staging/iio/triggered_buffer.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.28/drivers/staging/iio/triggered_buffer.h 2013-02-11 22:17:59.000000000 +0100
+@@ -0,0 +1,15 @@
++#ifndef _LINUX_IIO_TRIGGERED_BUFFER_H_
++#define _LINUX_IIO_TRIGGERED_BUFFER_H_
++
++#include <linux/interrupt.h>
++
++struct iio_dev;
++struct iio_buffer_setup_ops;
++
++int iio_triggered_buffer_setup(struct iio_dev *indio_dev,
++ irqreturn_t (*pollfunc_bh)(int irq, void *p),
++ irqreturn_t (*pollfunc_th)(int irq, void *p),
++ const struct iio_buffer_setup_ops *setup_ops);
++void iio_triggered_buffer_cleanup(struct iio_dev *indio_dev);
++
++#endif
diff --git a/patches/linux/3.4/800-armadeus-staging-iio-add_mxs_lradc.patch b/patches/linux/3.4/800-armadeus-staging-iio-add_mxs_lradc.patch
new file mode 100644
index 0000000..df577d4
--- /dev/null
+++ b/patches/linux/3.4/800-armadeus-staging-iio-add_mxs_lradc.patch
@@ -0,0 +1,737 @@
+Adaptation of Marek Vasut / Denx mainline patch.
+
+Index: linux-3.4.28/drivers/staging/iio/adc/Kconfig
+===================================================================
+--- linux-3.4.28.orig/drivers/staging/iio/adc/Kconfig 2013-02-12 09:11:18.000000000 +0100
++++ linux-3.4.28/drivers/staging/iio/adc/Kconfig 2013-02-12 09:24:30.000000000 +0100
+@@ -202,4 +202,17 @@
+ touchscreen driver, so you can only select one of the two drivers
+ (lpc32xx_adc or lpc32xx_ts). Provides direct access via sysfs.
+
++config MXS_LRADC
++ tristate "Freescale i.MX28 LRADC"
++ depends on ARCH_MXS
++ select IIO_BUFFER
++ select IIO_TRIGGERED_BUFFER
++ select STMP_DEVICE
++ help
++ Say yes here to build support for i.MX28 LRADC convertor
++ built into these chips.
++
++ To compile this driver as a module, choose M here: the
++ module will be called mxs-lradc.
++
+ endmenu
+Index: linux-3.4.28/drivers/staging/iio/adc/Makefile
+===================================================================
+--- linux-3.4.28.orig/drivers/staging/iio/adc/Makefile 2013-02-12 09:11:18.000000000 +0100
++++ linux-3.4.28/drivers/staging/iio/adc/Makefile 2013-02-12 09:24:30.000000000 +0100
+@@ -38,3 +38,4 @@
+ obj-$(CONFIG_ADT7410) += adt7410.o
+ obj-$(CONFIG_AD7280) += ad7280a.o
+ obj-$(CONFIG_LPC32XX_ADC) += lpc32xx_adc.o
++obj-$(CONFIG_MXS_LRADC) += mxs-lradc.o
+Index: linux-3.4.28/drivers/staging/iio/adc/mxs-lradc.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.28/drivers/staging/iio/adc/mxs-lradc.c 2013-02-12 11:30:00.000000000 +0100
+@@ -0,0 +1,587 @@
++/*
++ * Freescale i.MX28 LRADC driver
++ *
++ * Copyright (c) 2012 DENX Software Engineering, GmbH.
++ * Marek Vasut <ma...@de...>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * 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.
++ */
++
++#include <linux/interrupt.h>
++#include <linux/device.h>
++#include <linux/kernel.h>
++#include <linux/slab.h>
++#include <linux/of.h>
++#include <linux/of_device.h>
++#include <linux/sysfs.h>
++#include <linux/list.h>
++#include <linux/io.h>
++#include <linux/module.h>
++#include <linux/platform_device.h>
++#include <linux/spinlock.h>
++#include <linux/wait.h>
++#include <linux/sched.h>
++#include <linux/stmp_device.h>
++#include <linux/bitops.h>
++#include <linux/completion.h>
++
++#include <mach/mxs.h>
++#include <mach/common.h>
++
++#include "../iio.h"
++#include "../buffer.h"
++#include "../trigger.h"
++#include "../trigger_consumer.h"
++#include "../triggered_buffer.h"
++
++#define DRIVER_NAME "mxs-lradc"
++
++#define LRADC_MAX_DELAY_CHANS 4
++#define LRADC_MAX_MAPPED_CHANS 8
++#define LRADC_MAX_TOTAL_CHANS 16
++
++#define LRADC_DELAY_TIMER_HZ 2000
++
++/*
++ * Make this runtime configurable if necessary. Currently, if the buffered mode
++ * is enabled, the LRADC takes LRADC_DELAY_TIMER_LOOP samples of data before
++ * triggering IRQ. The sampling happens every (LRADC_DELAY_TIMER_PER / 2000)
++ * seconds. The result is that the samples arrive every 500mS.
++ */
++#define LRADC_DELAY_TIMER_PER 200
++#define LRADC_DELAY_TIMER_LOOP 5
++
++static const char * const mxs_lradc_irq_name[] = {
++ "mxs-lradc-touchscreen",
++ "mxs-lradc-thresh0",
++ "mxs-lradc-thresh1",
++ "mxs-lradc-channel0",
++ "mxs-lradc-channel1",
++ "mxs-lradc-channel2",
++ "mxs-lradc-channel3",
++ "mxs-lradc-channel4",
++ "mxs-lradc-channel5",
++ "mxs-lradc-channel6",
++ "mxs-lradc-channel7",
++ "mxs-lradc-button0",
++ "mxs-lradc-button1",
++};
++
++struct mxs_lradc_chan {
++ uint8_t slot;
++ uint8_t flags;
++};
++
++struct mxs_lradc {
++ struct device *dev;
++ void __iomem *base;
++ int irq[13];
++
++ uint32_t *buffer;
++ struct iio_trigger *trig;
++
++ struct mutex lock;
++
++ uint8_t enable;
++
++ struct completion completion;
++};
++
++#define LRADC_CTRL0 0x00
++#define LRADC_CTRL0_TOUCH_DETECT_ENABLE (1 << 23)
++#define LRADC_CTRL0_TOUCH_SCREEN_TYPE (1 << 22)
++
++#define LRADC_CTRL1 0x10
++#define LRADC_CTRL1_LRADC_IRQ(n) (1 << (n))
++#define LRADC_CTRL1_LRADC_IRQ_MASK 0x1fff
++#define LRADC_CTRL1_LRADC_IRQ_EN(n) (1 << ((n) + 16))
++#define LRADC_CTRL1_LRADC_IRQ_EN_MASK (0x1fff << 16)
++
++#define LRADC_CTRL2 0x20
++#define LRADC_CTRL2_TEMPSENSE_PWD (1 << 15)
++
++#define LRADC_CH(n) (0x50 + (0x10 * (n)))
++#define LRADC_CH_ACCUMULATE (1 << 29)
++#define LRADC_CH_NUM_SAMPLES_MASK (0x1f << 24)
++#define LRADC_CH_NUM_SAMPLES_OFFSET 24
++#define LRADC_CH_VALUE_MASK 0x3ffff
++#define LRADC_CH_VALUE_OFFSET 0
++
++#define LRADC_DELAY(n) (0xd0 + (0x10 * (n)))
++#define LRADC_DELAY_TRIGGER_LRADCS_MASK (0xff << 24)
++#define LRADC_DELAY_TRIGGER_LRADCS_OFFSET 24
++#define LRADC_DELAY_KICK (1 << 20)
++#define LRADC_DELAY_TRIGGER_DELAYS_MASK (0xf << 16)
++#define LRADC_DELAY_TRIGGER_DELAYS_OFFSET 16
++#define LRADC_DELAY_LOOP_COUNT_MASK (0x1f << 11)
++#define LRADC_DELAY_LOOP_COUNT_OFFSET 11
++#define LRADC_DELAY_DELAY_MASK 0x7ff
++#define LRADC_DELAY_DELAY_OFFSET 0
++
++#define LRADC_CTRL4 0x140
++#define LRADC_CTRL4_LRADCSELECT_MASK(n) (0xf << ((n) * 4))
++#define LRADC_CTRL4_LRADCSELECT_OFFSET(n) ((n) * 4)
++
++/*
++ * Raw I/O operations
++ */
++static int mxs_lradc_read_raw(struct iio_dev *iio_dev,
++ const struct iio_chan_spec *chan,
++ int *val, int *val2, long m)
++{
++ struct mxs_lradc *lradc = iio_priv(iio_dev);
++ int ret;
++
++ if (m != IIO_CHAN_INFO_RAW)
++ return -EINVAL;
++
++ /* Check for invalid channel */
++ if (chan->channel > LRADC_MAX_TOTAL_CHANS)
++ return -EINVAL;
++
++ /*
++ * See if there is no buffered operation in progess. If there is, simply
++ * bail out. This can be improved to support both buffered and raw IO at
++ * the same time, yet the code becomes horribly complicated. Therefore I
++ * applied KISS principle here.
++ */
++ ret = mutex_trylock(&lradc->lock);
++ if (!ret)
++ return -EBUSY;
++
++ INIT_COMPLETION(lradc->completion);
++
++ /*
++ * No buffered operation in progress, map the channel and trigger it.
++ * Virtual channel 0 is always used here as the others are always not
++ * used if doing raw sampling.
++ */
++ writel(LRADC_CTRL1_LRADC_IRQ_EN_MASK,
++ lradc->base + LRADC_CTRL1 + STMP_OFFSET_REG_CLR);
++ writel(0xff, lradc->base + LRADC_CTRL0 + STMP_OFFSET_REG_CLR);
++
++ writel(chan->channel, lradc->base + LRADC_CTRL4);
++ writel(0, lradc->base + LRADC_CH(0));
++
++ /* Enable the IRQ and start sampling the channel. */
++ writel(LRADC_CTRL1_LRADC_IRQ_EN(0),
++ lradc->base + LRADC_CTRL1 + STMP_OFFSET_REG_SET);
++ writel(1 << 0, lradc->base + LRADC_CTRL0 + STMP_OFFSET_REG_SET);
++
++ /* Wait for completion on the channel, 1 second max. */
++ ret = wait_for_completion_killable_timeout(&lradc->completion, HZ);
++ if (!ret)
++ ret = -ETIMEDOUT;
++ if (ret < 0)
++ goto err;
++
++ /* Read the data. */
++ *val = readl(lradc->base + LRADC_CH(0)) & LRADC_CH_VALUE_MASK;
++ ret = IIO_VAL_INT;
++
++err:
++ writel(LRADC_CTRL1_LRADC_IRQ_EN(0),
++ lradc->base + LRADC_CTRL1 + STMP_OFFSET_REG_CLR);
++
++ mutex_unlock(&lradc->lock);
++
++ return ret;
++}
++
++static const struct iio_info mxs_lradc_iio_info = {
++ .driver_module = THIS_MODULE,
++ .read_raw = mxs_lradc_read_raw,
++};
++
++/*
++ * IRQ Handling...
[truncated message content] |
|
From: jorasse <jo...@us...> - 2013-06-10 23:09:50
|
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 c6ead1e594061691245b2be8312849251dbae31c (commit)
from 45919116aa39f6807f6b0b92ad8726da5fdafdea (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 c6ead1e594061691245b2be8312849251dbae31c
Author: Eric Jarrige <eri...@ar...>
Date: Tue Jun 11 01:18:23 2013 +0200
[BUILDROOT] bump to BuildRoot 2013.05 - may require a git clean -dfx to rebuild the world. do not forget to backup your work in progress
-----------------------------------------------------------------------
Summary of changes:
Makefile | 4 +-
buildroot/configs/apf27_defconfig | 7 +++--
buildroot/configs/apf27_webradio_defconfig | 5 ++-
buildroot/configs/apf27test_defconfig | 5 ++-
buildroot/configs/apf28_defconfig | 9 ++++---
buildroot/configs/apf28test_defconfig | 6 ++--
buildroot/configs/apf51_defconfig | 13 ++++++-----
buildroot/configs/apf51test_defconfig | 33 +++++++++++++--------------
buildroot/configs/apf9328_defconfig | 5 ++-
buildroot/configs/apf9328test_defconfig | 14 ++++++-----
buildroot/configs/pps51_defconfig | 13 ++++++-----
buildroot/configs/pps_defconfig | 12 +++++-----
12 files changed, 67 insertions(+), 59 deletions(-)
diff --git a/Makefile b/Makefile
index cb0ee13..3522b52 100644
--- a/Makefile
+++ b/Makefile
@@ -26,8 +26,8 @@ ARMADEUS_TOPDIR:=$(shell pwd)
export ARMADEUS_TOPDIR
#--- User configurable stuff:
-BUILDROOT_VERSION:=2012.02
-#BUILDROOT_VERSION:=2012.11.1
+BUILDROOT_VERSION:=2013.05
+#BUILDROOT_VERSION:=2012.02
include ./Makefile.in
BUILDROOT_SITE:=http://buildroot.uclibc.org/downloads
BUILDROOT_PATCH_DIR:=$(ARMADEUS_TOPDIR)/patches/buildroot/$(BUILDROOT_VERSION)
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index 2ab77c5..ba32abe 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -11,8 +11,7 @@ BR2_KERNEL_HEADERS_VERSION=y
BR2_DEFAULT_KERNEL_VERSION="2.6.29.6"
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_GCC_VERSION_4_4_X=y
-BR2_PACKAGE_GDB_SERVER=y
-BR2_PACKAGE_GDB_HOST=y
+BR2_PACKAGE_HOST_GDB=y
BR2_ENABLE_LOCALE_PURGE=y
BR2_ENABLE_LOCALE_WHITELIST="C en_US"
BR2_TARGET_OPTIMIZATION="-Os -pipe"
@@ -21,6 +20,7 @@ BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
BR2_TOOLCHAIN_BUILDROOT_CXX=y
+BR2_PTHREAD_DEBUG=y
BR2_TARGET_GENERIC_HOSTNAME="armadeus"
BR2_TARGET_GENERIC_ISSUE="Welcome to the Armadeus development environment."
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS=y
@@ -41,12 +41,13 @@ BR2_PACKAGE_ALSA_UTILS=y
BR2_PACKAGE_ALSA_UTILS_AMIXER=y
BR2_PACKAGE_ALSA_UTILS_APLAY=y
BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
+BR2_PACKAGE_GDB=y
BR2_PACKAGE_STRACE=y
-BR2_PACKAGE_I2C_TOOLS=y
BR2_PACKAGE_MTD=y
BR2_PACKAGE_MTD_JFFS2DUMP=y
BR2_PACKAGE_MTD_MKFSJFFS2=y
BR2_PACKAGE_MTD_SUMTOOL=y
+BR2_PACKAGE_I2C_TOOLS=y
BR2_PACKAGE_UBOOT_TOOLS=y
BR2_PACKAGE_TSLIB=y
BR2_PACKAGE_CAN_UTILS=y
diff --git a/buildroot/configs/apf27_webradio_defconfig b/buildroot/configs/apf27_webradio_defconfig
index 1f33963..3cc70f6 100644
--- a/buildroot/configs/apf27_webradio_defconfig
+++ b/buildroot/configs/apf27_webradio_defconfig
@@ -11,8 +11,7 @@ BR2_KERNEL_HEADERS_VERSION=y
BR2_DEFAULT_KERNEL_VERSION="2.6.29.6"
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_GCC_VERSION_4_4_X=y
-BR2_PACKAGE_GDB_SERVER=y
-BR2_PACKAGE_GDB_HOST=y
+BR2_PACKAGE_HOST_GDB=y
BR2_ENABLE_LOCALE_PURGE=y
BR2_ENABLE_LOCALE_WHITELIST="C en_US"
BR2_TARGET_OPTIMIZATION="-Os -pipe"
@@ -21,6 +20,7 @@ BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
BR2_TOOLCHAIN_BUILDROOT_CXX=y
+BR2_PTHREAD_DEBUG=y
BR2_TARGET_GENERIC_HOSTNAME="armadeus"
BR2_TARGET_GENERIC_ISSUE="Welcome to the Armadeus development environment."
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS=y
@@ -43,6 +43,7 @@ BR2_PACKAGE_ALSA_UTILS_APLAY=y
BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
BR2_PACKAGE_MPLAYER=y
BR2_PACKAGE_PYWEBRADIO=y
+BR2_PACKAGE_GDB=y
BR2_PACKAGE_STRACE=y
BR2_PACKAGE_PYTHON_PYGAME=y
BR2_PACKAGE_PYTHON_PYGAME_IMAGE=y
diff --git a/buildroot/configs/apf27test_defconfig b/buildroot/configs/apf27test_defconfig
index 9e93f45..d126ece 100644
--- a/buildroot/configs/apf27test_defconfig
+++ b/buildroot/configs/apf27test_defconfig
@@ -11,8 +11,7 @@ BR2_KERNEL_HEADERS_VERSION=y
BR2_DEFAULT_KERNEL_VERSION="2.6.29.6"
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_GCC_VERSION_4_4_X=y
-BR2_PACKAGE_GDB_SERVER=y
-BR2_PACKAGE_GDB_HOST=y
+BR2_PACKAGE_HOST_GDB=y
BR2_ENABLE_LOCALE_PURGE=y
BR2_ENABLE_LOCALE_WHITELIST="C en_US"
BR2_TARGET_OPTIMIZATION="-Os -pipe"
@@ -21,6 +20,7 @@ BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
BR2_TOOLCHAIN_BUILDROOT_CXX=y
+BR2_PTHREAD_DEBUG=y
BR2_TARGET_GENERIC_HOSTNAME="armadeus"
BR2_TARGET_GENERIC_ISSUE="Welcome to the Armadeus development environment."
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS=y
@@ -61,6 +61,7 @@ BR2_PACKAGE_ALSA_UTILS_APLAY=y
BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
BR2_PACKAGE_MADPLAY=y
BR2_PACKAGE_MPLAYER=y
+BR2_PACKAGE_GDB=y
BR2_PACKAGE_LMBENCH=y
BR2_PACKAGE_LTRACE=y
BR2_PACKAGE_STRACE=y
diff --git a/buildroot/configs/apf28_defconfig b/buildroot/configs/apf28_defconfig
index 38de70e..41198f4 100644
--- a/buildroot/configs/apf28_defconfig
+++ b/buildroot/configs/apf28_defconfig
@@ -11,8 +11,7 @@ BR2_KERNEL_HEADERS_VERSION=y
BR2_DEFAULT_KERNEL_VERSION="2.6.35.3"
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_GCC_VERSION_4_4_X=y
-BR2_PACKAGE_GDB_SERVER=y
-BR2_PACKAGE_GDB_HOST=y
+BR2_PACKAGE_HOST_GDB=y
BR2_ENABLE_LOCALE_PURGE=y
BR2_ENABLE_LOCALE_WHITELIST="C en_US"
BR2_TARGET_OPTIMIZATION="-Os -pipe"
@@ -21,6 +20,7 @@ BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
BR2_TOOLCHAIN_BUILDROOT_CXX=y
+BR2_PTHREAD_DEBUG=y
BR2_TARGET_GENERIC_HOSTNAME="armadeus"
BR2_TARGET_GENERIC_ISSUE="Welcome to the Armadeus development environment."
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS=y
@@ -36,14 +36,15 @@ BR2_TARGET_ARMADEUS_SDRAM_SIZE="128"
BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox-$(BR2_BUSYBOX_VERSION).config"
BR2_PACKAGE_HOST_IMX28_USB_DOWNLOADER=y
BR2_PACKAGE_IMXREGS=y
+BR2_PACKAGE_GDB=y
BR2_PACKAGE_STRACE=y
+BR2_PACKAGE_MTD=y
+BR2_PACKAGE_MTD_SUMTOOL=y
BR2_PACKAGE_I2C_TOOLS=y
BR2_PACKAGE_INPUT_TOOLS=y
# BR2_PACKAGE_INPUT_TOOLS_INPUTATTACH is not set
# BR2_PACKAGE_INPUT_TOOLS_JSCAL is not set
# BR2_PACKAGE_INPUT_TOOLS_JSTEST is not set
-BR2_PACKAGE_MTD=y
-BR2_PACKAGE_MTD_SUMTOOL=y
BR2_PACKAGE_UBOOT_TOOLS=y
BR2_PACKAGE_LZO=y
BR2_PACKAGE_ZLIB=y
diff --git a/buildroot/configs/apf28test_defconfig b/buildroot/configs/apf28test_defconfig
index b91b3f5..b7c4897 100644
--- a/buildroot/configs/apf28test_defconfig
+++ b/buildroot/configs/apf28test_defconfig
@@ -11,9 +11,7 @@ BR2_KERNEL_HEADERS_VERSION=y
BR2_DEFAULT_KERNEL_VERSION="2.6.35.3"
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_GCC_VERSION_4_4_X=y
-BR2_PACKAGE_GDB=y
-BR2_PACKAGE_GDB_SERVER=y
-BR2_PACKAGE_GDB_HOST=y
+BR2_PACKAGE_HOST_GDB=y
BR2_ENABLE_LOCALE_PURGE=y
BR2_ENABLE_LOCALE_WHITELIST="C en_US"
BR2_TARGET_OPTIMIZATION="-Os -pipe"
@@ -22,6 +20,7 @@ BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
BR2_TOOLCHAIN_BUILDROOT_CXX=y
+BR2_PTHREAD_DEBUG=y
BR2_TARGET_GENERIC_HOSTNAME="armadeus"
BR2_TARGET_GENERIC_ISSUE="Welcome to the Armadeus development environment."
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS=y
@@ -54,6 +53,7 @@ BR2_PACKAGE_ALSA_UTILS=y
BR2_PACKAGE_ALSA_UTILS_APLAY=y
BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
BR2_PACKAGE_MPLAYER=y
+BR2_PACKAGE_GDB=y
BR2_PACKAGE_LTRACE=y
BR2_PACKAGE_STRACE=y
BR2_PACKAGE_PRBOOM=y
diff --git a/buildroot/configs/apf51_defconfig b/buildroot/configs/apf51_defconfig
index 1ea4695..478501a 100644
--- a/buildroot/configs/apf51_defconfig
+++ b/buildroot/configs/apf51_defconfig
@@ -11,8 +11,7 @@ BR2_KERNEL_HEADERS_VERSION=y
BR2_DEFAULT_KERNEL_VERSION="2.6.38.8"
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_GCC_VERSION_4_4_X=y
-BR2_PACKAGE_GDB_SERVER=y
-BR2_PACKAGE_GDB_HOST=y
+BR2_PACKAGE_HOST_GDB=y
BR2_ENABLE_LOCALE_PURGE=y
BR2_ENABLE_LOCALE_WHITELIST="C en_US"
# BR2_SOFT_FLOAT is not set
@@ -22,6 +21,7 @@ BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
BR2_TOOLCHAIN_BUILDROOT_CXX=y
+BR2_PTHREAD_DEBUG=y
BR2_VFP_FLOAT=y
BR2_TARGET_GENERIC_HOSTNAME="armadeus"
BR2_TARGET_GENERIC_ISSUE="Welcome to the Armadeus development environment."
@@ -45,16 +45,17 @@ BR2_PACKAGE_ALSA_UTILS=y
BR2_PACKAGE_ALSA_UTILS_AMIXER=y
BR2_PACKAGE_ALSA_UTILS_APLAY=y
BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
+BR2_PACKAGE_GDB=y
BR2_PACKAGE_STRACE=y
BR2_PACKAGE_FBV=y
-BR2_PACKAGE_DBUS=y
-BR2_PACKAGE_I2C_TOOLS=y
-BR2_PACKAGE_LINUX_FIRMWARE=y
-BR2_PACKAGE_LINUX_FIRMWARE_88W8686=y
BR2_PACKAGE_MTD=y
BR2_PACKAGE_MTD_JFFS2DUMP=y
BR2_PACKAGE_MTD_MKFSJFFS2=y
BR2_PACKAGE_MTD_SUMTOOL=y
+BR2_PACKAGE_LINUX_FIRMWARE=y
+BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8686_V9=y
+BR2_PACKAGE_DBUS=y
+BR2_PACKAGE_I2C_TOOLS=y
BR2_PACKAGE_UBOOT_TOOLS=y
BR2_PACKAGE_TSLIB=y
BR2_PACKAGE_LIBXML2=y
diff --git a/buildroot/configs/apf51test_defconfig b/buildroot/configs/apf51test_defconfig
index 5888309..c7dc75e 100644
--- a/buildroot/configs/apf51test_defconfig
+++ b/buildroot/configs/apf51test_defconfig
@@ -11,9 +11,7 @@ BR2_KERNEL_HEADERS_VERSION=y
BR2_DEFAULT_KERNEL_VERSION="2.6.38.8"
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_GCC_VERSION_4_4_X=y
-BR2_PACKAGE_GDB=y
-BR2_PACKAGE_GDB_SERVER=y
-BR2_PACKAGE_GDB_HOST=y
+BR2_PACKAGE_HOST_GDB=y
BR2_ENABLE_LOCALE_PURGE=y
BR2_ENABLE_LOCALE_WHITELIST="C en_US"
# BR2_SOFT_FLOAT is not set
@@ -23,6 +21,7 @@ BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
BR2_TOOLCHAIN_BUILDROOT_CXX=y
+BR2_PTHREAD_DEBUG=y
BR2_VFP_FLOAT=y
BR2_TARGET_GENERIC_HOSTNAME="armadeus"
BR2_TARGET_GENERIC_ISSUE="Welcome to the Armadeus development environment."
@@ -74,9 +73,8 @@ BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_H264PARSE=y
BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RTPMUX=y
BR2_PACKAGE_GST_PLUGINS_UGLY=y
BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MAD=y
-BR2_PACKAGE_MADPLAY=y
BR2_PACKAGE_MPLAYER=y
-BR2_PACKAGE_SPEEX=y
+BR2_PACKAGE_GDB=y
BR2_PACKAGE_LMBENCH=y
BR2_PACKAGE_LTRACE=y
BR2_PACKAGE_STRACE=y
@@ -86,11 +84,6 @@ BR2_PACKAGE_DOOM_WAD=y
BR2_PACKAGE_FBGRAB=y
BR2_PACKAGE_FBTEST=y
BR2_PACKAGE_FBV=y
-BR2_PACKAGE_PYTHON_PYGAME=y
-BR2_PACKAGE_PYTHON_PYGAME_IMAGE=y
-BR2_PACKAGE_PYTHON_PYGAME_FONT=y
-BR2_PACKAGE_PYTHON_PYGAME_MIXER=y
-BR2_PACKAGE_PYTHON_PYGAME_MIXER_MUSIC=y
BR2_PACKAGE_SDL_IMAGE_GIF=y
BR2_PACKAGE_SDL_IMAGE_JPEG=y
BR2_PACKAGE_SDL_IMAGE_PNG=y
@@ -99,26 +92,32 @@ BR2_PACKAGE_SDL_SOUND_PLAYSOUND=y
BR2_PACKAGE_SDL_GFX=y
BR2_PACKAGE_SLIDESHOW=y
BR2_PACKAGE_SDL_WATER=y
-BR2_PACKAGE_DBUS=y
BR2_PACKAGE_E2FSPROGS=y
-BR2_PACKAGE_GPSD=y
-BR2_PACKAGE_I2C_TOOLS=y
-BR2_PACKAGE_LINUX_FIRMWARE=y
-BR2_PACKAGE_LINUX_FIRMWARE_88W8686=y
-BR2_PACKAGE_INPUT_TOOLS=y
BR2_PACKAGE_MTD=y
BR2_PACKAGE_MTD_JFFS2DUMP=y
BR2_PACKAGE_MTD_MKFSJFFS2=y
BR2_PACKAGE_MTD_SUMTOOL=y
+BR2_PACKAGE_LINUX_FIRMWARE=y
+BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8686_V9=y
+BR2_PACKAGE_DBUS=y
+BR2_PACKAGE_GPSD=y
+BR2_PACKAGE_I2C_TOOLS=y
+BR2_PACKAGE_INPUT_TOOLS=y
BR2_PACKAGE_UBOOT_TOOLS=y
BR2_PACKAGE_LUA=y
BR2_PACKAGE_LUA_INTERPRETER=y
BR2_PACKAGE_LUA_INTERPRETER_READLINE=y
BR2_PACKAGE_PYTHON=y
BR2_PACKAGE_PYTHON_READLINE=y
+BR2_PACKAGE_PYTHON_PYGAME=y
+BR2_PACKAGE_PYTHON_PYGAME_IMAGE=y
+BR2_PACKAGE_PYTHON_PYGAME_FONT=y
+BR2_PACKAGE_PYTHON_PYGAME_MIXER=y
+BR2_PACKAGE_PYTHON_PYGAME_MIXER_MUSIC=y
+BR2_PACKAGE_PYTHON_SERIAL=y
+BR2_PACKAGE_SPEEX=y
BR2_PACKAGE_MESALIB=y
BR2_PACKAGE_TSLIB=y
-BR2_PACKAGE_PYTHON_SERIAL=y
BR2_PACKAGE_LIBXML2=y
BR2_PACKAGE_BOA=y
BR2_PACKAGE_BLUEZ3_UTILS=y
diff --git a/buildroot/configs/apf9328_defconfig b/buildroot/configs/apf9328_defconfig
index f650af3..41b6131 100644
--- a/buildroot/configs/apf9328_defconfig
+++ b/buildroot/configs/apf9328_defconfig
@@ -11,8 +11,7 @@ BR2_KERNEL_HEADERS_VERSION=y
BR2_DEFAULT_KERNEL_VERSION="2.6.29.6"
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_GCC_VERSION_4_4_X=y
-BR2_PACKAGE_GDB_SERVER=y
-BR2_PACKAGE_GDB_HOST=y
+BR2_PACKAGE_HOST_GDB=y
BR2_ENABLE_LOCALE_PURGE=y
BR2_ENABLE_LOCALE_WHITELIST="C en_US"
BR2_TARGET_OPTIMIZATION="-Os -pipe"
@@ -21,6 +20,7 @@ BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
BR2_TOOLCHAIN_BUILDROOT_CXX=y
+BR2_PTHREAD_DEBUG=y
BR2_TARGET_GENERIC_HOSTNAME="armadeus"
BR2_TARGET_GENERIC_ISSUE="Welcome to the Armadeus development environment."
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS=y
@@ -42,6 +42,7 @@ BR2_PACKAGE_ALSA_UTILS=y
BR2_PACKAGE_ALSA_UTILS_AMIXER=y
BR2_PACKAGE_ALSA_UTILS_APLAY=y
BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
+BR2_PACKAGE_GDB=y
BR2_PACKAGE_MTD=y
BR2_PACKAGE_MTD_JFFS2DUMP=y
BR2_PACKAGE_MTD_MKFSJFFS2=y
diff --git a/buildroot/configs/apf9328test_defconfig b/buildroot/configs/apf9328test_defconfig
index f9807e1..a9e7011 100644
--- a/buildroot/configs/apf9328test_defconfig
+++ b/buildroot/configs/apf9328test_defconfig
@@ -11,8 +11,7 @@ BR2_KERNEL_HEADERS_VERSION=y
BR2_DEFAULT_KERNEL_VERSION="2.6.29.6"
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_GCC_VERSION_4_4_X=y
-BR2_PACKAGE_GDB_SERVER=y
-BR2_PACKAGE_GDB_HOST=y
+BR2_PACKAGE_HOST_GDB=y
BR2_ENABLE_LOCALE_PURGE=y
BR2_ENABLE_LOCALE_WHITELIST="C en_US"
BR2_TARGET_OPTIMIZATION="-Os -pipe"
@@ -21,6 +20,7 @@ BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
BR2_TOOLCHAIN_BUILDROOT_CXX=y
+BR2_PTHREAD_DEBUG=y
BR2_TARGET_GENERIC_HOSTNAME="armadeus"
BR2_TARGET_GENERIC_ISSUE="Welcome to the Armadeus development environment."
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS=y
@@ -59,11 +59,11 @@ BR2_PACKAGE_ALSA_UTILS=y
BR2_PACKAGE_ALSA_UTILS_AMIXER=y
BR2_PACKAGE_ALSA_UTILS_APLAY=y
BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
-BR2_PACKAGE_MADPLAY=y
BR2_PACKAGE_MPLAYER=y
+BR2_PACKAGE_GDB=y
BR2_PACKAGE_LTRACE=y
BR2_PACKAGE_STRACE=y
-BR2_PACKAGE_LIBINTL=y
+BR2_PACKAGE_GETTEXT=y
BR2_PACKAGE_FBGRAB=y
BR2_PACKAGE_FBTEST=y
BR2_PACKAGE_FBV=y
@@ -73,13 +73,15 @@ BR2_PACKAGE_SDL_IMAGE_PNG=y
BR2_PACKAGE_SDL_NET=y
BR2_PACKAGE_SLIDESHOW=y
BR2_PACKAGE_SDL_WATER=y
-BR2_PACKAGE_I2C_TOOLS=y
-BR2_PACKAGE_INPUT_TOOLS=y
BR2_PACKAGE_MTD=y
BR2_PACKAGE_MTD_JFFS2DUMP=y
BR2_PACKAGE_MTD_MKFSJFFS2=y
BR2_PACKAGE_MTD_SUMTOOL=y
+BR2_PACKAGE_I2C_TOOLS=y
+BR2_PACKAGE_INPUT_TOOLS=y
BR2_PACKAGE_UBOOT_TOOLS=y
+BR2_PACKAGE_LIBID3TAG=y
+BR2_PACKAGE_LIBMAD=y
BR2_PACKAGE_TSLIB=y
BR2_PACKAGE_LIBUSB=y
BR2_PACKAGE_READLINE=y
diff --git a/buildroot/configs/pps51_defconfig b/buildroot/configs/pps51_defconfig
index 517a92a..bfcdc7e 100644
--- a/buildroot/configs/pps51_defconfig
+++ b/buildroot/configs/pps51_defconfig
@@ -12,8 +12,7 @@ BR2_KERNEL_HEADERS_VERSION=y
BR2_DEFAULT_KERNEL_VERSION="2.6.38.8"
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_GCC_VERSION_4_4_X=y
-BR2_PACKAGE_GDB_SERVER=y
-BR2_PACKAGE_GDB_HOST=y
+BR2_PACKAGE_HOST_GDB=y
BR2_ENABLE_LOCALE_PURGE=y
BR2_ENABLE_LOCALE_WHITELIST="C en_US"
# BR2_SOFT_FLOAT is not set
@@ -23,6 +22,7 @@ BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
BR2_TOOLCHAIN_BUILDROOT_CXX=y
+BR2_PTHREAD_DEBUG=y
BR2_VFP_FLOAT=y
BR2_TARGET_GENERIC_HOSTNAME="armadeus"
BR2_TARGET_GENERIC_ISSUE="Welcome to the Armadeus development environment."
@@ -49,17 +49,18 @@ BR2_PACKAGE_ALSA_UTILS=y
BR2_PACKAGE_ALSA_UTILS_AMIXER=y
BR2_PACKAGE_ALSA_UTILS_APLAY=y
BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
+BR2_PACKAGE_GDB=y
BR2_PACKAGE_STRACE=y
BR2_PACKAGE_FBTEST=y
BR2_PACKAGE_FBV=y
-BR2_PACKAGE_DBUS=y
-BR2_PACKAGE_I2C_TOOLS=y
-BR2_PACKAGE_LINUX_FIRMWARE=y
-BR2_PACKAGE_LINUX_FIRMWARE_88W8686=y
BR2_PACKAGE_MTD=y
BR2_PACKAGE_MTD_JFFS2DUMP=y
BR2_PACKAGE_MTD_MKFSJFFS2=y
BR2_PACKAGE_MTD_SUMTOOL=y
+BR2_PACKAGE_LINUX_FIRMWARE=y
+BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8686_V9=y
+BR2_PACKAGE_DBUS=y
+BR2_PACKAGE_I2C_TOOLS=y
BR2_PACKAGE_UBOOT_TOOLS=y
BR2_PACKAGE_TSLIB=y
BR2_PACKAGE_LIBXML2=y
diff --git a/buildroot/configs/pps_defconfig b/buildroot/configs/pps_defconfig
index 441df4a..7cc99df 100644
--- a/buildroot/configs/pps_defconfig
+++ b/buildroot/configs/pps_defconfig
@@ -11,14 +11,14 @@ BR2_KERNEL_HEADERS_VERSION=y
BR2_DEFAULT_KERNEL_VERSION="2.6.29.6"
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_GCC_VERSION_4_4_X=y
-BR2_PACKAGE_GDB_SERVER=y
-BR2_PACKAGE_GDB_HOST=y
+BR2_PACKAGE_HOST_GDB=y
BR2_TARGET_OPTIMIZATION="-Os -pipe"
BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
BR2_TOOLCHAIN_BUILDROOT_CXX=y
+BR2_PTHREAD_DEBUG=y
BR2_TARGET_GENERIC_HOSTNAME="armadeus"
BR2_TARGET_GENERIC_ISSUE="Welcome to the Armadeus development environment."
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS=y
@@ -37,15 +37,15 @@ BR2_PACKAGE_IMXREGS=y
BR2_PACKAGE_MAX5821CTRL=y
BR2_PACKAGE_PPS=y
BR2_PACKAGE_PPS_TEST_SCRIPTS=y
+BR2_PACKAGE_GDB=y
BR2_PACKAGE_STRACE=y
-BR2_PACKAGE_I2C_TOOLS=y
-BR2_PACKAGE_LINUX_FIRMWARE=y
-BR2_PACKAGE_LINUX_FIRMWARE_88W8686=y
-BR2_PACKAGE_LINUX_FIRMWARE_88W8686_V8=y
BR2_PACKAGE_MTD=y
BR2_PACKAGE_MTD_JFFS2DUMP=y
BR2_PACKAGE_MTD_MKFSJFFS2=y
BR2_PACKAGE_MTD_SUMTOOL=y
+BR2_PACKAGE_LINUX_FIRMWARE=y
+BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8686_V8=y
+BR2_PACKAGE_I2C_TOOLS=y
BR2_PACKAGE_UBOOT_TOOLS=y
BR2_PACKAGE_OPENSSL_BIN=y
BR2_PACKAGE_BOA=y
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2013-06-10 16:18: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 45919116aa39f6807f6b0b92ad8726da5fdafdea (commit)
from af823cc2c9fee17376035b96a00bab6b37df7406 (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 45919116aa39f6807f6b0b92ad8726da5fdafdea
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jun 10 18:16:38 2013 +0200
[BUILDROOT] 2013.05: port armadeus modifications to imx-lib
-----------------------------------------------------------------------
Summary of changes:
.../2013.05/174-imx-lib-add_package.patch.TOUPDATE | 105 --------------------
.../174-imx-lib-customize_package.patch} | 104 ++++++--------------
2 files changed, 31 insertions(+), 178 deletions(-)
delete mode 100644 patches/buildroot/2013.05/174-imx-lib-add_package.patch.TOUPDATE
copy patches/buildroot/{2012.02/174-imx-lib-add_package.patch => 2013.05/174-imx-lib-customize_package.patch} (54%)
diff --git a/patches/buildroot/2013.05/174-imx-lib-add_package.patch.TOUPDATE b/patches/buildroot/2013.05/174-imx-lib-add_package.patch.TOUPDATE
deleted file mode 100644
index 3acf660..0000000
--- a/patches/buildroot/2013.05/174-imx-lib-add_package.patch.TOUPDATE
+++ /dev/null
@@ -1,105 +0,0 @@
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: buildroot/package/imx-lib/Config.in
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/imx-lib/Config.in 2012-04-05 12:05:39.000000000 +0200
-@@ -0,0 +1,4 @@
-+config BR2_PACKAGE_IMX_LIB
-+ bool "imx-lib"
-+ help
-+ Freescale specific libraries for i.MX processors family.
-Index: buildroot/package/imx-lib/imx-lib.mk
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/imx-lib/imx-lib.mk 2012-04-05 12:41:02.000000000 +0200
-@@ -0,0 +1,56 @@
-+#############################################################
-+#
-+# imx-lib (helpers librairies from Freescale BSP)
-+#
-+#############################################################
-+IMX_LIB_VERSION = 11.09.01
-+IMX_LIB_SOURCE = imx-lib-$(IMX_LIB_VERSION).tar.gz
-+IMX_LIB_SITE = ftp://ftp2.armadeus.com/armadeusw/download/
-+IMX_LIB_INSTALL_STAGING = YES
-+
-+ifeq ($(BR2_CPU_NAME),imx27)
-+BUILD_PLATFORM = IMX27
-+else
-+BUILD_PLATFORM = IMX51
-+endif
-+
-+IMX_LIB_SUBDIRS += sahara2
-+IMX_LIB_SUBDIRS += vpu
-+IMX_LIB_SUBDIRS += ipu
-+
-+define IMX_LIB_BUILD_CMDS
-+ $(MAKE) CC="$(TARGET_CC)" \
-+ PLATFORM=$(BUILD_PLATFORM) \
-+ DIRS="$(IMX_LIB_SUBDIRS)" \
-+ CFLAGS="-fPIC -I$(LINUX_DIR)/drivers/mxc/security/sahara2/include -I$(LINUX_DIR)/include" \
-+ INCLUDE="-I$(LINUX_DIR)/include" \
-+ -C $(@D)
-+endef
-+
-+define IMX_LIB_INSTALL_STAGING_CMDS
-+ install -D -m 755 $(@D)/vpu/libvpu.so $(STAGING_DIR)/usr/lib
-+ install -D -m 755 $(@D)/vpu/vpu_io.h $(STAGING_DIR)/usr/include
-+ install -D -m 755 $(@D)/vpu/vpu_lib.h $(STAGING_DIR)/usr/include
-+ install -D -m 755 $(@D)/sahara2/libsahara.so $(STAGING_DIR)/usr/lib
-+ install -D -m 755 $(@D)/ipu/mxc_ipu_hl_lib.h $(STAGING_DIR)/usr/include
-+ install -D -m 755 $(@D)/ipu/ipu.h $(STAGING_DIR)/usr/include
-+ install -D -m 755 $(@D)/ipu/libipu.so $(STAGING_DIR)/usr/lib
-+endef
-+
-+define IMX_LIB_INSTALL_TARGET_CMDS
-+ install -D -m 755 $(@D)/vpu/libvpu.so $(TARGET_DIR)/usr/lib
-+ install -D -m 755 $(@D)/sahara2/libsahara.so $(TARGET_DIR)/usr/lib
-+ install -D -m 755 $(@D)/ipu/libipu.so $(TARGET_DIR)/usr/lib
-+endef
-+
-+define IMX_LIB_UNINSTALL_TARGET_CMDS
-+ rm -f $(TARGET_DIR)/usr/lib/libvpu.so
-+ rm -f $(TARGET_DIR)/usr/lib/libsahara.so
-+ rm -f $(TARGET_DIR)/usr/lib/libipu.so
-+endef
-+
-+define IMX_LIB_CLEAN_CMDS
-+ -$(MAKE) -C $(@D) clean
-+endef
-+
-+$(eval $(generic-package))
-Index: buildroot/package/Config.in
-===================================================================
---- buildroot.orig/package/Config.in 2012-04-05 12:05:39.000000000 +0200
-+++ buildroot/package/Config.in 2012-04-05 12:42:07.000000000 +0200
-@@ -349,6 +349,7 @@
-
- menu "Hardware handling"
- source "package/ccid/Config.in"
-+source "package/imx-lib/Config.in"
- source "package/lcdapi/Config.in"
- source "package/libaio/Config.in"
- source "package/libraw1394/Config.in"
-Index: buildroot/package/imx-lib/imx-lib-mxc_ipu_hl_li_v4l2_fixes.patch
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/imx-lib/imx-lib-mxc_ipu_hl_li_v4l2_fixes.patch 2012-04-05 12:35:42.000000000 +0200
-@@ -0,0 +1,16 @@
-+linux/videodev.h include doesn't exist anymore on V4L2 only (=recent kernels).
-+
-+Signed-off-by: Julien Boibessot <jul...@ar...>
-+
-+diff -urN -X linux-2.6.38.8/Documentation/dontdiff imx-lib-11.09.01/ipu/mxc_ipu_hl_lib.c imx-lib-11.09.01.mod/ipu/mxc_ipu_hl_lib.c
-+--- imx-lib-11.09.01/ipu/mxc_ipu_hl_lib.c 2012-04-05 12:24:55.000000000 +0200
-++++ imx-lib-11.09.01.mod/ipu/mxc_ipu_hl_lib.c 2011-09-09 16:10:11.000000000 +0200
-+@@ -41,7 +41,7 @@
-+ #include <sys/mman.h>
-+ #include <sys/types.h>
-+ #include <sys/stat.h>
-+-#include <linux/videodev.h>
-++#include <linux/videodev2.h>
-+ #include "mxc_ipu_hl_lib.h"
-+
-+ #define DBG_DEBUG 3
diff --git a/patches/buildroot/2012.02/174-imx-lib-add_package.patch b/patches/buildroot/2013.05/174-imx-lib-customize_package.patch
similarity index 54%
copy from patches/buildroot/2012.02/174-imx-lib-add_package.patch
copy to patches/buildroot/2013.05/174-imx-lib-customize_package.patch
index 7503636..a0e5edc 100644
--- a/patches/buildroot/2012.02/174-imx-lib-add_package.patch
+++ b/patches/buildroot/2013.05/174-imx-lib-customize_package.patch
@@ -1,93 +1,51 @@
+
Signed-off-by: Julien Boibessot <jul...@ar...>
-Index: buildroot/package/imx-lib/Config.in
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/imx-lib/Config.in 2013-05-27 21:35:12.000000000 +0200
-@@ -0,0 +1,4 @@
-+config BR2_PACKAGE_IMX_LIB
-+ bool "imx-lib"
-+ help
-+ Freescale specific libraries for i.MX processors family.
Index: buildroot/package/imx-lib/imx-lib.mk
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/imx-lib/imx-lib.mk 2013-05-28 15:59:43.000000000 +0200
-@@ -0,0 +1,58 @@
-+#############################################################
-+#
-+# imx-lib (helpers librairies from Freescale BSP)
-+#
-+#############################################################
-+IMX_LIB_VERSION = 11.09.01
-+IMX_LIB_SITE = ftp://ftp2.armadeus.com/armadeusw/download/
-+IMX_LIB_INSTALL_STAGING = YES
-+
+--- buildroot.orig/package/imx-lib/imx-lib.mk 2013-05-25 22:23:57.000000000 +0200
++++ buildroot/package/imx-lib/imx-lib.mk 2013-05-28 18:10:54.218306172 +0200
+@@ -12,6 +12,11 @@
+
+ IMX_LIB_INSTALL_STAGING = YES
+
+IMX_LIB_SUBDIRS = vpu
-+
-+ifeq ($(call qstrip,$(BR2_CPU_NAME)),imx27)
-+# Not tested yet !
-+IMX_LIB_BUILD_PLATFORM = IMX27ADS
-+else
-+IMX_LIB_BUILD_PLATFORM = IMX51
++ifeq ($(call qstrip,$(BR2_PACKAGE_IMX_LIB_PLATFORM)),IMX51)
+IMX_LIB_SUBDIRS += ipu sahara2
+endif
+
-+IMX_LIB_INCLUDE = \
-+ -I$(LINUX_DIR)/drivers/mxc/security/rng/include \
-+ -I$(LINUX_DIR)/drivers/mxc/security/sahara2/include \
-+ -idirafter $(LINUX_DIR)/include
-+
-+IMX_LIB_MAKE_ENV = \
-+ $(TARGET_MAKE_ENV) \
-+ $(TARGET_CONFIGURE_OPTS) \
-+ CROSS_COMPILE="$(CCACHE) $(TARGET_CROSS)" \
-+ PLATFORM="$(IMX_LIB_BUILD_PLATFORM)" \
-+ INCLUDE="$(IMX_LIB_INCLUDE)"
-+
-+define IMX_LIB_BUILD_CMDS
-+ $(IMX_LIB_MAKE_ENV) $(MAKE1) \
-+ DIRS="$(IMX_LIB_SUBDIRS)" \
-+ -C $(@D)
-+endef
-+
-+define IMX_LIB_INSTALL_STAGING_CMDS
-+ $(IMX_LIB_MAKE_ENV) $(MAKE1) -C $(@D) DIRS="$(IMX_LIB_SUBDIRS)" \
-+ DEST_DIR=$(STAGING_DIR) install
-+endef
-+
-+define IMX_LIB_INSTALL_TARGET_CMDS
-+ $(IMX_LIB_MAKE_ENV) $(MAKE1) -C $(@D) DIRS="$(IMX_LIB_SUBDIRS)" \
-+ DEST_DIR=$(TARGET_DIR) install
+ # imx-lib needs access to imx-specific kernel headers
+ IMX_LIB_DEPENDENCIES += linux
+ IMX_LIB_INCLUDE = \
+@@ -27,15 +32,21 @@
+ INCLUDE="$(IMX_LIB_INCLUDE)"
+
+ define IMX_LIB_BUILD_CMDS
+- $(IMX_LIB_MAKE_ENV) $(MAKE1) -C $(@D)
++ $(IMX_LIB_MAKE_ENV) $(MAKE1) DIRS="$(IMX_LIB_SUBDIRS)" -C $(@D)
+ endef
+
+ define IMX_LIB_INSTALL_STAGING_CMDS
+- $(IMX_LIB_MAKE_ENV) $(MAKE1) -C $(@D) DEST_DIR=$(STAGING_DIR) install
++ $(IMX_LIB_MAKE_ENV) $(MAKE1) DIRS="$(IMX_LIB_SUBDIRS)" -C $(@D) DEST_DIR=$(STAGING_DIR) install
+ endef
+
+ define IMX_LIB_INSTALL_TARGET_CMDS
+- $(IMX_LIB_MAKE_ENV) $(MAKE1) -C $(@D) DEST_DIR=$(TARGET_DIR) install
++ $(IMX_LIB_MAKE_ENV) $(MAKE1) DIRS="$(IMX_LIB_SUBDIRS)" -C $(@D) DEST_DIR=$(TARGET_DIR) install
+endef
+
+define IMX_LIB_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/usr/lib/libvpu.so
+ rm -f $(TARGET_DIR)/usr/lib/libsahara.so
+ rm -f $(TARGET_DIR)/usr/lib/libipu.so
-+endef
-+
-+define IMX_LIB_CLEAN_CMDS
-+ -$(MAKE) -C $(@D) clean
-+endef
-+
-+$(eval $(call GENTARGETS))
-Index: buildroot/package/Config.in
-===================================================================
---- buildroot.orig/package/Config.in 2013-05-27 21:35:12.000000000 +0200
-+++ buildroot/package/Config.in 2013-05-28 16:03:11.000000000 +0200
-@@ -348,6 +348,7 @@
- endmenu
+ endef
- menu "Hardware handling"
-+source "package/imx-lib/Config.in"
- source "package/libaio/Config.in"
- source "package/libraw1394/Config.in"
- source "package/tslib/Config.in"
+ $(eval $(generic-package))
Index: buildroot/package/imx-lib/imx-lib-mxc_ipu_hl_li_v4l2_fixes.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/imx-lib/imx-lib-mxc_ipu_hl_li_v4l2_fixes.patch 2013-05-27 21:35:12.000000000 +0200
++++ buildroot/package/imx-lib/imx-lib-mxc_ipu_hl_li_v4l2_fixes.patch 2013-05-28 18:10:54.218306172 +0200
@@ -0,0 +1,16 @@
+linux/videodev.h include doesn't exist anymore on V4L2 only (=recent kernels).
+
@@ -108,7 +66,7 @@ Index: buildroot/package/imx-lib/imx-lib-mxc_ipu_hl_li_v4l2_fixes.patch
Index: buildroot/package/imx-lib/imx-lib-fixes_build_on_imx27.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/imx-lib/imx-lib-fixes_build_on_imx27.patch 2013-05-28 16:02:42.000000000 +0200
++++ buildroot/package/imx-lib/imx-lib-fixes_build_on_imx27.patch 2013-05-28 18:10:54.218306172 +0200
@@ -0,0 +1,30 @@
+To build but I'm not sure it will work...
+
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2013-05-31 06:24: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 af823cc2c9fee17376035b96a00bab6b37df7406 (commit)
from bd1a1c19976ad68c560cde0e9c304a24cc5e37d4 (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 af823cc2c9fee17376035b96a00bab6b37df7406
Author: Eric Jarrige <eri...@ar...>
Date: Fri May 31 08:33:03 2013 +0200
[UBOOT] 2013.04: workaround to fix APF27 PHY power on reset issue: disable CONFIG_PHYLIB
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf27/apf27-u-boot-2013.04.h | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2013.04.h b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2013.04.h
index ee3bdb8..a6e6d26 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2013.04.h
+++ b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2013.04.h
@@ -349,7 +349,8 @@
* Ethernet (on SOC imx FEC)
*/
#define CONFIG_FEC_MXC
-#define CONFIG_PHYLIB
+/*#define CONFIG_PHYLIB
+#define CONFIG_PHY_SMSC*/
#define CONFIG_FEC_MXC_PHYADDR 0x1f
#define CONFIG_MII /* MII PHY management */
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2013-05-29 18:38: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 bd1a1c19976ad68c560cde0e9c304a24cc5e37d4 (commit)
from d36b701d77711f5d9d1a428b939901ae2fac4225 (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 bd1a1c19976ad68c560cde0e9c304a24cc5e37d4
Author: Philippe Reynes <tr...@ya...>
Date: Sat May 25 19:16:53 2013 +0200
[LINUX] 3.9: add support of the 3.9.4
Signed-off-by: Philippe Reynes <tr...@ya...>
-----------------------------------------------------------------------
Summary of changes:
...linux-3.9.3.config => apf27-linux-3.9.4.config} | 0
patches/linux/{3.9.3 => 3.9.4} | 0
2 files changed, 0 insertions(+), 0 deletions(-)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.9.3.config => apf27-linux-3.9.4.config} (100%)
rename patches/linux/{3.9.3 => 3.9.4} (100%)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.9.3.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.9.4.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.9.3.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.9.4.config
diff --git a/patches/linux/3.9.3 b/patches/linux/3.9.4
similarity index 100%
rename from patches/linux/3.9.3
rename to patches/linux/3.9.4
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2013-05-28 14:09: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 d36b701d77711f5d9d1a428b939901ae2fac4225 (commit)
from 06700620ebbe74a3e7782ff52c90e0534aa6ef00 (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 d36b701d77711f5d9d1a428b939901ae2fac4225
Author: Julien Boibessot <jul...@ar...>
Date: Tue May 28 16:07:54 2013 +0200
[BUILDROOT] 2011.02: makes imx-lib compile again (vpu only) on i.MX27
-----------------------------------------------------------------------
Summary of changes:
.../2012.02/174-imx-lib-add_package.patch | 93 ++++++++++++++------
1 files changed, 65 insertions(+), 28 deletions(-)
diff --git a/patches/buildroot/2012.02/174-imx-lib-add_package.patch b/patches/buildroot/2012.02/174-imx-lib-add_package.patch
index 9ea4304..7503636 100644
--- a/patches/buildroot/2012.02/174-imx-lib-add_package.patch
+++ b/patches/buildroot/2012.02/174-imx-lib-add_package.patch
@@ -3,7 +3,7 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/imx-lib/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/imx-lib/Config.in 2012-04-05 12:05:39.000000000 +0200
++++ buildroot/package/imx-lib/Config.in 2013-05-27 21:35:12.000000000 +0200
@@ -0,0 +1,4 @@
+config BR2_PACKAGE_IMX_LIB
+ bool "imx-lib"
@@ -12,51 +12,53 @@ Index: buildroot/package/imx-lib/Config.in
Index: buildroot/package/imx-lib/imx-lib.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/imx-lib/imx-lib.mk 2012-04-05 12:41:02.000000000 +0200
-@@ -0,0 +1,56 @@
++++ buildroot/package/imx-lib/imx-lib.mk 2013-05-28 15:59:43.000000000 +0200
+@@ -0,0 +1,58 @@
+#############################################################
+#
+# imx-lib (helpers librairies from Freescale BSP)
+#
+#############################################################
+IMX_LIB_VERSION = 11.09.01
-+IMX_LIB_SOURCE = imx-lib-$(IMX_LIB_VERSION).tar.gz
+IMX_LIB_SITE = ftp://ftp2.armadeus.com/armadeusw/download/
+IMX_LIB_INSTALL_STAGING = YES
+
-+ifeq ($(BR2_CPU_NAME),imx27)
-+BUILD_PLATFORM = IMX27
++IMX_LIB_SUBDIRS = vpu
++
++ifeq ($(call qstrip,$(BR2_CPU_NAME)),imx27)
++# Not tested yet !
++IMX_LIB_BUILD_PLATFORM = IMX27ADS
+else
-+BUILD_PLATFORM = IMX51
++IMX_LIB_BUILD_PLATFORM = IMX51
++IMX_LIB_SUBDIRS += ipu sahara2
+endif
+
-+IMX_LIB_SUBDIRS += sahara2
-+IMX_LIB_SUBDIRS += vpu
-+IMX_LIB_SUBDIRS += ipu
++IMX_LIB_INCLUDE = \
++ -I$(LINUX_DIR)/drivers/mxc/security/rng/include \
++ -I$(LINUX_DIR)/drivers/mxc/security/sahara2/include \
++ -idirafter $(LINUX_DIR)/include
++
++IMX_LIB_MAKE_ENV = \
++ $(TARGET_MAKE_ENV) \
++ $(TARGET_CONFIGURE_OPTS) \
++ CROSS_COMPILE="$(CCACHE) $(TARGET_CROSS)" \
++ PLATFORM="$(IMX_LIB_BUILD_PLATFORM)" \
++ INCLUDE="$(IMX_LIB_INCLUDE)"
+
+define IMX_LIB_BUILD_CMDS
-+ $(MAKE) CC="$(TARGET_CC)" \
-+ PLATFORM=$(BUILD_PLATFORM) \
++ $(IMX_LIB_MAKE_ENV) $(MAKE1) \
+ DIRS="$(IMX_LIB_SUBDIRS)" \
-+ CFLAGS="-fPIC -I$(LINUX_DIR)/drivers/mxc/security/sahara2/include -I$(LINUX_DIR)/include" \
-+ INCLUDE="-I$(LINUX_DIR)/include" \
+ -C $(@D)
+endef
+
+define IMX_LIB_INSTALL_STAGING_CMDS
-+ install -D -m 755 $(@D)/vpu/libvpu.so $(STAGING_DIR)/usr/lib
-+ install -D -m 755 $(@D)/vpu/vpu_io.h $(STAGING_DIR)/usr/include
-+ install -D -m 755 $(@D)/vpu/vpu_lib.h $(STAGING_DIR)/usr/include
-+ install -D -m 755 $(@D)/sahara2/libsahara.so $(STAGING_DIR)/usr/lib
-+ install -D -m 755 $(@D)/ipu/mxc_ipu_hl_lib.h $(STAGING_DIR)/usr/include
-+ install -D -m 755 $(@D)/ipu/ipu.h $(STAGING_DIR)/usr/include
-+ install -D -m 755 $(@D)/ipu/libipu.so $(STAGING_DIR)/usr/lib
++ $(IMX_LIB_MAKE_ENV) $(MAKE1) -C $(@D) DIRS="$(IMX_LIB_SUBDIRS)" \
++ DEST_DIR=$(STAGING_DIR) install
+endef
+
+define IMX_LIB_INSTALL_TARGET_CMDS
-+ install -D -m 755 $(@D)/vpu/libvpu.so $(TARGET_DIR)/usr/lib
-+ install -D -m 755 $(@D)/sahara2/libsahara.so $(TARGET_DIR)/usr/lib
-+ install -D -m 755 $(@D)/ipu/libipu.so $(TARGET_DIR)/usr/lib
++ $(IMX_LIB_MAKE_ENV) $(MAKE1) -C $(@D) DIRS="$(IMX_LIB_SUBDIRS)" \
++ DEST_DIR=$(TARGET_DIR) install
+endef
+
+define IMX_LIB_UNINSTALL_TARGET_CMDS
@@ -72,9 +74,9 @@ Index: buildroot/package/imx-lib/imx-lib.mk
+$(eval $(call GENTARGETS))
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2012-04-05 12:05:39.000000000 +0200
-+++ buildroot/package/Config.in 2012-04-05 12:42:07.000000000 +0200
-@@ -349,6 +349,7 @@
+--- buildroot.orig/package/Config.in 2013-05-27 21:35:12.000000000 +0200
++++ buildroot/package/Config.in 2013-05-28 16:03:11.000000000 +0200
+@@ -348,6 +348,7 @@
endmenu
menu "Hardware handling"
@@ -85,7 +87,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/imx-lib/imx-lib-mxc_ipu_hl_li_v4l2_fixes.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/imx-lib/imx-lib-mxc_ipu_hl_li_v4l2_fixes.patch 2012-04-05 12:35:42.000000000 +0200
++++ buildroot/package/imx-lib/imx-lib-mxc_ipu_hl_li_v4l2_fixes.patch 2013-05-27 21:35:12.000000000 +0200
@@ -0,0 +1,16 @@
+linux/videodev.h include doesn't exist anymore on V4L2 only (=recent kernels).
+
@@ -103,3 +105,38 @@ Index: buildroot/package/imx-lib/imx-lib-mxc_ipu_hl_li_v4l2_fixes.patch
+ #include "mxc_ipu_hl_lib.h"
+
+ #define DBG_DEBUG 3
+Index: buildroot/package/imx-lib/imx-lib-fixes_build_on_imx27.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/imx-lib/imx-lib-fixes_build_on_imx27.patch 2013-05-28 16:02:42.000000000 +0200
+@@ -0,0 +1,30 @@
++To build but I'm not sure it will work...
++
++Signed-off-by: Julien Boibessot <jul...@ar...>
++
++diff -urN -X linux-3.8.6/Documentation/dontdiff imx-lib-11.09.01/vpu/vpu_reg.h imx-lib-11.09.01.mod2/vpu/vpu_reg.h
++--- imx-lib-11.09.01/vpu/vpu_reg.h 2011-09-09 16:10:11.000000000 +0200
+++++ imx-lib-11.09.01.mod2/vpu/vpu_reg.h 2013-05-28 15:55:45.000000000 +0200
++@@ -369,7 +369,7 @@
++ #if defined(IMX27ADS)
++ #define CODE_BUF_SIZE (64 * 1024)
++ #define FMO_SLICE_SAVE_BUF_SIZE (32)
++- #define WORK_BUF_SIZE (288 * 1024) + (FMO_SLICE_SAVE_BUF_SIZE * 1024 * 8)
+++ #define TEMP_BUF_SIZE (288 * 1024) + (FMO_SLICE_SAVE_BUF_SIZE * 1024 * 8)
++ #define PARA_BUF2_SIZE (1728)
++ #define PARA_BUF_SIZE (10 * 1024)
++ #elif defined(IMX51) || defined(IMX53)
++diff -urN -X linux-3.8.6/Documentation/dontdiff imx-lib-11.09.01/vpu/vpu_util.h imx-lib-11.09.01.mod2/vpu/vpu_util.h
++--- imx-lib-11.09.01/vpu/vpu_util.h 2011-09-09 16:10:11.000000000 +0200
+++++ imx-lib-11.09.01.mod2/vpu/vpu_util.h 2013-05-28 15:56:38.000000000 +0200
++@@ -97,7 +97,9 @@
++ /* dummy */
++ RV_DEC = 0x81,
++ MJPG_DEC = 0x82,
++- MJPG_ENC = 0x83
+++ MJPG_ENC = 0x83,
+++ AVS_DEC = 0x84,
+++ VPX_DEC = 0x85
++ };
++ #endif
++
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2013-05-27 22:36:53
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 06700620ebbe74a3e7782ff52c90e0534aa6ef00 (commit)
from 8a26940559d5fa30611598c48d6587abd814d349 (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 06700620ebbe74a3e7782ff52c90e0534aa6ef00
Author: Eric Jarrige <eri...@ar...>
Date: Tue May 28 00:44:45 2013 +0200
[UBOOT] 2012.10: cleanup
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf28/apf28-u-boot-2012.10.h | 436 --------------------
1 files changed, 0 insertions(+), 436 deletions(-)
delete mode 100644 buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.10.h
diff --git a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.10.h b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.10.h
deleted file mode 100644
index 3562df1..0000000
--- a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.10.h
+++ /dev/null
@@ -1,436 +0,0 @@
-/*
- * Configuration settings for the Armadeus Project APF28 module.
- *
- * Copyright (C) 2011-2012 ej / Armadeus Project <eri...@ar...>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * 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 __CONFIG_H
-#define __CONFIG_H
-
-#include <asm/arch/regs-base.h>
-
-#define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION "1.3"
-#define CONFIG_IDENT_STRING " apf28 patch 1.3"
-#define CONFIG_BOARD_NAME apf28
-
-/*
- * SoC configurations
- */
-#define CONFIG_MX28 /* i.MX28 SoC */
-#define CONFIG_MACH_TYPE 3845 /* APF28 */
-
-/*
- * Enable the call to miscellaneous platform dependent initialization.
- */
-#define CONFIG_SYS_NO_FLASH /* to be define before <config_cmd_default.h>*/
-#define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_BOARD_LATE_INIT
-#define CONFIG_ARCH_MISC_INIT
-#define CONFIG_APBH_DMA
-
-/*
- * Board display option
- */
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DOS_PARTITION
-
-/*
- * SPL
- */
-#define CONFIG_SPL
-#define CONFIG_SPL_NO_CPU_SUPPORT_CODE
-#define CONFIG_SPL_START_S_PATH "arch/arm/cpu/arm926ejs/mxs"
-#define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds"
-#define CONFIG_SPL_LIBCOMMON_SUPPORT
-#define CONFIG_SPL_LIBGENERIC_SUPPORT
-#define CONFIG_SPL_GPIO_SUPPORT
-
-/* Enable CONFIG_SYS_NO_DCDC_BATT_SOURCE the following if you only have a
- * VDD5V source only and no DCDC_BATT source. This includes configurations with
- * and without a supercap on the BATTERY pin as shown in the i.MX28 reference
- * schematic.
- *
- * NOTE: If both a DCDC_BATT and VDD5V source are present, this is not meant to
- * select which one to use. This is only for hardware configurations without
- * DCDC_BATT power source.
- */
-/* #define CONFIG_SYS_NO_DCDC_BATT_SOURCE */
-
-/* Enable CONFIG_SYS_NO_VDD5V_SOURCE the following if you only have a DCDC_BATT
- * source only and no VDD5V. This includes configurations with and without a
- * supercap on the BATTERY pin as shown in the i.MX28 reference schematic.
- *
- * NOTE: If both a DCDC_BATT and VDD5V source are present, this is not meant to
- * select which one to use. This is only for hardware configurations without
- * VDD5V power source.
-*/
-/* #define CONFIG_SYS_NO_VDD5V_SOURCE */
-
-/* Enable CONFIG_SYS_VBUS_CURRENT_DRAW the following if VDD5V is sourced from
- * VBUS. Limit the current to 100mA
- */
-/* #define CONFIG_SYS_VBUS_CURRENT_DRAW */
-
-/*
- * BOOTP options
- */
-#define CONFIG_BOOTP_SUBNETMASK
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_DNS
-#define CONFIG_BOOTP_DNS2
-
-#define CONFIG_HOSTNAME CONFIG_BOARD_NAME
-#define CONFIG_ROOTPATH "/tftpboot/" MK_STR(CONFIG_BOARD_NAME) "-root"
-
-/*
- * U-Boot Commands
- */
-#include <config_cmd_default.h>
-
-#define CONFIG_CMD_ASKENV /* ask for env variable */
-#define CONFIG_CMD_BSP /* Board Specific functions */
-#define CONFIG_CMD_CACHE
-#define CONFIG_CMD_DATE
-#define CONFIG_CMD_DHCP
-#define CONFIG_CMD_DNS
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_FAT
-#define CONFIG_CMD_GPIO
-#define CONFIG_CMD_MII
-#define CONFIG_CMD_MMC
-#define CONFIG_CMD_MTDPARTS
-#define CONFIG_CMD_NAND
-#define CONFIG_CMD_NAND_TRIMFFS
-#define CONFIG_CMD_NFS
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_SETEXPR
-#define CONFIG_CMD_USB
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
-
-/*
- * Memory configurations
- */
-#define CONFIG_NR_DRAM_BANKS 1 /* 1 bank of DRAM */
-#define PHYS_SDRAM_1 0x40000000 /* Base address */
-#define PHYS_SDRAM_1_SIZE 0x20000000 /* Max 512 MiB RAM */
-#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
-#define CONFIG_SYS_MALLOC_LEN 0x00400000 /* 4 MB for malloc */
-#define CONFIG_SYS_MEMTEST_START 0x40000000 /* Memtest start adr */
-#define CONFIG_SYS_MEMTEST_END 0x40400000 /* 4 MB RAM test */
-/* Point initial SP in SRAM so SPL can use it too. */
-
-#define CONFIG_SYS_INIT_RAM_ADDR 0x00002000
-#define CONFIG_SYS_INIT_RAM_SIZE (128 * 1024)
-#define CONFIG_SYS_INIT_SP_OFFSET \
- (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
-#define CONFIG_SYS_INIT_SP_ADDR \
- (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
-
-#define CONFIG_SYS_TEXT_BASE 0x40000000
-
-/*
- * FLASH organization
- */
-/* First 1 MiB reservered for mx28 NAND BCBÂ tables */
-/* last 2 MiB reservered for 2 copies of U-Boot */
-#define CONFIG_SYS_MONITOR_OFFSET 0x00100000 /* offset in NAND */
-#define CONFIG_SYS_MONITOR_LEN 0x00100000 /* 2 x 1MB */
-#define CONFIG_ENV_IS_IN_NAND
-#define CONFIG_ENV_OFFSET 0x00300000 /* NAND offset */
-#define CONFIG_ENV_SIZE 0x00020000 /* 128kB */
-#define CONFIG_ENV_RANGE 0x00080000 /* 512kB */
-#define CONFIG_ENV_OFFSET_REDUND \
- (CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE) /* +512kB */
-#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE /* 512kB */
-#define CONFIG_KERNEL_OFFSET 0x00500000 /* 8MB */
-#define CONFIG_ROOTFS_OFFSET 0x00D00000
-
-#define CONFIG_MTDMAP "gpmi-nfc-main"
-#define MTDIDS_DEFAULT "nand0=" CONFIG_MTDMAP
-#define MTDPARTS_DEFAULT \
- "mtdparts=" CONFIG_MTDMAP \
- ":3M(u-boot)ro," \
- "512K(env)," \
- "512K(env2)," \
- "512K(dtb)," \
- "512K(splash)," \
- "8M(kernel)," \
- "-(rootfs)"
-
-/*
- * U-Boot general configurations
- */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_PROMPT "BIOS> "
-#define CONFIG_SYS_CBSIZE 2048 /* Console I/O buffer size */
-#define CONFIG_SYS_PBSIZE \
- (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
- /* Print buffer size */
-#define CONFIG_SYS_MAXARGS 16 /* Max number of command args */
-#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
- /* Boot argument buffer size */
-#define CONFIG_AUTO_COMPLETE /* Command auto complete */
-#define CONFIG_CMDLINE_EDITING /* Command history etc */
-#define CONFIG_SYS_HUSH_PARSER /* enable the "hush" shell */
-
-/*
- * Boot Linux
- */
-#define CONFIG_CMDLINE_TAG /* send commandline to Kernel */
-#define CONFIG_SETUP_MEMORY_TAGS /* send memory definition to kernel */
-#define CONFIG_INITRD_TAG /* send initrd params */
-
-/* #define CONFIG_REVISION_TAG */
-#define CONFIG_OF_LIBFDT
-
-#define CONFIG_BOOTDELAY 5
-#define CONFIG_ZERO_BOOTDELAY_CHECK
-#define CONFIG_BOOTFILE MK_STR(CONFIG_BOARD_NAME) "-linux.bin"
-#define CONFIG_BOOTARGS "console=" MK_STR(ACFG_CONSOLE_DEV) "," \
- MK_STR(CONFIG_BAUDRATE) " " MTDPARTS_DEFAULT \
- " ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs "
-
-#define ACFG_CONSOLE_DEV ttyAM0
-#define CONFIG_BOOTCOMMAND "run ubifsboot"
-#define CONFIG_SYS_AUTOLOAD "no"
-/*
- * Default load address for user programs and kernel
- */
-#define CONFIG_LOADADDR 0x40000000
-#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
-
-/*
- * Extra Environments
- */
-#define CONFIG_EXTRA_ENV_SETTINGS \
- "env_version=" CONFIG_ENV_VERSION "\0" \
- "consoledev=" MK_STR(ACFG_CONSOLE_DEV) "\0"\
- "mtdparts=" MTDPARTS_DEFAULT "\0"\
- "partition=nand0,6\0" \
- "u-boot_addr=" MK_STR(CONFIG_SYS_MONITOR_OFFSET) "\0"\
- "u-boot_len=" MK_STR(CONFIG_SYS_MONITOR_LEN) "\0"\
- "kernel_addr=" MK_STR(CONFIG_KERNEL_OFFSET) "\0"\
- "rootfs_addr=" MK_STR(CONFIG_ROOTFS_OFFSET) "\0"\
- "board_name=" MK_STR(CONFIG_BOARD_NAME) "\0"\
- "kernel_addr_r=40000000\0" \
- "addnfsargs=setenv bootargs ${bootargs} " \
- "root=/dev/nfs rw nfsroot=${serverip}:${rootpath}\0" \
- "addubifsargs=setenv bootargs ${bootargs} " \
- "ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs\0" \
- "addmmcargs=setenv bootargs ${bootargs} " \
- "root=/dev/mmcblk0p1 rootfstype=ext2\0" \
- "addipargs=setenv bootargs ${bootargs} " \
- "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:" \
- "${hostname}:eth0:off\0" \
- "nfsboot=setenv bootargs console=${consoledev},${baudrate} " \
- "${mtdparts} ${extrabootargs}; run addnfsargs addipargs;"\
- "nfs ${kernel_addr_r} " \
- "${serverip}:${rootpath}/boot/${board_name}-linux.bin;" \
- "if test -n ${fdt_addr_r} ; then " \
- "nand read ${fdt_addr_r} dtb; fi;" \
- "bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \
- "ubifsboot=setenv bootargs console=${consoledev},${baudrate} " \
- "${mtdparts} ${extrabootargs};run addubifsargs addipargs;"\
- "if test -n ${fdt_addr_r} ; then " \
- "nand read ${fdt_addr_r} dtb; fi;" \
- "nboot ${kernel_addr_r} kernel;" \
- "bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \
- "mmcboot=setenv bootargs console=${consoledev},${baudrate} " \
- "${mtdparts} ${extrabootargs}; run addmmcargs addipargs;"\
- "if test -n ${fdt_addr_r} ; then " \
- "nand read ${fdt_addr_r} dtb; fi;" \
- "mmc dev 0; ext2load mmc 0 ${kernel_addr_r}" \
- " /boot/${board_name}-linux.bin;" \
- "bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \
- "flash_uboot=if bcb nand.write ; then " \
- "nand erase ${u-boot_addr} ${u-boot_len} ; " \
- "nand write.trimffs ${fileaddr} ${u-boot_addr} ${filesize};" \
- "nand erase ${u-boot2_addr} ${u-boot_len};" \
- "if nand write.trimffs ${fileaddr} ${u-boot2_addr}" \
- " ${filesize};" \
- "then echo Flashing of uboot succeed;" \
- "else echo Flashing of uboot failed;" \
- "fi; " \
- "fi; \0" \
- "flash_kernel=nand erase.part kernel;" \
- "if nand write.trimffs ${fileaddr} ${kernel_addr} ${filesize};"\
- "then echo Flashing of kernel succeed;" \
- "else echo Flashing of kernel failed;" \
- "fi\0" \
- "flash_rootfs=nand erase.part rootfs;" \
- "if nand write.trimffs ${fileaddr} ${rootfs_addr} ${filesize};"\
- "then echo Flashing of rootfs succeed;" \
- "else echo Flashing of rootfs failed;" \
- "fi\0" \
- "flash_dtb=nand erase.part dtb;" \
- "if nand write.trimffs ${fileaddr} dtb ${filesize};" \
- "then echo Flashing of rootfs succeed;" \
- "else echo Flashing of rootfs failed;" \
- "fi\0" \
- "flash_reset_env=env default -f -a; saveenv;" \
- "echo Flash environment variables erased!\0" \
- "download_uboot=tftpboot ${loadaddr} ${board_name}-u-boot.sb\0" \
- "download_kernel=tftpboot ${loadaddr} ${board_name}-linux.bin\0"\
- "download_rootfs=tftpboot ${loadaddr} ${board_name}-rootfs.ubi\0"\
- "download_dtb=tftpboot ${loadaddr} imx28-${board_name}.dtb\0" \
- "update_uboot=run download_uboot flash_uboot\0" \
- "update_kernel=run download_kernel flash_kernel\0" \
- "update_rootfs=run download_rootfs flash_rootfs\0" \
- "update_dtb=run download_dtb flash_dtb\0" \
- "update_all=run download_kernel flash_kernel download_rootfs " \
- "flash_rootfs download_uboot flash_uboot\0" \
- "unlock_regs=echo unlock_reg not needed anymore\0"
-
-/*
- * Serial Driver
- */
-#define CONFIG_PL011_SERIAL
-#define CONFIG_PL011_CLOCK 24000000
-#define CONFIG_PL01x_PORTS { (void *)MXS_UARTDBG_BASE }
-#define CONFIG_CONS_INDEX 0
-#define CONFIG_BAUDRATE 115200 /* Default baud rate */
-
-/*
- * GPIO
- */
-#define CONFIG_MXS_GPIO
-
-/*
- * NOR
- */
-
-/*
- * NAND
- */
-#define CONFIG_NAND_MXS
-#define CONFIG_APBH_DMA
-#define CONFIG_SYS_NAND_BASE 0x60000000
-#define CONFIG_SYS_MAX_NAND_DEVICE 1
-
-#define CONFIG_SYS_NAND_5_ADDR_CYCLE
-#define NAND_MAX_CHIPS 1
-
-#define CONFIG_SYS_DIRECT_FLASH_TFTP
-#define CONFIG_FLASH_SHOW_PROGRESS 45
-#define CONFIG_SYS_NAND_QUIET 1
-
-/* Environment is in NAND */
-#define CONFIG_ENV_IS_IN_NAND
-#define CONFIG_ENV_OVERWRITE
-
-/*
- * Partitions & Filsystems
- */
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
-#define CONFIG_DOS_PARTITION
-#define CONFIG_SUPPORT_VFAT
-
-/*
- * UBIFS
- */
-#define CONFIG_RBTREE
-#define CONFIG_LZO
-
-/*
- * Ethernet (on SOC mx28 FEC)
- */
-#ifdef CONFIG_CMD_NET
-#define CONFIG_NET_MULTI
-#define CONFIG_ETHPRIME "FEC0"
-#define CONFIG_FEC_MXC
-#define CONFIG_FEC_MXC_MULTI
-#define CONFIG_MII
-#define CONFIG_DISCOVER_PHY
-#define CONFIG_FEC_XCV_TYPE RMII
-#define CONFIG_MX28_FEC_MAC_IN_OCOTP
-#define CONFIG_NETCONSOLE 1
-#endif
-#define ACFG_OUI 0x001EAC
-
-/*
- * Fuses - OCOTP
- */
-/* #define CONFIG_IMX_OCOTP */
-#define IMX_OCOTP_BASE MXS_OCOTP_BASE
-
-/*
- * I2C
- */
-#ifdef CONFIG_CMD_I2C
-#define CONFIG_I2C_MXS
-#define CONFIG_HARD_I2C
-#define CONFIG_SYS_I2C_SPEED 400000
-#endif
-
-/*
- * SPI
- */
-#ifdef CONFIG_CMD_SPI
-#define CONFIG_HARD_SPI
-#define CONFIG_MXS_SPI
-#define CONFIG_SPI_HALF_DUPLEX
-#define CONFIG_DEFAULT_SPI_BUS 2
-#define CONFIG_DEFAULT_SPI_MODE SPI_MODE_0
-#endif
-
-/*
- * SD/MMC
- */
-#ifdef CONFIG_CMD_MMC
-#define CONFIG_MMC
-#define CONFIG_MMC_BOUNCE_BUFFER
-#define CONFIG_GENERIC_MMC
-#define CONFIG_MXS_MMC
-#endif
-
-/*
- * RTC
- */
-#ifdef CONFIG_CMD_DATE
-/* Use the internal RTC in the MXS chip */
-#define CONFIG_RTC_INTERNAL
-#define CONFIG_RTC_MXS
-#endif
-
-/*
- * Watchdog Config
- */
-
-/*
- * USB
- */
-#ifdef CONFIG_CMD_USB
-#define CONFIG_USB_EHCI
-#define CONFIG_USB_EHCI_MXS
-#define CONFIG_EHCI_MXS_PORT 1
-#define CONFIG_EHCI_IS_TDI
-#define CONFIG_USB_STORAGE
-#endif
-
-/*
- * Clocks
- */
-#define CONFIG_SYS_HZ 1000 /* Ticks per second */
-
-#endif /* __CONFIG_H */
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2013-05-27 22:35: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 8a26940559d5fa30611598c48d6587abd814d349 (commit)
from d0a704a0b5a82f515b9fa1788b919b05778ffece (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 8a26940559d5fa30611598c48d6587abd814d349
Author: Eric Jarrige <eri...@ar...>
Date: Tue May 28 00:43:17 2013 +0200
[UBOOT] 2013.04: add apf28 configuration file
-----------------------------------------------------------------------
Summary of changes:
...f28-u-boot-2012.10.h => apf28-u-boot-2013.04.h} | 26 ++++++++++----------
1 files changed, 13 insertions(+), 13 deletions(-)
copy buildroot/target/device/armadeus/apf28/{apf28-u-boot-2012.10.h => apf28-u-boot-2013.04.h} (95%)
diff --git a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.10.h b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2013.04.h
similarity index 95%
copy from buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.10.h
copy to buildroot/target/device/armadeus/apf28/apf28-u-boot-2013.04.h
index 3562df1..3dcaced 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.10.h
+++ b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2013.04.h
@@ -22,8 +22,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#include <asm/arch/regs-base.h>
-
#define CONFIG_VERSION_VARIABLE
#define CONFIG_ENV_VERSION "1.3"
#define CONFIG_IDENT_STRING " apf28 patch 1.3"
@@ -35,6 +33,8 @@
#define CONFIG_MX28 /* i.MX28 SoC */
#define CONFIG_MACH_TYPE 3845 /* APF28 */
+#include <asm/arch/regs-base.h>
+
/*
* Enable the call to miscellaneous platform dependent initialization.
*/
@@ -99,7 +99,7 @@
#define CONFIG_BOOTP_DNS2
#define CONFIG_HOSTNAME CONFIG_BOARD_NAME
-#define CONFIG_ROOTPATH "/tftpboot/" MK_STR(CONFIG_BOARD_NAME) "-root"
+#define CONFIG_ROOTPATH "/tftpboot/" __stringify(CONFIG_BOARD_NAME) "-root"
/*
* U-Boot Commands
@@ -205,9 +205,9 @@
#define CONFIG_BOOTDELAY 5
#define CONFIG_ZERO_BOOTDELAY_CHECK
-#define CONFIG_BOOTFILE MK_STR(CONFIG_BOARD_NAME) "-linux.bin"
-#define CONFIG_BOOTARGS "console=" MK_STR(ACFG_CONSOLE_DEV) "," \
- MK_STR(CONFIG_BAUDRATE) " " MTDPARTS_DEFAULT \
+#define CONFIG_BOOTFILE __stringify(CONFIG_BOARD_NAME) "-linux.bin"
+#define CONFIG_BOOTARGS "console=" __stringify(ACFG_CONSOLE_DEV) "," \
+ __stringify(CONFIG_BAUDRATE) " " MTDPARTS_DEFAULT \
" ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs "
#define ACFG_CONSOLE_DEV ttyAM0
@@ -224,14 +224,14 @@
*/
#define CONFIG_EXTRA_ENV_SETTINGS \
"env_version=" CONFIG_ENV_VERSION "\0" \
- "consoledev=" MK_STR(ACFG_CONSOLE_DEV) "\0"\
+ "consoledev=" __stringify(ACFG_CONSOLE_DEV) "\0"\
"mtdparts=" MTDPARTS_DEFAULT "\0"\
"partition=nand0,6\0" \
- "u-boot_addr=" MK_STR(CONFIG_SYS_MONITOR_OFFSET) "\0"\
- "u-boot_len=" MK_STR(CONFIG_SYS_MONITOR_LEN) "\0"\
- "kernel_addr=" MK_STR(CONFIG_KERNEL_OFFSET) "\0"\
- "rootfs_addr=" MK_STR(CONFIG_ROOTFS_OFFSET) "\0"\
- "board_name=" MK_STR(CONFIG_BOARD_NAME) "\0"\
+ "u-boot_addr=" __stringify(CONFIG_SYS_MONITOR_OFFSET) "\0"\
+ "u-boot_len=" __stringify(CONFIG_SYS_MONITOR_LEN) "\0"\
+ "kernel_addr=" __stringify(CONFIG_KERNEL_OFFSET) "\0"\
+ "rootfs_addr=" __stringify(CONFIG_ROOTFS_OFFSET) "\0"\
+ "board_name=" __stringify(CONFIG_BOARD_NAME) "\0"\
"kernel_addr_r=40000000\0" \
"addnfsargs=setenv bootargs ${bootargs} " \
"root=/dev/nfs rw nfsroot=${serverip}:${rootpath}\0" \
@@ -399,7 +399,7 @@
*/
#ifdef CONFIG_CMD_MMC
#define CONFIG_MMC
-#define CONFIG_MMC_BOUNCE_BUFFER
+#define CONFIG_BOUNCE_BUFFER
#define CONFIG_GENERIC_MMC
#define CONFIG_MXS_MMC
#endif
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2013-05-27 22:34:47
|
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 d0a704a0b5a82f515b9fa1788b919b05778ffece (commit)
from 2ab8f09508789dec6790da5ae3c7a344578f819d (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 d0a704a0b5a82f515b9fa1788b919b05778ffece
Author: Eric Jarrige <eri...@ar...>
Date: Tue May 28 00:42:36 2013 +0200
[UBOOT] 2013.04: fix apf28 compilation errors
-----------------------------------------------------------------------
Summary of changes:
patches/u-boot/2013.04/502-add-apf28.patch | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/patches/u-boot/2013.04/502-add-apf28.patch b/patches/u-boot/2013.04/502-add-apf28.patch
index 6b50685..112adfd 100644
--- a/patches/u-boot/2013.04/502-add-apf28.patch
+++ b/patches/u-boot/2013.04/502-add-apf28.patch
@@ -75,7 +75,7 @@ new file mode 100644
index 0000000..7f75494
--- /dev/null
+++ b/board/armadeus/apf28/apf28.c
-@@ -0,0 +1,193 @@
+@@ -0,0 +1,194 @@
+/*
+ * APF28 motherboard based on DENX M28 module
+ *
@@ -103,6 +103,7 @@ index 0000000..7f75494
+ */
+
+#include <common.h>
++#include <environment.h>
+#include <asm/gpio.h>
+#include <asm/io.h>
+#include <asm/arch/imx-regs.h>
@@ -122,14 +123,14 @@ index 0000000..7f75494
+int board_early_init_f(void)
+{
+ /* IO0 clock at 480MHz */
-+ mx28_set_ioclk(MXC_IOCLK0, 480000);
++ mxs_set_ioclk(MXC_IOCLK0, 480000);
+ /* IO1 clock at 480MHz */
-+ mx28_set_ioclk(MXC_IOCLK1, 480000);
++ mxs_set_ioclk(MXC_IOCLK1, 480000);
+
+ /* SSP0 clock at 96MHz */
-+ mx28_set_sspclk(MXC_SSPCLK0, 96000, 0);
++ mxs_set_sspclk(MXC_SSPCLK0, 96000, 0);
+ /* SSP2 clock at 160MHz */
-+ mx28_set_sspclk(MXC_SSPCLK2, 160000, 0);
++ mxs_set_sspclk(MXC_SSPCLK2, 160000, 0);
+
+#ifdef CONFIG_CMD_USB
+ mxs_iomux_setup_pad(MX28_PAD_LCD_D23__GPIO_1_23 |
@@ -166,7 +167,7 @@ index 0000000..7f75494
+
+int board_mmc_init(bd_t *bis)
+{
-+ return mxsmmc_initialize(bis, 0, m28_mmc_wp);
++ return mxsmmc_initialize(bis, 0, m28_mmc_wp, NULL);
+}
+#endif
+
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2013-05-27 21:41:10
|
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 2ab8f09508789dec6790da5ae3c7a344578f819d (commit)
from df2707f8b739745108e3415ea5e5ec6ac4e238f9 (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 2ab8f09508789dec6790da5ae3c7a344578f819d
Author: Eric Jarrige <eri...@ar...>
Date: Mon May 27 23:48:55 2013 +0200
[UBOOT] 2013.04: add apf9328 config file - cleanup 2012.10 config
-----------------------------------------------------------------------
Summary of changes:
...8-u-boot-2012.10.h => apf9328-u-boot-2013.04.h} | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
rename buildroot/target/device/armadeus/apf9328/{apf9328-u-boot-2012.10.h => apf9328-u-boot-2013.04.h} (98%)
diff --git a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2012.10.h b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2013.04.h
similarity index 98%
rename from buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2012.10.h
rename to buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2013.04.h
index d751c7d..98fd250 100644
--- a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2012.10.h
+++ b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2013.04.h
@@ -62,7 +62,7 @@
#define CONFIG_BOOTP_DNS2
#define CONFIG_HOSTNAME CONFIG_BOARD_NAME
-#define CONFIG_ROOTPATH "/tftpboot/" MK_STR(CONFIG_BOARD_NAME) "-root"
+#define CONFIG_ROOTPATH "/tftpboot/" __stringify(CONFIG_BOARD_NAME) "-root"
/*
* U-Boot Commands
@@ -167,9 +167,9 @@
*/
#define CONFIG_BOOTDELAY 5
#define CONFIG_ZERO_BOOTDELAY_CHECK
-#define CONFIG_BOOTFILE MK_STR(CONFIG_BOARD_NAME) "-linux.bin"
-#define CONFIG_BOOTARGS "console=" MK_STR(ACFG_CONSOLE_DEV) "," \
- MK_STR(CONFIG_BAUDRATE) " " MTDPARTS_DEFAULT \
+#define CONFIG_BOOTFILE __stringify(CONFIG_BOARD_NAME) "-linux.bin"
+#define CONFIG_BOOTARGS "console=" __stringify(ACFG_CONSOLE_DEV) "," \
+ __stringify(CONFIG_BAUDRATE) " " MTDPARTS_DEFAULT \
" root=/dev/mtdblock5 rootfstype=jffs2 "
#define ACFG_CONSOLE_DEV ttySMX0
@@ -186,14 +186,14 @@
*/
#define CONFIG_EXTRA_ENV_SETTINGS \
"env_version=" CONFIG_ENV_VERSION "\0" \
- "consoledev=" MK_STR(ACFG_CONSOLE_DEV) "\0" \
+ "consoledev=" __stringify(ACFG_CONSOLE_DEV) "\0" \
"mtdparts=" MTDPARTS_DEFAULT "\0" \
"partition=nor0,5\0" \
- "uboot_addr=" MK_STR(CONFIG_SYS_MONITOR_BASE) "\0" \
- "firmware_addr=" MK_STR(CONFIG_FIRMWARE_ADDR) "\0" \
- "kernel_addr=" MK_STR(CONFIG_KERNEL_ADDR) "\0" \
- "rootfs_addr=" MK_STR(CONFIG_ROOTFS_ADDR) "\0" \
- "board_name=" MK_STR(CONFIG_BOARD_NAME) "\0" \
+ "uboot_addr=" __stringify(CONFIG_SYS_MONITOR_BASE) "\0" \
+ "firmware_addr=" __stringify(CONFIG_FIRMWARE_ADDR) "\0" \
+ "kernel_addr=" __stringify(CONFIG_KERNEL_ADDR) "\0" \
+ "rootfs_addr=" __stringify(CONFIG_ROOTFS_ADDR) "\0" \
+ "board_name=" __stringify(CONFIG_BOARD_NAME) "\0" \
"firmware_autoload=0\0" \
"addnfsargs=setenv bootargs ${bootargs} " \
"root=/dev/nfs rw nfsroot=${serverip}:${rootpath}\0" \
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2013-05-27 21:07: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 df2707f8b739745108e3415ea5e5ec6ac4e238f9 (commit)
from 6a3936bc132688b3be022a0933b2e03a31da13bf (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 df2707f8b739745108e3415ea5e5ec6ac4e238f9
Author: Eric Jarrige <eri...@ar...>
Date: Mon May 27 23:15:22 2013 +0200
[UBOOT] cleanup 2012.10 patchwork
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf27/apf27-u-boot-2012.10.h | 460 ------
.../100-SPL-Add-u-boot-nand-build-option.patch | 30 -
patches/u-boot/2012.10/102-mx1-i2c.patch | 46 -
patches/u-boot/2012.10/103-apf9328.patch | 1345 ----------------
patches/u-boot/2012.10/104-apf9328-makefile.patch | 41 -
patches/u-boot/2012.10/106-mx1-pllclk.patch | 63 -
patches/u-boot/2012.10/107-mx1-pllclk-debug.patch | 26 -
patches/u-boot/2012.10/108-DM9000.patch | 48 -
patches/u-boot/2012.10/109-mx1-relocation.patch | 33 -
patches/u-boot/2012.10/111-mx1-timer.patch | 25 -
...stant-to-support-the-armadeus-APF27-board.patch | 181 ---
...-add-support-for-the-armadeus-APF27-board.patch | 1469 ------------------
.../303-apf27-Add-spl-support-for-the-apf27.patch | 679 ---------
...pf27-Add-FPGA-support-for-the-apf27-board.patch | 372 -----
.../u-boot/2012.10/311-imx-nand-lock-unlock.patch | 95 --
patches/u-boot/2012.10/320-spartan.patch | 47 -
patches/u-boot/2012.10/321-add_spartan6.patch | 763 ----------
patches/u-boot/2012.10/330-arm926-relocation.patch | 31 -
.../u-boot/2012.10/340-apf27-misc-commands.patch | 379 -----
.../2012.10/350-nand_large_file_download.patch | 241 ---
...60-arm-support-continuous-mmu-mem-mapping.patch | 52 -
.../u-boot/2012.10/370-imx27-add-i2c-driver.patch | 25 -
patches/u-boot/2012.10/400-imx51.patch | 511 -------
patches/u-boot/2012.10/401-apf51.patch | 1601 --------------------
patches/u-boot/2012.10/403-apf51-wdog.patch | 29 -
patches/u-boot/2012.10/407-imx51-nand.patch | 1398 -----------------
patches/u-boot/2012.10/409-apf51-nand-spl.patch | 407 -----
patches/u-boot/2012.10/410-imx-iim.patch | 547 -------
patches/u-boot/2012.10/425-cortex-relocation.patch | 32 -
.../u-boot/2012.10/501-imx28-update-and-fix.patch | 61 -
patches/u-boot/2012.10/502-add-apf28.patch | 1338 ----------------
31 files changed, 0 insertions(+), 12375 deletions(-)
delete mode 100644 buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.10.h
delete mode 100644 patches/u-boot/2012.10/100-SPL-Add-u-boot-nand-build-option.patch
delete mode 100644 patches/u-boot/2012.10/102-mx1-i2c.patch
delete mode 100644 patches/u-boot/2012.10/103-apf9328.patch
delete mode 100644 patches/u-boot/2012.10/104-apf9328-makefile.patch
delete mode 100644 patches/u-boot/2012.10/106-mx1-pllclk.patch
delete mode 100644 patches/u-boot/2012.10/107-mx1-pllclk-debug.patch
delete mode 100644 patches/u-boot/2012.10/108-DM9000.patch
delete mode 100644 patches/u-boot/2012.10/109-mx1-relocation.patch
delete mode 100644 patches/u-boot/2012.10/111-mx1-timer.patch
delete mode 100644 patches/u-boot/2012.10/301-imx27-Add-missing-constant-to-support-the-armadeus-APF27-board.patch
delete mode 100644 patches/u-boot/2012.10/302-apf27-add-support-for-the-armadeus-APF27-board.patch
delete mode 100644 patches/u-boot/2012.10/303-apf27-Add-spl-support-for-the-apf27.patch
delete mode 100644 patches/u-boot/2012.10/304-apf27-Add-FPGA-support-for-the-apf27-board.patch
delete mode 100644 patches/u-boot/2012.10/311-imx-nand-lock-unlock.patch
delete mode 100644 patches/u-boot/2012.10/320-spartan.patch
delete mode 100644 patches/u-boot/2012.10/321-add_spartan6.patch
delete mode 100644 patches/u-boot/2012.10/330-arm926-relocation.patch
delete mode 100644 patches/u-boot/2012.10/340-apf27-misc-commands.patch
delete mode 100644 patches/u-boot/2012.10/350-nand_large_file_download.patch
delete mode 100644 patches/u-boot/2012.10/360-arm-support-continuous-mmu-mem-mapping.patch
delete mode 100644 patches/u-boot/2012.10/370-imx27-add-i2c-driver.patch
delete mode 100644 patches/u-boot/2012.10/400-imx51.patch
delete mode 100644 patches/u-boot/2012.10/401-apf51.patch
delete mode 100644 patches/u-boot/2012.10/403-apf51-wdog.patch
delete mode 100644 patches/u-boot/2012.10/407-imx51-nand.patch
delete mode 100644 patches/u-boot/2012.10/409-apf51-nand-spl.patch
delete mode 100644 patches/u-boot/2012.10/410-imx-iim.patch
delete mode 100644 patches/u-boot/2012.10/425-cortex-relocation.patch
delete mode 100644 patches/u-boot/2012.10/501-imx28-update-and-fix.patch
delete mode 100644 patches/u-boot/2012.10/502-add-apf28.patch
diff --git a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.10.h b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.10.h
deleted file mode 100644
index 4839d5b..0000000
--- a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.10.h
+++ /dev/null
@@ -1,460 +0,0 @@
-/*
- *
- * Configuration settings for the Armadeus Project motherboard APF27
- *
- * Copyright (C) 2008-2012 ej / Armadeus Project <eri...@ar...>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * 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 __CONFIG_H
-#define __CONFIG_H
-
-#define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION "3.3"
-#define CONFIG_IDENT_STRING " apf27 patch 3.9"
-#define CONFIG_BOARD_NAME apf27
-
-/*
- * SoC configurations
- */
-#define CONFIG_ARM926EJS /* this is an ARM926EJS CPU */
-#define CONFIG_MX27 /* in a Freescale i.MX27 Chip */
-#define CONFIG_MACH_TYPE 1698 /* APF27 */
-
-/*
- * Enable the call to miscellaneous platform dependent initialization.
- */
-#define CONFIG_SYS_NO_FLASH /* to be define before <config_cmd_default.h> */
-#define CONFIG_MISC_INIT_R
-#define CONFIG_BOARD_EARLY_INIT_F
-
-/*
- * Board display option
- */
-#define CONFIG_DISPLAY_BOARDINFO
-#define CONFIG_DISPLAY_CPUINFO
-
-/*
- * SPL
- */
-/* Copy SPL+U-Boot here */
-#define CONFIG_SYS_NAND_U_BOOT_DST (CONFIG_SYS_TEXT_BASE - 0x800)
-/* Size is the partion size */
-#define CONFIG_SYS_NAND_U_BOOT_SIZE CONFIG_SYS_MONITOR_LEN
-/* Build image with spl and u-boot */
-#define CONFIG_NAND_U_BOOT
-#define CONFIG_SPL_PAD_TO 0xa1000000
-
-/*
- * SPL
- */
-#define CONFIG_SPL
-#define CONFIG_SPL_NO_CPU_SUPPORT_CODE
-#define CONFIG_SPL_START_S_PATH "board/armadeus/apf27"
-#define CONFIG_SPL_LDSCRIPT "board/armadeus/apf27/u-boot-spl.lds"
-#define CONFIG_SPL_LIBCOMMON_SUPPORT
-#define CONFIG_SPL_LIBGENERIC_SUPPORT
-
-
-/*
- * BOOTP options
- */
-#define CONFIG_BOOTP_SUBNETMASK
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_DNS
-#define CONFIG_BOOTP_DNS2
-
-#define CONFIG_HOSTNAME CONFIG_BOARD_NAME
-#define CONFIG_ROOTPATH "/tftpboot/" MK_STR(CONFIG_BOARD_NAME) "-root"
-
-/*
- * U-Boot Commands
- */
-#include <config_cmd_default.h>
-
-#define CONFIG_CMD_ASKENV /* ask for env variable */
-#define CONFIG_CMD_BSP /* Board Specific functions */
-#define CONFIG_CMD_CACHE /* icache, dcache */
-#define CONFIG_CMD_DATE
-#define CONFIG_CMD_DHCP /* DHCP Support */
-#define CONFIG_CMD_DNS
-#define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_FAT /* FAT support */
-#define CONFIG_CMD_IMX_FUSE /* imx iim fuse */
-#define CONFIG_CMD_I2C
-#define CONFIG_CMD_MII /* MII support */
-#define CONFIG_CMD_MMC
-#define CONFIG_CMD_MTDPARTS /* MTD partition support */
-#define CONFIG_CMD_NAND /* NAND support */
-#define CONFIG_CMD_NAND_LOCK_UNLOCK
-#define CONFIG_CMD_NAND_TRIMFFS
-#define CONFIG_CMD_NFS /* NFS support */
-#define CONFIG_CMD_PING /* ping support */
-#define CONFIG_CMD_SETEXPR /* setexpr support */
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
-
-/*
- * Memory configurations
- */
-#define CONFIG_NR_DRAM_POPULATED 1
-#define CONFIG_NR_DRAM_BANKS 2
-
-#define ACFG_SDRAM_MBYTE_SYZE 64
-
-#define PHYS_SDRAM_1 0xA0000000
-#define PHYS_SDRAM_2 0xB0000000
-#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
-#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (512<<10))
-#define CONFIG_SYS_MEMTEST_START 0xA0000000 /* memtest test area */
-#define CONFIG_SYS_MEMTEST_END 0xA0300000 /* 3 MiB RAM test */
-
-#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE \
- + PHYS_SDRAM_1_SIZE - 0x0100000)
-
-#define CONFIG_SYS_TEXT_BASE 0xA1000000
-
-/*
- * FLASH organization
- */
-#define ACFG_MONITOR_OFFSET 0x00000000
-#define CONFIG_SYS_MONITOR_LEN 0x00100000 /* 1MiB */
-#define CONFIG_ENV_IS_IN_NAND
-#define CONFIG_ENV_OVERWRITE
-#define CONFIG_ENV_OFFSET 0x00100000 /* NAND offset */
-#define CONFIG_ENV_SIZE 0x00020000 /* 128kB */
-#define CONFIG_ENV_RANGE 0X00080000 /* 512kB */
-#define CONFIG_ENV_OFFSET_REDUND \
- (CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE) /* +512kB */
-#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE /* 512kB */
-#define CONFIG_FIRMWARE_OFFSET 0x00200000
-#define CONFIG_KERNEL_OFFSET 0x00300000
-#define CONFIG_ROOTFS_OFFSET 0x00800000
-
-#define CONFIG_MTDMAP "mxc_nand.0"
-#define MTDIDS_DEFAULT "nand0=" CONFIG_MTDMAP
-#define MTDPARTS_DEFAULT "mtdparts=" CONFIG_MTDMAP \
- ":1M(u-boot)ro," \
- "512K(env)," \
- "512K(env2)," \
- "512K(firmware)," \
- "512K(dtb)," \
- "5M(kernel)," \
- "-(rootfs)"
-
-/*
- * U-Boot general configurations
- */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_PROMPT "BIOS> " /* prompt string */
-#define CONFIG_SYS_CBSIZE 2048 /* console I/O buffer */
-#define CONFIG_SYS_PBSIZE \
- (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
- /* Print buffer size */
-#define CONFIG_SYS_MAXARGS 16 /* max command args */
-#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
- /* Boot argument buffer size */
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_SYS_HUSH_PARSER /* enable the "hush" shell */
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " /* secondary prompt string */
-
-/*
- * Boot Linux
- */
-#define CONFIG_CMDLINE_TAG /* send commandline to Kernel */
-#define CONFIG_SETUP_MEMORY_TAGS /* send memory definition to kernel */
-#define CONFIG_INITRD_TAG /* send initrd params */
-
-#define CONFIG_OF_LIBFDT
-
-#define CONFIG_BOOTDELAY 5
-#define CONFIG_ZERO_BOOTDELAY_CHECK
-#define CONFIG_BOOTFILE MK_STR(CONFIG_BOARD_NAME) "-linux.bin"
-#define CONFIG_BOOTARGS "console=" MK_STR(ACFG_CONSOLE_DEV) "," \
- MK_STR(CONFIG_BAUDRATE) " " MTDPARTS_DEFAULT \
- " ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs "
-
-#define ACFG_CONSOLE_DEV ttySMX0
-#define CONFIG_BOOTCOMMAND "run ubifsboot"
-#define CONFIG_SYS_AUTOLOAD "no"
-/*
- * Default load address for user programs and kernel
- */
-#define CONFIG_LOADADDR 0xA0000000
-#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
-
-/*
- * Extra Environments
- */
-#define CONFIG_EXTRA_ENV_SETTINGS \
- "env_version=" CONFIG_ENV_VERSION "\0" \
- "consoledev=" MK_STR(ACFG_CONSOLE_DEV) "\0" \
- "mtdparts=" MTDPARTS_DEFAULT "\0" \
- "partition=nand0,6\0" \
- "u-boot_addr=" MK_STR(ACFG_MONITOR_OFFSET) "\0" \
- "env_addr=" MK_STR(CONFIG_ENV_OFFSET) "\0" \
- "firmware_addr=" MK_STR(CONFIG_FIRMWARE_OFFSET) "\0" \
- "kernel_addr=" MK_STR(CONFIG_KERNEL_OFFSET) "\0" \
- "rootfs_addr=" MK_STR(CONFIG_ROOTFS_OFFSET) "\0" \
- "board_name=" MK_STR(CONFIG_BOARD_NAME) "\0" \
- "kernel_addr_r=A0000000\0" \
- "addnfsargs=setenv bootargs ${bootargs} " \
- "root=/dev/nfs rw nfsroot=${serverip}:${rootpath}\0" \
- "addubifsargs=setenv bootargs ${bootargs} " \
- "ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs\0" \
- "addmmcargs=setenv bootargs ${bootargs} " \
- "root=/dev/mmcblk0p1 rootfstype=ext2\0" \
- "addipargs=setenv bootargs ${bootargs} " \
- "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:" \
- "${hostname}:eth0:off \0" \
- "nfsboot=setenv bootargs console=${consoledev},${baudrate} " \
- "${mtdparts} ${extrabootargs}; run addnfsargs addipargs;"\
- "nfs ${kernel_addr_r} " \
- "${serverip}:${rootpath}/boot/${board_name}-linux.bin;" \
- "if test -n ${fdt_addr_r} ; then " \
- "nand read ${fdt_addr_r} dtb; fi;" \
- "bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \
- "ubifsboot=setenv bootargs console=${consoledev},${baudrate} " \
- "${mtdparts} ${extrabootargs};run addubifsargs addipargs;"\
- "if test -n ${fdt_addr_r} ; then " \
- "nand read ${fdt_addr_r} dtb; fi;" \
- "nboot ${kernel_addr_r} kernel;" \
- "bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \
- "mmcboot=setenv bootargs console=${consoledev},${baudrate} " \
- "${mtdparts} ${extrabootargs}; run addmmcargs addipargs;"\
- "if test -n ${fdt_addr_r} ; then " \
- "nand read ${fdt_addr_r} dtb; fi;" \
- "mmc dev 0; ext2load mmc 0 ${kernel_addr_r}" \
- " /boot/${board_name}-linux.bin;" \
- "bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \
- "boot_nfs_fallback_flash=if ping ${serverip};" \
- "then echo Boot over NFS; run nfsboot;" \
- "else echo Boot from the board; run ubifsboot;" \
- "fi\0" \
- "firmware_autoload=0\0" \
- "flash_uboot=nand unlock ${u-boot_addr} ;" \
- "nand erase.part u-boot;" \
- "if nand write.trimffs ${fileaddr} ${u-boot_addr} ${filesize};"\
- "then nand lock; nand unlock ${env_addr};" \
- "echo Flashing of uboot succeed;" \
- "else echo Flashing of uboot failed;" \
- "fi; \0" \
- "flash_firmware=nand erase.part firmware;" \
- "if nand write.trimffs ${fileaddr} ${firmware_addr} ${filesize};"\
- "then echo Flashing of Firmware succeed;" \
- "else echo Flashing of Firmware failed;" \
- "fi\0" \
- "flash_kernel=nand erase.part kernel;" \
- "if nand write.trimffs ${fileaddr} ${kernel_addr} ${filesize};"\
- "then echo Flashing of kernel succeed;" \
- "else echo Flashing of kernel failed;" \
- "fi\0" \
- "flash_rootfs=nand erase.part rootfs;" \
- "if nand write.trimffs ${fileaddr} ${rootfs_addr} ${filesize};"\
- "then echo Flashing of rootfs succeed;" \
- "else echo Flashing of rootfs failed;" \
- "fi\0" \
- "flash_dtb=nand erase.part dtb;" \
- "if nand write.trimffs ${fileaddr} dtb ${filesize};" \
- "then echo Flashing of rootfs succeed;" \
- "else echo Flashing of rootfs failed;" \
- "fi\0" \
- "flash_reset_env=env default -f -a; saveenv;" \
- "echo Flash environment variables erased!\0" \
- "download_uboot=tftpboot ${loadaddr} ${board_name}-u-boot-nand.bin\0" \
- "download_kernel=tftpboot ${loadaddr} ${board_name}-linux.bin\0" \
- "download_rootfs=tftpboot ${loadaddr} ${board_name}-rootfs.ubi\0" \
- "download_dtb=tftpboot ${loadaddr} imx27-${board_name}.dtb\0" \
- "update_uboot=run download_uboot flash_uboot\0" \
- "update_kernel=run download_kernel flash_kernel\0" \
- "update_rootfs=run download_rootfs flash_rootfs\0" \
- "update_dtb=run download_dtb flash_dtb\0" \
- "update_all=run download_kernel flash_kernel download_rootfs " \
- "flash_rootfs download_uboot flash_uboot\0" \
- "unlock_regs=mw 10000008 0; mw 10020008 0\0" \
-
-/*
- * Serial Driver
- */
-#define CONFIG_MXC_UART
-#define CONFIG_CONS_INDEX 1
-#define CONFIG_BAUDRATE 115200
-#define CONFIG_MXC_UART_BASE UART1_BASE
-
-/*
- * GPIO
- */
-#define CONFIG_MXC_GPIO
-
-/*
- * NOR
- */
-
-/*
- * NAND
- */
-#define CONFIG_NAND_MXC
-
-#define CONFIG_MXC_NAND_REGS_BASE 0xD8000000
-#define CONFIG_SYS_NAND_BASE CONFIG_MXC_NAND_REGS_BASE
-#define CONFIG_SYS_MAX_NAND_DEVICE 1
-
-#define CONFIG_MXC_NAND_HWECC
-#define CONFIG_SYS_NAND_LARGEPAGE
-#define IMX27_NAND_16BITS
-#define NAND_MAX_CHIPS 1
-
-#define CONFIG_SYS_DIRECT_FLASH_TFTP
-#define CONFIG_FLASH_SHOW_PROGRESS 45
-#define CONFIG_SYS_NAND_QUIET 1
-
-#define CONFIG_BOOT_TRACE_REG 0xAFFFFFF8 /* Addr to store traces of SPL boot*/
-
-/*
- * Partitions & Filsystems
- */
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
-#define CONFIG_DOS_PARTITION
-#define CONFIG_SUPPORT_VFAT
-
-/*
- * UBIFS
- */
-#define CONFIG_RBTREE
-#define CONFIG_LZO
-
-/*
- * Ethernet (on SOC imx FEC)
- */
-#define CONFIG_FEC_MXC
-
-#define CONFIG_NET_MULTI
-#define CONFIG_FEC_MXC_PHYADDR 0x1f
-#define CONFIG_MII 1 /* MII PHY management */
-
-/*
- * FPGA
- */
-#define CONFIG_FPGA CONFIG_SYS_SPARTAN3
-#define CONFIG_FPGA_COUNT 1
-#define CONFIG_FPGA_XILINX
-#define CONFIG_FPGA_SPARTAN3
-#define CONFIG_SYS_FPGA_WAIT 20000 /* 20 ms */
-#define CONFIG_SYS_FPGA_PROG_FEEDBACK
-#define CONFIG_SYS_FPGA_CHECK_CTRLC
-#define CONFIG_SYS_FPGA_CHECK_ERROR
-
-/*
- * Fuses - IIM
- */
-#ifdef CONFIG_CMD_IMX_FUSE
-#define IIM_MAC_BANK 0
-#define IIM_MAC_ROW 5
-#define IIM0_SCC_KEY 11
-#define IIM1_SUID 1
-#endif
-
-/*
- * I2C
- */
-
-#ifdef CONFIG_CMD_I2C
-#define CONFIG_HARD_I2C
-#define CONFIG_I2C_MXC
-#define CONFIG_I2C_MULTI_BUS
-#define CONFIG_SYS_I2C_BASE IMX_I2C1_BASE
-#define CONFIG_SYS_I2C_SPEED 100000 /* 100 kHz */
-#define CONFIG_SYS_I2C_SLAVE 0x7F
-#define CONFIG_SYS_I2C_NOPROBES { }
-
-#ifdef CONFIG_CMD_EEPROM
-# define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* EEPROM 24LC02 */
-# define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 /* bytes of address */
-#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3
-#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 10 /* msec */
-#endif /* CONFIG_CMD_EEPROM */
-#endif /* CONFIG_CMD_I2C */
-
-/*
- * SPI
- */
-
-/*
- * SD/MMC
- */
-#ifdef CONFIG_CMD_MMC
-#define CONFIG_MMC
-#define CONFIG_GENERIC_MMC
-#define CONFIG_MXC_MMC
-#define CONFIG_MXC_MCI_REGS_BASE 0x10014000
-#endif
-
-/*
- * RTC
- */
-#ifdef CONFIG_CMD_DATE
-#define CONFIG_RTC_DS1374
-#define CONFIG_SYS_RTC_BUS_NUM 0
-#endif /* CONFIG_CMD_DATE */
-
-/*
- * Watchdog Config
- */
-
-/*
- * USB
- */
-
-/*
- * Clocks
- */
-#define CONFIG_SYS_HZ 1000 /* Ticks per second */
-
-/*
- * PLL
- *
- * 31 | x |x| x x x x |x x x x x x x x x x |x x|x x x x|x x x x x x x x x x| 0
- * |CPLM|X|----PD---|--------MFD---------|XXX|--MFI--|-----MFN-----------|
- */
-#define CONFIG_MX27_CLK32 32768 /* 32768 or 32000 Hz crystal */
-#undef CONFIG_MX27_CLK26 /* No external 26MHz external clock */
-
-#if (ACFG_SDRAM_MBYTE_SYZE == 64) /* micron MT46H16M32LF -6 */
-/* micron 64MB */
-#define PHYS_SDRAM_1_SIZE 0x04000000 /* 64 MB */
-#define PHYS_SDRAM_2_SIZE 0x04000000 /* 64 MB */
-#endif
-
-#if (ACFG_SDRAM_MBYTE_SYZE == 128)
-/* micron 128MB */
-#define PHYS_SDRAM_1_SIZE 0x08000000 /* 128 MB */
-#define PHYS_SDRAM_2_SIZE 0x08000000 /* 128 MB */
-#endif
-
-#if (ACFG_SDRAM_MBYTE_SYZE == 256)
-/* micron 256MB */
-#define PHYS_SDRAM_1_SIZE 0x10000000 /* 256 MB */
-#define PHYS_SDRAM_2_SIZE 0x10000000 /* 256 MB */
-#endif
-
-#endif /* __CONFIG_H */
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
deleted file mode 100644
index 21e74fb..0000000
--- a/patches/u-boot/2012.10/100-SPL-Add-u-boot-nand-build-option.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-SPL: Add u-boot-nand build option
-
-Signed-off-by: Eric Jarrige <eri...@ar...>
-
----
- Makefile | 5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 08eecbb..00c9422 100644
---- a/Makefile
-+++ b/Makefile
-@@ -554,8 +554,14 @@ $(obj)u-boot.lds: $(LDSCRIPT)
- nand_spl: $(TIMESTAMP_FILE) $(VERSION_FILE) depend
- $(MAKE) -C nand_spl/board/$(BOARDDIR) all
-
-+ifeq ($(CONFIG_SPL),y)
-+$(obj)u-boot-nand.bin: $(obj)u-boot.bin $(obj)spl/u-boot-spl.bin
-+ $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(CONFIG_SPL_PAD_TO) -O binary $(obj)spl/u-boot-spl $(obj)spl/u-boot-spl-pad.bin && \
-+ cat $(obj)spl/u-boot-spl-pad.bin $(obj)u-boot.bin > $(obj)u-boot-nand.bin
-+else
- $(obj)u-boot-nand.bin: nand_spl $(obj)u-boot.bin
- cat $(obj)nand_spl/u-boot-spl-16k.bin $(obj)u-boot.bin > $(obj)u-boot-nand.bin
-+endif
-
- $(obj)spl/u-boot-spl.bin: $(SUBDIR_TOOLS) depend
- $(MAKE) -C spl all
---
-1.7.4.4
-
diff --git a/patches/u-boot/2012.10/102-mx1-i2c.patch b/patches/u-boot/2012.10/102-mx1-i2c.patch
deleted file mode 100644
index ff78658..0000000
--- a/patches/u-boot/2012.10/102-mx1-i2c.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-mx1: add i2c registers
-
-Add i2c registers for Freescale imx1/L/S
-
-Signed-off-by: Eric Jarrige <eri...@ar...>
-Signed-off-by: Philippe Reynes <tr...@ya...>
-Cc: Stefano Babic <sb...@de...>
----
- arch/arm/include/asm/arch-imx/imx-regs.h | 23 +++++++++++++++++++++++
- 1 files changed, 23 insertions(+), 0 deletions(-)
-
-diff --git a/arch/arm/include/asm/arch-imx/imx-regs.h b/arch/arm/include/asm/arch-imx/imx-regs.h
-index 4de0779..1fd3e17 100644
---- a/arch/arm/include/asm/arch-imx/imx-regs.h
-+++ b/arch/arm/include/asm/arch-imx/imx-regs.h
-@@ -634,4 +634,27 @@
- #define TSTAT_CAPT (1<<1) /* Capture event */
- #define TSTAT_COMP (1) /* Compare event */
-
-+/*
-+ * I2C module
-+ */
-+#define IADR __REG(IMX_I2C_BASE + 0x000) /* I2C Address Register */
-+#define IFDR __REG(IMX_I2C_BASE + 0x004) /* I2C Frequency Divider Register*/
-+#define I2CR __REG(IMX_I2C_BASE + 0x008) /* I2C Control Register */
-+#define I2SR __REG(IMX_I2C_BASE + 0x00C) /* I2C Status Register */
-+#define I2DR __REG(IMX_I2C_BASE + 0x010) /* I2C Data I/O Register */
-+/* I2C Control Register Bit Fields */
-+#define I2CR_IEN (1<<7) /* I2C Enable */
-+#define I2CR_IIEN (1<<6) /* I2C Interrupt Enable */
-+#define I2CR_MSTA (1<<5) /* I2C Master/Slave Mode Select */
-+#define I2CR_MTX (1<<4) /* I2C Transmit/Receive Mode Select */
-+#define I2CR_TXAK (1<<3) /* I2C Transmit Acknowledge Enable */
-+#define I2CR_RSTA (1<<2) /* I2C Repeated START */
-+#define I2SR_ICF (1<<7) /* I2C Data Transfer */
-+#define I2SR_IAAS (1<<6) /* I2C Addressed As a Slave */
-+#define I2SR_IBB (1<<5) /* I2C Bus Busy */
-+#define I2SR_IAL (1<<4) /* I2C Arbitration Lost */
-+#define I2SR_SRW (1<<2) /* I2C Slave Read/Write */
-+#define I2SR_IIF (1<<1) /* I2C interrupt */
-+#define I2SR_RXAK (1<<0) /* I2C Received Acknowledge */
-+
- #endif /* _IMX_REGS_H */
---
-1.7.2.5
-
diff --git a/patches/u-boot/2012.10/103-apf9328.patch b/patches/u-boot/2012.10/103-apf9328.patch
deleted file mode 100644
index 36f302a..0000000
--- a/patches/u-boot/2012.10/103-apf9328.patch
+++ /dev/null
@@ -1,1345 +0,0 @@
-apf9328: Add Armadeus Project board APF9328
-
-Add Armadeus Project board APF9328
-
-Signed-off-by: Eric Jarrige <eri...@ar...>
-Signed-off-by: Nicolas Colombain <nic...@ar...>
-Signed-off-by: Philippe Reynes <tr...@ya...>
-Cc: Nicolas Colombain <nic...@ar...>
----
- board/armadeus/apf9328/Makefile | 51 ++++
- board/armadeus/apf9328/apf9328.c | 106 +++++++
- board/armadeus/apf9328/apf9328fpga.c | 100 +++++++
- board/armadeus/apf9328/apf9328fpga.h | 31 ++
- board/armadeus/apf9328/eeprom.c | 88 ++++++
- board/armadeus/apf9328/fpga.c | 121 ++++++++
- board/armadeus/apf9328/fpga.h | 30 ++
- board/armadeus/apf9328/i2c.c | 276 +++++++++++++++++++
- board/armadeus/apf9328/lowlevel_init.S | 469 ++++++++++++++++++++++++++++++++
- 9 files changed, 1272 insertions(+), 0 deletions(-)
- create mode 100644 board/armadeus/apf9328/Makefile
- create mode 100644 board/armadeus/apf9328/apf9328.c
- create mode 100644 board/armadeus/apf9328/apf9328fpga.c
- create mode 100644 board/armadeus/apf9328/apf9328fpga.h
- create mode 100644 board/armadeus/apf9328/eeprom.c
- create mode 100644 board/armadeus/apf9328/fpga.c
- create mode 100644 board/armadeus/apf9328/fpga.h
- create mode 100644 board/armadeus/apf9328/i2c.c
- create mode 100644 board/armadeus/apf9328/lowlevel_init.S
-
-diff --git a/board/armadeus/apf9328/Makefile b/board/armadeus/apf9328/Makefile
-new file mode 100644
-index 0000000..0f097cd
---- /dev/null
-+++ b/board/armadeus/apf9328/Makefile
-@@ -0,0 +1,51 @@
-+#
-+# (C) Copyright 2000-2004
-+# Wolfgang Denk, DENX Software Engineering, wd...@de....
-+#
-+# See file CREDITS for list of people who contributed to this
-+# project.
-+#
-+# This program is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License as
-+# published by the Free Software Foundation; either version 2 of
-+# the License, or (at your option) any later version.
-+#
-+# 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 $(TOPDIR)/config.mk
-+
-+LIB = $(obj)lib$(BOARD).o
-+
-+COBJS := apf9328.o i2c.o apf9328fpga.o fpga.o eeprom.o
-+SOBJS := lowlevel_init.o
-+
-+SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
-+OBJS := $(addprefix $(obj),$(COBJS))
-+SOBJS := $(addprefix $(obj),$(SOBJS))
-+
-+$(LIB): $(obj).depend $(OBJS) $(SOBJS)
-+ $(call cmd_link_o_target, $(OBJS) $(SOBJS))
-+
-+clean:
-+ rm -f $(SOBJS) $(OBJS)
-+
-+distclean: clean
-+ rm -f $(LIB) core *.bak .depend
-+
-+#########################################################################
-+
-+# defines $(obj).depend target
-+include $(SRCTREE)/rules.mk
-+
-+sinclude $(obj).depend
-+
-+#########################################################################
-diff --git a/board/armadeus/apf9328/apf9328.c b/board/armadeus/apf9328/apf9328.c
-new file mode 100644
-index 0000000..280f749
---- /dev/null
-+++ b/board/armadeus/apf9328/apf9328.c
-@@ -0,0 +1,93 @@
-+/*
-+ * (C) Copyright 2005-2011
-+ * Nicolas Colombain <nic...@ar...>
-+ * Eric Jarrige <eri...@ar...>
-+ * Copyright (C) 2004 Sascha Hauer, Synertronixx GmbH
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * 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 <common.h>
-+#include <asm/arch/imx-regs.h>
-+#include <flash.h>
-+#include <netdev.h>
-+#include "apf9328fpga.h"
-+
-+DECLARE_GLOBAL_DATA_PTR;
-+
-+int board_init(void)
-+{
-+
-+ gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
-+
-+ return 0;
-+}
-+
-+int dram_init(void)
-+{
-+ /* dram_init must store complete ramsize in gd->ram_size */
-+ gd->ram_size = get_ram_size((void *)PHYS_SDRAM_1,
-+ PHYS_SDRAM_1_SIZE);
-+ return 0;
-+}
-+
-+void enable_caches(void)
-+{
-+#ifndef CONFIG_SYS_DCACHE_OFF
-+ /* Enable D-cache. I-cache is already enabled in start.S */
-+ dcache_enable();
-+#endif
-+}
-+
-+/*
-+ * Miscellaneous intialization
-+ */
-+int misc_init_r(void)
-+{
-+ char *s;
-+
-+#ifdef CONFIG_FPGA
-+ apf9328_init_fpga();
-+#endif
-+
-+#ifdef CONFIG_DRIVER_DM9000
-+ imx_gpio_mode(GPIO_PORTB | GPIO_DR | GPIO_IN | 14);
-+#endif
-+
-+ /* detect compatibility issue of environment version */
-+ s = getenv("env_version");
-+ if ((NULL == s) || (0 != strcmp(s, CONFIG_ENV_VERSION))) {
-+ char * const vars[] = {"flash_reset_env"};
-+ printf("*** Warning - Environment version change suggests: "
-+ "run flash_reset_env; reset\n");
-+ set_default_vars(1, vars);
-+ }
-+
-+ return 0;
-+}
-+
-+void show_boot_progress(int status)
-+{
-+ return;
-+}
-+
-+#ifdef CONFIG_DRIVER_DM9000
-+int board_eth_init(bd_t *bis)
-+{
-+ return dm9000_initialize(bis);
-+}
-+#endif
-diff --git a/board/armadeus/apf9328/apf9328fpga.c b/board/armadeus/apf9328/apf9328fpga.c
-new file mode 100644
-index 0000000..9782115
---- /dev/null
-+++ b/board/armadeus/apf9328/apf9328fpga.c
-@@ -0,0 +1,100 @@
-+/*
-+ * (C) Copyright 2005-2011
-+ * Nicolas Colombain <nic...@ar...>
-+ * Eric Jarrige <eri...@ar...>
-+ *
-+ * See file CREDITS for list of people who contributed to this
-+ * project.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * 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
-+ *
-+ */
-+
-+/*
-+ * Spartan 3 FPGA configuration support for the APF9328 daughter board
-+ */
-+
-+#include <common.h>
-+#include <spartan3.h>
-+#include <command.h>
-+#include <jffs2/jffs2.h>
-+#include <asm/arch/imx-regs.h>
-+#include <asm/io.h>
-+#include "apf9328fpga.h"
-+
-+#ifdef CONFIG_FPGA
-+DECLARE_GLOBAL_DATA_PTR;
-+/* Note that these are pointers to code that is in Flash. They will be
-+ * relocated at runtime.
-+ * Spartan3 code is used to download our Spartan 3 :) code is compatible.
-+ * Just take care about the file size
-+*/
-+Xilinx_Spartan3_Slave_Serial_fns fpga_fns = {
-+ fpga_pre_fn,
-+ fpga_pgm_fn,
-+ fpga_clk_fn,
-+ fpga_init_fn,
-+ fpga_done_fn,
-+ fpga_wr_fn,
-+};
-+
-+Xilinx_desc fpga[CONFIG_FPGA_COUNT] = {
-+ {Xilinx_Spartan3,
-+ slave_serial,
-+ XILINX_XC3S400_SIZE,
-+ (void *)&fpga_fns,
-+ 0}
-+};
-+
-+/*
-+ * Initialize the fpga. Return 1 on success, 0 on failure.
-+ */
-+int apf9328_init_fpga(void)
-+{
-+ char *autoload = getenv("firmware_autoload");
-+ int i, lout = 1;
-+ u8 pnum;
-+ struct mtd_device *dev;
-+ struct part_info *part;
-+
-+ debug("%s:%d: Initialize FPGA interface (relocation offset= 0x%.8lx)\n",
-+ __func__, __LINE__, gd->reloc_off);
-+
-+ fpga_init();
-+
-+ for (i = 0; i < CONFIG_FPGA_COUNT; i++) {
-+ debug("%s:%d: Adding fpga %d\n", __func__, __LINE__, i);
-+ fpga_add(fpga_xilinx, &fpga[i]);
-+ }
-+
-+ if ((autoload) && (0 == strcmp(autoload, "1"))) {
-+ if ((mtdparts_init() == 0) &&
-+ (find_dev_and_part("firmware", &dev, &pnum, &part) == 0)) {
-+ if (ctrlc()) {
-+ printf("Firmware download stopped!\n");
-+ lout = 0;
-+ } else if (FPGA_SUCCESS != fpga_load(0,
-+ (void *)part->offset,
-+ (size_t)part->size)) {
-+ lout = 0;
-+ printf("Firmware not loaded!\n");
-+ }
-+ }
-+ }
-+ return lout;
-+}
-+
-+#endif /* CONFIG_FPGA */
-diff --git a/board/armadeus/apf9328/apf9328fpga.h b/board/armadeus/apf9328/apf9328fpga.h
-new file mode 100644
-index 0000000..2a15443
---- /dev/null
-+++ b/board/armadeus/apf9328/apf9328fpga.h
-@@ -0,0 +1,31 @@
-+/*
-+ * (C) Copyright 2002
-+ * Rich Ireland, Enterasys Networks, rir...@en....
-+ * Keith Outwater, kei...@mv....
-+ *
-+ * See file CREDITS for list of people who contributed to this
-+ * project.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * 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
-+ *
-+ */
-+
-+/*
-+ * Spartan 3 FPGA configuration support for the APF9328 daughter board
-+ */
-+
-+#include "fpga.h"
-+extern int apf9328_init_fpga(void);
-diff --git a/board/armadeus/apf9328/eeprom.c b/board/armadeus/apf9328/eeprom.c
-new file mode 100644
-index 0000000..c8165ea
---- /dev/null
-+++ b/board/armadeus/apf9328/eeprom.c
-@@ -0,0 +1,88 @@
-+/*
-+ * (C) Copyright 2008-2011 Armadeus Project
-+ * (C) Copyright 2007
-+ * Stefano Babic, DENX Software Engineering, sb...@de....
-+ *
-+ * See file CREDITS for list of people who contributed to this
-+ * project.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * 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 <common.h>
-+#include <command.h>
-+#include <dm9000.h>
-+
-+static int do_read_dm9000_eeprom(cmd_tbl_t *cmdtp, int flag, int argc,
-+ char * const argv[])
-+{
-+ unsigned int i;
-+ u8 data[2];
-+
-+ for (i = 0; i < 0x40; i++) {
-+ if (!(i % 0x10))
-+ printf("\n%08x:", i);
-+ dm9000_read_srom_word(i, data);
-+ printf(" %02x%02x", data[1], data[0]);
-+ }
-+ printf("\n");
-+ return 0;
-+}
-+
-+static int do_write_dm9000_eeprom(cmd_tbl_t *cmdtp, int flag, int argc,
-+ char * const argv[])
-+{
-+ unsigned long offset, value;
-+
-+ if (argc < 4) {
-+ cmd_usage(cmdtp);
-+ return 1;
-+ }
-+
-+ strict_strtoul(argv[2], 16, &offset);
-+ strict_strtoul(argv[3], 16, &value);
-+ if (offset > 0x40) {
-+ printf("Wrong offset : 0x%lx\n", offset);
-+ cmd_usage(cmdtp);
-+ return 1;
-+ }
-+ dm9000_write_srom_word(offset, value);
-+ return 0;
-+}
-+
-+int do_dm9000_eeprom(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
-+{
-+ if (argc < 2) {
-+ cmd_usage(cmdtp);
-+ return 1;
-+ }
-+
-+ if (strcmp(argv[1], "read") == 0) {
-+ return do_read_dm9000_eeprom(cmdtp, flag, argc, argv);
-+ } else if (strcmp(argv[1], "write") == 0) {
-+ return do_write_dm9000_eeprom(cmdtp, flag, argc, argv);
-+ } else {
-+ cmd_usage(cmdtp);
-+ return 1;
-+ }
-+}
-+
-+U_BOOT_CMD(dm9000ee, 4, 1, do_dm9000_eeprom,
-+ "Read/Write eeprom connected to Ethernet Controller",
-+ "\ndm9000ee write <word offset> <value>\n"
-+ "\tdm9000ee read\n"
-+ "\tword:\t\t00-02 : MAC Address\n"
-+ "\t\t\t03-07 : DM9000 Configuration\n" "\t\t\t08-63 : User data");
-diff --git a/board/armadeus/apf9328/fpga.c b/board/armadeus/apf9328/fpga.c
-new file mode 100644
-index 0000000..f3d4f03
---- /dev/null
-+++ b/board/armadeus/apf9328/fpga.c
-@@ -0,0 +1,121 @@
-+/*
-+ * (C) Copyright 2002
-+ * Rich Ireland, Enterasys Networks, rir...@en....
-+ * Keith Outwater, kei...@mv....
-+ *
-+ * See file CREDITS for list of people who contributed to this
-+ * project.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * 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 <common.h>
-+
-+#ifdef CONFIG_FPGA
-+
-+#include <asm/arch/imx-regs.h>
-+#include <asm/io.h>
-+#include <config.h>
-+
-+#define GPIO_PORT(x) ((x >> 5) & 3)
-+#define GPIO_SET(x) (DR(GPIO_PORT(x)) |= (1<<(x & GPIO_PIN_MASK)))
-+#define GPIO_CLEAR(x) (DR(GPIO_PORT(x)) &= ~(1<<(x & GPIO_PIN_MASK)))
-+#define GPIO_WRITE(x, y) (y ? GPIO_SET(x) : GPIO_CLEAR(x))
-+#define GPIO_READ(x) ((SSR(GPIO_PORT(x)) & (1<<(x & GPIO_PIN_MASK))))
-+
-+/*
-+ * Port bit numbers for the serial slave controls
-+ */
-+#define FPGA_INIT CONFIG_SYS_FPGA_INIT
-+#define FPGA_DONE CONFIG_SYS_FPGA_DONE
-+#define FPGA_DIN CONFIG_SYS_FPGA_DATA
-+#define FPGA_PROGRAM CONFIG_SYS_FPGA_PRG
-+#define FPGA_CLOCK CONFIG_SYS_FPGA_CLK
-+
-+/* Note that these are pointers to code that is in Flash. They will be
-+ * relocated at runtime.
-+ * Spartan2 code is used to download our Spartan 3 :) code is compatible.
-+ * Just take care about the file size
-+*/
-+
-+/*
-+ * nitialize GPIO port B before download
-+ */
-+int fpga_pre_fn(int cookie)
-+{
-+ debug("%s:%d: FPGA PRE ", __func__, __LINE__);
-+
-+ /* Initialize GPIO pins */
-+ imx_gpio_mode(FPGA_INIT | GPIO_DR | GPIO_IN);
-+ imx_gpio_mode(FPGA_DONE | GPIO_DR | GPIO_IN);
-+ imx_gpio_mode(FPGA_DIN | GPIO_DR | GPIO_OUT);
-+ imx_gpio_mode(FPGA_PROGRAM | GPIO_DR | GPIO_OUT);
-+ imx_gpio_mode(FPGA_CLOCK | GPIO_DR | GPIO_OUT);
-+ return cookie;
-+}
-+
-+/*
-+ * Set the FPGA's active-low program line to the specified level
-+ */
-+int fpga_pgm_fn(int assert, int flush, int cookie)
-+{
-+ debug("%s:%d: FPGA PROGRAM %s", __func__, __LINE__,
-+ assert ? "high" : "low");
-+ GPIO_WRITE(FPGA_PROGRAM, !assert);
-+ return assert;
-+}
-+
-+/*
-+ * Set the FPGA's active-high clock line to the specified level
-+ */
-+int fpga_clk_fn(int assert_clk, int flush, int cookie)
-+{
-+ debug("%s:%d: FPGA CLOCK %s", __func__, __LINE__,
-+ assert_clk ? "high" : "low");
-+ GPIO_WRITE(FPGA_CLOCK, assert_clk);
-+ return assert_clk;
-+}
-+
-+/*
-+ * Test the state of the active-low FPGA INIT line. Return 1 on INIT
-+ * asserted (low).
-+ */
-+int fpga_init_fn(int cookie)
-+{
-+ debug("%s:%d: INIT check... ", __func__, __LINE__);
-+ return !GPIO_READ(FPGA_INIT);
-+}
-+
-+/*
-+ * Test the state of the active-high FPGA DONE pin
-+ */
-+int fpga_done_fn(int cookie)
-+{
-+ debug("%s:%d: DONE check... ", __func__, __LINE__);
-+ return GPIO_READ(FPGA_DONE);
-+}
-+
-+/*
-+ * Set the FPGA's data line to the specified level
-+ */
-+int fpga_wr_fn(int assert_write, int flush, int cookie)
-+{
-+ debug("%s:%d: DATA write... ", __func__, __LINE__);
-+ GPIO_WRITE(FPGA_DIN, assert_write);
-+ return assert_write;
-+}
-+
-+#endif /* CONFIG_FPGA */
-diff --git a/board/armadeus/apf9328/fpga.h b/board/armadeus/apf9328/fpga.h
-new file mode 100644
-index 0000000..3b226d7
---- /dev/null
-+++ b/board/armadeus/apf9328/fpga.h
-@@ -0,0 +1,30 @@
-+/*
-+ * (C) Copyright 2002
-+ * Rich Ireland, Enterasys Networks, rir...@en....
-+ * Keith Outwater, kei...@mv....
-+ *
-+ * See file CREDITS for list of people who contributed to this
-+ * project.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * 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
-+ *
-+ */
-+extern int fpga_pre_fn(int cookie);
-+extern int fpga_pgm_fn(int assert_pgm, int flush, int cookie);
-+extern int fpga_init_fn(int cookie);
-+extern int fpga_done_fn(int cookie);
-+extern int fpga_clk_fn(int assert_clk, int flush, int cookie);
-+extern int fpga_wr_fn(int assert_write, int flush, int cookie);
-diff --git a/board/armadeus/apf9328/i2c.c b/board/armadeus/apf9328/i2c.c
-new file mode 100644
-index 0000000..0ba0a8d
---- /dev/null
-+++ b/board/armadeus/apf9328/i2c.c
-@@ -0,0 +1,276 @@
-+/*
-+ * (C) Copyright 2005-2011 ej Armadeus Project <eri...@ar...>
-+ *
-+ * See file CREDITS for list of people who contributed to this
-+ * project.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * 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 <common.h>
-+
-+#ifdef CONFIG_HARD_I2C
-+
-+#include <asm/io.h>
-+#include <asm/arch/imx-regs.h>
-+#include <i2c.h>
-+
-+/*-----------------------------------------------------------------------
-+ * Definitions
-+ */
-+
-+#define I2C_ACK 0 /* level to ack a byte */
-+#define I2C_NOACK 1 /* level to noack a byte */
-+
-+/*-----------------------------------------------------------------------
-+ * Local functions
-+ */
-+
-+/*-----------------------------------------------------------------------
-+ * START: High -> Low on SDA while SCL is High
-+ * after check for a bus free
-+ */
-+static void imxi2c_send_start(void)
-+{
-+ while (I2SR & I2SR_IBB)
-+ udelay(1);
-+
-+ I2CR |= I2CR_MSTA;
-+ I2SR &= ~I2SR_IIF;
-+}
-+
-+/*-----------------------------------------------------------------------
-+ * STOP: Low -> High on SDA while SCL is High
-+ * after the end of previous transfer
-+ */
-+static void imxi2c_send_stop(void)
-+{
-+ while (!(I2SR & I2SR_ICF))
-+ udelay(1);
-+
-+ I2CR &= ~I2CR_MSTA;
-+}
-+
-+/*-----------------------------------------------------------------------
-+ * Send 8 bits and look for an acknowledgement.
-+ */
-+static int imxi2c_write_byte(uchar data)
-+{
-+ while (!(I2SR & I2SR_ICF)) /* Wait end of transfer */
-+ udelay(1);
-+
-+ I2CR |= I2CR_MTX;
-+ I2SR &= ~I2SR_IIF;
-+ I2DR = data;
-+
-+ while (!(I2SR & I2SR_IIF)) /* checking IIF before ICF: FIXME */
-+ udelay(1);
-+
-+ I2SR &= ~I2SR_IIF;
-+
-+ while (!(I2SR & I2SR_ICF)) /* Wait end of transfer */
-+ udelay(1);
-+
-+ return I2SR & I2SR_RXAK; /* not a nack is an ack */
-+}
-+
-+/*-----------------------------------------------------------------------
-+ * if ack == I2C_ACK, ACK the byte so can continue reading, else
-+ * send I2C_NOACK to end the read.
-+ */
-+static uchar imxi2c_read_byte(int ack)
-+{
-+ int data;
-+
-+ while (!(I2SR & I2SR_ICF))
-+ udelay(1);
-+
-+ I2CR &= ~I2CR_MTX;
-+
-+ if (ack)
-+ I2CR |= I2CR_TXAK;
-+ else
-+ I2CR &= ~I2CR_TXAK;
-+
-+ data = I2DR;
-+ return data;
-+}
-+
-+/* ------------------------------------------------------------------------
-+ * API Functions
-+ * ------------------------------------------------------------------------
-+ */
-+
-+/*-----------------------------------------------------------------------
-+ * i2c_init compute the i2c divider to reach the requested speed
-+ * see mxl reference manual
-+ */
-+void i2c_init(int speed, int slaveaddr)
-+{
-+ int hclk_dividers[] = {
-+ 30, 32, 36, 42, 48, 52, 60, 72,
-+ 80, 88, 104, 128, 144, 160, 192, 240,
-+ 288, 320, 384, 480, 576, 640, 768, 960,
-+ 1152, 1280, 1536, 1920, 2304, 2560, 3072, 3840,
-+ 22, 24, 26, 26, 32, 36, 40, 44,
-+ 48, 56, 64, 72, 80, 96, 112, 128,
-+ 160, 192, 224, 256, 320, 384, 448, 512,
-+ 640, 768, 896, 1024, 1280, 1536, 1792, 2048
-+ };
-+ int refDiv = get_HCLK() / speed;
-+ int i, tmpIC;
-+
-+ imx_gpio_mode(PA15_PF_I2C_SDA);
-+ imx_gpio_mode(PA16_PF_I2C_SCL);
-+
-+ tmpIC = (sizeof(hclk_dividers) / sizeof(int)) - 1;
-+ for (i = tmpIC; i >= 0; i--) {
-+ if ((hclk_dividers[i] >= refDiv)
-+ && (hclk_dividers[i] < hclk_dividers[tmpIC])) {
-+ tmpIC = i;
-+ }
-+ }
-+
-+ IFDR = tmpIC;
-+ IADR = slaveaddr << 1;
-+
-+ if (I2SR & I2SR_IBB)
-+ imxi2c_send_stop();
-+
-+ I2CR |= I2CR_IEN;
-+}
-+
-+/*-----------------------------------------------------------------------
-+ * Probe to see if a chip is present. Also good for checking for the
-+ * completion of EEPROM writes since the chip stops responding until
-+ * the write completes (typically 10mSec).
-+ * probe sends a read command to probe a an address
-+ */
-+int i2c_probe(uchar addr)
-+{
-+ int rc;
-+
-+ imxi2c_send_start();
-+ rc = imxi2c_write_byte((addr << 1) | 0);
-+ imxi2c_send_stop();
-+
-+ return rc ? 1 : 0;
-+}
-+
-+/*-----------------------------------------------------------------------
-+ * Read bytes
-+ */
-+int i2c_read(uchar chip, uint addr, int alen, uchar *buffer, int len)
-+{
-+ int shift;
-+ debug("i2c_read: chip %02X addr %02X alen %d buffer %p len %d\n",
-+ chip, addr, alen, buffer, len);
-+
-+#ifdef CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW
-+ /*
-+ * EEPROM chips that implement "address overflow" are ones
-+ * like Catalyst 24WC04/08/16 which has 9/10/11 bits of
-+ * address and the extra bits end up in the "chip address"
-+ * bit slots. This makes a 24WC08 (1Kbyte) chip look like
-+ * four 256 byte chips.
-+ *
-+ * Note that we consider the length of the address field to
-+ * still be one byte because the extra address bits are
-+ * hidden in the chip address.
-+ */
-+ chip |= ((addr >> (alen * 8)) & CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW);
-+
-+ debug("i2c_read: fix addr_overflow: chip %02X addr %02X\n",
-+ chip, addr);
-+#endif
-+
-+ /*
-+ * Do the addressing portion of a write cycle to set the
-+ * chip's address pointer. If the address length is zero,
-+ * don't do the normal write cycle to set the address pointer,
-+ * there is no address pointer in this chip.
-+ */
-+ imxi2c_send_start();
-+ if (alen > 0) {
-+ if (imxi2c_write_byte(chip << 1)) { /* write cycle */
-+ imxi2c_send_stop();
-+ debug("i2c_read, no chip responded %02X\n", chip);
-+ return 1;
-+ }
-+ shift = (alen - 1) * 8;
-+ while (alen-- > 0) {
-+ if (imxi2c_write_byte(addr >> shift)) {
-+ debug("i2c_read, address not <ACK>ed\n");
-+ return 1;
-+ }
-+ shift -= 8;
-+ }
-+
-+ /* reportedly some chips need a full stop */
-+ imxi2c_send_stop();
-+ imxi2c_send_start();
-+ }
-+ /*
-+ * Send the chip address again, this time for a read cycle.
-+ * Then read the data. On the last byte, we do a NACK instead
-+ * of an ACK(len == 0) to terminate the read.
-+ */
-+ imxi2c_write_byte((chip << 1) | 1); /* read cycle */
-+ imxi2c_read_byte(len <= 2);
-+ while (len-- > 1)
-+ *buffer++ = imxi2c_read_byte(len == 1);
-+
-+ imxi2c_send_stop();
-+ *buffer++ = imxi2c_read_byte(0);
-+ return 0;
-+}
-+
-+/*-----------------------------------------------------------------------
-+ * Write bytes
-+ */
-+int i2c_write(uchar chip, uint addr, int alen, uchar *buffer, int len)
-+{
-+ int shift, failures = 0;
-+
-+ debug("i2c_write: chip %02X addr %02X alen %d buffer %p len %d\n",
-+ chip, addr, alen, buffer, len);
-+
-+ imxi2c_send_start();
-+ if (imxi2c_write_byte(chip << 1)) { /* write cycle */
-+ imxi2c_send_stop();
-+ debug("i2c_write, no chip responded %02X\n", chip);
-+ return 1;
-+ }
-+ shift = (alen - 1) * 8;
-+ while (alen-- > 0) {
-+ if (imxi2c_write_byte(addr >> shift)) {
-+ debug("i2c_write, address not <ACK>ed\n");
-+ return 1;
-+ }
-+ shift -= 8;
-+ }
-+
-+ while (len-- > 0) {
-+ if (imxi2c_write_byte(*buffer++))
-+ failures++;
-+ }
-+ imxi2c_send_stop();
-+ return failures;
-+}
-+
-+#endif /* CONFIG_HARD_I2C */
-diff --git a/board/armadeus/apf9328/lowlevel_init.S b/board/armadeus/apf9328/lowlevel_init.S
-new file mode 100644
-index 0000000..f080423
---- /dev/null
-+++ b/board/armadeus/apf9328/lowlevel_init.S
-@@ -0,0 +1,469 @@
-+/*
-+ * (C) Copyright 2005-2011 ej Armadeus Project <eri...@ar...>
-+ * Copyright (C) 2004 Sascha Hauer, Synertronixx GmbH
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * 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 <config.h>
-+#include <version.h>
-+#include <asm/arch/imx-regs.h>
-+
-+.globl lowlevel_init
-+lowlevel_init:
-+/* Change PERCLK1DIV to 14 ie 14+1 */
-+ ldr r0, =PCDR
-+ ldr r1, =CONFIG_SYS_PCDR_VAL
-+ str r1, [r0]
-+
-+/* set MCU PLL Control Register 0 */
-+
-+ ldr r0, =MPCTL0
-+ ldr r1, =CONFIG_SYS_MPCTL0_VAL
-+ str r1, [r0]
-+
-+/* set MCU PLL Control Register 1 */
-+
-+ ldr r0, =MPCTL1
-+ ldr r1, =CONFIG_SYS_MPCTL1_VAL
-+ str r1, [r0]
-+
-+/* set mpll restart bit */
-+ ldr r0, =CSCR
-+ ldr r1, [r0]
-+ orr r1,r1,#(1<<21)
-+ str r1, [r0]
-+
-+ mov r2,#0x10
-+1:
-+ mov r3,#0x2000
-+2:
-+ subs r3,r3,#1
-+ bne 2b
-+
-+ subs r2,r2,#1
-+ bne 1b
-+
-+/* set System PLL Control Register 0 */
-+
-+ ldr r0, =SPCTL0
-+ ldr r1, =CONFIG_SYS_SPCTL0_VAL
-+ str r1, [r0]
-+
-+/* set System PLL Control Register 1 */
-+
-+ ldr r0, =SPCTL1
-+ ldr r1, =CONFIG_SYS_SPCTL1_VAL
-+ str r1, [r0]
-+
-+/* set spll restart bit */
-+ ldr r0, =CSCR
-+ ldr r1, [r0]
-+ orr r1,r1,#(1<<22)
-+ str r1, [r0]
-+
-+ mov r2,#0x10
-+1:
-+ mov r3,#0x2000
-+2:
-+ subs r3,r3,#1
-+ bne 2b
-+
-+ subs r2,r2,#1
-+ bne 1b
-+
-+ ldr r0, =CSCR
-+ ldr r1, =CONFIG_SYS_CSCR_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =GPCR
-+ ldr r1, =CONFIG_SYS_GPCR_VAL
-+ str r1, [r0]
-+
-+/* I have now read the ARM920 DataSheet back-to-Back, and have stumbled upon
-+ *this.....
-+ *
-+ * It would appear that from a Cold-Boot the ARM920T enters "FastBus" mode CP15
-+ * register 1, this stops it using the output of the PLL and thus runs at the
-+ * slow rate. Unless you place the Core into "Asynch" mode, the CPU will never
-+ * use the value set in the CM_OSC registers...regardless of what you set it
-+ * too! Thus, although i thought i was running at 140MHz, i'm actually running
-+ * at 40!..
-+
-+ * Slapping this into my bootloader does the trick...
-+
-+ * MRC p15,0,r0,c1,c0,0 ; read core configuration register
-+ * ORR r0,r0,#0xC0000000 ; set asynchronous clocks and not fastbus mode
-+ * MCR p15,0,r0,c1,c0,0 ; write modified value to core configuration
-+ * register
-+ */
-+ MRC p15,0,r0,c1,c0,0
-+ ORR r0,r0,#0xC0000000
-+ MCR p15,0,r0,c1,c0,0
-+
-+/* ldr r0, =GPR(0)
-+ ldr r1, =CONFIG_SYS_GPR_A_VAL
-+ str r1, [r0]
-+*/
-+
-+ ldr r0, =DR(0)
-+ ldr r1, =CONFIG_SYS_DR_A_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =OCR1(0)
-+ ldr r1, =CONFIG_SYS_OCR1_A_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =OCR2(0)
-+ ldr r1, =CONFIG_SYS_OCR2_A_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =ICONFA1(0)
-+ ldr r1, =CONFIG_SYS_ICFA1_A_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =ICONFA2(0)
-+ ldr r1, =CONFIG_SYS_ICFA2_A_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =ICONFB1(0)
-+ ldr r1, =CONFIG_SYS_ICFB1_A_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =ICONFB2(0)
-+ ldr r1, =CONFIG_SYS_ICFB2_A_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =ICR1(0)
-+ ldr r1, =CONFIG_SYS_ICR1_A_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =ICR2(0)
-+ ldr r1, =CONFIG_SYS_ICR2_A_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =IMR(0)
-+ ldr r1, =CONFIG_SYS_IMR_A_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =DDIR(0)
-+ ldr r1, =CONFIG_SYS_DDIR_A_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =GPR(0)
-+ ldr r1, =CONFIG_SYS_GPR_A_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =PUEN(0)
-+ ldr r1, =CONFIG_SYS_PUEN_A_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =GIUS(0)
-+ ldr r1, =CONFIG_SYS_GIUS_A_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =DR(1)
-+ ldr r1, =CONFIG_SYS_DR_B_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =OCR1(1)
-+ ldr r1, =CONFIG_SYS_OCR1_B_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =OCR2(1)
-+ ldr r1, =CONFIG_SYS_OCR2_B_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =ICONFA1(1)
-+ ldr r1, =CONFIG_SYS_ICFA1_B_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =ICONFA2(1)
-+ ldr r1, =CONFIG_SYS_ICFA2_B_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =ICONFB1(1)
-+ ldr r1, =CONFIG_SYS_ICFB1_B_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =ICONFB2(1)
-+ ldr r1, =CONFIG_SYS_ICFB2_B_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =ICR1(1)
-+ ldr r1, =CONFIG_SYS_ICR1_B_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =ICR2(1)
-+ ldr r1, =CONFIG_SYS_ICR2_B_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =IMR(1)
-+ ldr r1, =CONFIG_SYS_IMR_B_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =DDIR(1)
-+ ldr r1, =CONFIG_SYS_DDIR_B_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =GPR(1)
-+ ldr r1, =CONFIG_SYS_GPR_B_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =PUEN(1)
-+ ldr r1, =CONFIG_SYS_PUEN_B_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =GIUS(1)
-+ ldr r1, =CONFIG_SYS_GIUS_B_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =DR(2)
-+ ldr r1, =CONFIG_SYS_DR_C_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =OCR1(2)
-+ ldr r1, =CONFIG_SYS_OCR1_C_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =OCR2(2)
-+ ldr r1, =CONFIG_SYS_OCR2_C_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =ICONFA1(2)
-+ ldr r1, =CONFIG_SYS_ICFA1_C_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =ICONFA2(2)
-+ ldr r1, =CONFIG_SYS_ICFA2_C_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =ICONFB1(2)
-+ ldr r1, =CONFIG_SYS_ICFB1_C_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =ICONFB2(2)
-+ ldr r1, =CONFIG_SYS_ICFB2_C_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =ICR1(2)
-+ ldr r1, =CONFIG_SYS_ICR1_C_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =ICR2(2)
-+ ldr r1, =CONFIG_SYS_ICR2_C_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =IMR(2)
-+ ldr r1, =CONFIG_SYS_IMR_C_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =DDIR(2)
-+ ldr r1, =CONFIG_SYS_DDIR_C_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =GPR(2)
-+ ldr r1, =CONFIG_SYS_GPR_C_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =PUEN(2)
-+ ldr r1, =CONFIG_SYS_PUEN_C_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =GIUS(2)
-+ ldr r1, =CONFIG_SYS_GIUS_C_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =DR(3)
-+ ldr r1, =CONFIG_SYS_DR_D_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =OCR1(3)
-+ ldr r1, =CONFIG_SYS_OCR1_D_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =OCR2(3)
-+ ldr r1, =CONFIG_SYS_OCR2_D_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =ICONFA1(3)
-+ ldr r1, =CONFIG_SYS_ICFA1_D_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =ICONFA2(3)
-+ ldr r1, =CONFIG_SYS_ICFA2_D_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =ICONFB1(3)
-+ ldr r1, =CONFIG_SYS_ICFB1_D_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =ICONFB2(3)
-+ ldr r1, =CONFIG_SYS_ICFB2_D_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =ICR1(3)
-+ ldr r1, =CONFIG_SYS_ICR1_D_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =ICR2(3)
-+ ldr r1, =CONFIG_SYS_ICR2_D_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =IMR(3)
-+ ldr r1, =CONFIG_SYS_IMR_D_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =DDIR(3)
-+ ldr r1, =CONFIG_SYS_DDIR_D_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =GPR(3)
-+ ldr r1, =CONFIG_SYS_GPR_D_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =PUEN(3)
-+ ldr r1, =CONFIG_SYS_PUEN_D_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =GIUS(3)
-+ ldr r1, =CONFIG_SYS_GIUS_D_VAL
-+ str r1, [r0]
-+
-+/* CS3 becomes CS3 by clearing reset default bit 1 in FMCR */
-+
-+ ldr r0, =FMCR
-+ ldr r1, =CONFIG_SYS_FMCR_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =CS0U
-+ ldr r1, =CONFIG_SYS_CS0U_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =CS0L
-+ ldr r1, =CONFIG_SYS_CS0L_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =CS1U
-+ ldr r1, =CONFIG_SYS_CS1U_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =CS1L
-+ ldr r1, =CONFIG_SYS_CS1L_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =CS2U
-+ ldr r1, =CONFIG_SYS_CS2U_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =CS2L
-+ ldr r1, =CONFIG_SYS_CS2L_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =CS3U
-+ ldr r1, =CONFIG_SYS_CS3U_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =CS3L
-+ ldr r1, =CONFIG_SYS_CS3L_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =CS4U
-+ ldr r1, =CONFIG_SYS_CS4U_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =CS4L
-+ ldr r1, =CONFIG_SYS_CS4L_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =CS5U
-+ ldr r1, =CONFIG_SYS_CS5U_VAL
-+ str r1, [r0]
-+
-+ ldr r0, =CS5L
-+ ldr r1, =CONFIG_SYS_CS5L_VAL
-+ str r1, [r0]
-+
-+ adr r0, sdramsetup /* r0 <- current position of code */
-+ /* test if we run from flash or RAM */
-+ ldr r1, =PHYS_SDRAM_1
-+ cmp r1, r0 /* don't reloc during debug*/
-+ bhi sdramsetup
-+ /* test if we run from flash or RAM */
-+ ldr r1, =CONFIG_SYS_FLASH_BASE
-+ cmp r0, r1 /* don't reloc during debug */
-+ bmi copy2ram
-+
-+/* SDRAM Setup */
-+sdramsetup:
-+ ldr r0, =SDCTL0
-+ ldr r1, =CONFIG_SYS_PRECHARGE_CMD
-+ str r1, [r0]
-+
-+ ldr r1, =PHYS_SDRAM_1 \
-+ +CONFIG_SYS_SDRAM_PRECHARGE_ALL_VAL
-+ ldr r2, [r1]
-+
-+ ldr r1, =CONFIG_SYS_AUTOREFRESH_CMD
-+ str r1, [r0]
-+
-+ ldr r1, =PHYS_SDRAM_1
-+ ldr r2, [r1] /* Issue AutoRefresh Command */
-+ ldr r2, [r1]
-+ ldr r2, [r1]
-+ ldr r2, [r1]
-+ ldr r2, [r1]
-+ ldr r2, [r1]
-+ ldr r2, [r1]
-+ ldr r2, [r1]
-+
-+ ldr r1, =CONFIG_SYS_SET_MODE_REG_CMD
-+ str r1, [r0]
-+
-+ ldr r1, =PHYS_SDRAM_1 \
-+ +CONFIG_SYS_SDRAM_MODE_REGISTER_VAL
-+ str r2, [r1]
-+
-+ ldr r1, =CONFIG_SYS_NORMAL_RW_CMD
-+ str r1, [r0]
-+/* make U-Boot runnable form "almost" anywhere */
-+/* but SYS_TEXT_BASE should be in RAM */
-+copy2ram: /* populate _TEXT_BASE with U-Boot from load addr */
-+ ldr r0, _start_adr
-+ ldr r1, _copy2ram
-+ sub r1, r1, r0
-+ adr r0, copy2ram
-+ sub r0, r0, r1
-+ ldr r1, =CONFIG_SYS_TEXT_BASE
-+ cmp r0, r1
-+ beq end_of_copy2ram /* skip U-Boot copy */
-+ ldr r2, =CONFIG_SYS_MONITOR_LEN
-+ add r2, r2, r0 /* r2 <- source end address */
-+
-+copy_loop:
-+ ldmia r0!, {r9-r10} /* copy from source address [r0] */
-+ stmia r1!, {r9-r10} /* copy to target address [r1] */
-+ cmp r0, r2 /* until source end address [r2] */
-+ blo copy_loop
-+
-+end_of_copy2ram:
-+ mov pc,lr
-+
-+_copy2ram:
-+ .word copy2ram
-+_start_adr:
-+ .word _start
---
-1.7.2.5
-
diff --git a/patches/u-boot/2012.10/104-apf9328-makefile.patch b/patches/u-boot/2012.10/104-apf9328-makefile.patch
deleted file mode 100644
index fc15410..0000000
--- a/patches/u-boot/2012.10/104-apf9328-makefile.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-apf9328: add apf9328 board in Makefile
-
-add apf9328 board definition in makefile, MAKEALL and MAINTAINERS list
-
-Signed-off-by: Eric Jarrige <eri...@ar...>
-Signed-off-by: Philippe Reynes <tr...@ya...>
----
- MAINTAINERS | 4 ++++
- boards.cfg | 1 +
- 2 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git a/MAINTAINERS b/MAINTAINERS
-index b571400..18ac7d3 100644
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -255,6 +255,10 @@ Gabriel Huau <co...@hu...>
-
- mini2440 s3c2440
-
-+Eric Jarrige <eri...@ar...>
-+
-+ apf9328 ARM920T (iMX1)
-+
- Gary Jennejohn <ga...@de...>
-
- quad100hd PPC...
[truncated message content] |
|
From: jorasse <jo...@us...> - 2013-05-27 20:27: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 6a3936bc132688b3be022a0933b2e03a31da13bf (commit)
from da9f4205a8aea4b2b1260a7484bfb4cb12324b9a (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 6a3936bc132688b3be022a0933b2e03a31da13bf
Author: Eric Jarrige <eri...@ar...>
Date: Mon May 27 22:35:18 2013 +0200
[UBOOT] 2013.04: update apf27 FEC config and re-enable CONFIG_SYS_DIRECT_FLASH_TFTP
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf27/apf27-u-boot-2013.04.h | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2013.04.h b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2013.04.h
index e5e1dea..ee3bdb8 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2013.04.h
+++ b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2013.04.h
@@ -325,6 +325,7 @@
#define NAND_MAX_CHIPS 1
+#define CONFIG_SYS_DIRECT_FLASH_TFTP
#define CONFIG_FLASH_SHOW_PROGRESS 45
#define CONFIG_SYS_NAND_QUIET 1
@@ -348,10 +349,9 @@
* Ethernet (on SOC imx FEC)
*/
#define CONFIG_FEC_MXC
-
-#define CONFIG_NET_MULTI
+#define CONFIG_PHYLIB
#define CONFIG_FEC_MXC_PHYADDR 0x1f
-#define CONFIG_MII 1 /* MII PHY management */
+#define CONFIG_MII /* MII PHY management */
/*
* FPGA
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2013-05-27 16:19:47
|
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 da9f4205a8aea4b2b1260a7484bfb4cb12324b9a (commit)
from 984347599ef1ef7f2d0d4557489be516b2d6e2ab (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 da9f4205a8aea4b2b1260a7484bfb4cb12324b9a
Author: Eric Jarrige <eri...@ar...>
Date: Mon May 27 18:27:20 2013 +0200
[UBOOT] 2013.04: add apf27 config file
-----------------------------------------------------------------------
Summary of changes:
...-u-boot-2013.01.01.h => apf27-u-boot-2013.04.h} | 35 ++++++++++---------
1 files changed, 18 insertions(+), 17 deletions(-)
copy buildroot/target/device/armadeus/apf27/{apf27-u-boot-2013.01.01.h => apf27-u-boot-2013.04.h} (95%)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2013.01.01.h b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2013.04.h
similarity index 95%
copy from buildroot/target/device/armadeus/apf27/apf27-u-boot-2013.01.01.h
copy to buildroot/target/device/armadeus/apf27/apf27-u-boot-2013.04.h
index df2a9cc..e5e1dea 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2013.01.01.h
+++ b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2013.04.h
@@ -25,7 +25,7 @@
#define CONFIG_VERSION_VARIABLE
#define CONFIG_ENV_VERSION "3.3"
-#define CONFIG_IDENT_STRING " apf27 patch 3.8"
+#define CONFIG_IDENT_STRING " apf27 patch 3.9"
#define CONFIG_BOARD_NAME apf27
/*
@@ -41,6 +41,9 @@
#define CONFIG_SYS_NO_FLASH /* to be define before <config_cmd_default.h> */
#define CONFIG_MISC_INIT_R
#define CONFIG_BOARD_EARLY_INIT_F
+#ifdef CONFIG_SPL_BUILD
+#define CONFIG_SKIP_LOWLEVEL_INIT
+#endif
/*
* Board display option
@@ -57,20 +60,16 @@
#define CONFIG_SYS_NAND_U_BOOT_SIZE CONFIG_SYS_MONITOR_LEN
/* Build image with spl and u-boot */
#define CONFIG_NAND_U_BOOT
-#define CONFIG_SPL_PAD_TO 0xa1000000
+#define CONFIG_SPL_PAD_TO 0xa0000800
/*
* SPL
*/
#define CONFIG_SPL
-#define CONFIG_SPL_TEXT_BASE 0xa0fff800
-/* #define CONFIG_SPL_STACK CONFIG_SYS_INIT_SP_ADDR */
-#define CONFIG_SPL_STACK 0xd8000800
-#define CONFIG_SYS_NAND_U_BOOT_START 0xa1000000
+#define CONFIG_SPL_TEXT_BASE 0xa0000000
+#define CONFIG_SPL_STACK 0xffffff00
+#define CONFIG_SYS_NAND_U_BOOT_START 0xa0000800
#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x800
-#define CONFIG_SPL_LIBGENERIC_SUPPORT /* memcpy */
-
-#define CONFIG_CMD_NAND_SIMPLE
/*
* BOOTP options
@@ -94,11 +93,14 @@
#define CONFIG_CMD_ASKENV /* ask for env variable */
#define CONFIG_CMD_BSP /* Board Specific functions */
#define CONFIG_CMD_CACHE /* icache, dcache */
+#define CONFIG_CMD_DATE
#define CONFIG_CMD_DHCP /* DHCP Support */
#define CONFIG_CMD_DNS
+#define CONFIG_CMD_EEPROM
#define CONFIG_CMD_EXT2
#define CONFIG_CMD_FAT /* FAT support */
#define CONFIG_CMD_IMX_FUSE /* imx iim fuse */
+#define CONFIG_CMD_I2C
#define CONFIG_CMD_MII /* MII support */
#define CONFIG_CMD_MMC
#define CONFIG_CMD_MTDPARTS /* MTD partition support */
@@ -129,7 +131,7 @@
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE \
+ PHYS_SDRAM_1_SIZE - 0x0100000)
-#define CONFIG_SYS_TEXT_BASE 0xA1000000
+#define CONFIG_SYS_TEXT_BASE 0xA0000800
/*
* FLASH organization
@@ -319,7 +321,7 @@
#define CONFIG_MXC_NAND_HWECC
#define CONFIG_SYS_NAND_LARGEPAGE
-#define IMX27_NAND_16BITS
+#define CONFIG_SYS_NAND_BUSWIDTH_16BIT
#define NAND_MAX_CHIPS 1
@@ -376,14 +378,14 @@
/*
* I2C
*/
-#ifdef CONFIG_CMD_I2C
-#define CONFIG_HARD_I2C 1
+#ifdef CONFIG_CMD_I2C
+#define CONFIG_HARD_I2C
+#define CONFIG_I2C_MXC
+#define CONFIG_I2C_MULTI_BUS
+#define CONFIG_SYS_I2C_BASE IMX_I2C1_BASE
#define CONFIG_SYS_I2C_SPEED 100000 /* 100 kHz */
#define CONFIG_SYS_I2C_SLAVE 0x7F
-
-#define CONFIG_I2C_CMD_TREE
-#define CONFIG_I2C_MULTI_BUS 2
#define CONFIG_SYS_I2C_NOPROBES { }
#ifdef CONFIG_CMD_EEPROM
@@ -424,7 +426,6 @@
* |CPLM|X|----PD---|--------MFD---------|XXX|--MFI--|-----MFN-----------|
*/
#define CONFIG_MX27_CLK32 32768 /* 32768 or 32000 Hz crystal */
-#undef CONFIG_MX27_CLK26 /* No external 26MHz external clock */
#if (ACFG_SDRAM_MBYTE_SYZE == 64) /* micron MT46H16M32LF -6 */
/* micron 64MB */
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2013-05-27 16:18:50
|
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 984347599ef1ef7f2d0d4557489be516b2d6e2ab (commit)
via c2573612132a129be7c807c518ad7dc7b3abcd45 (commit)
from 181fd8b94365e7797e44e399fdf6d6337650be12 (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 984347599ef1ef7f2d0d4557489be516b2d6e2ab
Merge: c257361 181fd8b
Author: Eric Jarrige <eri...@ar...>
Date: Mon May 27 18:26:29 2013 +0200
[UBOOT] 2013.01.01: add apf27 config file
commit c2573612132a129be7c807c518ad7dc7b3abcd45
Author: Eric Jarrige <eri...@ar...>
Date: Mon May 27 18:24:37 2013 +0200
[UBOOT] 2013.01.01: add apf27 config file
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2013-05-27 16:16:53
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 181fd8b94365e7797e44e399fdf6d6337650be12 (commit)
from 832588a251eafebd30c19f8344bc8b5a40532233 (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 181fd8b94365e7797e44e399fdf6d6337650be12
Author: Eric Jarrige <eri...@ar...>
Date: Mon May 27 18:24:37 2013 +0200
[UBOOT] 2013.04: add apf27 config file
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf27/apf27-u-boot-2013.01.01.h | 43 +++++++-------------
1 files changed, 15 insertions(+), 28 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2013.01.01.h b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2013.01.01.h
index 0de0e29..df2a9cc 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2013.01.01.h
+++ b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2013.01.01.h
@@ -25,7 +25,7 @@
#define CONFIG_VERSION_VARIABLE
#define CONFIG_ENV_VERSION "3.3"
-#define CONFIG_IDENT_STRING " apf27 patch 3.9"
+#define CONFIG_IDENT_STRING " apf27 patch 3.8"
#define CONFIG_BOARD_NAME apf27
/*
@@ -63,12 +63,14 @@
* SPL
*/
#define CONFIG_SPL
-#define CONFIG_SPL_NO_CPU_SUPPORT_CODE
-#define CONFIG_SPL_START_S_PATH "board/armadeus/apf27"
-#define CONFIG_SPL_LDSCRIPT "board/armadeus/apf27/u-boot-spl.lds"
-#define CONFIG_SPL_LIBCOMMON_SUPPORT
-#define CONFIG_SPL_LIBGENERIC_SUPPORT
+#define CONFIG_SPL_TEXT_BASE 0xa0fff800
+/* #define CONFIG_SPL_STACK CONFIG_SYS_INIT_SP_ADDR */
+#define CONFIG_SPL_STACK 0xd8000800
+#define CONFIG_SYS_NAND_U_BOOT_START 0xa1000000
+#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x800
+#define CONFIG_SPL_LIBGENERIC_SUPPORT /* memcpy */
+#define CONFIG_CMD_NAND_SIMPLE
/*
* BOOTP options
@@ -92,14 +94,11 @@
#define CONFIG_CMD_ASKENV /* ask for env variable */
#define CONFIG_CMD_BSP /* Board Specific functions */
#define CONFIG_CMD_CACHE /* icache, dcache */
-#define CONFIG_CMD_DATE
#define CONFIG_CMD_DHCP /* DHCP Support */
#define CONFIG_CMD_DNS
-#define CONFIG_CMD_EEPROM
#define CONFIG_CMD_EXT2
#define CONFIG_CMD_FAT /* FAT support */
#define CONFIG_CMD_IMX_FUSE /* imx iim fuse */
-#define CONFIG_CMD_I2C
#define CONFIG_CMD_MII /* MII support */
#define CONFIG_CMD_MMC
#define CONFIG_CMD_MTDPARTS /* MTD partition support */
@@ -115,7 +114,7 @@
/*
* Memory configurations
*/
-#define CONFIG_NR_DRAM_POPULATED 1
+#define CONFIG_NR_DRAM_POPULATED 1
#define CONFIG_NR_DRAM_BANKS 2
#define ACFG_SDRAM_MBYTE_SYZE 64
@@ -323,7 +322,7 @@
#define IMX27_NAND_16BITS
#define NAND_MAX_CHIPS 1
-#define CONFIG_SYS_DIRECT_FLASH_TFTP
+
#define CONFIG_FLASH_SHOW_PROGRESS 45
#define CONFIG_SYS_NAND_QUIET 1
@@ -377,14 +376,14 @@
/*
* I2C
*/
-
#ifdef CONFIG_CMD_I2C
-#define CONFIG_HARD_I2C
-#define CONFIG_I2C_MXC
-#define CONFIG_I2C_MULTI_BUS
-#define CONFIG_SYS_I2C_BASE IMX_I2C1_BASE
+#define CONFIG_HARD_I2C 1
+
#define CONFIG_SYS_I2C_SPEED 100000 /* 100 kHz */
#define CONFIG_SYS_I2C_SLAVE 0x7F
+
+#define CONFIG_I2C_CMD_TREE
+#define CONFIG_I2C_MULTI_BUS 2
#define CONFIG_SYS_I2C_NOPROBES { }
#ifdef CONFIG_CMD_EEPROM
@@ -396,10 +395,6 @@
#endif /* CONFIG_CMD_I2C */
/*
- * SPI
- */
-
-/*
* SD/MMC
*/
#ifdef CONFIG_CMD_MMC
@@ -418,14 +413,6 @@
#endif /* CONFIG_CMD_DATE */
/*
- * Watchdog Config
- */
-
-/*
- * USB
- */
-
-/*
* Clocks
*/
#define CONFIG_SYS_HZ 1000 /* Ticks per second */
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2013-05-27 01:12:06
|
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 832588a251eafebd30c19f8344bc8b5a40532233 (commit)
from f8270ad6feca5a23bbfb5dec26d2e9e8e9954746 (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 832588a251eafebd30c19f8344bc8b5a40532233
Author: Eric Jarrige <eri...@ar...>
Date: Mon May 27 03:19:35 2013 +0200
[UBOOT] 2013.04: start update
-----------------------------------------------------------------------
Summary of changes:
.../100-SPL-Add-u-boot-nand-build-option.patch | 0
.../u-boot/{2012.10 => 2013.04}/102-mx1-i2c.patch | 0
.../u-boot/{2012.10 => 2013.04}/103-apf9328.patch | 0
.../104-apf9328-makefile.patch | 0
.../{2012.10 => 2013.04}/106-mx1-pllclk.patch | 0
.../107-mx1-pllclk-debug.patch | 0
.../u-boot/{2012.10 => 2013.04}/108-DM9000.patch | 0
.../{2012.10 => 2013.04}/111-mx1-timer.patch | 0
...stant-to-support-the-armadeus-APF27-board.patch | 49 +
.../301-imx27-add-function-enable_caches.patch | 26 +
...-add-support-for-the-armadeus-APF27-board.patch | 921 +++++++++++++++-----
...pf27-Add-FPGA-support-for-the-apf27-board.patch | 101 +--
.../311-imx-nand-lock-unlock.patch | 0
.../u-boot/{2012.10 => 2013.04}/320-spartan.patch | 0
.../{2013.01.01 => 2013.04}/321-add_spartan6.patch | 0
.../340-apf27-misc-commands.patch | 2 +-
.../350-nand_large_file_download.patch | 0
...60-arm-support-continuous-mmu-mem-mapping.patch | 29 +-
.../370-imx27-add-i2c-driver.patch | 0
.../u-boot/{2013.01.01 => 2013.04}/400-imx51.patch | 35 -
.../u-boot/{2013.01.01 => 2013.04}/401-apf51.patch | 2 +-
.../{2013.01.01 => 2013.04}/403-apf51-wdog.patch | 0
.../{2013.01.01 => 2013.04}/407-imx51-nand.patch | 2 +-
.../{2012.10 => 2013.04}/409-apf51-nand-spl.patch | 0
.../{2013.01.01 => 2013.04}/410-imx-iim.patch | 0
.../501-imx28-update-and-fix.patch | 0
.../{2013.01.01 => 2013.04}/502-add-apf28.patch | 11 +-
27 files changed, 836 insertions(+), 342 deletions(-)
copy patches/u-boot/{2013.01.01 => 2013.04}/100-SPL-Add-u-boot-nand-build-option.patch (100%)
copy patches/u-boot/{2012.10 => 2013.04}/102-mx1-i2c.patch (100%)
copy patches/u-boot/{2012.10 => 2013.04}/103-apf9328.patch (100%)
copy patches/u-boot/{2013.01.01 => 2013.04}/104-apf9328-makefile.patch (100%)
copy patches/u-boot/{2012.10 => 2013.04}/106-mx1-pllclk.patch (100%)
copy patches/u-boot/{2012.10 => 2013.04}/107-mx1-pllclk-debug.patch (100%)
copy patches/u-boot/{2012.10 => 2013.04}/108-DM9000.patch (100%)
copy patches/u-boot/{2012.10 => 2013.04}/111-mx1-timer.patch (100%)
create mode 100644 patches/u-boot/2013.04/301-imx27-Add-missing-constant-to-support-the-armadeus-APF27-board.patch
create mode 100644 patches/u-boot/2013.04/301-imx27-add-function-enable_caches.patch
copy patches/u-boot/{2013.01.01 => 2013.04}/302-apf27-add-support-for-the-armadeus-APF27-board.patch (67%)
copy patches/u-boot/{2012.10 => 2013.04}/304-apf27-Add-FPGA-support-for-the-apf27-board.patch (83%)
copy patches/u-boot/{2012.10 => 2013.04}/311-imx-nand-lock-unlock.patch (100%)
copy patches/u-boot/{2012.10 => 2013.04}/320-spartan.patch (100%)
copy patches/u-boot/{2013.01.01 => 2013.04}/321-add_spartan6.patch (100%)
copy patches/u-boot/{2013.01.01 => 2013.04}/340-apf27-misc-commands.patch (99%)
copy patches/u-boot/{2013.01.01 => 2013.04}/350-nand_large_file_download.patch (100%)
copy patches/u-boot/{2013.01.01 => 2013.04}/360-arm-support-continuous-mmu-mem-mapping.patch (67%)
copy patches/u-boot/{2013.01.01 => 2013.04}/370-imx27-add-i2c-driver.patch (100%)
copy patches/u-boot/{2013.01.01 => 2013.04}/400-imx51.patch (94%)
copy patches/u-boot/{2013.01.01 => 2013.04}/401-apf51.patch (99%)
copy patches/u-boot/{2013.01.01 => 2013.04}/403-apf51-wdog.patch (100%)
copy patches/u-boot/{2013.01.01 => 2013.04}/407-imx51-nand.patch (99%)
copy patches/u-boot/{2012.10 => 2013.04}/409-apf51-nand-spl.patch (100%)
copy patches/u-boot/{2013.01.01 => 2013.04}/410-imx-iim.patch (100%)
copy patches/u-boot/{2013.01.01 => 2013.04}/501-imx28-update-and-fix.patch (100%)
copy patches/u-boot/{2013.01.01 => 2013.04}/502-add-apf28.patch (98%)
diff --git a/patches/u-boot/2013.01.01/100-SPL-Add-u-boot-nand-build-option.patch b/patches/u-boot/2013.04/100-SPL-Add-u-boot-nand-build-option.patch
similarity index 100%
copy from patches/u-boot/2013.01.01/100-SPL-Add-u-boot-nand-build-option.patch
copy to patches/u-boot/2013.04/100-SPL-Add-u-boot-nand-build-option.patch
diff --git a/patches/u-boot/2012.10/102-mx1-i2c.patch b/patches/u-boot/2013.04/102-mx1-i2c.patch
similarity index 100%
copy from patches/u-boot/2012.10/102-mx1-i2c.patch
copy to patches/u-boot/2013.04/102-mx1-i2c.patch
diff --git a/patches/u-boot/2012.10/103-apf9328.patch b/patches/u-boot/2013.04/103-apf9328.patch
similarity index 100%
copy from patches/u-boot/2012.10/103-apf9328.patch
copy to patches/u-boot/2013.04/103-apf9328.patch
diff --git a/patches/u-boot/2013.01.01/104-apf9328-makefile.patch b/patches/u-boot/2013.04/104-apf9328-makefile.patch
similarity index 100%
copy from patches/u-boot/2013.01.01/104-apf9328-makefile.patch
copy to patches/u-boot/2013.04/104-apf9328-makefile.patch
diff --git a/patches/u-boot/2012.10/106-mx1-pllclk.patch b/patches/u-boot/2013.04/106-mx1-pllclk.patch
similarity index 100%
copy from patches/u-boot/2012.10/106-mx1-pllclk.patch
copy to patches/u-boot/2013.04/106-mx1-pllclk.patch
diff --git a/patches/u-boot/2012.10/107-mx1-pllclk-debug.patch b/patches/u-boot/2013.04/107-mx1-pllclk-debug.patch
similarity index 100%
copy from patches/u-boot/2012.10/107-mx1-pllclk-debug.patch
copy to patches/u-boot/2013.04/107-mx1-pllclk-debug.patch
diff --git a/patches/u-boot/2012.10/108-DM9000.patch b/patches/u-boot/2013.04/108-DM9000.patch
similarity index 100%
copy from patches/u-boot/2012.10/108-DM9000.patch
copy to patches/u-boot/2013.04/108-DM9000.patch
diff --git a/patches/u-boot/2012.10/111-mx1-timer.patch b/patches/u-boot/2013.04/111-mx1-timer.patch
similarity index 100%
copy from patches/u-boot/2012.10/111-mx1-timer.patch
copy to patches/u-boot/2013.04/111-mx1-timer.patch
diff --git a/patches/u-boot/2013.04/301-imx27-Add-missing-constant-to-support-the-armadeus-APF27-board.patch b/patches/u-boot/2013.04/301-imx27-Add-missing-constant-to-support-the-armadeus-APF27-board.patch
new file mode 100644
index 0000000..74a645b
--- /dev/null
+++ b/patches/u-boot/2013.04/301-imx27-Add-missing-constant-to-support-the-armadeus-APF27-board.patch
@@ -0,0 +1,49 @@
+Add some missing constant (chip select, ...), and
+a file mxc_nand.h with the NFC constant.
+
+Signed-off-by: Philippe Reynes <tr...@ya...>
+Signed-off-by: Eric Jarrige <eri...@ar...>
+---
+ arch/arm/cpu/arm926ejs/mx27/asm-offsets.c | 5 +++++
+ arch/arm/include/asm/arch-mx27/imx-regs.h | 3 ++-
+ 2 files changed, 7 insertions(+), 1 deletions(-)
+
+diff --git a/arch/arm/cpu/arm926ejs/mx27/asm-offsets.c b/arch/arm/cpu/arm926ejs/mx27/asm-offsets.c
+index f3a8d7b..215c562 100644
+--- a/arch/arm/cpu/arm926ejs/mx27/asm-offsets.c
++++ b/arch/arm/cpu/arm926ejs/mx27/asm-offsets.c
+@@ -41,5 +41,10 @@ int main(void)
+ DEFINE(ESDCFG1_ROF, offsetof(struct esdramc_regs, esdcfg1));
+ DEFINE(ESDMISC_ROF, offsetof(struct esdramc_regs, esdmisc));
+
++ DEFINE(GPCR, IMX_SYSTEM_CTL_BASE +
++ offsetof(struct system_control_regs, gpcr));
++ DEFINE(FMCR, IMX_SYSTEM_CTL_BASE +
++ offsetof(struct system_control_regs, fmcr));
++
+ return 0;
+ }
+diff --git a/arch/arm/include/asm/arch-mx27/imx-regs.h b/arch/arm/include/asm/arch-mx27/imx-regs.h
+index 8867e9f..707ca4b 100644
+--- a/arch/arm/include/asm/arch-mx27/imx-regs.h
++++ b/arch/arm/include/asm/arch-mx27/imx-regs.h
+@@ -185,7 +185,7 @@ struct iim_regs {
+ struct fuse_bank {
+ u32 fuse_regs[0x20];
+ u32 fuse_rsvd[0xe0];
+- } bank[1];
++ } bank[2];
+ };
+
+ struct fuse_bank0_regs {
+@@ -225,6 +225,7 @@ struct fuse_bank0_regs {
+ #define IIM_BASE_ADDR IMX_IIM_BASE
+ #define IMX_FEC_BASE (0x2b000 + IMX_IO_BASE)
+
++#define IMX_NFC_BASE (0xD8000000)
+ #define IMX_ESD_BASE (0xD8001000)
+ #define IMX_WEIM_BASE (0xD8002000)
+
+--
+1.7.4.4
+
diff --git a/patches/u-boot/2013.04/301-imx27-add-function-enable_caches.patch b/patches/u-boot/2013.04/301-imx27-add-function-enable_caches.patch
new file mode 100644
index 0000000..6c19eda
--- /dev/null
+++ b/patches/u-boot/2013.04/301-imx27-add-function-enable_caches.patch
@@ -0,0 +1,26 @@
+mx27: add function enable_caches
+
+Signed-off-by: Philippe Reynes <tr...@ya...>
+Signed-off-by: Eric Jarrige <eri...@ar...>
+---
+ arch/arm/cpu/arm926ejs/mx27/generic.c | 6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/arch/arm/cpu/arm926ejs/mx27/generic.c b/arch/arm/cpu/arm926ejs/mx27/generic.c
+index 41bb84b..4239fa0 100644
+--- a/arch/arm/cpu/arm926ejs/mx27/generic.c
++++ b/arch/arm/cpu/arm926ejs/mx27/generic.c
+@@ -380,3 +380,9 @@ void mx27_sd2_init_pins(void)
+
+ }
+ #endif /* CONFIG_MXC_MMC */
++
++void enable_caches(void)
++{
++ /* Enable D-cache. I-cache is already enabled in start.S */
++ dcache_enable();
++}
+--
+1.7.4.4
+
+
diff --git a/patches/u-boot/2013.01.01/302-apf27-add-support-for-the-armadeus-APF27-board.patch b/patches/u-boot/2013.04/302-apf27-add-support-for-the-armadeus-APF27-board.patch
similarity index 67%
copy from patches/u-boot/2013.01.01/302-apf27-add-support-for-the-armadeus-APF27-board.patch
copy to patches/u-boot/2013.04/302-apf27-add-support-for-the-armadeus-APF27-board.patch
index f4df5bf..b99faaf 100644
--- a/patches/u-boot/2013.01.01/302-apf27-add-support-for-the-armadeus-APF27-board.patch
+++ b/patches/u-boot/2013.04/302-apf27-add-support-for-the-armadeus-APF27-board.patch
@@ -4,33 +4,42 @@ Signed-off-by: Philippe Reynes <tr...@ya...>
Signed-off-by: Eric Jarrige <eri...@ar...>
Signed-off-by: Nicolas Colombain <nic...@ar...>
---
+ MAINTAINERS | 5 +
+ board/armadeus/apf27/Makefile | 51 ++++
+ board/armadeus/apf27/apf27.c | 362 +++++++++++++++++++++++++++++
+ board/armadeus/apf27/apf27.h | 450 ++++++++++++++++++++++++++++++++++++
+ board/armadeus/apf27/splboot.S | 500 ++++++++++++++++++++++++++++++++++++++++
+ boards.cfg | 1 +
+ include/configs/apf27.h | 448 +++++++++++++++++++++++++++++++++++
+ 7 files changed, 1817 insertions(+), 0 deletions(-)
create mode 100644 board/armadeus/apf27/Makefile
create mode 100644 board/armadeus/apf27/apf27.c
create mode 100644 board/armadeus/apf27/apf27.h
+ create mode 100644 board/armadeus/apf27/splboot.S
create mode 100644 include/configs/apf27.h
diff --git a/MAINTAINERS b/MAINTAINERS
-index 1b2da94..297467a 100644
+index 7c12d95..445527d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -1028,6 +1028,11 @@ Nobuhiro Iwamatsu <nob...@re...>
-
- nokia_rx51 ARM ARMV7 (OMAP34xx SoC)
+@@ -712,6 +712,11 @@ Ilko Iliev <il...@ro...>
+ PM9263 AT91SAM9263
+ PM9G45 ARM926EJS (AT91SAM9G45 SoC)
+Eric Jarrige <eri...@ar...>
+Philippe Reynes <tr...@ya...>
+
-+ apf27 ARM926EJS (imx27 SoC)
++ apf27 ARM926EJS (i.MX27 SoC)
+
- -------------------------------------------------------------------------
+ Michael Jones <mic...@ma...>
- Unknown / orphaned boards:
+ omap3_mvblx ARM ARMV7 (OMAP3xx SoC)
diff --git a/board/armadeus/apf27/Makefile b/board/armadeus/apf27/Makefile
new file mode 100644
-index 0000000..1da9548
+index 0000000..08d5d8d
--- /dev/null
+++ b/board/armadeus/apf27/Makefile
-@@ -0,0 +1,45 @@
+@@ -0,0 +1,51 @@
+#
+# (C) Copyright 2000-2004
+# Wolfgang Denk, DENX Software Engineering, wd...@de....
@@ -60,9 +69,15 @@ index 0000000..1da9548
+
+LIB = $(obj)lib$(BOARD).o
+
++ifndef CONFIG_SPL_BUILD
+COBJS := apf27.o
++endif
++
++ifdef CONFIG_SPL_BUILD
++SOBJS := splboot.o
++endif
+
-+SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
++SRCS := $(COBJS:.o=.c) $(SOBJS:.o=.S)
+OBJS := $(addprefix $(obj),$(COBJS))
+SOBJS := $(addprefix $(obj),$(SOBJS))
+
@@ -78,10 +93,10 @@ index 0000000..1da9548
+#########################################################################
diff --git a/board/armadeus/apf27/apf27.c b/board/armadeus/apf27/apf27.c
new file mode 100644
-index 0000000..bf3e5ec
+index 0000000..fce3325
--- /dev/null
+++ b/board/armadeus/apf27/apf27.c
-@@ -0,0 +1,423 @@
+@@ -0,0 +1,356 @@
+/*
+ * Copyright (C) 2007 Sascha Hauer, Pengutronix
+ * Copyright (C) 2008-2012 Eric Jarrige <eri...@ar...>
@@ -104,7 +119,7 @@ index 0000000..bf3e5ec
+ */
+
+#include <common.h>
-+#include "crc.h"
++#include <environment.h>
+#include <jffs2/jffs2.h>
+#include <nand.h>
+#include <netdev.h>
@@ -112,20 +127,28 @@ index 0000000..bf3e5ec
+#include <asm/arch/imx-regs.h>
+#include <asm/arch/gpio.h>
+#include <asm/errno.h>
-+#include <environment.h>
+#include "apf27.h"
++#include "crc.h"
+
+DECLARE_GLOBAL_DATA_PTR;
+
++static inline void wait(void)
++{
++ int i;
++
++ for (i = 0; i < 0x10000; i++)
++ asm volatile ("nop");
++}
++
+/*
+ * Fuse bank 1 row 8 is "reserved for future use" and therefore available for
-+ * custormer use. The APF27 board uses this fuse to store the board revision:
++ * customer use. The APF27 board uses this fuse to store the board revision:
+ * 0: initial board revision
+ * 1: first revision - Presence of the second RAM chip on the board is blown in
+ * fuse bank 1 row 9 bit 0 - No hardware change
+ * N: to be defined
+ */
-+u32 get_board_rev(void)
++static u32 get_board_rev(void)
+{
+ struct iim_regs *iim = (struct iim_regs *)IMX_IIM_BASE;
+
@@ -134,12 +157,12 @@ index 0000000..bf3e5ec
+
+/*
+ * Fuse bank 1 row 9 is "reserved for future use" and therefore available for
-+ * custormer use. The APF27 board revision 1 uses the bit 0 to permanently store
++ * customer use. The APF27 board revision 1 uses the bit 0 to permanently store
+ * the presence of the second RAM chip
+ * 0: AFP27 with 1 RAM of 64 MiB
+ * 1: AFP27 with 2 RAM chips of 64 MiB each (128MB)
+ */
-+int get_num_ram_bank(void)
++static int get_num_ram_bank(void)
+{
+ struct iim_regs *iim = (struct iim_regs *)IMX_IIM_BASE;
+ int nr_dram_banks = 1;
@@ -152,109 +175,45 @@ index 0000000..bf3e5ec
+ return nr_dram_banks;
+}
+
-+static void apf27_gpio_init(void)
++static void apf27_port_init(int port, u32 gpio_dr, u32 ocr1, u32 ocr2,
++ u32 iconfa1, u32 iconfa2, u32 iconfb1, u32 iconfb2,
++ u32 icr1, u32 icr2, u32 imr, u32 gpio_dir, u32 gpr,
++ u32 puen, u32 gius)
+{
+ struct gpio_port_regs *regs = (struct gpio_port_regs *)IMX_GPIO_BASE;
+
-+ /* PORT A */
-+ writel(ACFG_DR_A_VAL, ®s->port[PORTA].gpio_dr);
-+ writel(ACFG_OCR1_A_VAL, ®s->port[PORTA].ocr1);
-+ writel(ACFG_OCR2_A_VAL, ®s->port[PORTA].ocr2);
-+ writel(ACFG_ICFA1_A_VAL, ®s->port[PORTA].iconfa1);
-+ writel(ACFG_ICFA2_A_VAL, ®s->port[PORTA].iconfa2);
-+ writel(ACFG_ICFB1_A_VAL, ®s->port[PORTA].iconfb1);
-+ writel(ACFG_ICFB2_A_VAL, ®s->port[PORTA].iconfb2);
-+ writel(ACFG_ICR1_A_VAL, ®s->port[PORTA].icr1);
-+ writel(ACFG_ICR2_A_VAL, ®s->port[PORTA].icr2);
-+ writel(ACFG_IMR_A_VAL, ®s->port[PORTA].imr);
-+ writel(ACFG_DDIR_A_VAL, ®s->port[PORTA].gpio_dir);
-+ writel(ACFG_GPR_A_VAL, ®s->port[PORTA].gpr);
-+ writel(ACFG_PUEN_A_VAL, ®s->port[PORTA].puen);
-+ writel(ACFG_GIUS_A_VAL, ®s->port[PORTA].gius);
-+
-+ /* PORT B */
-+ writel(ACFG_DR_B_VAL, ®s->port[PORTB].gpio_dr);
-+ writel(ACFG_OCR1_B_VAL, ®s->port[PORTB].ocr1);
-+ writel(ACFG_OCR2_B_VAL, ®s->port[PORTB].ocr2);
-+ writel(ACFG_ICFA1_B_VAL, ®s->port[PORTB].iconfa1);
-+ writel(ACFG_ICFA2_B_VAL, ®s->port[PORTB].iconfa2);
-+ writel(ACFG_ICFB1_B_VAL, ®s->port[PORTB].iconfb1);
-+ writel(ACFG_ICFB2_B_VAL, ®s->port[PORTB].iconfb2);
-+ writel(ACFG_ICR1_B_VAL, ®s->port[PORTB].icr1);
-+ writel(ACFG_ICR2_B_VAL, ®s->port[PORTB].icr2);
-+ writel(ACFG_IMR_B_VAL, ®s->port[PORTB].imr);
-+ writel(ACFG_DDIR_B_VAL, ®s->port[PORTB].gpio_dir);
-+ writel(ACFG_GPR_B_VAL, ®s->port[PORTB].gpr);
-+ writel(ACFG_PUEN_B_VAL, ®s->port[PORTB].puen);
-+ writel(ACFG_GIUS_B_VAL, ®s->port[PORTB].gius);
-+
-+ /* PORT C */
-+ writel(ACFG_DR_C_VAL, ®s->port[PORTC].gpio_dr);
-+ writel(ACFG_OCR1_C_VAL, ®s->port[PORTC].ocr1);
-+ writel(ACFG_OCR2_C_VAL, ®s->port[PORTC].ocr2);
-+ writel(ACFG_ICFA1_C_VAL, ®s->port[PORTC].iconfa1);
-+ writel(ACFG_ICFA2_C_VAL, ®s->port[PORTC].iconfa2);
-+ writel(ACFG_ICFB1_C_VAL, ®s->port[PORTC].iconfb1);
-+ writel(ACFG_ICFB2_C_VAL, ®s->port[PORTC].iconfb2);
-+ writel(ACFG_ICR1_C_VAL, ®s->port[PORTC].icr1);
-+ writel(ACFG_ICR2_C_VAL, ®s->port[PORTC].icr2);
-+ writel(ACFG_IMR_C_VAL, ®s->port[PORTC].imr);
-+ writel(ACFG_DDIR_C_VAL, ®s->port[PORTC].gpio_dir);
-+ writel(ACFG_GPR_C_VAL, ®s->port[PORTC].gpr);
-+ writel(ACFG_PUEN_C_VAL, ®s->port[PORTC].puen);
-+ writel(ACFG_GIUS_C_VAL, ®s->port[PORTC].gius);
-+
-+ /* PORT D */
-+ writel(ACFG_DR_D_VAL, ®s->port[PORTD].gpio_dr);
-+ writel(ACFG_OCR1_D_VAL, ®s->port[PORTD].ocr1);
-+ writel(ACFG_OCR2_D_VAL, ®s->port[PORTD].ocr2);
-+ writel(ACFG_ICFA1_D_VAL, ®s->port[PORTD].iconfa1);
-+ writel(ACFG_ICFA2_D_VAL, ®s->port[PORTD].iconfa2);
-+ writel(ACFG_ICFB1_D_VAL, ®s->port[PORTD].iconfb1);
-+ writel(ACFG_ICFB2_D_VAL, ®s->port[PORTD].iconfb2);
-+ writel(ACFG_ICR1_D_VAL, ®s->port[PORTD].icr1);
-+ writel(ACFG_ICR2_D_VAL, ®s->port[PORTD].icr2);
-+ writel(ACFG_IMR_D_VAL, ®s->port[PORTD].imr);
-+ writel(ACFG_DDIR_D_VAL, ®s->port[PORTD].gpio_dir);
-+ writel(ACFG_GPR_D_VAL, ®s->port[PORTD].gpr);
-+ writel(ACFG_PUEN_D_VAL, ®s->port[PORTD].puen);
-+ writel(ACFG_GIUS_D_VAL, ®s->port[PORTD].gius);
-+
-+ /* PORT E */
-+ writel(ACFG_DR_E_VAL, ®s->port[PORTE].gpio_dr);
-+ writel(ACFG_OCR1_E_VAL, ®s->port[PORTE].ocr1);
-+ writel(ACFG_OCR2_E_VAL, ®s->port[PORTE].ocr2);
-+ writel(ACFG_ICFA1_E_VAL, ®s->port[PORTE].iconfa1);
-+ writel(ACFG_ICFA2_E_VAL, ®s->port[PORTE].iconfa2);
-+ writel(ACFG_ICFB1_E_VAL, ®s->port[PORTE].iconfb1);
-+ writel(ACFG_ICFB2_E_VAL, ®s->port[PORTE].iconfb2);
-+ writel(ACFG_ICR1_E_VAL, ®s->port[PORTE].icr1);
-+ writel(ACFG_ICR2_E_VAL, ®s->port[PORTE].icr2);
-+ writel(ACFG_IMR_E_VAL, ®s->port[PORTE].imr);
-+ writel(ACFG_DDIR_E_VAL, ®s->port[PORTE].gpio_dir);
-+ writel(ACFG_GPR_E_VAL, ®s->port[PORTE].gpr);
-+ writel(ACFG_PUEN_E_VAL, ®s->port[PORTE].puen);
-+ writel(ACFG_GIUS_E_VAL, ®s->port[PORTE].gius);
-+
-+ /* PORT F */
-+ writel(ACFG_DR_F_VAL, ®s->port[PORTF].gpio_dr);
-+ writel(ACFG_OCR1_F_VAL, ®s->port[PORTF].ocr1);
-+ writel(ACFG_OCR2_F_VAL, ®s->port[PORTF].ocr2);
-+ writel(ACFG_ICFA1_F_VAL, ®s->port[PORTF].iconfa1);
-+ writel(ACFG_ICFA2_F_VAL, ®s->port[PORTF].iconfa2);
-+ writel(ACFG_ICFB1_F_VAL, ®s->port[PORTF].iconfb1);
-+ writel(ACFG_ICFB2_F_VAL, ®s->port[PORTF].iconfb2);
-+ writel(ACFG_ICR1_F_VAL, ®s->port[PORTF].icr1);
-+ writel(ACFG_ICR2_F_VAL, ®s->port[PORTF].icr2);
-+ writel(ACFG_IMR_F_VAL, ®s->port[PORTF].imr);
-+ writel(ACFG_DDIR_F_VAL, ®s->port[PORTF].gpio_dir);
-+ writel(ACFG_GPR_F_VAL, ®s->port[PORTF].gpr);
-+ writel(ACFG_PUEN_F_VAL, ®s->port[PORTF].puen);
-+ writel(ACFG_GIUS_F_VAL, ®s->port[PORTF].gius);
++ writel(gpio_dr, ®s->port[port].gpio_dr);
++ writel(ocr1, ®s->port[port].ocr1);
++ writel(ocr2, ®s->port[port].ocr2);
++ writel(iconfa1, ®s->port[port].iconfa1);
++ writel(iconfa2, ®s->port[port].iconfa2);
++ writel(iconfb1, ®s->port[port].iconfb1);
++ writel(iconfb2, ®s->port[port].iconfb2);
++ writel(icr1, ®s->port[port].icr1);
++ writel(icr2, ®s->port[port].icr2);
++ writel(imr, ®s->port[port].imr);
++ writel(gpio_dir, ®s->port[port].gpio_dir);
++ writel(gpr, ®s->port[port].gpr);
++ writel(puen, ®s->port[port].puen);
++ writel(gius, ®s->port[port].gius);
+}
+
-+void bus_i2c_init(void *base, int speed, int slave_addr,
-+ int (*idle_bus_fn)(void *p), void *p);
++#define APF27_PORT_INIT(n) apf27_port_init(PORT##n, ACFG_DR_##n##_VAL, \
++ ACFG_OCR1_##n##_VAL, ACFG_OCR2_##n##_VAL, ACFG_ICFA1_##n##_VAL, \
++ ACFG_ICFA2_##n##_VAL, ACFG_ICFB1_##n##_VAL, ACFG_ICFB2_##n##_VAL, \
++ ACFG_ICR1_##n##_VAL, ACFG_ICR2_##n##_VAL, ACFG_IMR_##n##_VAL, \
++ ACFG_DDIR_##n##_VAL, ACFG_GPR_##n##_VAL, ACFG_PUEN_##n##_VAL, \
++ ACFG_GIUS_##n##_VAL)
++
++void apf27_gpio_init(void)
++{
++ APF27_PORT_INIT(A);
++ APF27_PORT_INIT(B);
++ APF27_PORT_INIT(C);
++ APF27_PORT_INIT(D);
++ APF27_PORT_INIT(E);
++ APF27_PORT_INIT(F);
++}
+
+static int apf27_devices_init(void)
+{
@@ -294,13 +253,13 @@ index 0000000..bf3e5ec
+ mx27_sd2_init_pins();
+ imx_gpio_mode((GPIO_PORTF | GPIO_OUT | GPIO_PUEN | GPIO_GPIO | 16));
+ writel(readl(®s->port[PORTF].gpio_dr) | (1 << 16),
-+ ®s->port[PORTF].gpio_dr);
++ ®s->port[PORTF].gpio_dr);
+#endif
+#if defined(CONFIG_I2C_MXC) && defined(CONFIG_I2C_MULTI_BUS)
+ bus_i2c_init(IMX_I2C1_BASE, CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE,
-+ NULL, NULL);
++ NULL, NULL);
+ bus_i2c_init(IMX_I2C2_BASE, CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE,
-+ NULL, NULL);
++ NULL, NULL);
+#endif
+ return 0;
+}
@@ -309,7 +268,7 @@ index 0000000..bf3e5ec
+{
+ struct aipi_regs *aipi1 = (struct aipi_regs *)IMX_AIPI1_BASE;
+ struct aipi_regs *aipi2 = (struct aipi_regs *)IMX_AIPI2_BASE;
-+ struct system_control_regs *system = \
++ struct system_control_regs *system =
+ (struct system_control_regs *)IMX_SYSTEM_CTL_BASE;
+ u32 gpcr;
+
@@ -358,33 +317,31 @@ index 0000000..bf3e5ec
+
+static void board_setup_port(void)
+{
-+ struct system_control_regs *system = \
++ struct system_control_regs *system =
+ (struct system_control_regs *)IMX_SYSTEM_CTL_BASE;
+
+ writel(ACFG_FMCR_VAL, &system->fmcr);
+}
+
-+static void board_setup_clock()
++static void board_setup_clock(void)
+{
+ struct pll_regs *pll = (struct pll_regs *)IMX_PLL_BASE;
-+ volatile int wait = 0x1000;
+ u32 cscr;
+
+ /* disable MPLL/SPLL first */
+ cscr = readl(&pll->cscr);
-+ cscr &= ~(CSCR_MPEN|CSCR_SPEN);
++ cscr &= ~(CSCR_MPEN | CSCR_SPEN);
+ writel(cscr, &pll->cscr);
+
+ /* pll clock initialization */
+ writel(ACFG_MPCTL0_VAL, &pll->mpctl0);
+ writel(ACFG_SPCTL0_VAL, &pll->spctl0);
+
-+ cscr = ACFG_CSCR_VAL|CSCR_MPLL_RESTART|CSCR_SPLL_RESTART;
++ cscr = ACFG_CSCR_VAL | CSCR_MPLL_RESTART | CSCR_SPLL_RESTART;
+ writel(cscr, &pll->cscr);
+
+ /* add some delay here */
-+ while (wait)
-+ wait--;
++ wait();
+
+ /* peripheral clock divider */
+ writel(ACFG_PCDR0_VAL, &pll->pcdr0);
@@ -405,8 +362,7 @@ index 0000000..bf3e5ec
+ return 0;
+}
+
-+int
-+board_init(void)
++int board_init(void)
+{
+ gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
+
@@ -416,8 +372,7 @@ index 0000000..bf3e5ec
+ return 0;
+}
+
-+int
-+dram_init(void)
++int dram_init(void)
+{
+ /* dram_init must store complete ramsize in gd->ram_size */
+ if (get_num_ram_bank() > 1) {
@@ -435,37 +390,32 @@ index 0000000..bf3e5ec
+{
+ phys_size_t ramsize = gd->ram_size;
+
-+ if (get_num_ram_bank() > 1) {
++ if (get_num_ram_bank() > 1)
+ ramsize -= PHYS_SDRAM_2 - CONFIG_SYS_SDRAM_BASE;
-+ }
+
+ gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
+ gd->bd->bi_dram[0].size = ramsize;
-+ gd->ram_size = gd->bd->bi_dram[0].size;
-+
-+ if (CONFIG_NR_DRAM_BANKS > 1) {
-+ gd->bd->bi_dram[1].start = PHYS_SDRAM_2;
-+ if (get_num_ram_bank() > 1) {
-+ gd->bd->bi_dram[1].size = ramsize;
-+ } else {
-+ gd->bd->bi_dram[1].size = 0;
-+ }
-+ gd->ram_size += gd->bd->bi_dram[1].size;
-+ }
++ gd->bd->bi_dram[1].start = PHYS_SDRAM_2;
++ if (get_num_ram_bank() > 1)
++ gd->bd->bi_dram[1].size = ramsize;
++ else
++ gd->bd->bi_dram[1].size = 0;
++ gd->ram_size = gd->bd->bi_dram[0].size + gd->bd->bi_dram[1].size;
+}
+
+/*
-+ * Miscellaneous intialization
++ * Miscellaneous initialisation
+ */
-+int
-+misc_init_r(void)
++int misc_init_r(void)
+{
+ char *s;
-+ u_char * firmware_buffer = (u_char *)(CONFIG_SYS_LOAD_ADDR + \
++ u_char *firmware_buffer = (u_char *)(CONFIG_SYS_LOAD_ADDR +
+ CONFIG_SYS_MONITOR_LEN);
+ size_t size = 0;
+ size_t offset = -1;
++#if defined(CONFIG_FPGA)
+ char *autoload = getenv("firmware_autoload");
++#endif
+ u8 pnum;
+ struct mtd_device *dev;
+ struct part_info *part;
@@ -473,17 +423,19 @@ index 0000000..bf3e5ec
+ /* detect compatibility issue of environment version */
+ s = getenv("env_version");
+ if ((NULL == s) || (0 != strcmp(s, CONFIG_ENV_VERSION))) {
-+ char * const vars[] = {"flash_reset_env"};
-+ printf("*** Warning - Environment version change suggests: "
-+ "run flash_reset_env; reset\n");
++ char *const vars[] = {"flash_reset_env"};
++ printf("*** Warning - Environment version change suggests: ");
++ printf("run flash_reset_env; reset\n");
+ set_default_vars(1, vars);
+ }
+
+ /* Unlock whole flash but U-Boot */
-+ s = getenv("env_offset");
-+ offset = CONFIG_ENV_OFFSET;
-+ if ((s != NULL) && (0 != strcmp(s, "0")))
-+ offset = simple_strtoul(s, NULL, 16);
++ if (mtdparts_init() == 0) {
++ if (find_dev_and_part("u-boot",
++ &dev, &pnum, &part) == 0) {
++ offset = part->size;
++ }
++ }
+
+ if (nand_unlock(&nand_info[0], offset, nand_info[0].size - offset, 0))
+ printf("NAND flash lock/unlocked failed\n");
@@ -498,19 +450,15 @@ index 0000000..bf3e5ec
+ return 0;
+}
+
-+void enable_caches(void)
++void lowlevel_init(void)
+{
-+ /* Enable D-cache. I-cache is already enabled in start.S */
-+ dcache_enable();
+}
-+
-+inline void lowlevel_init(void) {}
diff --git a/board/armadeus/apf27/apf27.h b/board/armadeus/apf27/apf27.h
new file mode 100644
-index 0000000..bb007e8
+index 0000000..b0a4473
--- /dev/null
+++ b/board/armadeus/apf27/apf27.h
-@@ -0,0 +1,477 @@
+@@ -0,0 +1,450 @@
+#ifndef __APF27_H
+#define __APF27_H
+
@@ -527,42 +475,20 @@ index 0000000..bb007e8
+#define ACFG_FPGA_SUSPEND (GPIO_PORTF | 10) /* FPGA done pin */
+#define ACFG_FPGA_RESET (GPIO_PORTF | 7) /* FPGA done pin */
+
-+/* MPU CLOCK source before PLL */
-+/* ACFG_CLK_FREQ (2/3 MPLL clock or ext 266 MHZ) */
-+#ifndef CONFIG_MX27_CLK26
-+#if (CONFIG_MX27_CLK32 == 32000)
-+#define ACFG_MPCTL0_VAL 0x00211803 /* 398.998 MHz */
-+#define ACFG_MPCTL1_VAL 0
-+#define CONFIG_MPLL_FREQ 399
-+#else /* CONFIG_MX27_CLK32 == 32768*/
++/*
++ * MPU CLOCK source before PLL
++ * ACFG_CLK_FREQ (2/3 MPLL clock or ext 266 MHZ)
++ */
+#define ACFG_MPCTL0_VAL 0x01EF15D5 /* 399.000 MHz */
+#define ACFG_MPCTL1_VAL 0
+#define CONFIG_MPLL_FREQ 399
-+#endif /* CONFIG_MX27_CLK32 */
-+#else /* CONFIG_MX27_CLK26 in use*/
-+#define ACFG_MPCTL0_VAL 0x00331C23 /* 399.000 MHz */
-+#define ACFG_MPCTL1_VAL 0
-+#define CONFIG_MPLL_FREQ 399
-+#endif /* CONFIG_MX27_CLK26 */
+
+#define ACFG_CLK_FREQ (CONFIG_MPLL_FREQ*2/3) /* 266 MHz */
+
+/* Serial clock source before PLL (should be named ACFG_SYSPLL_CLK_FREQ)*/
-+#ifndef CONFIG_MX27_CLK26
-+#if (CONFIG_MX27_CLK32 == 32000)
-+#define ACFG_SPCTL0_VAL 0x04A02419 /* 300.00020 MHz */
-+#define ACFG_SPCTL1_VAL 0
-+#define CONFIG_SPLL_FREQ 300 /* MHz */
-+#else /* CONFIG_MX27_CLK32 == 32768*/
+#define ACFG_SPCTL0_VAL 0x0475206F /* 299.99937 MHz */
+#define ACFG_SPCTL1_VAL 0
+#define CONFIG_SPLL_FREQ 300 /* MHz */
-+#endif /* CONFIG_MX27_CLK32 */
-+#else /* CONFIG_MX27_CLK26 in use*/
-+#define ACFG_SPCTL0_VAL 0x040C2C07 /* 300 MHz */
-+#define ACFG_SPCTL1_VAL 0x0
-+#define CONFIG_SPLL_FREQ 300 /* MHz */
-+#endif /* CONFIG_MX27_CLK26 */
+
+/* ARM bus frequency (have to be a CONFIG_MPLL_FREQ ratio) */
+#define CONFIG_ARM_FREQ 399 /* up to 400 MHz */
@@ -752,7 +678,11 @@ index 0000000..bb007e8
+
+#define ACFG_EIM_VAL 0x00002200
+
-+/* FPGA specific settings */
++
++/*
++ * FPGA specific settings
++ */
++
+/* CLKO */
+#define ACFG_CCSR_VAL 0x00000305
+/* drive strength CLKO set to 2*/
@@ -768,7 +698,6 @@ index 0000000..bb007e8
+/*
+ * Default configuration for GPIOs and peripherals
+ */
-+#ifndef ACFG_APF27_CUSTOM
+#define ACFG_DDIR_A_VAL 0x00000000
+#define ACFG_OCR1_A_VAL 0x00000000
+#define ACFG_OCR2_A_VAL 0x00000000
@@ -858,12 +787,11 @@ index 0000000..bb007e8
+#define ACFG_IMR_F_VAL 0x00000000
+#define ACFG_GPR_F_VAL 0x00000000
+#define ACFG_PUEN_F_VAL 0xFFFFFFFF
-+#endif /* ACFG_APF27_CUSTOM */
+
+/* Enforce DDR signal strengh & enable USB/PP/DMA burst override bits */
+#define ACFG_GPCR_VAL 0x0003000F
+
-+#define ACFG_ESDMISC_VAL ESDMISC_LHD+ESDMISC_MDDREN
++#define ACFG_ESDMISC_VAL ESDMISC_LHD+ESDMISC_MDDREN
+
+/* FMCR select num LPDDR RAMs and nand 16bits, 2KB pages */
+#if (CONFIG_NR_DRAM_BANKS == 1)
@@ -872,18 +800,14 @@ index 0000000..bb007e8
+#define ACFG_FMCR_VAL 0xFFFFFFFB
+#endif
+
-+#ifndef ACFG_APF27_CUSTOM
+#define ACFG_AIPI1_PSR0_VAL 0x20040304
+#define ACFG_AIPI1_PSR1_VAL 0xDFFBFCFB
+#define ACFG_AIPI2_PSR0_VAL 0x00000000
+#define ACFG_AIPI2_PSR1_VAL 0xFFFFFFFF
-+#endif /* ACFG_APF27_CUSTOM */
+
+/* PCCR enable DMA FEC I2C1 IIM SDHC1 */
-+#ifndef ACFG_APF27_CUSTOM
+#define ACFG_PCCR0_VAL 0x05070410
+#define ACFG_PCCR1_VAL 0xA14A0608
-+#endif /* ACFG_APF27_CUSTOM */
+
+/*
+ * From here, there should not be any user configuration.
@@ -891,15 +815,12 @@ index 0000000..bb007e8
+ */
+
+/* fixme none integer value (7.5ns) => 2*hclock = 15ns */
-+#define ACFG_2XHCLK_LGTH (2000/CONFIG_HCLK_FREQ) /* ns */
++#define ACFG_2XHCLK_LGTH (2000/CONFIG_HCLK_FREQ) /* ns */
+
+/* USB 60 MHz ; ARM up to 400; HClK up to 133MHz*/
-+#ifdef CONFIG_MX27_CLK26
-+#define CSCR_MASK 0x0303800D
-+#else
+#define CSCR_MASK 0x0300800D
-+#endif
-+#define ACFG_CSCR_VAL\
++
++#define ACFG_CSCR_VAL \
+ (CSCR_MASK \
+ |((((CONFIG_SPLL_FREQ/CONFIG_USB_FREQ)-1)&0x07) << 28) \
+ |((((CONFIG_MPLL_FREQ/CONFIG_ARM_FREQ)-1)&0x03) << 12) \
@@ -923,8 +844,8 @@ index 0000000..bb007e8
+ |((((ACFG_CLK_FREQ/CONFIG_PERIF4_FREQ)-1)&0x3F)<<24))
+
+/* SDRAM controller programming Values */
-+#if (((2*ACFG_SDRAM_CLOCK_CYCLE_CL_1) > (3*ACFG_2XHCLK_LGTH)) \
-+ || (ACFG_SDRAM_CLOCK_CYCLE_CL_1 < 1))
++#if (((2*ACFG_SDRAM_CLOCK_CYCLE_CL_1) > (3*ACFG_2XHCLK_LGTH)) || \
++ (ACFG_SDRAM_CLOCK_CYCLE_CL_1 < 1))
+#define REG_FIELD_SCL_VAL 3
+#define REG_FIELD_SCLIMX_VAL 0
+#else
@@ -988,24 +909,558 @@ index 0000000..bb007e8
+#define ACFG_SDRAM_PRECHARGE_ALL_VAL (1<<10)
+
+#endif /* __APF27_H */
+diff --git a/board/armadeus/apf27/splboot.S b/board/armadeus/apf27/splboot.S
+new file mode 100644
+index 0000000..bc30acc
+--- /dev/null
++++ b/board/armadeus/apf27/splboot.S
+@@ -0,0 +1,528 @@
++/*
++ * IMX27 NAND Flash SPL (Secondary Program Loader)
++ *
++ * Copyright (c) 2008 Armadeus Project / eja
++ *
++ * Based on Freescale NAND SPL
++ *
++ * Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
++ * Copyright (c) 2008-2012 Eric Jarrige <eri...@ar...>
++ *
++ * See file CREDITS for list of people who contributed to this
++ * project.
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * 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 <config.h>
++#include <generated/asm-offsets.h>
++#include <version.h>
++#include <asm/macro.h>
++#include <asm/arch/imx-regs.h>
++/* #include <linux/linkage.h> */
++#include "apf27.h"
++
++/*
++ * Standard NAND flash commands
++ */
++#define NAND_CMD_READ0 0
++
++/* Extended commands for large page devices */
++#define NAND_CMD_READSTART 0x30
++#define NAND_CMD_CACHEDPROG 0x15
++
++/* Status bits */
++#define NAND_STATUS_FAIL 0x01
++#define NAND_STATUS_FAIL_N1 0x02
++#define NAND_STATUS_TRUE_READY 0x20
++#define NAND_STATUS_READY 0x40
++#define NAND_STATUS_WP 0x80
++
++#define IMX_NFC_MAIN_AREA0 (0xD8000000)
++#define IMX_NFC_MAIN_AREA1 (0xD8000200)
++#define IMX_NFC_SPARE_AREA0 (0xD8000800)
++#define IMX_NFC_REGS (0xD8000E00)
++
++/*
++ * NFC registers address offset
++ */
++#define NFC_OFFSET_BUF_ADDR (0x04) /* Buffer Number for Page Data
++ Transfer To/From Flash Mem */
++#define NFC_OFFSET_FLASH_ADDR (0x06) /* NAND Flash Address */
++#define NFC_OFFSET_FLASH_CMD (0x08) /* NAND Flash Command */
++#define NFC_OFFSET_CONFIG (0x0A) /* NFC Internal Buffer Lock
++ Control */
++#define NFC_OFFSET_ECC_STATUS_RESULT (0x0C) /* Controller Status/Result of
++ Flash Operation */
++#define NFC_OFFSET_CONFIG1 (0x1A) /* Nand Flash Operation
++ Configuration 1 */
++#define NFC_OFFSET_CONFIG2 (0x1C) /* Nand Flash Operation
++ Configuration 2 */
++
++/* NFC_ECC_STATUS_RESULT Status Register Bit Fields */
++#define NFC_ECC_STAT_ERM_SHFT (2) /* ERM shift */
++#define NFC_ECC_STAT_ERROR2 (1<<1) /* non correctable error */
++
++/* NFC_CONFIG Control Register Bit Fields */
++#define NFC_CONFIG_UNLOCKED (1<<1) /* unlocked */
++
++/* NFC_CONFIG1 Control Register Bit Fields */
++#define NFC_CONFIG1_ECC_EN (1<<3)
++#define NFC_CONFIG1_INT_MSK (1<<4)
++
++/* NFC_CONFIG2 Control Register Bit Fields */
++#define NFC_CONFIG2_INT (1<<15) /* Interrupt */
++#define NFC_CONFIG2_FDO_PAGE (1<<3) /* Flash data output */
++#define NFC_CONFIG2_FDI (1<<2) /* Flash data input */
++#define NFC_CONFIG2_FADD (1<<1) /* Flash address input */
++#define NFC_CONFIG2_FCMD (1<<0) /* Flash command input */
++
++ .macro nand_boot
++
++#ifdef CONFIG_BOOT_TRACE_REG
++/*
++ * If CONFIG_BOOT_TRACE_REG is a SDRAM address then be sure to use the following
++ * 2 command after SDRAM init
++ */
++
++/* Backup state of previous boot to CONFIG_BOOT_TRACE_REG+4*/
++#define BACKUP_TRACE() \
++ ldr r4, =CONFIG_BOOT_TRACE_REG; \
++ ldr r3, [r4]; \
++ str r3, [r4, #0x04];
++
++/* Save a state of boot at CONFIG_BOOT_TRACE_REG */
++#define BOOT_TRACE(val) \
++ ldr r4, =CONFIG_BOOT_TRACE_REG; \
++ ldr r3, =val; \
++ str r3, [r4];
++#else
++#define BACKUP_TRACE()
++#define BOOT_TRACE(val)
++#endif
++
++nand_boot_setup:
++
++ /* Copy SPL image from flash to SDRAM first */
++ BOOT_TRACE(1)
++ ldr r0, =IMX_NFC_MAIN_AREA0
++ add r2, r0, #(IMX_NFC_SPARE_AREA0-IMX_NFC_MAIN_AREA0) //2KB NFC Buff
++ ldr r1, =CONFIG_SYS_NAND_U_BOOT_DST
++
++ BOOT_TRACE(2)
++1: ldmia r0!, {r3-r10}
++ stmia r1!, {r3-r10}
++ cmp r0, r2
++ blo 1b
++
++
++
++ /* Jump to SDRAM */
++ BOOT_TRACE(3)
++ ldr r1, =0x7FF
++ and r0, pc, r1 /* offset of pc */
++ ldr r1, =CONFIG_SYS_NAND_U_BOOT_DST
++ add r1, r1, #0x10
++ add pc, r0, r1
++ nop
++ nop
++ nop
++ nop
++
++nand_copy_main:
++ BOOT_TRACE(4)
++ /* r0: nfc base. Reloaded after each page copying */
++ ldr r0, =IMX_NFC_MAIN_AREA0
++
++ /* r1: starting flash addr to be copied. Updated constantly */
++ /* bypass the first preloaded pages */
++ ldr r1, =(IMX_NFC_SPARE_AREA0-IMX_NFC_MAIN_AREA0)
++
++ /* r2: end of 1st RAM buf. Doesn't change */
++ ldr r2, =IMX_NFC_MAIN_AREA1
++
++ /* r12: NFC register base. Doesn't change */
++ ldr r12, =IMX_NFC_REGS
++
++ ldr r11, =CONFIG_SYS_NAND_U_BOOT_DST
++
++ /* r13: end of SDRAM address for copying. Doesn't change */
++ add r13, r11, #CONFIG_SYS_NAND_U_BOOT_SIZE
++
++ /* r11: starting SDRAM address for copying. Updated constantly */
++ add r11, r11, r1
++
++ /* unlock internal buffer */
++ ldr r3, =NFC_CONFIG_UNLOCKED
++ strh r3, [r12, #NFC_OFFSET_CONFIG]
++
++ /* enable ECC and mask interrupts */
++ ldr r3, =(NFC_CONFIG1_ECC_EN | NFC_CONFIG1_INT_MSK)
++ strh r3, [r12, #NFC_OFFSET_CONFIG1]
++
++nfc_read_page:
++ BOOT_TRACE(5)
++ /* send NAND_CMD_READ0 command */
++ ldr r3, =NAND_CMD_READ0;
++ strh r3, [r12, #NFC_OFFSET_FLASH_CMD]
++
++ ldr r3, =NFC_CONFIG2_FCMD
++ strh r3, [r12, #NFC_OFFSET_CONFIG2]
++ bl do_wait_op_done
++
++ /* send NAND address to read. TODO small page support */
++ BOOT_TRACE(6)
++ mov r3, r1, lsr #1
++ bl do_addr_input /* 1st addr cycle */
++
++ mov r3, r1, lsr #9
++ and r3, r3, #0x03
++ bl do_addr_input /* 2nd addr cycle */
++
++ mov r3, r1, lsr #11
++ bl do_addr_input /* 3rd addr cycle */
++
++ mov r3, r1, lsr #19
++ bl do_addr_input /* 4th addr cycle */
++
++ /* Small NAND flashs (== 1Gb) support 5 addr cycles */
++ mov r3, r1, lsr #27
++ bl do_addr_input /* 5th addr cycle */
++
++ /* send NAND_CMD_READSTART command. TODO small page support */
++ BOOT_TRACE(7)
++ mov r3, #NAND_CMD_READSTART;
++ strh r3, [r12, #NFC_OFFSET_FLASH_CMD]
++ mov r3, #NFC_CONFIG2_FCMD
++ strh r3, [r12, #NFC_OFFSET_CONFIG2]
++ bl do_wait_op_done
++
++ /* read and copy buf 0 */
++ BOOT_TRACE(8)
++ mov r3, #0
++ strh r3, [r12, #NFC_OFFSET_BUF_ADDR]
++
++ mov r3, #NFC_CONFIG2_FDO_PAGE
++ strh r3, [r12, #NFC_OFFSET_CONFIG2]
++ bl do_wait_op_done
++
++ bl test_and_copy_buffer
++
++ /* read and copy buf 1 */
++ mov r3, #1
++ strh r3, [r12, #NFC_OFFSET_BUF_ADDR]
++
++ mov r3, #NFC_CONFIG2_FDO_PAGE
++ strh r3, [r12, #NFC_OFFSET_CONFIG2]
++ bl do_wait_op_done
++
++ bl test_and_copy_buffer
++
++ /* here we should test if 512B page flash and bypass next buffers */
++ /* read and copy buf 2. TODO small page support */
++ mov r3, #2
++ strh r3, [r12, #NFC_OFFSET_BUF_ADDR]
++
++ mov r3, #NFC_CONFIG2_FDO_PAGE
++ strh r3, [r12, #NFC_OFFSET_CONFIG2]
++ bl do_wait_op_done
++
++ bl test_and_copy_buffer
++
++ /* read and copy buf 3 */
++ mov r3, #3
++ strh r3, [r12, #NFC_OFFSET_BUF_ADDR]
++
++ mov r3, #NFC_CONFIG2_FDO_PAGE
++ strh r3, [r12, #NFC_OFFSET_CONFIG2]
++ bl do_wait_op_done
++
++ bl test_and_copy_buffer
++
++ /* is the last page ? */
++ BOOT_TRACE(12)
++ cmp r11, r13
++ bge nand_copy_main_done
++
++ /* r0: nfc base. Reloaded after each page copying */
++ ldr r0, =IMX_NFC_MAIN_AREA0
++ /* r2: end of 1st RAM buf. Doesn't change */
++ ldr r2, =IMX_NFC_MAIN_AREA1
++ b nfc_read_page
++
++nand_copy_main_done:
++ BOOT_TRACE(13)
++ .endm /* nand_boot */
++
++ .macro init_aipi
++ /*
++ * setup AIPI1 and AIPI2
++ */
++ write32 AIPI1_PSR0, ACFG_AIPI1_PSR0_VAL
++ write32 AIPI1_PSR1, ACFG_AIPI1_PSR1_VAL
++ write32 AIPI2_PSR0, ACFG_AIPI2_PSR0_VAL
++ write32 AIPI2_PSR1, ACFG_AIPI2_PSR1_VAL
++
++ /* Change SDRAM signal strengh */
++ ldr r0, =GPCR
++ ldr r1, =ACFG_GPCR_VAL
++ ldr r5, [r0]
++ orr r5, r5, r1
++ str r5, [r0]
++
++ .endm /* init_aipi */
++
++ .macro init_clock
++ ldr r0, =CSCR
++ /* disable MPLL/SPLL first */
++ ldr r1, [r0]
++ bic r1, r1, #(CSCR_MPEN|CSCR_SPEN)
++ str r1, [r0]
++
++ /*
++ * pll clock initialization predefined in apf27.h
++ */
++ write32 MPCTL0, ACFG_MPCTL0_VAL
++ write32 SPCTL0, ACFG_SPCTL0_VAL
++
++ write32 CSCR, ACFG_CSCR_VAL|CSCR_MPLL_RESTART|CSCR_SPLL_RESTART
++
++ /*
++ * add some delay here
++ */
++ mov r1, #0x1000
++ 1: subs r1, r1, #0x1
++ bne 1b
++
++ /* peripheral clock divider */
++ write32 PCDR0, ACFG_PCDR0_VAL
++ write32 PCDR1, ACFG_PCDR1_VAL
++
++ /* Configure PCCR0 and PCCR1 */
++ write32 PCCR0, ACFG_PCCR0_VAL
++ write32 PCCR1, ACFG_PCCR1_VAL
++
++ .endm /* init_clock */
++
++.globl board_init_f
++board_init_f:
++
++ /*
++ * invalidate I/D cache/TLB and drain write buffer
++ */
++ mov r0, #0
++ mcr p15, 0, r0, c7, c7, 0 /* invalidate I cache and D cache */
++ mcr p15, 0, r0, c8, c7, 0 /* invalidate TLBs */
++ mcr p15, 0, r0, c7, c10, 4 /* Drain the write buffer */
++
++ /*
++ * disable MMU stuff and caches
++ */
++ mrc p15, 0, r0, c1, c0, 0
++ bic r0, r0, #0x00002300 /* clear bits 13, 9:8 (--V- --RS) */
++ bic r0, r0, #0x00000087 /* clear bits 7, 2:0 (B--- -CAM) */
++ orr r0, r0, #0x00000002 /* set bit 2 (A) Align */
++ orr r0, r0, #0x00001000 /* set bit 12 (I) I-Cache */
++ mcr p15, 0, r0, c1, c0, 0
++
++init_aipi_start:
++ init_aipi
++
++ /* check if sdram has been setup (running within sdram) */
++ cmp pc, #0xa0000000 /* start of first sdram memory space */
++ blo init_clock_start
++ cmp pc, #0xc0000000 /* end of second sdram memory space */
++ blo regular_boot
++
++ /* running from sdram with full code present -> regular_boot */
++init_clock_start:
++ init_clock
++
++init_sdram_start:
++ bl setup_sdram_ddr
++
++ /* save state of previous boot (SDRAM is configured)*/
++ BACKUP_TRACE()
++
++ /* nand_boot BOOT_TRACE(1..13) */
++
++ nand_boot
++
++ BOOT_TRACE(14) /* start regular U-Boot */
++
++regular_boot: /* jump to start of next 2kiB block (U-Boot) */
++ ldr r0, =0xfffff800
++ and r0, r0, pc
++ add pc, r0, #0x800
++
++do_wait_op_done:
++ 1:
++ ldrh r3, [r12, #NFC_OFFSET_CONFIG2]
++ ands r3, r3, #NFC_CONFIG2_INT
++ beq 1b
++ mov r3, #0x0
++ strh r3, [r12, #NFC_OFFSET_CONFIG2]
++ mov pc, lr
++
++do_addr_input:
++ mov r9, lr
++ and r3, r3, #0xFF
++ strh r3, [r12, #NFC_OFFSET_FLASH_ADDR]
++ mov r3, #NFC_CONFIG2_FADD
++ strh r3, [r12, #NFC_OFFSET_CONFIG2]
++ bl do_wait_op_done
++ mov pc, r9
++
++test_and_copy_buffer:
++ /* check for bad block (2 bits error in main or spare are)*/
++ BOOT_TRACE(9)
++ ldrh r4, [r12, #NFC_OFFSET_ECC_STATUS_RESULT]
++ ands r4, r4, #(NFC_ECC_STAT_ERROR2| \
++ (NFC_ECC_STAT_ERROR2<<NFC_ECC_STAT_ERM_SHFT))
++ bne skip_bad_buffer
++
++ /* check BI byte of the current spare buffer */
++ ldr r4, =IMX_NFC_SPARE_AREA0
++ ldrh r3, [r12, #NFC_OFFSET_BUF_ADDR] /* for the current buffer */
++ orr r4, r3, lsl #0x04
++
++ /* at bi word offset 4. */
++ /* Fixme position change betwwen 8 and 16 bits bus */
++ ldrh r4, [r4, #0x04]
++ and r4, r4, #0x0FF00 /* has to be 0xFFxx */
++ cmp r4, #0x0FF00
++ bne skip_bad_buffer
++
++copy_good_buffer:
++ /* copying 512 bytes buffer */
++ BOOT_TRACE(10)
++1: ldmia r0!, {r3-r10}
++ stmia r11!, {r3-r10}
++ cmp r0, r2
++ blo 1b
++ b end_of_copy
++
++skip_bad_buffer:
++ BOOT_TRACE(11)
++ /* bad pages do not contain valid data and have to be skip */
++ add r0, r0, #0x200
++
++ /* rewind ram addr to start of buffer */
++ ldr r3, =(~0x1FF)
++ and r11, r11, r3
++
++end_of_copy:
++ add r2, r2, #0x200
++ add r1, r1, #0x200
++
++ mov pc, lr
++
++setup_sdram_ddr:
++
++ /* wait for SDRAM/LPDDR ready (SDRAMRDY) */
++ ldr r0, =IMX_ESD_BASE
++ ldr r4, =ESDMISC_SDRAM_RDY
++2: ldr r1, [r0, #ESDMISC_ROF]
++ ands r1, r1, r4
++ bpl 2b
++
++ /* LPDDR Soft Reset Mobile/Low Power DDR SDRAM. */
++ ldr r0, =IMX_ESD_BASE
++ ldr r4, =ACFG_ESDMISC_VAL
++ orr r1, r4, #ESDMISC_MDDR_DL_RST
++ str r1, [r0, #ESDMISC_ROF]
++
++ /* Hold for more than 200ns */
++ ldr r1, =0x10000
++1: subs r1, r1, #0x1
++ bne 1b
++
++ str r4, [r0]
++
++ ldr r0, =IMX_ESD_BASE
++ ldr r1, =ACFG_SDRAM_ESDCFG_REGISTER_VAL
++ str r1, [r0, #ESDCFG0_ROF]
++
++ ldr r0, =IMX_ESD_BASE
++ ldr r1, =ACFG_PRECHARGE_CMD
++ str r1, [r0, #ESDCTL0_ROF]
++
++ /* write8(0xA0001000, any value) */
++ ldr r1, =PHYS_SDRAM_1+ACFG_SDRAM_PRECHARGE_ALL_VAL
++ strb r2, [r1]
++
++ ldr r1, =ACFG_AUTOREFRESH_CMD
++ str r1, [r0, #ESDCTL0_ROF]
++
++ ldr r4, =PHYS_SDRAM_1 /* CSD0 base address */
++
++ ldr r6,=0x7 /* load loop counter */
++1: str r5,[r4] /* run auto-refresh cycle to array 0 */
++ subs r6,r6,#1
++ bne 1b
++
++ ldr r1, =ACFG_SET_MODE_REG_CMD
++ str r1, [r0, #ESDCTL0_ROF]
++
++ /* set standard mode register */
++ ldr r4, = PHYS_SDRAM_1+ACFG_SDRAM_MODE_REGISTER_VAL
++ strb r2, [r4]
++
++ /* set extended mode register */
++ ldr r4, =PHYS_SDRAM_1+ACFG_SDRAM_EXT_MODE_REGISTER_VAL
++ strb r5, [r4]
++
++ ldr r1, =ACFG_NORMAL_RW_CMD
++ str r1, [r0, #ESDCTL0_ROF]
++
++ /* 2nd sdram */
++ ldr r0, =IMX_ESD_BASE
++ ldr r1, =ACFG_SDRAM_ESDCFG_REGISTER_VAL
++ str r1, [r0, #ESDCFG1_ROF]
++
++ ldr r0, =IMX_ESD_BASE
++ ldr r1, =ACFG_PRECHARGE_CMD
++ str r1, [r0, #ESDCTL1_ROF]
++
++ /* write8(0xB0001000, any value) */
++ ldr r1, =PHYS_SDRAM_2+ACFG_SDRAM_PRECHARGE_ALL_VAL
++ strb r2, [r1]
++
++ ldr r1, =ACFG_AUTOREFRESH_CMD
++ str r1, [r0, #ESDCTL1_ROF]
++
++ ldr r4, =PHYS_SDRAM_2 /* CSD1 base address */
++
++ ldr r6,=0x7 /* load loop counter */
++1: str r5,[r4] /* run auto-refresh cycle to array 0 */
++ subs r6,r6,#1
++ bne 1b
++
++ ldr r1, =ACFG_SET_MODE_REG_CMD
++ str r1, [r0, #ESDCTL1_ROF]
++
++ /* set standard mode register */
++ ldr r4, =PHYS_SDRAM_2+ACFG_SDRAM_MODE_REGISTER_VAL
++ strb r2, [r4]
++
++ /* set extended mode register */
++ ldr r4, =PHYS_SDRAM_2+ACFG_SDRAM_EXT_MODE_REGISTER_VAL
++ strb r2, [r4]
++
++ ldr r1, =ACFG_NORMAL_RW_CMD
++ str r1, [r0, #ESDCTL1_ROF]
++
++ mov pc, lr
diff --git a/boards.cfg b/boards.cfg
-index 4c63789..72c49df 100644
+index 0e082a0..58072c0 100644
--- a/boards.cfg
+++ b/boards.cfg
-@@ -190,6 +190,7 @@ jadecpu arm arm926ejs jadecpu syteco
+@@ -191,6 +191,7 @@ jadecpu arm arm926ejs jadecpu syteco
mx25pdk arm arm926ejs mx25pdk freescale mx25 mx25pdk:IMX_CONFIG=board/freescale/mx25pdk/imximage.cfg
tx25 arm arm926ejs tx25 karo mx25
zmx25 arm arm926ejs zmx25 syteco mx25
+apf27 arm arm926ejs apf27 armadeus mx27
imx27lite arm arm926ejs imx27lite logicpd mx27
magnesium arm arm926ejs imx27lite logicpd mx27
- apx4devkit arm arm926ejs apx4devkit bluegiga mxs apx4devkit
+ mx23_olinuxino arm arm926ejs mx23_olinuxino olimex mxs mx23_olinuxino
diff --git a/include/configs/apf27.h b/include/configs/apf27.h
new file mode 100644
-index 0000000..5af347b
+index 0000000..e5e1dea
--- /dev/null
+++ b/include/configs/apf27.h
-@@ -0,0 +1,458 @@
+@@ -0,0 +1,448 @@
+/*
+ *
+ * Configuration settings for the Armadeus Project motherboard APF27
@@ -1033,7 +1488,7 @@ index 0000000..5af347b
+
+#define CONFIG_VERSION_VARIABLE
+#define CONFIG_ENV_VERSION "3.3"
-+#define CONFIG_IDENT_STRING " apf27 patch 3.8"
++#define CONFIG_IDENT_STRING " apf27 patch 3.9"
+#define CONFIG_BOARD_NAME apf27
+
+/*
@@ -1049,6 +1504,9 @@ index 0000000..5af347b
+#define CONFIG_SYS_NO_FLASH /* to be define before <config_cmd_default.h> */
+#define CONFIG_MISC_INIT_R
+#define CONFIG_BOARD_EARLY_INIT_F
++#ifdef CONFIG_SPL_BUILD
++#define CONFIG_SKIP_LOWLEVEL_INIT
++#endif
+
+/*
+ * Board display option
@@ -1065,18 +1523,16 @@ index 0000000..5af347b
+#define CONFIG_SYS_NAND_U_BOOT_SIZE CONFIG_SYS_MONITOR_LEN
+/* Build image with spl and u-boot */
+#define CONFIG_NAND_U_BOOT
-+#define CONFIG_SPL_PAD_TO 0xa1000000
++#define CONFIG_SPL_PAD_TO 0xa0000800
+
+/*
+ * SPL
+ */
+#define CONFIG_SPL
-+#define CONFIG_SPL_NO_CPU_SUPPORT_CODE
-+#define CONFIG_SPL_START_S_PATH "board/armadeus/apf27"
-+#define CONFIG_SPL_LDSCRIPT "board/armadeus/apf27/u-boot-spl.lds"
-+#define CONFIG_SPL_LIBCOMMON_SUPPORT
-+#define CONFIG_SPL_LIBGENERIC_SUPPORT
-+
++#define CONFIG_SPL_TEXT_BASE 0xa0000000
++#define CONFIG_SPL_STACK 0xffffff00
++#define CONFIG_SYS_NAND_U_BOOT_START 0xa0000800
++#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x800
+
+/*
+ * BOOTP options
@@ -1100,11 +1556,14 @@ index 0000000..5af347b
+#define CONFIG_CMD_ASKENV /* ask for env variable */
+#define CONFIG_CMD_BSP /* Board Specific functions */
+#define CONFIG_CMD_CACHE /* icache, dcache */
++#define CONFIG_CMD_DATE
+#define CONFIG_CMD_DHCP /* DHCP Support */
+#define CONFIG_CMD_DNS
++#define CONFIG_CMD_EEPROM
+#define CONFIG_CMD_EXT2
+#define CONFIG_CMD_FAT /* FAT support */
+#define CONFIG_CMD_IMX_FUSE /* imx iim fuse */
++#define CONFIG_CMD_I2C
+#define CONFIG_CMD_MII /* MII support */
+#define CONFIG_CMD_MMC
+#define CONFIG_CMD_MTDPARTS /* MTD partition support */
@@ -1120,7 +1579,7 @@ index 0000000..5af347b
+/*
+ * Memory configurations
+ */
-+#define CONFIG_NR_DRAM_POPULATED 1
++#define CONFIG_NR_DRAM_POPULATED 1
+#define CONFIG_NR_DRAM_BANKS 2
+
+#define ACFG_SDRAM_MBYTE_SYZE 64
@@ -1135,7 +1594,7 @@ index 0000000..5af347b
+#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE \
+ + PHYS_SDRAM_1_SIZE - 0x0100000)
+
-+#define CONFIG_SYS_TEXT_BASE 0xA1000000
++#define CONFIG_SYS_TEXT_BASE 0xA0000800
+
+/*
+ * FLASH organization
@@ -1325,7 +1784,7 @@ index 0000000..5af347b
+
+#define CONFIG_MXC_NAND_HWECC
+#define CONFIG_SYS_NAND_LARGEPAGE
-+#define IMX27_NAND_16BITS
++#define CONFIG_SYS_NAND_BUSWIDTH_16BIT
+#define NAND_MAX_CHIPS 1
+
+
@@ -1384,13 +1843,12 @@ index 0000000..5af347b
+ */
+
+#ifdef CONFIG_CMD_I2C
-+#define CONFIG_HARD_I2C 1
-+
++#define CONFIG_HARD_I2C
++#define CONFIG_I2C_MXC
++#define CONFIG_I2C_MULTI_BUS
++#define CONFIG_SYS_I2C_BASE IMX_I2C1_BASE
+#define CONFIG_SYS_I2C_SPEED 100000 /* 100 kHz */
+#define CONFIG_SYS_I2C_SLAVE 0x7F
-+
-+#define CONFIG_I2C_CMD_TREE
-+#define CONFIG_I2C_MULTI_BUS 2
+#define CONFIG_SYS_I2C_NOPROBES { }
+
+#ifdef CONFIG_CMD_EEPROM
@@ -1402,10 +1860,6 @@ index 0000000..5af347b
+#endif /* CONFIG_CMD_I2C */
+
+/*
-+ * SPI
-+ */
-+
-+/*
+ * SD/MMC
+ */
+#ifdef CONFIG_CMD_MMC
@@ -1424,14 +1878,6 @@ index 0000000..5af347b
+#endif /* CONFIG_CMD_DATE */
+
+/*
-+ * Watchdog Config
-+ */
-+
-+/*
-+ * USB
-+ */
-+
-+/*
+ * Clocks
+ */
+#define CONFIG_SYS_HZ 1000 /* Ticks per second */
@@ -1443,7 +1889,6 @@ index 0000000..5af347b
+ * |CPLM|X|----PD---|--------MFD---------|XXX|--MFI--|-----MFN-----------|
+ */
+#define CONFIG_MX27_CLK32 32768 /* 32768 or 32000 Hz crystal */
-+#undef CONFIG_MX27_CLK26 /* No external 26MHz external clock */
+
+#if (ACFG_SDRAM_MBYTE_SYZE == 64) /* micron MT46H16M32LF -6 */
+/* micron 64MB */
diff --git a/patches/u-boot/2012.10/304-apf27-Add-FPGA-support-for-the-apf27-board.patch b/patches/u-boot/2013.04/304-apf27-Add-FPGA-support-for-the-apf27-board.patch
similarity index 83%
copy from patches/u-boot/2012.10/304-apf27-Add-FPGA-support-for-the-apf27-board.patch
copy to patches/u-boot/2013.04/304-apf27-Add-FPGA-support-for-the-apf27-board.patch
index a3c013e..9bc8a89 100644
--- a/patches/u-boot/2012.10/304-apf27-Add-FPGA-support-for-the-apf27-board.patch
+++ b/patches/u-boot/2013.04/304-apf27-Add-FPGA-support-for-the-apf27-board.patch
@@ -3,36 +3,41 @@ Add FPGA support for the apf27 board
Signed-off-by: Philippe Reynes <tr...@ya...>
Signed-off-by: Eric Jarrige <eri...@ar...>
---
+ board/armadeus/apf27/Makefile | 3 +
+ board/armadeus/apf27/apf27.c | 18 +++
+ board/armadeus/apf27/fpga.c | 249 +++++++++++++++++++++++++++++++++++++++++
+ board/armadeus/apf27/fpga.h | 39 +++++++
+ 4 files changed, 309 insertions(+), 0 deletions(-)
create mode 100644 board/armadeus/apf27/fpga.c
create mode 100644 board/armadeus/apf27/fpga.h
diff --git a/board/armadeus/apf27/Makefile b/board/armadeus/apf27/Makefile
-index f57f405..9d356a3 100644
+index 08d5d8d..11562a2 100644
--- a/board/armadeus/apf27/Makefile
+++ b/board/armadeus/apf27/Makefile
@@ -29,6 +29,9 @@ LIB = $(obj)lib$(BOARD).o
- ifndef CONFIG_SPL_BUILD
+ ifndef CONFIG_SPL_BUILD
COBJS := apf27.o
+ifdef CONFIG_FPGA
+COBJS += fpga.o
+endif
endif
- SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
+ ifdef CONFIG_SPL_BUILD
diff --git a/board/armadeus/apf27/apf27.c b/board/armadeus/apf27/apf27.c
-index bf3e5ec..fa5dfd8 100644
+index fce3325..951a5e3 100644
--- a/board/armadeus/apf27/apf27.c
+++ b/board/armadeus/apf27/apf27.c
-@@ -21,6 +21,7 @@
-
- #include <common.h>
+@@ -30,6 +30,7 @@
+ #include <asm/errno.h>
+ #include "apf27.h"
#include "crc.h"
+#include "fpga.h"
- #include <jffs2/jffs2.h>
- #include <nand.h>
- #include <netdev.h>
-@@ -386,6 +387,21 @@ misc_init_r(void)
+
+ DECLARE_GLOBAL_DATA_PTR;
+
+@@ -321,6 +322,23 @@ int misc_init_r(void)
struct mtd_device *dev;
struct part_info *part;
@@ -44,7 +49,9 @@ index bf3e5ec..fa5dfd8 100644
+ &dev, &pnum, &part) == 0) {
+ size = part->size;
+ if (nand_read_skip_bad(&nand_info[0],
-+ part->offset, &size, firmware_buffer))
++ part->offset, &size,
++ NULL, part->size,
++ firmware_buffer))
+ size = 0;
+ }
+ }
@@ -56,10 +63,10 @@ index bf3e5ec..fa5dfd8 100644
if ((NULL == s) || (0 != strcmp(s, CONFIG_ENV_VERSION))) {
diff --git a/board/armadeus/apf27/fpga.c b/board/armadeus/apf27/fpga.c
new file mode 100644
-index 0000000..d5c27a7
+index 0000000..47f4ffc
--- /dev/null
+++ b/board/armadeus/apf27/fpga.c
-@@ -0,0 +1,262 @@
+@@ -0,0 +1,250 @@
+/*
+ * (C) Copyright 2002-2012
+ * Eric Jarrige <eri...@ar...>
@@ -122,15 +129,14 @@ index 0000000..d5c27a7
+ {Xilinx_Spartan3,
+ slave_parallel,
+ 1196128l/8,
-+ (void *) &fpga_fns,
++ (void *)&fpga_fns,
+ 0}
+};
+
+/*
+ * Initialize GPIO port B before download
+ */
-+int
-+fpga_pre_fn(int cookie)
++int fpga_pre_fn(int cookie)
+{
+ /* Initialize GPIO pins */
+ gpio_set_value(ACFG_FPGA_PWR, 1);
@@ -150,6 +156,7 @@ index 0000000..d5c27a7
+ gpio_set_value(ACFG_FPGA_CS, 1);
+ gpio_set_value(ACFG_FPGA_SUSPEND, 0);
+ gpio_set_value(ACFG_FPGA_PWR, 0);
++ udelay(30000); /*wait until supply started*/
+
+ return cookie;
+}
@@ -157,11 +164,10 @@ index 0000000..d5c27a7
+/*
+ * Set the FPGA's active-low program line to the specified level
+ */
-+int
-+fpga_pgm_fn(int assert, int flush, int cookie)
++int fpga_pgm_fn(int assert, int flush, int cookie)
+{
+ debug("%s:%d: FPGA PROGRAM %s", __func__, __LINE__,
-+ assert ? "high" : "low");
++ assert ? "high" : "low");
+ gpio_set_value(ACFG_FPGA_PRG, !assert);
+ return assert;
+}
@@ -169,11 +175,10 @@ index 0000000..d5c27a7
+/*
+ * Set the FPGA's active-high clock line to the specified level
+ */
-+int
-+fpga_clk_fn(int assert_clk, int flush, int cookie)
++int fpga_clk_fn(int assert_clk, int flush, int cookie)
+{
+ debug("%s:%d: FPGA CLOCK %s", __func__, __LINE__,
-+ assert_clk ? "high" : "low");
++ assert_clk ? "high" : "low");
+ gpio_set_value(ACFG_FPGA_CLK, !assert_clk);
+ return assert_clk;
+}
@@ -182,8 +187,7 @@ index 0000000..d5c27a7
+ * Test the state of the active-low FPGA INIT line. Return 1 on INIT
+ * asserted (low).
+ */
-+int
-+fpga_init_fn(int cookie)
++int fpga_init_fn(int cookie)
+{
+ int value;
+ debug("%s:%d: INIT check... ", __func__, __LINE__);
@@ -199,69 +203,61 @@ index 0000000..d5c27a7
+/*
+ * Test the state of the active-high FPGA DONE pin
+ */
-+int
-+fpga_done_fn(int cookie)
++int fpga_done_fn(int cookie)
+{
+ debug("%s:%d: DONE check... %s", __func__, __LINE__,
-+ gpio_get_value(ACFG_FPGA_DONE) ? "high" : "low");
++ gpio_get_value(ACFG_FPGA_DONE) ? "high" : "low");
+ return gpio_get_value(ACFG_FPGA_DONE) ? FPGA_SUCCESS : FPGA_FAIL;
+}
+
+/*
+ * Set the FPGA's wr line to the specified level
+ */
-+int
-+fpga_wr_fn(int assert_write, int flush, int cookie)
++int fpga_wr_fn(int assert_write, int flush, int cookie)
+{
+ debug("%s:%d: FPGA RW... %s ", __func__, __LINE__,
-+ assert_write ? "high" : "low");
++ assert_write ? "high" : "low");
+ gpio_set_value(ACFG_FPGA_RW, !assert_write);
+ return assert_write;
+}
+
-+int
-+fpga_cs_fn(int assert_cs, int flush, int cookie)
++int fpga_cs_fn(int assert_cs, int flush, int cookie)
+{
+ debug("%s:%d: FPGA CS %s ", __func__, __LINE__,
-+ assert_cs ? "high" : "low");
++ assert_cs ? "high" : "low");
+ gpio_set_value(ACFG_FPGA_CS, !assert_cs);
+ return assert_cs;
+}
+
-+int
-+fpga_rdata_fn(unsigned char *data, int cookie)
++int fpga_rdata_fn(unsigned char *data, int cookie)
+{
+ debug("%s:%d: FPGA READ DATA %02X ", __func__, __LINE__,
-+ *((char *)ACFG_FPGA_RDATA));
-+ *data = (unsigned char) \
++ *((char *)ACFG_FPGA_RDATA));
++ *data = (unsigned char)
+ ((*((unsigned short *)ACFG_FPGA_RDATA))&0x00FF);
+ return *data;
+}
+
-+int
-+fpga_wdata_fn(unsigned char data, int cookie)
++int fpga_wdata_fn(unsigned char data, int flush, int cookie)
+{
+ debug("%s:%d: FPGA WRITE DATA %02X ", __func__, __LINE__,
-+ data);
++ data);
+ *((unsigned short *)ACFG_FPGA_WDATA) = data;
+ return data;
+}
+
-+int
-+fpga_abort_fn(int cookie)
++int fpga_abort_fn(int cookie)
+{
+ return cookie;
+}
+
+
-+int
-+fpga_busy_fn(int cookie)
++int fpga_busy_fn(int cookie)
+{
+ return 1;
+}
+
-+int
-+fpga_post_fn(int cookie)
++int fpga_post_fn(int cookie)
+{
+ debug("%s:%d: FPGA POST ", __func__, __LINE__);
+
@@ -277,7 +273,7 @@ index 0000000..d5c27a7
+void apf27_fpga_setup(void)
+{
+ struct pll_regs *pll = (struct pll_regs *)IMX_PLL_BASE;
-+ struct system_control_regs *system = \
++ struct system_control_regs *system =
+ (struct system_control_regs *)IMX_SYSTEM_CTL_BASE;
+
+ /* Configure FPGA CLKO */
@@ -293,8 +289,7 @@ index 0000000..d5c27a7
+/*
+ * Initialize the fpga. Return 1 on success, 0 on failure.
+ */
-+int
-+APF27_init_fpga(u_char *buffer, size_t size)
++int APF27_init_fpga(u_char *buffer, size_t size)
+{
+ char *autoload = getenv("firmware_autoload");
+
@@ -310,7 +305,7 @@ index 0000000..d5c27a7
+ }
+
+ if ((size >= fpga[0].size) && (autoload) &&
-+ (0 == strcmp(autoload, "1"))) {
++ (0 == strcmp(autoload, "1"))) {
+ if (ctrlc()) {
+ printf("Firmware download stopped!\n");
+ } else if (FPGA_SUCCESS != fpga_load(0, (void *)buffer, size)) {
@@ -324,7 +319,7 @@ index 0000000..d5c27a7
+}
diff --git a/board/armadeus/apf27/fpga.h b/board/armadeus/apf27/fpga.h
new file mode 100644
-index 0000000..b11b24c
+index 0000000..e30dd11
--- /dev/null
+++ b/board/armadeus/apf27/fpga.h
@@ -0,0 +1,39 @@
@@ -363,7 +358,7 @@ index 0000000..b11b24c
+extern int fpga_clk_fn(int assert_clk, int flush, int cookie);
+extern int fpga_wr_fn(int assert_write, int flush, int cookie);
+extern int fpga_rdata_fn(unsigned char *data, int cookie);
-+extern int fpga_wdata_fn(unsigned char data, int cookie);
++extern int fpga_wdata_fn(unsigned char data, int flush, int cookie);
+extern int fpga_abort_fn(int cookie);
+extern int fpga_post_fn(int cookie);
+extern int fpga_busy_fn(int cookie);
diff --git a/patches/u-boot/2012.10/311-imx-nand-lock-unlock.patch b/patches/u-boot/2013.04/311-imx-nand-lock-unlock.patch
similarity index 100%
copy from patches/u-boot/2012.10/311-imx-nand-lock-unlock.patch
copy to patches/u-boot/2013.04/311-imx-nand-lock-unlock.patch
diff --git a/patches/u-boot/2012.10/320-spartan.patch b/patches/u-boot/2013.04/320-spartan.patch
similarity index 100%
copy from patches/u-boot/2012.10/320-spartan.patch
copy to patches/u-boot/2013.04/320-spartan.patch
diff --git a/patches/u-boot/2013.01.01/321-add_spartan6.patch b/patches/u-boot/2013.04/321-add_spartan6.patch
similarity index 100%
copy from patches/u-boot/2013.01.01/321-add_spartan6.patch
copy to patches/u-boot/2013.04/321-add_spartan6.patch
diff --git a/patches/u-boot/2013.01.01/340-apf27-misc-commands.patch b/patches/u-boot/2013.04/340-apf27-misc-commands.patch
similarity index 99%
copy from patches/u-boot/2013.01.01/340-apf27-misc-commands.patch
copy to patches/u-boot/2013.04/340-apf27-misc-commands.patch
index e0f81c2..addecd5 100644
--- a/patches/u-boot/2013.01.01/340-apf27-misc-commands.patch
+++ b/patches/u-boot/2013.04/340-apf27-misc-commands.patch
@@ -31,7 +31,7 @@ index 7a39426..484268e 100644
@@ -28,7 +28,7 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(BOARD).o
- ifndef CONFIG_SPL_BUILD
+ ifndef CONFIG_SPL_BUILD
-COBJS := apf27.o
+COBJS := apf27.o cmd_imxfuse.o
ifdef CONFIG_FPGA
diff --git a/patches/u-boot/2013.01.01/350-nand_large_file_download.patch b/p...
[truncated message content] |
|
From: Gwenhael Goavec-M. <gwe...@us...> - 2013-05-24 05:39: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 f8270ad6feca5a23bbfb5dec26d2e9e8e9954746 (commit)
from 9d1c3667fc355a64f5793f5287adccf52a8fcfbe (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 f8270ad6feca5a23bbfb5dec26d2e9e8e9954746
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date: Fri May 24 07:38:52 2013 +0200
[LINUX][3.10] 3.10-rc2: add apf28 config
-----------------------------------------------------------------------
Summary of changes:
...inux-3.7.config => apf28-linux-3.10-rc2.config} | 31 ++++++++++---------
...28-linux-3.7.config => apf28-linux-3.10.config} | 31 ++++++++++---------
2 files changed, 32 insertions(+), 30 deletions(-)
copy buildroot/target/device/armadeus/apf28/{apf28-linux-3.7.config => apf28-linux-3.10-rc2.config} (89%)
copy buildroot/target/device/armadeus/apf28/{apf28-linux-3.7.config => apf28-linux-3.10.config} (89%)
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.7.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.10-rc2.config
similarity index 89%
copy from buildroot/target/device/armadeus/apf28/apf28-linux-3.7.config
copy to buildroot/target/device/armadeus/apf28/apf28-linux-3.10-rc2.config
index 3024a00..ceca161 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-linux-3.7.config
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-3.10-rc2.config
@@ -1,10 +1,7 @@
-CONFIG_EXPERIMENTAL=y
# CONFIG_LOCALVERSION_AUTO is not set
# 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_EMBEDDED=y
# CONFIG_COMPAT_BRK is not set
@@ -17,8 +14,8 @@ CONFIG_MODULE_UNLOAD=y
CONFIG_PARTITION_ADVANCED=y
CONFIG_BSD_DISKLABEL=y
# CONFIG_IOSCHED_CFQ is not set
+# CONFIG_ARCH_MULTI_V7 is not set
CONFIG_ARCH_MXS=y
-CONFIG_MACH_MXS_DT=y
CONFIG_PREEMPT=y
CONFIG_AEABI=y
# CONFIG_OABI_COMPAT is not set
@@ -39,8 +36,6 @@ CONFIG_IP_PNP=y
# 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
@@ -52,7 +47,6 @@ CONFIG_BT_BNEP_PROTO_FILTER=y
CONFIG_BT_HIDP=m
CONFIG_BT_HCIBTUSB=m
CONFIG_CFG80211=m
-CONFIG_LIB80211=m
CONFIG_MAC80211=m
CONFIG_MAC80211_RC_PID=y
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
@@ -61,8 +55,11 @@ 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_DATAFLASH=y
+CONFIG_MTD_M25P80=y
+# CONFIG_M25PXX_USE_FAST_READ is not set
+CONFIG_MTD_SST25L=y
CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_GPMI_NAND=y
CONFIG_MTD_UBI=y
@@ -84,14 +81,19 @@ CONFIG_RT73USB=m
CONFIG_ZD1211RW=m
CONFIG_INPUT_JOYDEV=y
CONFIG_INPUT_EVDEV=y
-CONFIG_KEYBOARD_GPIO=y
CONFIG_INPUT_TOUCHSCREEN=y
CONFIG_INPUT_MISC=y
CONFIG_INPUT_UINPUT=m
+# CONFIG_SERIO_SERPORT is not set
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
# CONFIG_LEGACY_PTYS is not set
+# CONFIG_DEVKMEM is not set
CONFIG_SERIAL_AMBA_PL011=y
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
CONFIG_SERIAL_MXS_AUART=y
+CONFIG_SERIAL_MXS_AUART_CONSOLE=y
+CONFIG_TTY_PRINTK=y
# CONFIG_HW_RANDOM is not set
CONFIG_I2C=y
CONFIG_I2C_CHARDEV=y
@@ -103,11 +105,14 @@ CONFIG_SPI_SPIDEV=m
CONFIG_GPIO_SYSFS=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_FB=y
CONFIG_FB_MXS=y
CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_LCD_CLASS_DEVICE=y
CONFIG_BACKLIGHT_CLASS_DEVICE=y
# CONFIG_BACKLIGHT_GENERIC is not set
CONFIG_BACKLIGHT_PWM=y
@@ -121,17 +126,15 @@ CONFIG_USB=y
CONFIG_USB_DEBUG=y
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
CONFIG_USB_MON=y
-CONFIG_USB_CHIPIDEA=y
-CONFIG_USB_CHIPIDEA_HOST=y
CONFIG_USB_ACM=y
CONFIG_USB_PRINTER=y
CONFIG_USB_WDM=y
CONFIG_USB_STORAGE=y
+CONFIG_USB_CHIPIDEA=y
+CONFIG_USB_CHIPIDEA_UDC=y
CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_DEBUG_FILES=y
CONFIG_USB_ETH=m
-CONFIG_USB_ULPI=y
-CONFIG_USB_MXS_PHY=y
CONFIG_MMC=y
CONFIG_MMC_MXS=y
CONFIG_NEW_LEDS=y
@@ -142,10 +145,8 @@ CONFIG_LEDS_TRIGGER_TIMER=y
CONFIG_LEDS_TRIGGER_ONESHOT=y
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
CONFIG_LEDS_TRIGGER_BACKLIGHT=y
-CONFIG_LEDS_TRIGGER_GPIO=y
CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_STMP=y
CONFIG_DMADEVICES=y
CONFIG_MXS_DMA=y
CONFIG_STAGING=y
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.7.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.config
similarity index 89%
copy from buildroot/target/device/armadeus/apf28/apf28-linux-3.7.config
copy to buildroot/target/device/armadeus/apf28/apf28-linux-3.10.config
index 3024a00..ceca161 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-linux-3.7.config
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.config
@@ -1,10 +1,7 @@
-CONFIG_EXPERIMENTAL=y
# CONFIG_LOCALVERSION_AUTO is not set
# 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_EMBEDDED=y
# CONFIG_COMPAT_BRK is not set
@@ -17,8 +14,8 @@ CONFIG_MODULE_UNLOAD=y
CONFIG_PARTITION_ADVANCED=y
CONFIG_BSD_DISKLABEL=y
# CONFIG_IOSCHED_CFQ is not set
+# CONFIG_ARCH_MULTI_V7 is not set
CONFIG_ARCH_MXS=y
-CONFIG_MACH_MXS_DT=y
CONFIG_PREEMPT=y
CONFIG_AEABI=y
# CONFIG_OABI_COMPAT is not set
@@ -39,8 +36,6 @@ CONFIG_IP_PNP=y
# 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
@@ -52,7 +47,6 @@ CONFIG_BT_BNEP_PROTO_FILTER=y
CONFIG_BT_HIDP=m
CONFIG_BT_HCIBTUSB=m
CONFIG_CFG80211=m
-CONFIG_LIB80211=m
CONFIG_MAC80211=m
CONFIG_MAC80211_RC_PID=y
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
@@ -61,8 +55,11 @@ 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_DATAFLASH=y
+CONFIG_MTD_M25P80=y
+# CONFIG_M25PXX_USE_FAST_READ is not set
+CONFIG_MTD_SST25L=y
CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_GPMI_NAND=y
CONFIG_MTD_UBI=y
@@ -84,14 +81,19 @@ CONFIG_RT73USB=m
CONFIG_ZD1211RW=m
CONFIG_INPUT_JOYDEV=y
CONFIG_INPUT_EVDEV=y
-CONFIG_KEYBOARD_GPIO=y
CONFIG_INPUT_TOUCHSCREEN=y
CONFIG_INPUT_MISC=y
CONFIG_INPUT_UINPUT=m
+# CONFIG_SERIO_SERPORT is not set
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
# CONFIG_LEGACY_PTYS is not set
+# CONFIG_DEVKMEM is not set
CONFIG_SERIAL_AMBA_PL011=y
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
CONFIG_SERIAL_MXS_AUART=y
+CONFIG_SERIAL_MXS_AUART_CONSOLE=y
+CONFIG_TTY_PRINTK=y
# CONFIG_HW_RANDOM is not set
CONFIG_I2C=y
CONFIG_I2C_CHARDEV=y
@@ -103,11 +105,14 @@ CONFIG_SPI_SPIDEV=m
CONFIG_GPIO_SYSFS=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_FB=y
CONFIG_FB_MXS=y
CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_LCD_CLASS_DEVICE=y
CONFIG_BACKLIGHT_CLASS_DEVICE=y
# CONFIG_BACKLIGHT_GENERIC is not set
CONFIG_BACKLIGHT_PWM=y
@@ -121,17 +126,15 @@ CONFIG_USB=y
CONFIG_USB_DEBUG=y
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
CONFIG_USB_MON=y
-CONFIG_USB_CHIPIDEA=y
-CONFIG_USB_CHIPIDEA_HOST=y
CONFIG_USB_ACM=y
CONFIG_USB_PRINTER=y
CONFIG_USB_WDM=y
CONFIG_USB_STORAGE=y
+CONFIG_USB_CHIPIDEA=y
+CONFIG_USB_CHIPIDEA_UDC=y
CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_DEBUG_FILES=y
CONFIG_USB_ETH=m
-CONFIG_USB_ULPI=y
-CONFIG_USB_MXS_PHY=y
CONFIG_MMC=y
CONFIG_MMC_MXS=y
CONFIG_NEW_LEDS=y
@@ -142,10 +145,8 @@ CONFIG_LEDS_TRIGGER_TIMER=y
CONFIG_LEDS_TRIGGER_ONESHOT=y
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
CONFIG_LEDS_TRIGGER_BACKLIGHT=y
-CONFIG_LEDS_TRIGGER_GPIO=y
CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_STMP=y
CONFIG_DMADEVICES=y
CONFIG_MXS_DMA=y
CONFIG_STAGING=y
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2013-05-23 18:59:29
|
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 9d1c3667fc355a64f5793f5287adccf52a8fcfbe (commit)
from 41d21297400a66e7d8bb44746735d441cbd5b710 (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 9d1c3667fc355a64f5793f5287adccf52a8fcfbe
Author: Eric Jarrige <eri...@ar...>
Date: Thu May 23 21:06:43 2013 +0200
[BUILDROOT] cleanup BR 2012.11.1 patches
-----------------------------------------------------------------------
Summary of changes:
.../2012.11.1/001-add_armadeus_device.patch | 24 -
.../002-add_armadeus_specific_packages.patch | 16 -
patches/buildroot/2012.11.1/006-lcd4linux.patch | 753 --------
patches/buildroot/2012.11.1/018-allegro.patch | 114 --
.../buildroot/2012.11.1/021-sdl-water-config.patch | 99 --
patches/buildroot/2012.11.1/034-slideshow.patch | 224 ---
.../buildroot/2012.11.1/040-linux-makefile.patch | 47 -
.../2012.11.1/043-mesa-add_packages.patch | 287 ----
.../2012.11.1/045-openssh-add_passwd_expire.patch | 18 -
...support-for-Safe-Boot-file-format-this-fo.patch | 46 -
...d_possibility_to_choose_board_header_file.patch | 26 -
...x_in_a_standalone_way_after_configuration.patch | 13 -
...-linux-change_board_specific_patches_name.patch | 13 -
.../buildroot/2012.11.1/072-xenomai-package.patch | 222 ---
.../2012.11.1/081-adds_quake_package.patch | 160 --
.../2012.11.1/083-pygame-armadeus_addons.patch | 43 -
.../buildroot/2012.11.1/085-adds_gpm_package.patch | 168 --
.../2012.11.1/097-adds_flite_package.patch | 108 --
...for_pld_asm_instruction_on_non_armv5_arch.patch | 22 -
...r-add_patch_for_recent_alsa_compatibility.patch | 187 --
.../2012.11.1/107-games-add_wolf4sdl.patch | 92 -
.../2012.11.1/110-bluez3-add_package.patch | 118 --
patches/buildroot/2012.11.1/111-bluez3-hacks.patch | 198 ---
.../2012.11.1/116-openobex-add_package.patch | 168 --
.../2012.11.1/117-ussp-push-add_package.patch | 85 -
.../2012.11.1/118-snes9x-add_package.patch | 417 -----
.../2012.11.1/119-fbtest-add_package.patch | 176 --
.../2012.11.1/120-cwiid-add_package.patch | 106 --
.../121-target-arm926t_is_arm926ej-s.patch | 18 -
.../buildroot/2012.11.1/122-urg-add_package.patch | 74 -
.../2012.11.1/123-pywebradio-add_package.patch | 56 -
.../2012.11.1/124-e-uae-add_package.patch | 54 -
.../2012.11.1/125-opentyrian-add_package.patch | 83 -
.../2012.11.1/130-lbreakout-add_package.patch | 82 -
.../2012.11.1/131-ltetris-add_package.patch | 84 -
...-qt-full_integration_with_cross_compiling.patch | 44 -
.../buildroot/2012.11.1/133-qwt-add_package.patch | 163 --
...ffs2-add_board_name_to_binary_rootfs_name.patch | 30 -
.../135-linux-add_linux26-clean_target.patch | 11 -
...42-ncurses-fix_compilation_with_old_hosts.patch | 25 -
...-disable_ip_busybox_if_iproute2_buildroot.patch | 36 -
...fix_installation_bug_on_some_host_systems.patch | 19 -
...lection_even_when_custom_rootfs_is_chosen.patch | 46 -
.../2012.11.1/158-setserial-bump_version.patch | 17 -
.../2012.11.1/168-libcanfestival-add_package.patch | 897 ----------
.../170-mplayer-make_it_compile_on_apf51.patch | 17 -
.../2012.11.1/172-gsmmux-add_package.patch | 88 -
.../2012.11.1/174-imx-lib-add_package.patch | 105 --
.../2012.11.1/176-imx-test-add_package.patch | 148 --
...177-restore-java-packages-classpath-jamvm.patch | 1808 --------------------
.../178-uboot-add-missing-UBOOT_CLEAN_CMDS.patch | 29 -
...e4defrag_build_against_old_kernel_headers.patch | 81 -
.../2012.11.1/181-qtcreator-add_package.patch | 1001 -----------
.../182-uclibc-add_accept4_declaration_fix.patch | 146 --
.../2012.11.1/183-firmware-imx-add_package.patch | 49 -
.../184-fsl-mm-codeclib-add_package.patch | 30 -
.../2012.11.1/185-gst-fsl-plugin-add_package.patch | 97 --
...-linux-firmware-add_marvell_libertas_8686.patch | 101 --
...nore-env_sectors-on-NOR-and-SPI-dataflash.patch | 46 -
.../2012.11.1/188-marble-add_package.patch | 88 -
.../2012.11.1/189-dbus-fix_installation.patch | 27 -
.../2012.11.1/191-madplay-requires_libintl.patch | 29 -
.../2012.11.1/196-python-crc16-add_package.patch | 58 -
.../2012.11.1/197-cunit-add_package.patch | 49 -
.../2012.11.1/198-boost-bump-version.patch | 51 -
patches/buildroot/2012.11.1/cleanup_buildroot.sh | 73 -
66 files changed, 0 insertions(+), 9810 deletions(-)
delete mode 100644 patches/buildroot/2012.11.1/001-add_armadeus_device.patch
delete mode 100644 patches/buildroot/2012.11.1/002-add_armadeus_specific_packages.patch
delete mode 100644 patches/buildroot/2012.11.1/006-lcd4linux.patch
delete mode 100644 patches/buildroot/2012.11.1/018-allegro.patch
delete mode 100644 patches/buildroot/2012.11.1/021-sdl-water-config.patch
delete mode 100644 patches/buildroot/2012.11.1/034-slideshow.patch
delete mode 100644 patches/buildroot/2012.11.1/040-linux-makefile.patch
delete mode 100644 patches/buildroot/2012.11.1/043-mesa-add_packages.patch
delete mode 100644 patches/buildroot/2012.11.1/045-openssh-add_passwd_expire.patch
delete mode 100644 patches/buildroot/2012.11.1/051a-U-Boot-add-support-for-Safe-Boot-file-format-this-fo.patch
delete mode 100644 patches/buildroot/2012.11.1/051d-u-boot-add_possibility_to_choose_board_header_file.patch
delete mode 100644 patches/buildroot/2012.11.1/060-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.patch
delete mode 100644 patches/buildroot/2012.11.1/071-linux-change_board_specific_patches_name.patch
delete mode 100644 patches/buildroot/2012.11.1/072-xenomai-package.patch
delete mode 100644 patches/buildroot/2012.11.1/081-adds_quake_package.patch
delete mode 100644 patches/buildroot/2012.11.1/083-pygame-armadeus_addons.patch
delete mode 100644 patches/buildroot/2012.11.1/085-adds_gpm_package.patch
delete mode 100644 patches/buildroot/2012.11.1/097-adds_flite_package.patch
delete mode 100644 patches/buildroot/2012.11.1/099-mplayer-add_patch_for_pld_asm_instruction_on_non_armv5_arch.patch
delete mode 100644 patches/buildroot/2012.11.1/101-mplayer-add_patch_for_recent_alsa_compatibility.patch
delete mode 100644 patches/buildroot/2012.11.1/107-games-add_wolf4sdl.patch
delete mode 100644 patches/buildroot/2012.11.1/110-bluez3-add_package.patch
delete mode 100644 patches/buildroot/2012.11.1/111-bluez3-hacks.patch
delete mode 100644 patches/buildroot/2012.11.1/116-openobex-add_package.patch
delete mode 100644 patches/buildroot/2012.11.1/117-ussp-push-add_package.patch
delete mode 100644 patches/buildroot/2012.11.1/118-snes9x-add_package.patch
delete mode 100644 patches/buildroot/2012.11.1/119-fbtest-add_package.patch
delete mode 100644 patches/buildroot/2012.11.1/120-cwiid-add_package.patch
delete mode 100644 patches/buildroot/2012.11.1/121-target-arm926t_is_arm926ej-s.patch
delete mode 100644 patches/buildroot/2012.11.1/122-urg-add_package.patch
delete mode 100644 patches/buildroot/2012.11.1/123-pywebradio-add_package.patch
delete mode 100644 patches/buildroot/2012.11.1/124-e-uae-add_package.patch
delete mode 100644 patches/buildroot/2012.11.1/125-opentyrian-add_package.patch
delete mode 100644 patches/buildroot/2012.11.1/130-lbreakout-add_package.patch
delete mode 100644 patches/buildroot/2012.11.1/131-ltetris-add_package.patch
delete mode 100644 patches/buildroot/2012.11.1/132-qt-full_integration_with_cross_compiling.patch
delete mode 100644 patches/buildroot/2012.11.1/133-qwt-add_package.patch
delete mode 100644 patches/buildroot/2012.11.1/134-jffs2-add_board_name_to_binary_rootfs_name.patch
delete mode 100644 patches/buildroot/2012.11.1/135-linux-add_linux26-clean_target.patch
delete mode 100644 patches/buildroot/2012.11.1/142-ncurses-fix_compilation_with_old_hosts.patch
delete mode 100644 patches/buildroot/2012.11.1/146-busybox-disable_ip_busybox_if_iproute2_buildroot.patch
delete mode 100644 patches/buildroot/2012.11.1/150-alsa-utils-fix_installation_bug_on_some_host_systems.patch
delete mode 100644 patches/buildroot/2012.11.1/157-buildroot-allow_generic_device_selection_even_when_custom_rootfs_is_chosen.patch
delete mode 100644 patches/buildroot/2012.11.1/158-setserial-bump_version.patch
delete mode 100644 patches/buildroot/2012.11.1/168-libcanfestival-add_package.patch
delete mode 100644 patches/buildroot/2012.11.1/170-mplayer-make_it_compile_on_apf51.patch
delete mode 100644 patches/buildroot/2012.11.1/172-gsmmux-add_package.patch
delete mode 100644 patches/buildroot/2012.11.1/174-imx-lib-add_package.patch
delete mode 100644 patches/buildroot/2012.11.1/176-imx-test-add_package.patch
delete mode 100644 patches/buildroot/2012.11.1/177-restore-java-packages-classpath-jamvm.patch
delete mode 100644 patches/buildroot/2012.11.1/178-uboot-add-missing-UBOOT_CLEAN_CMDS.patch
delete mode 100644 patches/buildroot/2012.11.1/179-e2fsprog-allow_e4defrag_build_against_old_kernel_headers.patch
delete mode 100644 patches/buildroot/2012.11.1/181-qtcreator-add_package.patch
delete mode 100644 patches/buildroot/2012.11.1/182-uclibc-add_accept4_declaration_fix.patch
delete mode 100644 patches/buildroot/2012.11.1/183-firmware-imx-add_package.patch
delete mode 100644 patches/buildroot/2012.11.1/184-fsl-mm-codeclib-add_package.patch
delete mode 100644 patches/buildroot/2012.11.1/185-gst-fsl-plugin-add_package.patch
delete mode 100644 patches/buildroot/2012.11.1/186-linux-firmware-add_marvell_libertas_8686.patch
delete mode 100644 patches/buildroot/2012.11.1/186-uboot-tools-2011.03-Ignore-env_sectors-on-NOR-and-SPI-dataflash.patch
delete mode 100644 patches/buildroot/2012.11.1/188-marble-add_package.patch
delete mode 100644 patches/buildroot/2012.11.1/189-dbus-fix_installation.patch
delete mode 100644 patches/buildroot/2012.11.1/191-madplay-requires_libintl.patch
delete mode 100644 patches/buildroot/2012.11.1/196-python-crc16-add_package.patch
delete mode 100644 patches/buildroot/2012.11.1/197-cunit-add_package.patch
delete mode 100644 patches/buildroot/2012.11.1/198-boost-bump-version.patch
delete mode 100755 patches/buildroot/2012.11.1/cleanup_buildroot.sh
diff --git a/patches/buildroot/2012.11.1/001-add_armadeus_device.patch b/patches/buildroot/2012.11.1/001-add_armadeus_device.patch
deleted file mode 100644
index 0e8f71f..0000000
--- a/patches/buildroot/2012.11.1/001-add_armadeus_device.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Add armadeus target specific menu to BR.
-
-Index: buildroot/Makefile
-===================================================================
---- buildroot/Makefile
-+++ buildroot/Makefile
-@@ -336,6 +336,7 @@ endif
- endif
-
- 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/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.
-
-+source "target/device/armadeus/Config.in"
- endmenu
diff --git a/patches/buildroot/2012.11.1/002-add_armadeus_specific_packages.patch b/patches/buildroot/2012.11.1/002-add_armadeus_specific_packages.patch
deleted file mode 100644
index bd5703d..0000000
--- a/patches/buildroot/2012.11.1/002-add_armadeus_specific_packages.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Add armadeus specific packages menu to BR.
-
-Index: buildroot/package/Config.in
-===================================================================
---- buildroot.orig/package/Config.in 2012-02-21 16:43:29.000000000 +0100
-+++ buildroot/package/Config.in 2012-02-21 16:43:56.000000000 +0100
-@@ -3,6 +3,9 @@
- source "package/busybox/Config.in"
- source "package/customize/Config.in"
-
-+# Armadeus specific
-+source "package/armadeus/Config.in"
-+
- # Audio and video applications
- source "package/multimedia/Config.in"
-
diff --git a/patches/buildroot/2012.11.1/006-lcd4linux.patch b/patches/buildroot/2012.11.1/006-lcd4linux.patch
deleted file mode 100644
index aa1c584..0000000
--- a/patches/buildroot/2012.11.1/006-lcd4linux.patch
+++ /dev/null
@@ -1,753 +0,0 @@
-Add lcd4linux package to BR.
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: buildroot/package/Config.in
-===================================================================
---- buildroot/package/Config.in
-+++ buildroot/package/Config.in
-@@ -230,6 +230,7 @@
- source "package/iostat/Config.in"
- source "package/irda-utils/Config.in"
- source "package/kbd/Config.in"
-+source "package/lcd4linux/Config.in"
- source "package/lcdproc/Config.in"
- source "package/linux-firmware/Config.in"
- source "package/lm-sensors/Config.in"
-Index: buildroot/package/lcd4linux/Config.in
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/lcd4linux/Config.in 2012-02-21 16:43:57.000000000 +0100
-@@ -0,0 +1,7 @@
-+config BR2_PACKAGE_LCD4LINUX
-+ bool "LCD4Linux daemon"
-+ select BR2_PACKAGE_NCURSES
-+ help
-+ LCD4Linux allows you to show some system parameters on a textual LCD
-+ connected to your Armadeus board.
-+
-Index: buildroot/package/lcd4linux/lcd4linux.mk
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/lcd4linux/lcd4linux.mk 2012-02-21 16:43:57.000000000 +0100
-@@ -0,0 +1,66 @@
-+#############################################################
-+#
-+# LCD4Linux daemon
-+#
-+#############################################################
-+
-+LCD4LINUX_VER:=0.10.1-RC2
-+LCD4LINUX_SOURCE:=lcd4linux-$(LCD4LINUX_VER).tar.gz
-+LCD4LINUX_SITE:=http://ssl.bulix.org/projects/lcd4linux/raw-attachment/wiki/Download/
-+LCD4LINUX_DIR:=$(BUILD_DIR)/lcd4linux-$(LCD4LINUX_VER)
-+LCD4LINUX_CAT:=zcat
-+LCD4LINUX_BINARY:=lcd4linux
-+LCD4LINUX_TARGET_BINARY:=usr/bin/lcd4linux
-+LCD4LINUX_PATCH:=lcd4linux_armadeus.patch
-+LCD4LINUX_CONF:=lcd4linux_armadeus.conf
-+LCD4LINUX_TARGET_CONF:=etc/lcd4linux.conf
-+
-+
-+$(DL_DIR)/$(LCD4LINUX_SOURCE):
-+ $(call DOWNLOAD,$(LCD4LINUX_SITE),$(LCD4LINUX_SOURCE))
-+
-+lcd4linux-source: $(DL_DIR)/$(LCD4LINUX_SOURCE)
-+
-+$(LCD4LINUX_DIR)/.unpacked: $(DL_DIR)/$(LCD4LINUX_SOURCE)
-+ $(LCD4LINUX_CAT) $(DL_DIR)/$(LCD4LINUX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-+ touch $@
-+
-+$(LCD4LINUX_DIR)/.patched: $(LCD4LINUX_DIR)/.unpacked
-+ support/scripts/apply-patches.sh $(LCD4LINUX_DIR) package/lcd4linux lcd4linux\*.patch
-+ (if [ -d $(BUILD_DIR)/linux-2.6.12/include/asm-generic ]; then ln -sf $(BUILD_DIR)/linux-2.6.12/include/asm-generic/ $(BUILD_DIR)/staging_dir/arm-linux-uclibc/sys-include/asm-generic; fi)
-+ touch $@
-+
-+$(LCD4LINUX_DIR)/.configured: $(LCD4LINUX_DIR)/.patched
-+ (cd $(LCD4LINUX_DIR); rm -rf config.cache; \
-+ $(TARGET_CONFIGURE_OPTS) CC_FOR_BUILD=$(HOSTCC) \
-+ CFLAGS="$(TARGET_CFLAGS)" \
-+ ./configure \
-+ --host=$(GNU_TARGET_NAME) \
-+ );
-+ touch $@
-+
-+$(LCD4LINUX_DIR)/$(LCD4LINUX_BINARY): $(LCD4LINUX_DIR)/.configured
-+ $(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(LCD4LINUX_DIR)
-+
-+$(TARGET_DIR)/$(LCD4LINUX_TARGET_BINARY): $(LCD4LINUX_DIR)/$(LCD4LINUX_BINARY)
-+ install -D $< $@
-+ $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
-+ cp package/lcd4linux/$(LCD4LINUX_CONF) $(TARGET_DIR)/$(LCD4LINUX_TARGET_CONF)
-+
-+lcd4linux: uclibc ncurses $(TARGET_DIR)/$(LCD4LINUX_TARGET_BINARY)
-+
-+lcd4linux-clean:
-+ rm -f $(TARGET_DIR)/$(LCD4LINUX_TARGET_BINARY)
-+ -$(MAKE) -C $(LCD4LINUX_DIR) clean
-+
-+lcd4linux-dirclean:
-+ rm -rf $(LCD4LINUX_DIR)
-+
-+#############################################################
-+#
-+# Toplevel Makefile options
-+#
-+#############################################################
-+ifeq ($(strip $(BR2_PACKAGE_LCD4LINUX)),y)
-+TARGETS+=lcd4linux
-+endif
-Index: buildroot/package/lcd4linux/lcd4linux-remove-wireless.patch
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/lcd4linux/lcd4linux-remove-wireless.patch 2012-02-21 16:43:57.000000000 +0100
-@@ -0,0 +1,13 @@
-+This plugin doesn't compile yet (/anymore?)
-+
-+--- lcd4linux-0.10.0/configure.org 2007-11-21 22:31:40.000000000 +0100
-++++ lcd4linux-0.10.0/configure 2007-11-21 22:32:04.000000000 +0100
-+@@ -6366,7 +6366,7 @@
-+ PLUGIN_STATFS="yes"
-+ PLUGIN_UNAME="yes"
-+ PLUGIN_UPTIME="yes"
-+- PLUGIN_WIRELESS="yes"
-++ PLUGIN_WIRELESS="no"
-+ PLUGIN_XMMS="yes"
-+ ;;
-+ apm)
-Index: buildroot/package/lcd4linux/lcd4linux-armadeus.patch
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/lcd4linux/lcd4linux-armadeus.patch 2012-02-21 16:43:57.000000000 +0100
-@@ -0,0 +1,181 @@
-+diff -uprN lcd4linux-0.10.0/configure lcd4linux-0.10.0.armadeus/configure
-+--- lcd4linux-0.10.0/configure 2005-06-10 13:21:49.000000000 +0200
-++++ lcd4linux-0.10.0.armadeus/configure 2005-09-11 20:39:47.000000000 +0200
-+@@ -7242,7 +7242,7 @@ for driver in $drivers; do
-+ picoLCD="yes"
-+ PNG="yes"
-+ PPM="yes"
-+- ROUTERBOARD="yes"
-++ ROUTERBOARD="no"
-+ SAMPLE="yes"
-+ SERDISPLIB="yes"
-+ SIMPLELCD="yes"
-+diff -uprN lcd4linux-0.10.0/drv_generic_parport.c lcd4linux-0.10.0.armadeus/drv_generic_parport.c
-+--- lcd4linux-0.10.0/drv_generic_parport.c 2005-05-08 06:32:44.000000000 +0200
-++++ lcd4linux-0.10.0.armadeus/drv_generic_parport.c 2005-09-11 20:46:27.000000000 +0200
-+@@ -215,9 +215,8 @@ int drv_generic_parport_open(const char
-+ return -1;
-+ }
-+ } else
-+-#endif
-+-
-+ {
-++#else
-+ error("using raw port 0x%x (deprecated!)", Port);
-+ error("You *really* should change your setup and use ppdev!");
-+ if ((Port + 3) <= 0x3ff) {
-+@@ -231,6 +230,7 @@ int drv_generic_parport_open(const char
-+ return -1;
-+ }
-+ }
-++#endif // WITH_PPDEV
-+ }
-+ return 0;
-+ }
-+@@ -250,9 +250,9 @@ int drv_generic_parport_close(void)
-+ }
-+ free(PPdev);
-+ } else
-+-#endif
-+ {
-+ debug("closing raw port 0x%x", Port);
-++#else
-+ if ((Port + 3) <= 0x3ff) {
-+ if (ioperm(Port, 3, 0) != 0) {
-+ error("%s: ioperm(0x%x) failed: %s", Driver, Port, strerror(errno));
-+@@ -264,6 +264,7 @@ int drv_generic_parport_close(void)
-+ return -1;
-+ }
-+ }
-++#endif // WITH_PPDEV
-+ }
-+
-+ return 0;
-+@@ -426,11 +427,12 @@ void drv_generic_parport_direction(const
-+ if (PPdev) {
-+ ioctl(PPfd, PPDATADIR, &direction);
-+ } else
-+-#endif
-+ {
-++#else
-+ /* code stolen from linux/parport_pc.h */
-+ ctr = (ctr & ~0x20) ^ (direction ? 0x20 : 0x00);
-+ outb(ctr, Port + 2);
-++#endif
-+ }
-+ }
-+
-+@@ -445,9 +447,10 @@ unsigned char drv_generic_parport_status
-+ if (PPdev) {
-+ ioctl(PPfd, PPRSTATUS, &data);
-+ } else
-+-#endif
-+ {
-++#else
-+ data = inb(Port + 1);
-++#endif
-+ }
-+
-+ /* clear unused bits */
-+@@ -476,11 +479,12 @@ void drv_generic_parport_control(const u
-+ frob.val = val;
-+ ioctl(PPfd, PPFCONTROL, &frob);
-+ } else
-+-#endif
-+ {
-++#else
-+ /* code stolen from linux/parport_pc.h */
-+ ctr = (ctr & ~mask) ^ val;
-+ outb(ctr, Port + 2);
-++#endif
-+ }
-+ }
-+
-+@@ -519,9 +523,10 @@ void drv_generic_parport_toggle(const un
-+ frob.val = value2;
-+ ioctl(PPfd, PPFCONTROL, &frob);
-+
-+- } else
-+-#endif
-++ }
-++ else
-+ {
-++#else
-+ /* rise */
-+ ctr = (ctr & ~bits) ^ value1;
-+ outb(ctr, Port + 2);
-+@@ -532,6 +537,7 @@ void drv_generic_parport_toggle(const un
-+ /* lower */
-+ ctr = (ctr & ~bits) ^ value2;
-+ outb(ctr, Port + 2);
-++#endif
-+ }
-+ }
-+
-+@@ -541,11 +547,13 @@ void drv_generic_parport_data(const unsi
-+ #ifdef WITH_PPDEV
-+ if (PPdev) {
-+ ioctl(PPfd, PPWDATA, &data);
-+- } else
-+-#endif
-++ }
-++#else
-++ else
-+ {
-+ outb(data, Port);
-+ }
-++#endif
-+ }
-+
-+ unsigned char drv_generic_parport_read(void)
-+@@ -555,11 +563,13 @@ unsigned char drv_generic_parport_read(v
-+ #ifdef WITH_PPDEV
-+ if (PPdev) {
-+ ioctl(PPfd, PPRDATA, &data);
-+- } else
-+-#endif
-+- {
-++ }
-++#else
-++ else {
-+ data = inb(Port);
-+ }
-++#endif // WITH_PPDEV
-++
-+ return data;
-+ }
-+
-+@@ -571,11 +581,12 @@ void drv_generic_parport_debug(void)
-+ #ifdef WITH_PPDEV
-+ if (PPdev) {
-+ ioctl(PPfd, PPRCONTROL, &control);
-+- } else
-+-#endif
-+- {
-++ }
-++#else
-++ else {
-+ control = ctr;
-+ }
-++#endif // WITH_PPDEV
-+
-+ debug("%cSTROBE %cAUTOFD %cINIT %cSLCTIN",
-+ control & PARPORT_CONTROL_STROBE ? '-' : '+',
-+diff -uprN lcd4linux-0.10.0/stamp-h lcd4linux-0.10.0.armadeus/stamp-h
-+--- lcd4linux-0.10.0/stamp-h 1970-01-01 01:00:00.000000000 +0100
-++++ lcd4linux-0.10.0.armadeus/stamp-h 2005-09-11 20:40:06.000000000 +0200
-+@@ -0,0 +1 @@
-++timestamp
-+diff -uprN lcd4linux-0.10.0/udelay.c lcd4linux-0.10.0.armadeus/udelay.c
-+--- lcd4linux-0.10.0/udelay.c 2005-05-08 06:32:45.000000000 +0200
-++++ lcd4linux-0.10.0.armadeus/udelay.c 2005-09-11 19:59:42.000000000 +0200
-+@@ -133,6 +133,7 @@
-+ #include <stdlib.h>
-+ #include <stdio.h>
-+
-++#undef USE_OLD_UDELAY // otherwise x86 asm code is used
-+
-+ #ifdef USE_OLD_UDELAY
-+
-+
-+
-Index: buildroot/package/lcd4linux/lcd4linux_armadeus.conf
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/lcd4linux/lcd4linux_armadeus.conf 2012-02-21 16:43:57.000000000 +0100
-@@ -0,0 +1,445 @@
-+
-+# Armadeus HD44780 display (Nico wiring ;-))
-+Display HD44780-generic {
-+ Driver 'HD44780'
-+ Model 'generic'
-+ Port '/dev/parports/0'
-+ Size '40x2'
-+ asc255bug 0
-+ Bits 4
-+ Wire {
-+ RW 'DB4'
-+ RS 'DB5'
-+ ENABLE 'DB6'
-+ ENABLE2 'GND'
-+ GPO 'GND'
-+ }
-+}
-+
-+Plugin Seti {
-+ Directory '/root/setiathome-3.08.i686-pc-linux-gnu'
-+}
-+
-+
-+Plugin MySQL {
-+ server 'gsmlandia.com' # if none, localhost assumed
-+ port 3306 # if none, MySQL default assumed
-+ user 'lcd4linux' # if none, lcd4linux unix owner assumed
-+ password 'lcd4linux' # if none, empty password assumed
-+ database 'lcd4linux' # MUST be specified
-+}
-+
-+Plugin Pop3 {
-+ server1 'localhost'
-+ port1 110
-+ user1 'michael'
-+ password1 'secret'
-+}
-+
-+
-+Widget OS {
-+ class 'Text'
-+ expression '*** '.uname('sysname').' '.uname('release').' ***'
-+ width 20
-+ align 'M'
-+ speed 100
-+ update tick
-+}
-+
-+Widget CPU {
-+ class 'Text'
-+ expression uname('machine')
-+ prefix 'CPU '
-+ width 9
-+ align 'L'
-+ update tick
-+}
-+
-+
-+Widget RAM {
-+ class 'Text'
-+ expression meminfo('MemTotal')/1024
-+ postfix ' MB RAM'
-+ width 11
-+ precision 0
-+ align 'R'
-+ update tick
-+}
-+
-+Widget Busy {
-+ class 'Text'
-+ expression proc_stat::cpu('busy', 500)
-+ prefix 'Busy'
-+ postfix '%'
-+ width 8
-+ precision 1
-+ align 'R'
-+ update tick
-+}
-+
-+Widget BusyBar {
-+ class 'Bar'
-+ expression proc_stat::cpu('busy', 500)
-+ expression2 proc_stat::cpu('system', 500)
-+ length 10
-+ direction 'E'
-+ update tack
-+}
-+
-+Widget Load {
-+ class 'Text'
-+ expression loadavg(1)
-+ prefix 'Load'
-+ postfix loadavg(1)>1.0?'!':' '
-+ width 10
-+ precision 1
-+ align 'R'
-+ update tick
-+}
-+
-+Widget LoadBar {
-+ class 'Bar'
-+ expression loadavg(1)
-+ max 2.0
-+ length 10
-+ direction 'E'
-+ update tack
-+}
-+
-+
-+Widget Disk {
-+ class 'Text'
-+ # disk.[rw]blk return blocks, we assume a blocksize of 512
-+ # to get the number in kB/s we would do blk*512/1024, which is blk/2
-+ # expression (proc_stat::disk('.*', 'rblk', 500)+proc_stat::disk('.*', 'wblk', 500))/2
-+ # with kernel 2.6, disk_io disappeared from /proc/stat but moved to /proc/diskstat
-+ # therefore you have to use another function called 'diskstats':
-+ expression diskstats('hd.', 'read_sectors', 500) + diskstats('hd.', 'write_sectors', 500)
-+ prefix 'disk'
-+ postfix ' '
-+ width 10
-+ precision 0
-+ align 'R'
-+ update tick
-+}
-+
-+Widget DiskBar {
-+ class 'Bar'
-+ #expression proc_stat::disk('.*', 'rblk', 500)
-+ #expression2 proc_stat::disk('.*', 'wblk', 500)
-+ # for kernel 2.6:
-+ expression diskstats('hd.', 'read_sectors', 500)
-+ expression2 diskstats('hd.', 'write_sectors', 500)
-+ length 14
-+ direction 'E'
-+ update tack
-+}
-+
-+Widget Eth0 {
-+ class 'Text'
-+ expression (netdev('eth0', 'Rx_bytes', 500)+netdev('eth0', 'Tx_bytes', 500))/1024
-+ prefix 'eth0'
-+ postfix ' '
-+ width 10
-+ precision 0
-+ align 'R'
-+ update tick
-+}
-+
-+Widget Eth0Bar {
-+ class 'Bar'
-+ expression netdev('eth0', 'Rx_bytes', 500)
-+ expression2 netdev('eth0', 'Tx_bytes', 500)
-+ length 14
-+ direction 'E'
-+ update tack
-+}
-+
-+Widget PPP {
-+ class 'Text'
-+ expression (ppp('Rx:0', 500)+ppp('Tx:0', 500))
-+ prefix 'PPP'
-+ width 9
-+ precision 0
-+ align 'R'
-+ update tick
-+}
-+
-+Widget Temp {
-+ class 'Text'
-+ expression i2c_sensors('temp_input3')*1.0324-67
-+ prefix 'Temp'
-+ width 9
-+ precision 1
-+ align 'R'
-+ update tick
-+}
-+
-+Widget TempBar {
-+ class 'Bar'
-+ expression i2c_sensors('temp_input3')*1.0324-67
-+ min 40
-+ max 80
-+ length 10
-+ direction 'E'
-+ update tack
-+}
-+
-+Widget MySQLtest1 {
-+ class 'Text'
-+ expression MySQL::query('SELECT id FROM table1')
-+ width 20
-+ align 'R'
-+ prefix 'MySQL test:'
-+ update minute
-+}
-+
-+Widget MySQLtest2 {
-+ class 'Text'
-+ expression MySQL::status()
-+ width 20
-+ align 'M'
-+ prefix 'Status: '
-+ update minute
-+}
-+
-+Widget Uptime {
-+ class 'Text'
-+ expression uptime('%d days %H:%M:%S')
-+ width 20
-+ align 'R'
-+ prefix 'Up '
-+ update 1000
-+}
-+
-+
-+# debugging widgets
-+
-+Widget BarTest {
-+ class 'Bar'
-+ # test::bar(barno,maxval,startval,delta) - move a test value between 0 and max.
-+ # delta= step to change value by each time it's read.
-+ # barno - ten different test bar values can be set up, with barno=0..9
-+ # if delta=0, just returns the value of bar n instead of changing it.
-+ expression test::bar(0,30,25,1)
-+ expression2 test::bar(1,30,0,1)
-+ length 8
-+ # max 50
-+ direction 'E'
-+ update 10
-+}
-+
-+Widget BarTestVal {
-+ class 'Text'
-+ expression test::bar(0,100,50,0)
-+ prefix 'Test '
-+ width 9
-+ update 200
-+}
-+
-+Widget LightningTest {
-+ class 'icon'
-+ speed 500
-+ visible test::onoff(0)
-+ bitmap {
-+ row1 '...***'
-+ row2 '..***.'
-+ row3 '.***..'
-+ row4 '.****.'
-+ row5 '..**..'
-+ row6 '.**...'
-+ row7 '**....'
-+ row8 '*.....'
-+ }
-+}
-+
-+
-+# Icons
-+
-+Widget Heartbeat {
-+ class 'Icon'
-+ speed 800
-+ Bitmap {
-+ Row1 '.....|.....'
-+ Row2 '.*.*.|.*.*.'
-+ Row3 '*****|*.*.*'
-+ Row4 '*****|*...*'
-+ Row5 '.***.|.*.*.'
-+ Row6 '.***.|.*.*.'
-+ Row7 '..*..|..*..'
-+ Row8 '.....|.....'
-+ }
-+}
-+
-+Widget EKG {
-+ class 'Icon'
-+ speed 50
-+ Bitmap {
-+ Row1 '.....|.....|.....|.....|.....|.....|.....|.....'
-+ Row2 '.....|....*|...*.|..*..|.*...|*....|.....|.....'
-+ Row3 '.....|....*|...*.|..*..|.*...|*....|.....|.....'
-+ Row4 '.....|....*|...**|..**.|.**..|**...|*....|.....'
-+ Row5 '.....|....*|...**|..**.|.**..|**...|*....|.....'
-+ Row6 '.....|....*|...*.|..*.*|.*.*.|*.*..|.*...|*....'
-+ Row7 '*****|*****|****.|***..|**..*|*..**|..***|.****'
-+ Row8 '.....|.....|.....|.....|.....|.....|.....|.....'
-+ }
-+}
-+Widget Karo {
-+ class 'Icon'
-+ speed 200
-+ Bitmap {
-+ Row1 '.....|.....|.....|.....|..*..|.....|.....|.....'
-+ Row2 '.....|.....|.....|..*..|.*.*.|..*..|.....|.....'
-+ Row3 '.....|.....|..*..|.*.*.|*...*|.*.*.|..*..|.....'
-+ Row4 '.....|..*..|.*.*.|*...*|.....|*...*|.*.*.|..*..'
-+ Row5 '.....|.....|..*..|.*.*.|*...*|.*.*.|..*..|.....'
-+ Row6 '.....|.....|.....|..*..|.*.*.|..*..|.....|.....'
-+ Row7 '.....|.....|.....|.....|..*..|.....|.....|.....'
-+ Row8 '.....|.....|.....|.....|.....|.....|.....|.....'
-+ }
-+}
-+Widget Heart {
-+ class 'Icon'
-+ speed 250
-+ Bitmap {
-+ Row1 '.....|.....|.....|.....|.....|.....'
-+ Row2 '.*.*.|.....|.*.*.|.....|.....|.....'
-+ Row3 '*****|.*.*.|*****|.*.*.|.*.*.|.*.*.'
-+ Row4 '*****|.***.|*****|.***.|.***.|.***.'
-+ Row5 '.***.|.***.|.***.|.***.|.***.|.***.'
-+ Row6 '.***.|..*..|.***.|..*..|..*..|..*..'
-+ Row7 '..*..|.....|..*..|.....|.....|.....'
-+ Row8 '.....|.....|.....|.....|.....|.....'
-+ }
-+}
-+Widget Blob {
-+ class 'Icon'
-+ speed 250
-+ Bitmap {
-+ Row1 '.....|.....|.....'
-+ Row2 '.....|.....|.***.'
-+ Row3 '.....|.***.|*...*'
-+ Row4 '..*..|.*.*.|*...*'
-+ Row5 '.....|.***.|*...*'
-+ Row6 '.....|.....|.***.'
-+ Row7 '.....|.....|.....'
-+ Row8 '.....|.....|.....'
-+ }
-+}
-+Widget Wave {
-+ class 'Icon'
-+ speed 100
-+ Bitmap {
-+ Row1 '..**.|.**..|**...|*....|.....|.....|.....|.....|....*|...**'
-+ Row2 '.*..*|*..*.|..*..|.*...|*....|.....|.....|....*|...*.|..*..'
-+ Row3 '*....|....*|...*.|..*..|.*...|*....|....*|...*.|..*..|.*...'
-+ Row4 '*....|....*|...*.|..*..|.*...|*....|....*|...*.|..*..|.*...'
-+ Row5 '*....|....*|...*.|..*..|.*...|*....|....*|...*.|..*..|.*...'
-+ Row6 '.....|.....|....*|...*.|..*..|.*..*|*..*.|..*..|.*...|*....'
-+ Row7 '.....|.....|.....|....*|...**|..**.|.**..|**...|*....|.....'
-+ Row8 '.....|.....|.....|.....|.....|.....|.....|.....|.....|.....'
-+ }
-+}
-+Widget Squirrel {
-+ class 'Icon'
-+ speed 100
-+ Bitmap {
-+ Row1 '.....|.....|.....|.....|.....|.....'
-+ Row2 '.....|.....|.....|.....|.....|.....'
-+ Row3 '.....|.....|.....|.....|.....|.....'
-+ Row4 '**...|.**..|..**.|...**|....*|.....'
-+ Row5 '*****|*****|*****|*****|*****|*****'
-+ Row6 '...**|..**.|.**..|**...|*....|.....'
-+ Row7 '.....|.....|.....|.....|.....|.....'
-+ Row8 '.....|.....|.....|.....|.....|.....'
-+ }
-+}
-+
-+Widget Lightning {
-+ class 'icon'
-+ speed 100
-+ visible cpu('busy', 500)-50
-+ bitmap {
-+ row1 '...***'
-+ row2 '..***.'
-+ row3 '.***..'
-+ row4 '.****.'
-+ row5 '..**..'
-+ row6 '.**...'
-+ row7 '**....'
-+ row8 '*.....'
-+ }
-+}
-+
-+Widget Rain {
-+ class 'icon'
-+ speed 200
-+ bitmap {
-+ row1 '...*.|.....|.....|.*...|....*|..*..|.....|*....'
-+ row2 '*....|...*.|.....|.....|.*...|....*|..*..|.....'
-+ row3 '.....|*....|...*.|.....|.....|.*...|....*|..*..'
-+ row4 '..*..|.....|*....|...*.|.....|.....|.*...|....*'
-+ row5 '....*|..*..|.....|*....|...*.|.....|.....|.*...'
-+ row6 '.*...|....*|..*..|.....|*....|...*.|.....|.....'
-+ row7 '.....|.*...|....*|..*..|.....|*....|...*.|.....'
-+ row8 '.....|.....|.*...|....*|..*..|.....|*....|...*.'
-+ }
-+}
-+
-+Widget Test {
-+ class 'Text'
-+ expression '1234567890123456789012345678901234567890'
-+ #expression '|'
-+ width 40
-+}
-+
-+Widget Armadeus {
-+ class 'Text'
-+ expression 'Armadeus Project'
-+ width 20
-+}
-+
-+
-+Layout L40x2 {
-+ Row1 {
-+ Col1 'Busy'
-+ Col10 'BusyBar'
-+ Col20 'Uptime'
-+ }
-+ Row2 {
-+ Col1 'Load'
-+ Col10 'LoadBar'
-+ Col21 'Armadeus
-+ }
-+}
-+
-+Layout Test {
-+ Row01.Col1 'Test'
-+ Row02.Col1 'Test'
-+ Row03.Col1 'Test'
-+ Row04.Col1 'Test'
-+}
-+
-+Layout testMySQL {
-+ Row1 {
-+ Col1 'MySQLtest1'
-+ }
-+ Row2 {
-+ Col1 'MySQLtest2'
-+ }
-+}
-+
-+
-+#
-+# Specify here which diplay and layout should be used
-+#
-+Display 'HD44780-generic'
-+Layout 'L40x2'
-+
-+
-+Variables {
-+ tick 500
-+ tack 100
-+ minute 60000
-+}
diff --git a/patches/buildroot/2012.11.1/018-allegro.patch b/patches/buildroot/2012.11.1/018-allegro.patch
deleted file mode 100644
index 0f52fbb..0000000
--- a/patches/buildroot/2012.11.1/018-allegro.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-Add allegro package to BR.
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: buildroot/package/Config.in
-===================================================================
---- buildroot/package/Config.in
-+++ buildroot/package/Config.in
-@@ -112,6 +112,7 @@
- source "package/rrdtool/Config.in"
-
- comment "graphic libraries"
-+source "package/allegro/Config.in"
- source "package/directfb/Config.in"
- source "package/directfb-examples/Config.in"
- source "package/divine/Config.in"
-Index: buildroot/package/allegro/Config.in
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/allegro/Config.in 2012-02-21 16:44:05.000000000 +0100
-@@ -0,0 +1,13 @@
-+config BR2_PACKAGE_ALLEGRO
-+ bool "Allegro"
-+ help
-+ Allegro is a game programming library for C/C++ developers
-+ distributed freely and supporting the following platforms:
-+ DOS, Unix (Linux, FreeBSD, Irix, Solaris, Darwin), Windows, QNX,
-+ BeOS and MacOS X.
-+ It provides many functions for graphics, sounds, player input
-+ (keyboard, mouse and joystick) and timers. It also provides fixed and
-+ floating point mathematical functions, 3d functions, file management
-+ functions, compressed datafile and a GUI.
-+
-+ http://alleg.sourceforge.net/
-Index: buildroot/package/allegro/allegro.mk
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/allegro/allegro.mk 2012-02-21 16:44:05.000000000 +0100
-@@ -0,0 +1,75 @@
-+#############################################################
-+#
-+# Allegro: a game programming library
-+#
-+#############################################################
-+ALLEGRO_VERSION:=4.2.1
-+ALLEGRO_SOURCE:=allegro-$(ALLEGRO_VERSION).tar.gz
-+ALLEGRO_SITE:=http://downloads.sourceforge.net/alleg
-+ALLEGRO_CAT:=zcat
-+ALLEGRO_DIR:=$(BUILD_DIR)/allegro-$(ALLEGRO_VERSION)
-+
-+$(DL_DIR)/$(ALLEGRO_SOURCE):
-+ $(call DOWNLOAD,$(ALLEGRO_SITE),$(ALLEGRO_SOURCE))
-+
-+allegro-source: $(DL_DIR)/$(ALLEGRO_SOURCE)
-+
-+$(ALLEGRO_DIR)/.unpacked: $(DL_DIR)/$(ALLEGRO_SOURCE)
-+ $(ALLEGRO_CAT) $(DL_DIR)/$(ALLEGRO_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-+ touch $@
-+
-+$(ALLEGRO_DIR)/.configured: $(ALLEGRO_DIR)/.unpacked
-+ (cd $(ALLEGRO_DIR); \
-+ $(TARGET_CONFIGURE_OPTS) \
-+ CFLAGS="$(TARGET_CFLAGS)" \
-+ LDFLAGS="$(TARGET_LDFLAGS)" \
-+ CROSSCOMPILE=1 \
-+ ./configure \
-+ --target=$(GNU_TARGET_NAME) \
-+ --host=$(GNU_TARGET_NAME) \
-+ --build=$(GNU_HOST_NAME) \
-+ --prefix=/usr \
-+ --without-svgalib \
-+ --enable-modules=no \
-+ --enable-static=yes \
-+ --enable-shared=no \
-+ --disable-asm \
-+ --disable-mmx \
-+ --disable-sse \
-+ --disable-color24 \
-+ --disable-color32 \
-+ --without-x );
-+ touch $@
-+# allegro doesn't seem to build as shared library
-+# --disable-color24 \
-+# --disable-color32 \
-+
-+$(ALLEGRO_DIR)/lib/unix/liballeg.a: $(ALLEGRO_DIR)/.configured
-+ $(MAKE) -C $(ALLEGRO_DIR) CROSSCOMPILE=1
-+ touch $@
-+
-+#$(STAGING_DIR)/usr/lib/liballeg.so: $(ALLEGRO_DIR)/lib/unix/liballeg.a
-+# $(MAKE) -C $(ALLEGRO_DIR) install
-+# touch -c $@
-+#
-+# $(TARGET_DIR)/usr/lib/liballeg.so.so: $(STAGING_DIR)/usr/lib/liballeg.so
-+# cp -dpf $(STAGING_DIR)/usr/lib/liballeg*.so* $(TARGET_DIR)/usr/lib/
-+# -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/liballeg.so
-+
-+ALLEGRO allegro: $(ALLEGRO_DIR)/lib/unix/liballeg.a
-+
-+allegro-clean:
-+ $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(ALLEGRO_DIR) uninstall
-+ -$(MAKE) -C $(ALLEGRO_DIR) clean
-+
-+allegro-dirclean:
-+ rm -rf $(ALLEGRO_DIR)
-+
-+#############################################################
-+#
-+# Toplevel Makefile options
-+#
-+#############################################################
-+ifeq ($(strip $(BR2_PACKAGE_ALLEGRO)),y)
-+TARGETS+=allegro
-+endif
diff --git a/patches/buildroot/2012.11.1/021-sdl-water-config.patch b/patches/buildroot/2012.11.1/021-sdl-water-config.patch
deleted file mode 100644
index 4596ff1..0000000
--- a/patches/buildroot/2012.11.1/021-sdl-water-config.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-Add sdlwater package to BR.
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: buildroot/package/Config.in
-===================================================================
---- buildroot/package/Config.in
-+++ buildroot/package/Config.in
-@@ -135,6 +135,8 @@
- source "package/sdl_net/Config.in"
- source "package/sdl_ttf/Config.in"
- source "package/sdl_gfx/Config.in"
-+comment "Demos"
-+source "package/sdlwater/Config.in"
-
- comment "other GUIs"
- source "package/efl/Config.in"
-Index: buildroot/package/sdlwater/Config.in
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/sdlwater/Config.in 2012-02-21 16:44:08.000000000 +0100
-@@ -0,0 +1,7 @@
-+config BR2_PACKAGE_SDL_WATER
-+ bool "SDL_water"
-+ select BR2_PACKAGE_SDL
-+ help
-+ Water effect demo coded with SDL
-+
-+ http://www.libsdl.org/projects/SDL_water/
-Index: buildroot/package/sdlwater/sdlwater.mk
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/sdlwater/sdlwater.mk 2012-02-21 16:44:08.000000000 +0100
-@@ -0,0 +1,65 @@
-+#############################################################
-+#
-+# SDL Water Demo
-+#
-+#############################################################
-+SDL_WATER_VERSION:=1.0
-+SDL_WATER_SOURCE:=water-$(SDL_WATER_VERSION).tar.gz
-+SDL_WATER_SITE:=http://www.libsdl.org/projects/water/src/
-+SDL_WATER_CAT:=$(ZCAT)
-+SDL_WATER_DIR:=$(BUILD_DIR)/water-$(SDL_WATER_VERSION)
-+SDL_WATER_TARGET_DATA_DIR:=$(TARGET_DIR)/usr/share/images/
-+
-+$(DL_DIR)/$(SDL_WATER_SOURCE):
-+ $(call DOWNLOAD,$(SDL_WATER_SITE),$(SDL_WATER_SOURCE))
-+
-+sdl-water-source: $(DL_DIR)/$(SDL_WATER_SOURCE)
-+
-+$(SDL_WATER_DIR)/.unpacked: $(DL_DIR)/$(SDL_WATER_SOURCE)
-+ $(SDL_WATER_CAT) $(DL_DIR)/$(SDL_WATER_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-+ touch $@
-+
-+$(SDL_WATER_DIR)/.configured: $(SDL_WATER_DIR)/.unpacked
-+ (cd $(SDL_WATER_DIR); \
-+ $(TARGET_CONFIGURE_OPTS) \
-+ CFLAGS="$(TARGET_CFLAGS) " \
-+ ./configure \
-+ --target=$(GNU_TARGET_NAME) \
-+ --host=$(GNU_TARGET_NAME) \
-+ --build=$(GNU_HOST_NAME) \
-+ --prefix=$(STAGING_DIR)/usr \
-+ --with-sdl-exec-prefix=$(STAGING_DIR)/usr/ \
-+ --disable-video-x11 );
-+ touch $@
-+
-+$(SDL_WATER_DIR)/water: $(SDL_WATER_DIR)/.configured
-+ $(MAKE) -C $(SDL_WATER_DIR)
-+
-+$(STAGING_DIR)/usr/bin/water: $(SDL_WATER_DIR)/water
-+ $(MAKE) -C $(SDL_WATER_DIR) install
-+ touch -c $@
-+
-+$(TARGET_DIR)/usr/bin/water: $(STAGING_DIR)/usr/bin/water
-+ mkdir -p $(SDL_WATER_TARGET_DATA_DIR)
-+ cp -dpf $(SDL_WATER_DIR)/water320.bmp $(SDL_WATER_TARGET_DATA_DIR)/
-+ cp -dpf $< $(TARGET_DIR)/usr/bin/
-+ -$(STRIPCMD) $@
-+
-+SDL-WATER sdl-water: uclibc sdl $(TARGET_DIR)/usr/bin/water
-+
-+sdl-water-clean:
-+ $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(SDL_WATER_DIR) uninstall
-+ rm $(SDL_WATER_TARGET_DATA_DIR)/water320.bmp
-+ -$(MAKE) -C $(SDL_WATER_DIR) clean
-+
-+sdl-water-dirclean:
-+ rm -rf $(SDL_WATER_DIR)
-+
-+#############################################################
-+#
-+# Toplevel Makefile options
-+#
-+#############################################################
-+ifeq ($(strip $(BR2_PACKAGE_SDL_WATER)),y)
-+TARGETS+=sdl-water
-+endif
diff --git a/patches/buildroot/2012.11.1/034-slideshow.patch b/patches/buildroot/2012.11.1/034-slideshow.patch
deleted file mode 100644
index 408838f..0000000
--- a/patches/buildroot/2012.11.1/034-slideshow.patch
+++ /dev/null
@@ -1,224 +0,0 @@
-Add slideshow package to BR.
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: buildroot/package/Config.in
-===================================================================
---- buildroot/package/Config.in
-+++ buildroot/package/Config.in
-@@ -135,6 +135,7 @@
- source "package/sdl_net/Config.in"
- source "package/sdl_ttf/Config.in"
- source "package/sdl_gfx/Config.in"
-+source "package/slideshow/Config.in"
- comment "Demos"
- source "package/sdlwater/Config.in"
-
-Index: buildroot/package/slideshow/Config.in
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/slideshow/Config.in 2012-02-21 16:44:09.000000000 +0100
-@@ -0,0 +1,8 @@
-+config BR2_PACKAGE_SLIDESHOW
-+ bool "Slideshow"
-+ depends on BR2_PACKAGE_SDL && BR2_PACKAGE_SDL_IMAGE
-+ help
-+ Perigee Slideshow is a command line program that searches a directory
-+ for supported graphic files and displays them in a slideshow.
-+
-+ http://www.xmission.com/~jstanley/slideshow.html
-Index: buildroot/package/slideshow/slideshow.mk
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/slideshow/slideshow.mk 2012-02-21 16:44:09.000000000 +0100
-@@ -0,0 +1,39 @@
-+#############################################################
-+#
-+# slideshow
-+#
-+#############################################################
-+
-+SLIDESHOW_VERSION:=1.1
-+SLIDESHOW_SOURCE:=slideshow-source-$(SLIDESHOW_VERSION).zip
-+SLIDESHOW_SITE:=http://www.xmission.com/~jstanley/
-+
-+SLIDESHOW_DEPENDENCIES += sdl sdl_image
-+
-+define SLIDESHOW_BUILD_CMDS
-+ $(MAKE) CC="$(TARGET_CXX)" CFLAGS="$(TARGET_CFLAGS) `sh $(STAGING_DIR)/usr/bin/sdl-config --cflags`" \
-+ LFLAGS="`sh $(STAGING_DIR)/usr/bin/sdl-config --libs` -lSDL_image" \
-+ -C $(SLIDESHOW_DIR)
-+endef
-+
-+define SLIDESHOW_INSTALL_TARGET_CMDS
-+ cp -dpf $(SLIDESHOW_DIR)/slideshow $(TARGET_DIR)/usr/bin
-+endef
-+
-+define SLIDESHOW_CLEAN_CMDS
-+ $(MAKE) clean -C $(SLIDESHOW_DIR)
-+endef
-+
-+define SLIDESHOW_UNINSTALL_TARGET_CMDS
-+ rm -f $(TARGET_DIR)/usr/bin/slideshow
-+endef
-+
-+$(eval $(generic-package))
-+
-+# BR currently doesn't support .zip archive, so do extraction manually:
-+$(SLIDESHOW_TARGET_EXTRACT): $(SLIDESHOW_TARGET_SOURCE)
-+ $(call MESSAGE,"Extracting")
-+ unzip $(DL_DIR)/$($(PKG)_SOURCE) -d $(BUILD_DIR)
-+ mv $(BUILD_DIR)/slideshow/* $(BUILD_DIR)/slideshow-$(SLIDESHOW_VERSION)/
-+ rm -rf $(BUILD_DIR)/slideshow
-+ touch $@
-Index: buildroot/package/slideshow/slideshow-01-restart-after-end.patch
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/slideshow/slideshow-01-restart-after-end.patch 2012-02-21 16:44:09.000000000 +0100
-@@ -0,0 +1,73 @@
-+--- slideshow/slideshow.cpp 2003-12-08 22:17:38.000000000 +0100
-++++ slideshow.mod/slideshow.cpp 2007-09-08 19:05:10.000000000 +0200
-+@@ -196,43 +196,48 @@
-+ SDL_FillRect(m_sdl, &rc, SDL_MapRGB(m_sdl->format, 0, 255, 0));
-+ SDL_UpdateRects(m_sdl, 1, &rc);
-+ }
-+-
-+- user_command cmd = wait_for_command();
-+-
-++
-++ user_command cmd = wait_for_command();
-++
-+ switch(cmd)
-+- {
-+- case c_quit:
-+- stop_timer();
-+- return true;
-+- case c_first_slide:
-++ {
-++ case c_quit:
-++ stop_timer();
-++ return true;
-++ case c_first_slide:
-+ stop_timer();
-+ m_image_index = 0;
-+ break;
-+ case c_last_slide:
-+- stop_timer();
-++ stop_timer();
-+ m_image_index = m_file_list->count() - 1;
-+- break;
-++ break;
-+ case c_prev_slide:
-+- stop_timer();
-++ stop_timer();
-+ if ( m_image_index > 0 )
-+ m_image_index--;
-+ break;
-+ case c_next_slide:
-+- stop_timer();
-+- // fall through
-+- case c_timer_advance:
-+- if ( m_image_index < m_file_list->count() - 1 )
-++ stop_timer();
-++ // fall through
-++ case c_timer_advance:
-++ if ( m_image_index <= m_file_list->count() - 1 )
-+ m_image_index++;
-+- break;
-+- case c_redraw:
-+ break;
-+- }
-++ case c_redraw:
-++ break;
-++ }
-+
-+ // stop the auto-advance when the last picture is about to be shown
-+- if ( m_image_index == m_file_list->count() - 1 )
-+- stop_timer();
-+- }
-+-
-++ if ( m_image_index == m_file_list->count() /*- 1*/ )
-++ {
-++ //stop_timer();
-++ m_image_index = 0;
-++ m_prev_image_index = -1;
-++ }
-++
-++ }
-++
-+ return true;
-+ }
-+
-Index: buildroot/package/slideshow/slideshow-02-remove-compile-warning.patch
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/slideshow/slideshow-02-remove-compile-warning.patch 2012-02-21 16:44:09.000000000 +0100
-@@ -0,0 +1,13 @@
-+--- slideshow.org/SDLFont.cpp 2007-11-17 19:25:02.000000000 +0100
-++++ slideshow/SDLFont.cpp 2007-11-17 20:06:20.000000000 +0100
-+@@ -84,8 +84,8 @@
-+
-+ Uint8 *pixloc = (Uint8 *)pDisplay->pixels + dpitch * y + Bpp * x;
-+ Uint8 *pChar, *pScreen;
-+- char c;
-+- int i, j;
-++ //char c;
-++ int i, j, c;
-+
-+ for(const char *p = text; *p != '\0'; p++)
-+ {
-Index: buildroot/package/slideshow/slideshow-03-fix_compilation_errors_with_recent_gcc.patch
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/slideshow/slideshow-03-fix_compilation_errors_with_recent_gcc.patch 2012-02-21 16:44:09.000000000 +0100
-@@ -0,0 +1,28 @@
-+On recent gcc some includes are needed to have string stuff defined.
-+
-+Signed-off-by: Julien Boibessot <jul...@ar...>
-+
-+Index: slideshow-1.1/file_list.cpp
-+===================================================================
-+--- slideshow-1.1.orig/file_list.cpp 2011-07-01 18:58:49.000000000 +0200
-++++ slideshow-1.1/file_list.cpp 2011-07-01 18:59:10.000000000 +0200
-+@@ -8,6 +8,7 @@
-+ #include <fstream>
-+ #include <stdlib.h>
-+ #include <ctype.h>
-++#include <string.h>
-+
-+ #ifdef WIN32
-+ #include <io.h>
-+Index: slideshow-1.1/slideshow.h
-+===================================================================
-+--- slideshow-1.1.orig/slideshow.h 2011-07-01 18:59:56.000000000 +0200
-++++ slideshow-1.1/slideshow.h 2011-07-01 19:00:02.000000000 +0200
-+@@ -9,6 +9,7 @@
-+ #pragma once
-+ #endif // _MSC_VER > 1000
-+
-++#include <iostream>
-+ #include "SDL.h"
-+ #include "cache.h"
-+
-Index: buildroot/package/slideshow/slideshow-04-fix_sdl_crash.patch
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/slideshow/slideshow-04-fix_sdl_crash.patch 2012-02-21 16:44:09.000000000 +0100
-@@ -0,0 +1,17 @@
-+Otherwise crashes on APF27.
-+
-+Signed-off-by: Julien Boibessot <jul...@ar...>
-+
-+Index: slideshow-1.1/slideshow.cpp
-+===================================================================
-+--- slideshow-1.1.orig/slideshow.cpp 2011-07-02 13:19:00.000000000 +0200
-++++ slideshow-1.1/slideshow.cpp 2011-07-02 13:19:17.000000000 +0200
-+@@ -416,7 +416,7 @@
-+ else
-+ flags |= SDL_FULLSCREEN;
-+
-+- m_sdl = SDL_SetVideoMode(m_options->width, m_options->height, 32, flags);
-++ m_sdl = SDL_SetVideoMode(m_options->width, m_options->height, 16 /*32*/, flags);
-+
-+ if ( !m_sdl )
-+ {
diff --git a/patches/buildroot/2012.11.1/040-linux-makefile.patch b/patches/buildroot/2012.11.1/040-linux-makefile.patch
deleted file mode 100644
index 49e96a9..0000000
--- a/patches/buildroot/2012.11.1/040-linux-makefile.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Index: buildroot/linux/linux.mk
-===================================================================
---- buildroot.orig/linux/linux.mk 2012-02-12 23:22:29.000000000 +0100
-+++ buildroot/linux/linux.mk 2012-02-21 20:57:38.000000000 +0100
-@@ -44,7 +44,8 @@
-
- # Get the real Linux version, which tells us where kernel modules are
- # going to be installed in the target filesystem.
--LINUX_VERSION_PROBED = $(shell $(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) --no-print-directory -s kernelrelease)
-+LINUX_VERSION_PROBED = $(LINUX_VERSION)
-+#LINUX_VERSION_PROBED = $(shell $(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) --no-print-directory -s kernelrelease)
-
- ifeq ($(BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM),y)
- LINUX_IMAGE_NAME=$(call qstrip,$(BR2_LINUX_KERNEL_IMAGE_TARGET_NAME))
-@@ -124,7 +125,14 @@
- KERNEL_SOURCE_CONFIG = $(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE)
- endif
-
-+ifeq ($(strip $(BR2_TARGET_ARMADEUS)),y)
-+define ARMADEUS_LINUX_CONFIG_HACKS
-+ ln -sf $(ARMADEUS_TOPDIR)/target/linux/modules/ $(@D)/drivers/armadeus
-+endef
-+endif
-+
- define LINUX_CONFIGURE_CMDS
-+ $(ARMADEUS_LINUX_CONFIG_HACKS)
- cp $(KERNEL_SOURCE_CONFIG) $(KERNEL_ARCH_PATH)/configs/buildroot_defconfig
- $(TARGET_MAKE_ENV) $(MAKE1) $(LINUX_MAKE_FLAGS) -C $(@D) buildroot_defconfig
- rm $(KERNEL_ARCH_PATH)/configs/buildroot_defconfig
-@@ -168,7 +176,7 @@
- endif
-
- define LINUX_INSTALL_IMAGES_CMDS
-- cp $(LINUX_IMAGE_PATH) $(BINARIES_DIR)
-+ cp $(LINUX_IMAGE_PATH) $(BINARIES_DIR)/$(ARMADEUS_LINUX_IMAGE_NAME)
- endef
-
- define LINUX_INSTALL_TARGET_CMDS
-@@ -214,7 +222,7 @@
- # Build the kernel.
- $(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_IMAGE_NAME)
- # Copy the kernel image to its final destination
-- cp $(LINUX_IMAGE_PATH) $(BINARIES_DIR)
-+ cp $(LINUX_IMAGE_PATH) $(BINARIES_DIR)/$(ARMADEUS_LINUX_IMAGE_NAME)
- # If there is a .ub file copy it to the final destination
- test ! -f $(LINUX_IMAGE_PATH).ub || cp $(LINUX_IMAGE_PATH).ub $(BINARIES_DIR)
- $(Q)touch $@
diff --git a/patches/buildroot/2012.11.1/043-mesa-add_packages.patch b/patches/buildroot/2012.11.1/043-mesa-add_packages.patch
deleted file mode 100644
index bd52bb5..0000000
--- a/patches/buildroot/2012.11.1/043-mesa-add_packages.patch
+++ /dev/null
@@ -1,287 +0,0 @@
-Index: buildroot/package/Config.in
-===================================================================
---- buildroot/package/Config.in
-+++ buildroot/package/Config.in
-@@ -403,6 +403,7 @@
- source "package/librsvg/Config.in"
- source "package/libsvgtiny/Config.in"
- source "package/libungif/Config.in"
-+source "package/mesa/Config.in"
- source "package/opencv/Config.in"
- source "package/pango/Config.in"
- source "package/pixman/Config.in"
-Index: buildroot/package/mesa/Config.in
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/mesa/Config.in 2012-02-21 16:44:18.000000000 +0100
-@@ -0,0 +1,6 @@
-+config BR2_PACKAGE_MESALIB
-+ bool "Mesa library"
-+ select BR2_PACKAGE_GPM
-+ help
-+ Build MesaGL. It allows you to use OpenGL on your system.
-+
-Index: buildroot/package/mesa/mesa.mk
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/mesa/mesa.mk 2012-02-21 16:44:18.000000000 +0100
-@@ -0,0 +1,66 @@
-+#############################################################
-+#
-+# Mesa
-+#
-+#############################################################
-+
-+MESALIB_VER:=7.0
-+MESALIB_SOURCE:=MesaLib-$(MESALIB_VER).tar.bz2
-+MESALIB_DEMOS:=MesaDemos-$(MESALIB_VER).tar.bz2
-+MESAGLUT_SOURCE:=MesaGLUT-$(MESALIB_VER).tar.bz2
-+MESALIB_SITE:=http://downloads.sourceforge.net/mesa3d
-+MESALIB_DIR:=$(BUILD_DIR)/Mesa-$(MESALIB_VER)
-+MESALIB_CAT:=bzcat
-+MESALIB_PATCH:=mesa.patch
-+
-+
-+$(DL_DIR)/$(MESALIB_SOURCE):
-+ $(call DOWNLOAD,$(MESALIB_SITE),$(MESALIB_SOURCE))
-+
-+$(DL_DIR)/$(MESALIB_DEMOS):
-+ $(call DOWNLOAD,$(MESALIB_SITE),$(MESALIB_DEMOS))
-+
-+$(DL_DIR)/$(MESAGLUT_SOURCE):
-+ $(call DOWNLOAD,$(MESALIB_SITE),$(MESAGLUT_SOURCE))
-+
-+mesa-source: $(DL_DIR)/$(MESALIB_SOURCE) $(DL_DIR)/$(MESALIB_DEMOS)
-+
-+$(MESALIB_DIR)/.unpacked: $(DL_DIR)/$(MESALIB_SOURCE) $(DL_DIR)/$(MESALIB_DEMOS) $(DL_DIR)/$(MESAGLUT_SOURCE)
-+ $(MESALIB_CAT) $(DL_DIR)/$(MESALIB_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-+ $(MESALIB_CAT) $(DL_DIR)/$(MESALIB_DEMOS) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-+ $(MESALIB_CAT) $(DL_DIR)/$(MESAGLUT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-+ touch $@
-+
-+$(MESALIB_DIR)/.patched: $(MESALIB_DIR)/.unpacked
-+ support/scripts/apply-patches.sh $(MESALIB_DIR) package/mesa $(MESALIB_PATCH)
-+ touch $@
-+
-+$(MESALIB_DIR)/.compiled: $(MESALIB_DIR)/.patched
-+ (cd $(MESALIB_DIR); \
-+ $(MAKE) realclean; \
-+ $(MAKE) CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" linux-fbdev);
-+#arm-linux-osmesa
-+ touch $@
-+
-+$(TARGET_DIR)/usr/lib/libGL.so.7.1.0: $(MESALIB_DIR)/.compiled
-+ mkdir -p $(TARGET_DIR)/usr/lib/
-+ cp -a $(MESALIB_DIR)/lib/* $(TARGET_DIR)/usr/lib/
-+ touch $@
-+
-+#also depends on host-makedepend ?
-+MESA mesa: gpm $(TARGET_DIR)/usr/lib/libGL.so.7.1.0
-+
-+mesa-clean:
-+ $(MAKE) CC="$(TARGET_CC)" clean -C $(MESALIB_DIR)
-+
-+mesa-dirclean:
-+ rm -rf $(MESALIB_DIR)
-+
-+#############################################################
-+#
-+# Toplevel Makefile options
-+#
-+#############################################################
-+ifeq ($(strip $(BR2_PACKAGE_MESALIB)),y)
-+TARGETS+=mesa
-+endif
-Index: buildroot/package/mesa/mesa.patch
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/mesa/mesa.patch 2012-02-21 16:44:18.000000000 +0100
-@@ -0,0 +1,188 @@
-+diff -bruN Mesa-7.0.orig/configs/arm-linux-osmesa Mesa-7.0/configs/arm-linux-osmesa
-+--- Mesa-7.0.orig/configs/arm-linux-osmesa 1970-01-01 01:00:00.000000000 +0100
-++++ Mesa-7.0/configs/arm-linux-osmesa 2007-06-26 23:00:52.000000000 +0200
-+@@ -0,0 +1,25 @@
-++# Configuration for building only libOSMesa on Linux, no Xlib driver
-++# This doesn't really have any Linux dependencies, so it should be usable
-++# on other (gcc-based) systems.
-++
-++include $(TOP)/configs/default
-++
-++CONFIG_NAME = arm-linux-osmesa
-++
-++# Compiler and flags
-++CC = gcc
-++CXX = g++
-++CFLAGS = -O3 -ansi -pedantic -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS
-++CXXFLAGS = -O3 -ansi -pedantic -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
-++
-++
-++# Directories
-++SRC_DIRS = mesa
-++DRIVER_DIRS = osmesa
-++PROGRAM_DIRS = osdemos
-++
-++
-++# Dependencies
-++OSMESA_LIB_DEPS = -lm -lpthread
-++GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
-++APP_LIB_DEPS = -lOSMesa
-+diff -bruN Mesa-7.0.orig/Makefile Mesa-7.0/Makefile
-+--- Mesa-7.0.orig/Makefile 2007-06-22 00:14:38.000000000 +0200
-++++ Mesa-7.0/Makefile 2007-06-26 22:31:34.000000000 +0200
-+@@ -111,6 +111,7 @@
-+ linux-ia64-icc-static \
-+ linux-icc \
-+ linux-icc-static \
-++arm-linux-osmesa \
-+ linux-osmesa \
-+ linux-osmesa16 \
-+ linux-osmesa16-static \
-+diff -bruN Mesa-7.0.orig/progs/osdemos/osdemo.c Mesa-7.0/progs/osdemos/osdemo.c
-+--- Mesa-7.0.orig/progs/osdemos/osdemo.c 2007-06-26 23:05:40.000000000 +0200
-++++ Mesa-7.0/progs/osdemos/osdemo.c 2007-06-26 22:44:58.000000000 +0200
-+@@ -22,7 +22,7 @@
-+ #include <stdlib.h>
-+ #include <string.h>
-+ #include "GL/osmesa.h"
-+-#include "GL/glu.h"
-++/*#include "GL/glu.h"*/
-+
-+
-+ #define SAVE_TARGA
-+@@ -30,7 +30,7 @@
-+ static int Width = 400;
-+ static int Height = 400;
-+
-+-
-++/*
-+ static void
-+ Sphere(float radius, int slices, int stacks)
-+ {
-+@@ -50,7 +50,7 @@
-+ gluCylinder(q, base, 0.0, height, slices, stacks);
-+ gluDeleteQuadric(q);
-+ }
-+-
-++*/
-+
-+ static void
-+ Torus(float innerRadius, float outerRadius, int sides, int rings)
-+@@ -131,7 +131,7 @@
-+ Torus(0.275, 0.85, 20, 20);
-+ glPopMatrix();
-+
-+- glPushMatrix();
-++/* glPushMatrix();
-+ glTranslatef(-0.75, -0.5, 0.0);
-+ glRotatef(270.0, 1.0, 0.0, 0.0);
-+ glMaterialfv( GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, green_mat );
-+@@ -143,7 +143,7 @@
-+ glMaterialfv( GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, blue_mat );
-+ Sphere(1.0, 20, 20);
-+ glPopMatrix();
-+-
-++*/
-+ glPopMatrix();
-+
-+ /* This is very important!!!
-+diff -bruN Mesa-7.0.orig/progs/osdemos/ostest1.c Mesa-7.0/progs/osdemos/ostest1.c
-+--- Mesa-7.0.orig/progs/osdemos/ostest1.c 2007-06-26 23:05:40.000000000 +0200
-++++ Mesa-7.0/progs/osdemos/ostest1.c 2007-06-26 22:47:58.000000000 +0200
-+@@ -14,7 +14,7 @@
-+ #include <stdlib.h>
-+ #include <string.h>
-+ #include "GL/osmesa.h"
-+-#include "GL/glu.h"
-++/*#include "GL/glu.h"*/
-+
-+
-+ #define WIDTH 600
-+@@ -23,7 +23,7 @@
-+ static GLboolean WriteFiles = GL_FALSE;
-+ static GLboolean Gradient = GL_FALSE;
-+
-+-
-++/*
-+ static void
-+ Sphere(float radius, int slices, int stacks)
-+ {
-+@@ -43,7 +43,7 @@
-+ gluCylinder(q, base, 0.0, height, slices, stacks);
-+ gluDeleteQuadric(q);
-+ }
-+-
-++*/
-+
-+ static void
-+ Torus(float innerRadius, float outerRadius, int sides, int rings)
-+@@ -225,7 +225,7 @@
-+ glMaterialfv( GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, red_mat );
-+ Torus(0.275, 0.85, 20, 20);
-+ glPopMatrix();
-+-
-++/*
-+ glPushMatrix();
-+ glTranslatef(-1.5, -0.5, 0.0);
-+ glRotatef(270.0, 1.0, 0.0, 0.0);
-+@@ -241,7 +241,7 @@
-+ Sphere(1.2, 20, 20);
-+ glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
-+ glPopMatrix();
-+-
-++*/
-+ #if 0
-+ glPushMatrix();
-+ glTranslatef(0.75, 0.0, 1.3);
-+diff -bruN Mesa-7.0.orig/src/mesa/Makefile Mesa-7.0/src/mesa/Makefile
-+--- Mesa-7.0.orig/src/mesa/Makefile 2007-06-22 00:10:54.000000000 +0200
-++++ Mesa-7.0/src/mesa/Makefile 2007-06-26 22:31:34.000000000 +0200
-+@@ -107,7 +107,7 @@
-+
-+ stand-alone: depend subdirs $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME)
-+
-+-osmesa-only: depend subdirs $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME)
-++osmesa-only: depend $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME)
-+
-+ # Make the GL library
-+ $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS)
-+@@ -139,13 +139,13 @@
-+ depend: $(ALL_SOURCES)
-+ @ echo "running $(MKDEP)"
-+ @ touch depend
-+- @$(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDE_DIRS) $(ALL_SOURCES) \
-+- > /dev/null 2>/dev/null
-++ @$(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDE_DIRS) $(ALL_SOURCES) #\
-++ #> /dev/null 2>/dev/null
-+
-+
-+-subdirs:
-+- @ (cd x86 ; $(MAKE))
-+- @ (cd x86-64 ; $(MAKE))
-++#subdirs:
-++# @ (cd x86 ; $(MAKE))
-++# @ (cd x86-64 ; $(MAKE))
-+
-+
-+ install: default
-+--- Mesa-7.0.org/configs/linux-fbdev 2007-06-22 00:10:53.000000000 +0200
-++++ Mesa-7.0/configs/linux-fbdev 2007-06-29 19:13:04.000000000 +0200
-+@@ -4,13 +4,14 @@
-+
-+ CONFIG_NAME = linux-fbdev
-+
-+-CFLAGS = -O3 -ffast-math -ansi -pedantic -fPIC -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS -DUSE_GLFBDEV_DRIVER
-++CFLAGS = -O3 -ffast-math -ansi -pedantic -fPIC -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS -DUSE_GLFBDEV_DRIVER -I$(TOP)/../staging_dir/usr/include -I$(TOP)/../staging_dir/include
-+
-+ SRC_DIRS = mesa glu glut/fbdev
-+ DRIVER_DIRS = fbdev osmesa
-+-PROGRAM_DIRS = fbdev demos redbook samples
-++PROGRAM_DIRS = fbdev demos osdemos redbook samples
-+
-+ GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread
-+-OSMESA_LIB_DEPS = -lm -lpthread
-+-GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lgpm -lm
-++OSMESA_LIB_DEPS = -lm -lpthread -L$(TOP)/../staging_dir/usr/lib
-++GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L$(TOP)/../staging_dir/usr/lib -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lgpm -lm
-++APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L$(TOP)/../staging_dir/usr/lib -l$(GLU_LIB) -l$(GL_LIB) -l$(GLUT_LIB) $(EXTRA_LIB_PATH) -lgpm -lm -lstdc++
-+
diff --git a/patches/buildroot/2012.11.1/045-openssh-add_passwd_expire.patch b/patches/buildroot/2012.11.1/045-openssh-add_passwd_expire.patch
deleted file mode 100644
index 939063e..0000000
--- a/patches/buildroot/2012.11.1/045-openssh-add_passwd_expire.patch
+++ /de...
[truncated message content] |
|
From: jorasse <jo...@us...> - 2013-05-23 18:02:07
|
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 41d21297400a66e7d8bb44746735d441cbd5b710 (commit)
from 592ac6cf2102eaf37fc09eb16968d4429073d8ec (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 41d21297400a66e7d8bb44746735d441cbd5b710
Author: Eric Jarrige <eri...@ar...>
Date: Thu May 23 20:09:16 2013 +0200
[BUILDROOT] preliminary migration to BR 2013.05
-----------------------------------------------------------------------
Summary of changes:
.../2013.05/001-add_armadeus_device.patch | 24 +
.../002-add_armadeus_specific_packages.patch | 0
patches/buildroot/2013.05/006-lcd4linux.patch | 753 +++++++++++++++
patches/buildroot/2013.05/018-allegro.patch | 114 +++
.../buildroot/2013.05/021-sdl-water-config.patch | 99 ++
patches/buildroot/2013.05/034-slideshow.patch | 224 +++++
patches/buildroot/2013.05/040-linux-makefile.patch | 47 +
.../buildroot/2013.05/043-mesa-add_packages.patch | 287 ++++++
.../045-openssh-add_passwd_expire.patch | 0
...support-for-Safe-Boot-file-format-this-fo.patch | 46 +
...d_possibility_to_choose_board_header_file.patch | 26 +
...x_in_a_standalone_way_after_configuration.patch | 13 +
...-linux-change_board_specific_patches_name.patch | 13 +
.../buildroot/2013.05/072-xenomai-package.patch | 222 +++++
.../buildroot/2013.05/081-adds_quake_package.patch | 160 ++++
.../083-pygame-armadeus_addons.patch | 0
.../buildroot/2013.05/085-adds_gpm_package.patch | 168 ++++
.../097-adds_flite_package.patch | 0
...for_pld_asm_instruction_on_non_armv5_arch.patch | 0
...r-add_patch_for_recent_alsa_compatibility.patch | 0
.../buildroot/2013.05/107-games-add_wolf4sdl.patch | 92 ++
.../buildroot/2013.05/110-bluez3-add_package.patch | 118 +++
.../{2012.11.1 => 2013.05}/111-bluez3-hacks.patch | 0
.../buildroot/2013.05/118-snes9x-add_package.patch | 417 ++++++++
.../buildroot/2013.05/119-fbtest-add_package.patch | 176 ++++
.../buildroot/2013.05/120-cwiid-add_package.patch | 106 ++
.../2013.05/121-target-arm926t_is_arm926ej-s.patch | 18 +
.../123-pywebradio-add_package.patch | 0
.../buildroot/2013.05/124-e-uae-add_package.patch | 54 ++
.../2013.05/125-opentyrian-add_package.patch | 83 ++
.../2013.05/130-lbreakout-add_package.patch | 82 ++
.../2013.05/131-ltetris-add_package.patch | 84 ++
...-qt-full_integration_with_cross_compiling.patch | 44 +
...ffs2-add_board_name_to_binary_rootfs_name.patch | 30 +
.../135-linux-add_linux26-clean_target.patch | 11 +
...42-ncurses-fix_compilation_with_old_hosts.patch | 0
...-disable_ip_busybox_if_iproute2_buildroot.patch | 37 +
...fix_installation_bug_on_some_host_systems.patch | 0
...lection_even_when_custom_rootfs_is_chosen.patch | 0
.../158-setserial-bump_version.patch | 0
.../2013.05/168-libcanfestival-add_package.patch | 897 ++++++++++++++++++
.../buildroot/2013.05/172-gsmmux-add_package.patch | 88 ++
.../174-imx-lib-add_package.patch.TOUPDATE | 0
.../2013.05/176-imx-test-add_package.patch | 148 +++
.../178-uboot-add-missing-UBOOT_CLEAN_CMDS.patch | 29 +
...e4defrag_build_against_old_kernel_headers.patch | 0
.../2013.05/181-qtcreator-add_package.patch | 1001 ++++++++++++++++++++
.../182-uclibc-add_accept4_declaration_fix.patch | 0
.../184-fsl-mm-codeclib-add_package.patch | 0
...nore-env_sectors-on-NOR-and-SPI-dataflash.patch | 0
.../buildroot/2013.05/188-marble-add_package.patch | 88 ++
.../2013.05/189-dbus-fix_installation.patch | 27 +
.../2013.05/191-madplay-requires_libintl.patch | 29 +
.../2013.05/196-python-crc16-add_package.patch | 58 ++
.../buildroot/2013.05/197-cunit-add_package.patch | 49 +
.../2013.05/201-armadeus-add_gnokii.patch | 57 ++
.../204-busybox-fix-snapshot.patch | 0
.../204-wpa-supplicant-add-option-ieee80211w.patch | 0
...x-coreutils-stty-add-rs485-config-options.patch | 0
patches/buildroot/2013.05/cleanup_buildroot.sh | 76 ++
60 files changed, 6095 insertions(+), 0 deletions(-)
create mode 100644 patches/buildroot/2013.05/001-add_armadeus_device.patch
copy patches/buildroot/{2013.02 => 2013.05}/002-add_armadeus_specific_packages.patch (100%)
create mode 100644 patches/buildroot/2013.05/006-lcd4linux.patch
create mode 100644 patches/buildroot/2013.05/018-allegro.patch
create mode 100644 patches/buildroot/2013.05/021-sdl-water-config.patch
create mode 100644 patches/buildroot/2013.05/034-slideshow.patch
create mode 100644 patches/buildroot/2013.05/040-linux-makefile.patch
create mode 100644 patches/buildroot/2013.05/043-mesa-add_packages.patch
copy patches/buildroot/{2012.02 => 2013.05}/045-openssh-add_passwd_expire.patch (100%)
create mode 100644 patches/buildroot/2013.05/051a-U-Boot-add-support-for-Safe-Boot-file-format-this-fo.patch
create mode 100644 patches/buildroot/2013.05/051d-u-boot-add_possibility_to_choose_board_header_file.patch
create mode 100644 patches/buildroot/2013.05/060-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.patch
create mode 100644 patches/buildroot/2013.05/071-linux-change_board_specific_patches_name.patch
create mode 100644 patches/buildroot/2013.05/072-xenomai-package.patch
create mode 100644 patches/buildroot/2013.05/081-adds_quake_package.patch
copy patches/buildroot/{2012.02 => 2013.05}/083-pygame-armadeus_addons.patch (100%)
create mode 100644 patches/buildroot/2013.05/085-adds_gpm_package.patch
copy patches/buildroot/{2012.11.1 => 2013.05}/097-adds_flite_package.patch (100%)
copy patches/buildroot/{2012.02 => 2013.05}/099-mplayer-add_patch_for_pld_asm_instruction_on_non_armv5_arch.patch (100%)
copy patches/buildroot/{2012.02 => 2013.05}/101-mplayer-add_patch_for_recent_alsa_compatibility.patch (100%)
create mode 100644 patches/buildroot/2013.05/107-games-add_wolf4sdl.patch
create mode 100644 patches/buildroot/2013.05/110-bluez3-add_package.patch
copy patches/buildroot/{2012.11.1 => 2013.05}/111-bluez3-hacks.patch (100%)
create mode 100644 patches/buildroot/2013.05/118-snes9x-add_package.patch
create mode 100644 patches/buildroot/2013.05/119-fbtest-add_package.patch
create mode 100644 patches/buildroot/2013.05/120-cwiid-add_package.patch
create mode 100644 patches/buildroot/2013.05/121-target-arm926t_is_arm926ej-s.patch
copy patches/buildroot/{2013.02 => 2013.05}/123-pywebradio-add_package.patch (100%)
create mode 100644 patches/buildroot/2013.05/124-e-uae-add_package.patch
create mode 100644 patches/buildroot/2013.05/125-opentyrian-add_package.patch
create mode 100644 patches/buildroot/2013.05/130-lbreakout-add_package.patch
create mode 100644 patches/buildroot/2013.05/131-ltetris-add_package.patch
create mode 100644 patches/buildroot/2013.05/132-qt-full_integration_with_cross_compiling.patch
create mode 100644 patches/buildroot/2013.05/134-jffs2-add_board_name_to_binary_rootfs_name.patch
create mode 100644 patches/buildroot/2013.05/135-linux-add_linux26-clean_target.patch
copy patches/buildroot/{2012.11.1 => 2013.05}/142-ncurses-fix_compilation_with_old_hosts.patch (100%)
create mode 100644 patches/buildroot/2013.05/146-busybox-disable_ip_busybox_if_iproute2_buildroot.patch
copy patches/buildroot/{2013.02 => 2013.05}/150-alsa-utils-fix_installation_bug_on_some_host_systems.patch (100%)
copy patches/buildroot/{2013.02 => 2013.05}/157-buildroot-allow_generic_device_selection_even_when_custom_rootfs_is_chosen.patch (100%)
copy patches/buildroot/{2012.02 => 2013.05}/158-setserial-bump_version.patch (100%)
create mode 100644 patches/buildroot/2013.05/168-libcanfestival-add_package.patch
create mode 100644 patches/buildroot/2013.05/172-gsmmux-add_package.patch
copy patches/buildroot/{2013.02 => 2013.05}/174-imx-lib-add_package.patch.TOUPDATE (100%)
create mode 100644 patches/buildroot/2013.05/176-imx-test-add_package.patch
create mode 100644 patches/buildroot/2013.05/178-uboot-add-missing-UBOOT_CLEAN_CMDS.patch
copy patches/buildroot/{2012.02 => 2013.05}/179-e2fsprog-allow_e4defrag_build_against_old_kernel_headers.patch (100%)
create mode 100644 patches/buildroot/2013.05/181-qtcreator-add_package.patch
copy patches/buildroot/{2012.11.1 => 2013.05}/182-uclibc-add_accept4_declaration_fix.patch (100%)
copy patches/buildroot/{2012.11.1 => 2013.05}/184-fsl-mm-codeclib-add_package.patch (100%)
copy patches/buildroot/{2013.02 => 2013.05}/186-uboot-tools-2011.03-Ignore-env_sectors-on-NOR-and-SPI-dataflash.patch (100%)
create mode 100644 patches/buildroot/2013.05/188-marble-add_package.patch
create mode 100644 patches/buildroot/2013.05/189-dbus-fix_installation.patch
create mode 100644 patches/buildroot/2013.05/191-madplay-requires_libintl.patch
create mode 100644 patches/buildroot/2013.05/196-python-crc16-add_package.patch
create mode 100644 patches/buildroot/2013.05/197-cunit-add_package.patch
create mode 100644 patches/buildroot/2013.05/201-armadeus-add_gnokii.patch
copy patches/buildroot/{2013.02 => 2013.05}/204-busybox-fix-snapshot.patch (100%)
copy patches/buildroot/{2013.02 => 2013.05}/204-wpa-supplicant-add-option-ieee80211w.patch (100%)
copy patches/buildroot/{2013.02 => 2013.05}/205-busybox-coreutils-stty-add-rs485-config-options.patch (100%)
create mode 100755 patches/buildroot/2013.05/cleanup_buildroot.sh
diff --git a/patches/buildroot/2013.05/001-add_armadeus_device.patch b/patches/buildroot/2013.05/001-add_armadeus_device.patch
new file mode 100644
index 0000000..1237ac3
--- /dev/null
+++ b/patches/buildroot/2013.05/001-add_armadeus_device.patch
@@ -0,0 +1,24 @@
+Add armadeus target specific menu to BR.
+
+Index: buildroot/Makefile
+===================================================================
+--- buildroot/Makefile
++++ buildroot/Makefile
+@@ -337,6 +337,7 @@ endif
+ include boot/common.mk
+ include linux/linux.mk
+ include system/system.mk
++include target/device/armadeus/Makefile.in
+
+ TARGETS+=target-finalize
+
+Index: buildroot/system/Config.in
+===================================================================
+--- buildroot/system/Config.in
++++ buildroot/system/Config.in
+@@ -294,4 +294,5 @@ config BR2_ROOTFS_POST_BUILD_SCRIPT
+ first and only argument. The script is executed from the
+ main Buildroot source directory as the current directory.
+
++source "target/device/armadeus/Config.in"
+ endmenu
diff --git a/patches/buildroot/2013.02/002-add_armadeus_specific_packages.patch b/patches/buildroot/2013.05/002-add_armadeus_specific_packages.patch
similarity index 100%
copy from patches/buildroot/2013.02/002-add_armadeus_specific_packages.patch
copy to patches/buildroot/2013.05/002-add_armadeus_specific_packages.patch
diff --git a/patches/buildroot/2013.05/006-lcd4linux.patch b/patches/buildroot/2013.05/006-lcd4linux.patch
new file mode 100644
index 0000000..31c293d
--- /dev/null
+++ b/patches/buildroot/2013.05/006-lcd4linux.patch
@@ -0,0 +1,753 @@
+Add lcd4linux package to BR.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot/package/Config.in
++++ buildroot/package/Config.in
+@@ -257,6 +257,7 @@
+ source "package/iostat/Config.in"
+ source "package/irda-utils/Config.in"
+ source "package/kbd/Config.in"
++source "package/lcd4linux/Config.in"
+ source "package/lcdproc/Config.in"
+ source "package/lm-sensors/Config.in"
+ source "package/lshw/Config.in"
+Index: buildroot/package/lcd4linux/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/lcd4linux/Config.in 2012-02-21 16:43:57.000000000 +0100
+@@ -0,0 +1,7 @@
++config BR2_PACKAGE_LCD4LINUX
++ bool "LCD4Linux daemon"
++ select BR2_PACKAGE_NCURSES
++ help
++ LCD4Linux allows you to show some system parameters on a textual LCD
++ connected to your Armadeus board.
++
+Index: buildroot/package/lcd4linux/lcd4linux.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/lcd4linux/lcd4linux.mk 2012-02-21 16:43:57.000000000 +0100
+@@ -0,0 +1,66 @@
++#############################################################
++#
++# LCD4Linux daemon
++#
++#############################################################
++
++LCD4LINUX_VER:=0.10.1-RC2
++LCD4LINUX_SOURCE:=lcd4linux-$(LCD4LINUX_VER).tar.gz
++LCD4LINUX_SITE:=http://ssl.bulix.org/projects/lcd4linux/raw-attachment/wiki/Download/
++LCD4LINUX_DIR:=$(BUILD_DIR)/lcd4linux-$(LCD4LINUX_VER)
++LCD4LINUX_CAT:=zcat
++LCD4LINUX_BINARY:=lcd4linux
++LCD4LINUX_TARGET_BINARY:=usr/bin/lcd4linux
++LCD4LINUX_PATCH:=lcd4linux_armadeus.patch
++LCD4LINUX_CONF:=lcd4linux_armadeus.conf
++LCD4LINUX_TARGET_CONF:=etc/lcd4linux.conf
++
++
++$(DL_DIR)/$(LCD4LINUX_SOURCE):
++ $(call DOWNLOAD,$(LCD4LINUX_SITE),$(LCD4LINUX_SOURCE))
++
++lcd4linux-source: $(DL_DIR)/$(LCD4LINUX_SOURCE)
++
++$(LCD4LINUX_DIR)/.unpacked: $(DL_DIR)/$(LCD4LINUX_SOURCE)
++ $(LCD4LINUX_CAT) $(DL_DIR)/$(LCD4LINUX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
++ touch $@
++
++$(LCD4LINUX_DIR)/.patched: $(LCD4LINUX_DIR)/.unpacked
++ support/scripts/apply-patches.sh $(LCD4LINUX_DIR) package/lcd4linux lcd4linux\*.patch
++ (if [ -d $(BUILD_DIR)/linux-2.6.12/include/asm-generic ]; then ln -sf $(BUILD_DIR)/linux-2.6.12/include/asm-generic/ $(BUILD_DIR)/staging_dir/arm-linux-uclibc/sys-include/asm-generic; fi)
++ touch $@
++
++$(LCD4LINUX_DIR)/.configured: $(LCD4LINUX_DIR)/.patched
++ (cd $(LCD4LINUX_DIR); rm -rf config.cache; \
++ $(TARGET_CONFIGURE_OPTS) CC_FOR_BUILD=$(HOSTCC) \
++ CFLAGS="$(TARGET_CFLAGS)" \
++ ./configure \
++ --host=$(GNU_TARGET_NAME) \
++ );
++ touch $@
++
++$(LCD4LINUX_DIR)/$(LCD4LINUX_BINARY): $(LCD4LINUX_DIR)/.configured
++ $(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(LCD4LINUX_DIR)
++
++$(TARGET_DIR)/$(LCD4LINUX_TARGET_BINARY): $(LCD4LINUX_DIR)/$(LCD4LINUX_BINARY)
++ install -D $< $@
++ $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
++ cp package/lcd4linux/$(LCD4LINUX_CONF) $(TARGET_DIR)/$(LCD4LINUX_TARGET_CONF)
++
++lcd4linux: uclibc ncurses $(TARGET_DIR)/$(LCD4LINUX_TARGET_BINARY)
++
++lcd4linux-clean:
++ rm -f $(TARGET_DIR)/$(LCD4LINUX_TARGET_BINARY)
++ -$(MAKE) -C $(LCD4LINUX_DIR) clean
++
++lcd4linux-dirclean:
++ rm -rf $(LCD4LINUX_DIR)
++
++#############################################################
++#
++# Toplevel Makefile options
++#
++#############################################################
++ifeq ($(strip $(BR2_PACKAGE_LCD4LINUX)),y)
++TARGETS+=lcd4linux
++endif
+Index: buildroot/package/lcd4linux/lcd4linux-remove-wireless.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/lcd4linux/lcd4linux-remove-wireless.patch 2012-02-21 16:43:57.000000000 +0100
+@@ -0,0 +1,13 @@
++This plugin doesn't compile yet (/anymore?)
++
++--- lcd4linux-0.10.0/configure.org 2007-11-21 22:31:40.000000000 +0100
+++++ lcd4linux-0.10.0/configure 2007-11-21 22:32:04.000000000 +0100
++@@ -6366,7 +6366,7 @@
++ PLUGIN_STATFS="yes"
++ PLUGIN_UNAME="yes"
++ PLUGIN_UPTIME="yes"
++- PLUGIN_WIRELESS="yes"
+++ PLUGIN_WIRELESS="no"
++ PLUGIN_XMMS="yes"
++ ;;
++ apm)
+Index: buildroot/package/lcd4linux/lcd4linux-armadeus.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/lcd4linux/lcd4linux-armadeus.patch 2012-02-21 16:43:57.000000000 +0100
+@@ -0,0 +1,181 @@
++diff -uprN lcd4linux-0.10.0/configure lcd4linux-0.10.0.armadeus/configure
++--- lcd4linux-0.10.0/configure 2005-06-10 13:21:49.000000000 +0200
+++++ lcd4linux-0.10.0.armadeus/configure 2005-09-11 20:39:47.000000000 +0200
++@@ -7242,7 +7242,7 @@ for driver in $drivers; do
++ picoLCD="yes"
++ PNG="yes"
++ PPM="yes"
++- ROUTERBOARD="yes"
+++ ROUTERBOARD="no"
++ SAMPLE="yes"
++ SERDISPLIB="yes"
++ SIMPLELCD="yes"
++diff -uprN lcd4linux-0.10.0/drv_generic_parport.c lcd4linux-0.10.0.armadeus/drv_generic_parport.c
++--- lcd4linux-0.10.0/drv_generic_parport.c 2005-05-08 06:32:44.000000000 +0200
+++++ lcd4linux-0.10.0.armadeus/drv_generic_parport.c 2005-09-11 20:46:27.000000000 +0200
++@@ -215,9 +215,8 @@ int drv_generic_parport_open(const char
++ return -1;
++ }
++ } else
++-#endif
++-
++ {
+++#else
++ error("using raw port 0x%x (deprecated!)", Port);
++ error("You *really* should change your setup and use ppdev!");
++ if ((Port + 3) <= 0x3ff) {
++@@ -231,6 +230,7 @@ int drv_generic_parport_open(const char
++ return -1;
++ }
++ }
+++#endif // WITH_PPDEV
++ }
++ return 0;
++ }
++@@ -250,9 +250,9 @@ int drv_generic_parport_close(void)
++ }
++ free(PPdev);
++ } else
++-#endif
++ {
++ debug("closing raw port 0x%x", Port);
+++#else
++ if ((Port + 3) <= 0x3ff) {
++ if (ioperm(Port, 3, 0) != 0) {
++ error("%s: ioperm(0x%x) failed: %s", Driver, Port, strerror(errno));
++@@ -264,6 +264,7 @@ int drv_generic_parport_close(void)
++ return -1;
++ }
++ }
+++#endif // WITH_PPDEV
++ }
++
++ return 0;
++@@ -426,11 +427,12 @@ void drv_generic_parport_direction(const
++ if (PPdev) {
++ ioctl(PPfd, PPDATADIR, &direction);
++ } else
++-#endif
++ {
+++#else
++ /* code stolen from linux/parport_pc.h */
++ ctr = (ctr & ~0x20) ^ (direction ? 0x20 : 0x00);
++ outb(ctr, Port + 2);
+++#endif
++ }
++ }
++
++@@ -445,9 +447,10 @@ unsigned char drv_generic_parport_status
++ if (PPdev) {
++ ioctl(PPfd, PPRSTATUS, &data);
++ } else
++-#endif
++ {
+++#else
++ data = inb(Port + 1);
+++#endif
++ }
++
++ /* clear unused bits */
++@@ -476,11 +479,12 @@ void drv_generic_parport_control(const u
++ frob.val = val;
++ ioctl(PPfd, PPFCONTROL, &frob);
++ } else
++-#endif
++ {
+++#else
++ /* code stolen from linux/parport_pc.h */
++ ctr = (ctr & ~mask) ^ val;
++ outb(ctr, Port + 2);
+++#endif
++ }
++ }
++
++@@ -519,9 +523,10 @@ void drv_generic_parport_toggle(const un
++ frob.val = value2;
++ ioctl(PPfd, PPFCONTROL, &frob);
++
++- } else
++-#endif
+++ }
+++ else
++ {
+++#else
++ /* rise */
++ ctr = (ctr & ~bits) ^ value1;
++ outb(ctr, Port + 2);
++@@ -532,6 +537,7 @@ void drv_generic_parport_toggle(const un
++ /* lower */
++ ctr = (ctr & ~bits) ^ value2;
++ outb(ctr, Port + 2);
+++#endif
++ }
++ }
++
++@@ -541,11 +547,13 @@ void drv_generic_parport_data(const unsi
++ #ifdef WITH_PPDEV
++ if (PPdev) {
++ ioctl(PPfd, PPWDATA, &data);
++- } else
++-#endif
+++ }
+++#else
+++ else
++ {
++ outb(data, Port);
++ }
+++#endif
++ }
++
++ unsigned char drv_generic_parport_read(void)
++@@ -555,11 +563,13 @@ unsigned char drv_generic_parport_read(v
++ #ifdef WITH_PPDEV
++ if (PPdev) {
++ ioctl(PPfd, PPRDATA, &data);
++- } else
++-#endif
++- {
+++ }
+++#else
+++ else {
++ data = inb(Port);
++ }
+++#endif // WITH_PPDEV
+++
++ return data;
++ }
++
++@@ -571,11 +581,12 @@ void drv_generic_parport_debug(void)
++ #ifdef WITH_PPDEV
++ if (PPdev) {
++ ioctl(PPfd, PPRCONTROL, &control);
++- } else
++-#endif
++- {
+++ }
+++#else
+++ else {
++ control = ctr;
++ }
+++#endif // WITH_PPDEV
++
++ debug("%cSTROBE %cAUTOFD %cINIT %cSLCTIN",
++ control & PARPORT_CONTROL_STROBE ? '-' : '+',
++diff -uprN lcd4linux-0.10.0/stamp-h lcd4linux-0.10.0.armadeus/stamp-h
++--- lcd4linux-0.10.0/stamp-h 1970-01-01 01:00:00.000000000 +0100
+++++ lcd4linux-0.10.0.armadeus/stamp-h 2005-09-11 20:40:06.000000000 +0200
++@@ -0,0 +1 @@
+++timestamp
++diff -uprN lcd4linux-0.10.0/udelay.c lcd4linux-0.10.0.armadeus/udelay.c
++--- lcd4linux-0.10.0/udelay.c 2005-05-08 06:32:45.000000000 +0200
+++++ lcd4linux-0.10.0.armadeus/udelay.c 2005-09-11 19:59:42.000000000 +0200
++@@ -133,6 +133,7 @@
++ #include <stdlib.h>
++ #include <stdio.h>
++
+++#undef USE_OLD_UDELAY // otherwise x86 asm code is used
++
++ #ifdef USE_OLD_UDELAY
++
++
++
+Index: buildroot/package/lcd4linux/lcd4linux_armadeus.conf
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/lcd4linux/lcd4linux_armadeus.conf 2012-02-21 16:43:57.000000000 +0100
+@@ -0,0 +1,445 @@
++
++# Armadeus HD44780 display (Nico wiring ;-))
++Display HD44780-generic {
++ Driver 'HD44780'
++ Model 'generic'
++ Port '/dev/parports/0'
++ Size '40x2'
++ asc255bug 0
++ Bits 4
++ Wire {
++ RW 'DB4'
++ RS 'DB5'
++ ENABLE 'DB6'
++ ENABLE2 'GND'
++ GPO 'GND'
++ }
++}
++
++Plugin Seti {
++ Directory '/root/setiathome-3.08.i686-pc-linux-gnu'
++}
++
++
++Plugin MySQL {
++ server 'gsmlandia.com' # if none, localhost assumed
++ port 3306 # if none, MySQL default assumed
++ user 'lcd4linux' # if none, lcd4linux unix owner assumed
++ password 'lcd4linux' # if none, empty password assumed
++ database 'lcd4linux' # MUST be specified
++}
++
++Plugin Pop3 {
++ server1 'localhost'
++ port1 110
++ user1 'michael'
++ password1 'secret'
++}
++
++
++Widget OS {
++ class 'Text'
++ expression '*** '.uname('sysname').' '.uname('release').' ***'
++ width 20
++ align 'M'
++ speed 100
++ update tick
++}
++
++Widget CPU {
++ class 'Text'
++ expression uname('machine')
++ prefix 'CPU '
++ width 9
++ align 'L'
++ update tick
++}
++
++
++Widget RAM {
++ class 'Text'
++ expression meminfo('MemTotal')/1024
++ postfix ' MB RAM'
++ width 11
++ precision 0
++ align 'R'
++ update tick
++}
++
++Widget Busy {
++ class 'Text'
++ expression proc_stat::cpu('busy', 500)
++ prefix 'Busy'
++ postfix '%'
++ width 8
++ precision 1
++ align 'R'
++ update tick
++}
++
++Widget BusyBar {
++ class 'Bar'
++ expression proc_stat::cpu('busy', 500)
++ expression2 proc_stat::cpu('system', 500)
++ length 10
++ direction 'E'
++ update tack
++}
++
++Widget Load {
++ class 'Text'
++ expression loadavg(1)
++ prefix 'Load'
++ postfix loadavg(1)>1.0?'!':' '
++ width 10
++ precision 1
++ align 'R'
++ update tick
++}
++
++Widget LoadBar {
++ class 'Bar'
++ expression loadavg(1)
++ max 2.0
++ length 10
++ direction 'E'
++ update tack
++}
++
++
++Widget Disk {
++ class 'Text'
++ # disk.[rw]blk return blocks, we assume a blocksize of 512
++ # to get the number in kB/s we would do blk*512/1024, which is blk/2
++ # expression (proc_stat::disk('.*', 'rblk', 500)+proc_stat::disk('.*', 'wblk', 500))/2
++ # with kernel 2.6, disk_io disappeared from /proc/stat but moved to /proc/diskstat
++ # therefore you have to use another function called 'diskstats':
++ expression diskstats('hd.', 'read_sectors', 500) + diskstats('hd.', 'write_sectors', 500)
++ prefix 'disk'
++ postfix ' '
++ width 10
++ precision 0
++ align 'R'
++ update tick
++}
++
++Widget DiskBar {
++ class 'Bar'
++ #expression proc_stat::disk('.*', 'rblk', 500)
++ #expression2 proc_stat::disk('.*', 'wblk', 500)
++ # for kernel 2.6:
++ expression diskstats('hd.', 'read_sectors', 500)
++ expression2 diskstats('hd.', 'write_sectors', 500)
++ length 14
++ direction 'E'
++ update tack
++}
++
++Widget Eth0 {
++ class 'Text'
++ expression (netdev('eth0', 'Rx_bytes', 500)+netdev('eth0', 'Tx_bytes', 500))/1024
++ prefix 'eth0'
++ postfix ' '
++ width 10
++ precision 0
++ align 'R'
++ update tick
++}
++
++Widget Eth0Bar {
++ class 'Bar'
++ expression netdev('eth0', 'Rx_bytes', 500)
++ expression2 netdev('eth0', 'Tx_bytes', 500)
++ length 14
++ direction 'E'
++ update tack
++}
++
++Widget PPP {
++ class 'Text'
++ expression (ppp('Rx:0', 500)+ppp('Tx:0', 500))
++ prefix 'PPP'
++ width 9
++ precision 0
++ align 'R'
++ update tick
++}
++
++Widget Temp {
++ class 'Text'
++ expression i2c_sensors('temp_input3')*1.0324-67
++ prefix 'Temp'
++ width 9
++ precision 1
++ align 'R'
++ update tick
++}
++
++Widget TempBar {
++ class 'Bar'
++ expression i2c_sensors('temp_input3')*1.0324-67
++ min 40
++ max 80
++ length 10
++ direction 'E'
++ update tack
++}
++
++Widget MySQLtest1 {
++ class 'Text'
++ expression MySQL::query('SELECT id FROM table1')
++ width 20
++ align 'R'
++ prefix 'MySQL test:'
++ update minute
++}
++
++Widget MySQLtest2 {
++ class 'Text'
++ expression MySQL::status()
++ width 20
++ align 'M'
++ prefix 'Status: '
++ update minute
++}
++
++Widget Uptime {
++ class 'Text'
++ expression uptime('%d days %H:%M:%S')
++ width 20
++ align 'R'
++ prefix 'Up '
++ update 1000
++}
++
++
++# debugging widgets
++
++Widget BarTest {
++ class 'Bar'
++ # test::bar(barno,maxval,startval,delta) - move a test value between 0 and max.
++ # delta= step to change value by each time it's read.
++ # barno - ten different test bar values can be set up, with barno=0..9
++ # if delta=0, just returns the value of bar n instead of changing it.
++ expression test::bar(0,30,25,1)
++ expression2 test::bar(1,30,0,1)
++ length 8
++ # max 50
++ direction 'E'
++ update 10
++}
++
++Widget BarTestVal {
++ class 'Text'
++ expression test::bar(0,100,50,0)
++ prefix 'Test '
++ width 9
++ update 200
++}
++
++Widget LightningTest {
++ class 'icon'
++ speed 500
++ visible test::onoff(0)
++ bitmap {
++ row1 '...***'
++ row2 '..***.'
++ row3 '.***..'
++ row4 '.****.'
++ row5 '..**..'
++ row6 '.**...'
++ row7 '**....'
++ row8 '*.....'
++ }
++}
++
++
++# Icons
++
++Widget Heartbeat {
++ class 'Icon'
++ speed 800
++ Bitmap {
++ Row1 '.....|.....'
++ Row2 '.*.*.|.*.*.'
++ Row3 '*****|*.*.*'
++ Row4 '*****|*...*'
++ Row5 '.***.|.*.*.'
++ Row6 '.***.|.*.*.'
++ Row7 '..*..|..*..'
++ Row8 '.....|.....'
++ }
++}
++
++Widget EKG {
++ class 'Icon'
++ speed 50
++ Bitmap {
++ Row1 '.....|.....|.....|.....|.....|.....|.....|.....'
++ Row2 '.....|....*|...*.|..*..|.*...|*....|.....|.....'
++ Row3 '.....|....*|...*.|..*..|.*...|*....|.....|.....'
++ Row4 '.....|....*|...**|..**.|.**..|**...|*....|.....'
++ Row5 '.....|....*|...**|..**.|.**..|**...|*....|.....'
++ Row6 '.....|....*|...*.|..*.*|.*.*.|*.*..|.*...|*....'
++ Row7 '*****|*****|****.|***..|**..*|*..**|..***|.****'
++ Row8 '.....|.....|.....|.....|.....|.....|.....|.....'
++ }
++}
++Widget Karo {
++ class 'Icon'
++ speed 200
++ Bitmap {
++ Row1 '.....|.....|.....|.....|..*..|.....|.....|.....'
++ Row2 '.....|.....|.....|..*..|.*.*.|..*..|.....|.....'
++ Row3 '.....|.....|..*..|.*.*.|*...*|.*.*.|..*..|.....'
++ Row4 '.....|..*..|.*.*.|*...*|.....|*...*|.*.*.|..*..'
++ Row5 '.....|.....|..*..|.*.*.|*...*|.*.*.|..*..|.....'
++ Row6 '.....|.....|.....|..*..|.*.*.|..*..|.....|.....'
++ Row7 '.....|.....|.....|.....|..*..|.....|.....|.....'
++ Row8 '.....|.....|.....|.....|.....|.....|.....|.....'
++ }
++}
++Widget Heart {
++ class 'Icon'
++ speed 250
++ Bitmap {
++ Row1 '.....|.....|.....|.....|.....|.....'
++ Row2 '.*.*.|.....|.*.*.|.....|.....|.....'
++ Row3 '*****|.*.*.|*****|.*.*.|.*.*.|.*.*.'
++ Row4 '*****|.***.|*****|.***.|.***.|.***.'
++ Row5 '.***.|.***.|.***.|.***.|.***.|.***.'
++ Row6 '.***.|..*..|.***.|..*..|..*..|..*..'
++ Row7 '..*..|.....|..*..|.....|.....|.....'
++ Row8 '.....|.....|.....|.....|.....|.....'
++ }
++}
++Widget Blob {
++ class 'Icon'
++ speed 250
++ Bitmap {
++ Row1 '.....|.....|.....'
++ Row2 '.....|.....|.***.'
++ Row3 '.....|.***.|*...*'
++ Row4 '..*..|.*.*.|*...*'
++ Row5 '.....|.***.|*...*'
++ Row6 '.....|.....|.***.'
++ Row7 '.....|.....|.....'
++ Row8 '.....|.....|.....'
++ }
++}
++Widget Wave {
++ class 'Icon'
++ speed 100
++ Bitmap {
++ Row1 '..**.|.**..|**...|*....|.....|.....|.....|.....|....*|...**'
++ Row2 '.*..*|*..*.|..*..|.*...|*....|.....|.....|....*|...*.|..*..'
++ Row3 '*....|....*|...*.|..*..|.*...|*....|....*|...*.|..*..|.*...'
++ Row4 '*....|....*|...*.|..*..|.*...|*....|....*|...*.|..*..|.*...'
++ Row5 '*....|....*|...*.|..*..|.*...|*....|....*|...*.|..*..|.*...'
++ Row6 '.....|.....|....*|...*.|..*..|.*..*|*..*.|..*..|.*...|*....'
++ Row7 '.....|.....|.....|....*|...**|..**.|.**..|**...|*....|.....'
++ Row8 '.....|.....|.....|.....|.....|.....|.....|.....|.....|.....'
++ }
++}
++Widget Squirrel {
++ class 'Icon'
++ speed 100
++ Bitmap {
++ Row1 '.....|.....|.....|.....|.....|.....'
++ Row2 '.....|.....|.....|.....|.....|.....'
++ Row3 '.....|.....|.....|.....|.....|.....'
++ Row4 '**...|.**..|..**.|...**|....*|.....'
++ Row5 '*****|*****|*****|*****|*****|*****'
++ Row6 '...**|..**.|.**..|**...|*....|.....'
++ Row7 '.....|.....|.....|.....|.....|.....'
++ Row8 '.....|.....|.....|.....|.....|.....'
++ }
++}
++
++Widget Lightning {
++ class 'icon'
++ speed 100
++ visible cpu('busy', 500)-50
++ bitmap {
++ row1 '...***'
++ row2 '..***.'
++ row3 '.***..'
++ row4 '.****.'
++ row5 '..**..'
++ row6 '.**...'
++ row7 '**....'
++ row8 '*.....'
++ }
++}
++
++Widget Rain {
++ class 'icon'
++ speed 200
++ bitmap {
++ row1 '...*.|.....|.....|.*...|....*|..*..|.....|*....'
++ row2 '*....|...*.|.....|.....|.*...|....*|..*..|.....'
++ row3 '.....|*....|...*.|.....|.....|.*...|....*|..*..'
++ row4 '..*..|.....|*....|...*.|.....|.....|.*...|....*'
++ row5 '....*|..*..|.....|*....|...*.|.....|.....|.*...'
++ row6 '.*...|....*|..*..|.....|*....|...*.|.....|.....'
++ row7 '.....|.*...|....*|..*..|.....|*....|...*.|.....'
++ row8 '.....|.....|.*...|....*|..*..|.....|*....|...*.'
++ }
++}
++
++Widget Test {
++ class 'Text'
++ expression '1234567890123456789012345678901234567890'
++ #expression '|'
++ width 40
++}
++
++Widget Armadeus {
++ class 'Text'
++ expression 'Armadeus Project'
++ width 20
++}
++
++
++Layout L40x2 {
++ Row1 {
++ Col1 'Busy'
++ Col10 'BusyBar'
++ Col20 'Uptime'
++ }
++ Row2 {
++ Col1 'Load'
++ Col10 'LoadBar'
++ Col21 'Armadeus
++ }
++}
++
++Layout Test {
++ Row01.Col1 'Test'
++ Row02.Col1 'Test'
++ Row03.Col1 'Test'
++ Row04.Col1 'Test'
++}
++
++Layout testMySQL {
++ Row1 {
++ Col1 'MySQLtest1'
++ }
++ Row2 {
++ Col1 'MySQLtest2'
++ }
++}
++
++
++#
++# Specify here which diplay and layout should be used
++#
++Display 'HD44780-generic'
++Layout 'L40x2'
++
++
++Variables {
++ tick 500
++ tack 100
++ minute 60000
++}
diff --git a/patches/buildroot/2013.05/018-allegro.patch b/patches/buildroot/2013.05/018-allegro.patch
new file mode 100644
index 0000000..bb51f68
--- /dev/null
+++ b/patches/buildroot/2013.05/018-allegro.patch
@@ -0,0 +1,114 @@
+Add allegro package to BR.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot/package/Config.in
++++ buildroot/package/Config.in
+@@ -116,6 +116,7 @@
+ source "package/rrdtool/Config.in"
+
+ comment "graphic libraries"
++source "package/allegro/Config.in"
+ source "package/cegui06/Config.in"
+ source "package/directfb/Config.in"
+ source "package/directfb-examples/Config.in"
+Index: buildroot/package/allegro/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/allegro/Config.in 2012-02-21 16:44:05.000000000 +0100
+@@ -0,0 +1,13 @@
++config BR2_PACKAGE_ALLEGRO
++ bool "Allegro"
++ help
++ Allegro is a game programming library for C/C++ developers
++ distributed freely and supporting the following platforms:
++ DOS, Unix (Linux, FreeBSD, Irix, Solaris, Darwin), Windows, QNX,
++ BeOS and MacOS X.
++ It provides many functions for graphics, sounds, player input
++ (keyboard, mouse and joystick) and timers. It also provides fixed and
++ floating point mathematical functions, 3d functions, file management
++ functions, compressed datafile and a GUI.
++
++ http://alleg.sourceforge.net/
+Index: buildroot/package/allegro/allegro.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/allegro/allegro.mk 2012-02-21 16:44:05.000000000 +0100
+@@ -0,0 +1,75 @@
++#############################################################
++#
++# Allegro: a game programming library
++#
++#############################################################
++ALLEGRO_VERSION:=4.2.1
++ALLEGRO_SOURCE:=allegro-$(ALLEGRO_VERSION).tar.gz
++ALLEGRO_SITE:=http://downloads.sourceforge.net/alleg
++ALLEGRO_CAT:=zcat
++ALLEGRO_DIR:=$(BUILD_DIR)/allegro-$(ALLEGRO_VERSION)
++
++$(DL_DIR)/$(ALLEGRO_SOURCE):
++ $(call DOWNLOAD,$(ALLEGRO_SITE),$(ALLEGRO_SOURCE))
++
++allegro-source: $(DL_DIR)/$(ALLEGRO_SOURCE)
++
++$(ALLEGRO_DIR)/.unpacked: $(DL_DIR)/$(ALLEGRO_SOURCE)
++ $(ALLEGRO_CAT) $(DL_DIR)/$(ALLEGRO_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
++ touch $@
++
++$(ALLEGRO_DIR)/.configured: $(ALLEGRO_DIR)/.unpacked
++ (cd $(ALLEGRO_DIR); \
++ $(TARGET_CONFIGURE_OPTS) \
++ CFLAGS="$(TARGET_CFLAGS)" \
++ LDFLAGS="$(TARGET_LDFLAGS)" \
++ CROSSCOMPILE=1 \
++ ./configure \
++ --target=$(GNU_TARGET_NAME) \
++ --host=$(GNU_TARGET_NAME) \
++ --build=$(GNU_HOST_NAME) \
++ --prefix=/usr \
++ --without-svgalib \
++ --enable-modules=no \
++ --enable-static=yes \
++ --enable-shared=no \
++ --disable-asm \
++ --disable-mmx \
++ --disable-sse \
++ --disable-color24 \
++ --disable-color32 \
++ --without-x );
++ touch $@
++# allegro doesn't seem to build as shared library
++# --disable-color24 \
++# --disable-color32 \
++
++$(ALLEGRO_DIR)/lib/unix/liballeg.a: $(ALLEGRO_DIR)/.configured
++ $(MAKE) -C $(ALLEGRO_DIR) CROSSCOMPILE=1
++ touch $@
++
++#$(STAGING_DIR)/usr/lib/liballeg.so: $(ALLEGRO_DIR)/lib/unix/liballeg.a
++# $(MAKE) -C $(ALLEGRO_DIR) install
++# touch -c $@
++#
++# $(TARGET_DIR)/usr/lib/liballeg.so.so: $(STAGING_DIR)/usr/lib/liballeg.so
++# cp -dpf $(STAGING_DIR)/usr/lib/liballeg*.so* $(TARGET_DIR)/usr/lib/
++# -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/liballeg.so
++
++ALLEGRO allegro: $(ALLEGRO_DIR)/lib/unix/liballeg.a
++
++allegro-clean:
++ $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(ALLEGRO_DIR) uninstall
++ -$(MAKE) -C $(ALLEGRO_DIR) clean
++
++allegro-dirclean:
++ rm -rf $(ALLEGRO_DIR)
++
++#############################################################
++#
++# Toplevel Makefile options
++#
++#############################################################
++ifeq ($(strip $(BR2_PACKAGE_ALLEGRO)),y)
++TARGETS+=allegro
++endif
diff --git a/patches/buildroot/2013.05/021-sdl-water-config.patch b/patches/buildroot/2013.05/021-sdl-water-config.patch
new file mode 100644
index 0000000..bfdf33c
--- /dev/null
+++ b/patches/buildroot/2013.05/021-sdl-water-config.patch
@@ -0,0 +1,99 @@
+Add sdlwater package to BR.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot/package/Config.in
++++ buildroot/package/Config.in
+@@ -140,6 +140,8 @@
+ source "package/sdl_net/Config.in"
+ source "package/sdl_ttf/Config.in"
+ source "package/sdl_gfx/Config.in"
++comment "Demos"
++source "package/sdlwater/Config.in"
+
+ comment "other GUIs"
+ source "package/efl/Config.in"
+Index: buildroot/package/sdlwater/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/sdlwater/Config.in 2012-02-21 16:44:08.000000000 +0100
+@@ -0,0 +1,7 @@
++config BR2_PACKAGE_SDL_WATER
++ bool "SDL_water"
++ select BR2_PACKAGE_SDL
++ help
++ Water effect demo coded with SDL
++
++ http://www.libsdl.org/projects/SDL_water/
+Index: buildroot/package/sdlwater/sdlwater.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/sdlwater/sdlwater.mk 2012-02-21 16:44:08.000000000 +0100
+@@ -0,0 +1,65 @@
++#############################################################
++#
++# SDL Water Demo
++#
++#############################################################
++SDL_WATER_VERSION:=1.0
++SDL_WATER_SOURCE:=water-$(SDL_WATER_VERSION).tar.gz
++SDL_WATER_SITE:=http://www.libsdl.org/projects/water/src/
++SDL_WATER_CAT:=$(ZCAT)
++SDL_WATER_DIR:=$(BUILD_DIR)/water-$(SDL_WATER_VERSION)
++SDL_WATER_TARGET_DATA_DIR:=$(TARGET_DIR)/usr/share/images/
++
++$(DL_DIR)/$(SDL_WATER_SOURCE):
++ $(call DOWNLOAD,$(SDL_WATER_SITE),$(SDL_WATER_SOURCE))
++
++sdl-water-source: $(DL_DIR)/$(SDL_WATER_SOURCE)
++
++$(SDL_WATER_DIR)/.unpacked: $(DL_DIR)/$(SDL_WATER_SOURCE)
++ $(SDL_WATER_CAT) $(DL_DIR)/$(SDL_WATER_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
++ touch $@
++
++$(SDL_WATER_DIR)/.configured: $(SDL_WATER_DIR)/.unpacked
++ (cd $(SDL_WATER_DIR); \
++ $(TARGET_CONFIGURE_OPTS) \
++ CFLAGS="$(TARGET_CFLAGS) " \
++ ./configure \
++ --target=$(GNU_TARGET_NAME) \
++ --host=$(GNU_TARGET_NAME) \
++ --build=$(GNU_HOST_NAME) \
++ --prefix=$(STAGING_DIR)/usr \
++ --with-sdl-exec-prefix=$(STAGING_DIR)/usr/ \
++ --disable-video-x11 );
++ touch $@
++
++$(SDL_WATER_DIR)/water: $(SDL_WATER_DIR)/.configured
++ $(MAKE) -C $(SDL_WATER_DIR)
++
++$(STAGING_DIR)/usr/bin/water: $(SDL_WATER_DIR)/water
++ $(MAKE) -C $(SDL_WATER_DIR) install
++ touch -c $@
++
++$(TARGET_DIR)/usr/bin/water: $(STAGING_DIR)/usr/bin/water
++ mkdir -p $(SDL_WATER_TARGET_DATA_DIR)
++ cp -dpf $(SDL_WATER_DIR)/water320.bmp $(SDL_WATER_TARGET_DATA_DIR)/
++ cp -dpf $< $(TARGET_DIR)/usr/bin/
++ -$(STRIPCMD) $@
++
++SDL-WATER sdl-water: uclibc sdl $(TARGET_DIR)/usr/bin/water
++
++sdl-water-clean:
++ $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(SDL_WATER_DIR) uninstall
++ rm $(SDL_WATER_TARGET_DATA_DIR)/water320.bmp
++ -$(MAKE) -C $(SDL_WATER_DIR) clean
++
++sdl-water-dirclean:
++ rm -rf $(SDL_WATER_DIR)
++
++#############################################################
++#
++# Toplevel Makefile options
++#
++#############################################################
++ifeq ($(strip $(BR2_PACKAGE_SDL_WATER)),y)
++TARGETS+=sdl-water
++endif
diff --git a/patches/buildroot/2013.05/034-slideshow.patch b/patches/buildroot/2013.05/034-slideshow.patch
new file mode 100644
index 0000000..464cbb1
--- /dev/null
+++ b/patches/buildroot/2013.05/034-slideshow.patch
@@ -0,0 +1,224 @@
+Add slideshow package to BR.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot/package/Config.in
++++ buildroot/package/Config.in
+@@ -140,6 +140,7 @@
+ source "package/sdl_net/Config.in"
+ source "package/sdl_ttf/Config.in"
+ source "package/sdl_gfx/Config.in"
++source "package/slideshow/Config.in"
+ comment "Demos"
+ source "package/sdlwater/Config.in"
+
+Index: buildroot/package/slideshow/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/slideshow/Config.in 2012-02-21 16:44:09.000000000 +0100
+@@ -0,0 +1,8 @@
++config BR2_PACKAGE_SLIDESHOW
++ bool "Slideshow"
++ depends on BR2_PACKAGE_SDL && BR2_PACKAGE_SDL_IMAGE
++ help
++ Perigee Slideshow is a command line program that searches a directory
++ for supported graphic files and displays them in a slideshow.
++
++ http://www.xmission.com/~jstanley/slideshow.html
+Index: buildroot/package/slideshow/slideshow.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/slideshow/slideshow.mk 2012-02-21 16:44:09.000000000 +0100
+@@ -0,0 +1,39 @@
++#############################################################
++#
++# slideshow
++#
++#############################################################
++
++SLIDESHOW_VERSION:=1.1
++SLIDESHOW_SOURCE:=slideshow-source-$(SLIDESHOW_VERSION).zip
++SLIDESHOW_SITE:=http://www.xmission.com/~jstanley/
++
++SLIDESHOW_DEPENDENCIES += sdl sdl_image
++
++define SLIDESHOW_BUILD_CMDS
++ $(MAKE) CC="$(TARGET_CXX)" CFLAGS="$(TARGET_CFLAGS) `sh $(STAGING_DIR)/usr/bin/sdl-config --cflags`" \
++ LFLAGS="`sh $(STAGING_DIR)/usr/bin/sdl-config --libs` -lSDL_image" \
++ -C $(SLIDESHOW_DIR)
++endef
++
++define SLIDESHOW_INSTALL_TARGET_CMDS
++ cp -dpf $(SLIDESHOW_DIR)/slideshow $(TARGET_DIR)/usr/bin
++endef
++
++define SLIDESHOW_CLEAN_CMDS
++ $(MAKE) clean -C $(SLIDESHOW_DIR)
++endef
++
++define SLIDESHOW_UNINSTALL_TARGET_CMDS
++ rm -f $(TARGET_DIR)/usr/bin/slideshow
++endef
++
++$(eval $(generic-package))
++
++# BR currently doesn't support .zip archive, so do extraction manually:
++$(SLIDESHOW_TARGET_EXTRACT): $(SLIDESHOW_TARGET_SOURCE)
++ $(call MESSAGE,"Extracting")
++ unzip $(DL_DIR)/$($(PKG)_SOURCE) -d $(BUILD_DIR)
++ mv $(BUILD_DIR)/slideshow/* $(BUILD_DIR)/slideshow-$(SLIDESHOW_VERSION)/
++ rm -rf $(BUILD_DIR)/slideshow
++ touch $@
+Index: buildroot/package/slideshow/slideshow-01-restart-after-end.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/slideshow/slideshow-01-restart-after-end.patch 2012-02-21 16:44:09.000000000 +0100
+@@ -0,0 +1,73 @@
++--- slideshow/slideshow.cpp 2003-12-08 22:17:38.000000000 +0100
+++++ slideshow.mod/slideshow.cpp 2007-09-08 19:05:10.000000000 +0200
++@@ -196,43 +196,48 @@
++ SDL_FillRect(m_sdl, &rc, SDL_MapRGB(m_sdl->format, 0, 255, 0));
++ SDL_UpdateRects(m_sdl, 1, &rc);
++ }
++-
++- user_command cmd = wait_for_command();
++-
+++
+++ user_command cmd = wait_for_command();
+++
++ switch(cmd)
++- {
++- case c_quit:
++- stop_timer();
++- return true;
++- case c_first_slide:
+++ {
+++ case c_quit:
+++ stop_timer();
+++ return true;
+++ case c_first_slide:
++ stop_timer();
++ m_image_index = 0;
++ break;
++ case c_last_slide:
++- stop_timer();
+++ stop_timer();
++ m_image_index = m_file_list->count() - 1;
++- break;
+++ break;
++ case c_prev_slide:
++- stop_timer();
+++ stop_timer();
++ if ( m_image_index > 0 )
++ m_image_index--;
++ break;
++ case c_next_slide:
++- stop_timer();
++- // fall through
++- case c_timer_advance:
++- if ( m_image_index < m_file_list->count() - 1 )
+++ stop_timer();
+++ // fall through
+++ case c_timer_advance:
+++ if ( m_image_index <= m_file_list->count() - 1 )
++ m_image_index++;
++- break;
++- case c_redraw:
++ break;
++- }
+++ case c_redraw:
+++ break;
+++ }
++
++ // stop the auto-advance when the last picture is about to be shown
++- if ( m_image_index == m_file_list->count() - 1 )
++- stop_timer();
++- }
++-
+++ if ( m_image_index == m_file_list->count() /*- 1*/ )
+++ {
+++ //stop_timer();
+++ m_image_index = 0;
+++ m_prev_image_index = -1;
+++ }
+++
+++ }
+++
++ return true;
++ }
++
+Index: buildroot/package/slideshow/slideshow-02-remove-compile-warning.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/slideshow/slideshow-02-remove-compile-warning.patch 2012-02-21 16:44:09.000000000 +0100
+@@ -0,0 +1,13 @@
++--- slideshow.org/SDLFont.cpp 2007-11-17 19:25:02.000000000 +0100
+++++ slideshow/SDLFont.cpp 2007-11-17 20:06:20.000000000 +0100
++@@ -84,8 +84,8 @@
++
++ Uint8 *pixloc = (Uint8 *)pDisplay->pixels + dpitch * y + Bpp * x;
++ Uint8 *pChar, *pScreen;
++- char c;
++- int i, j;
+++ //char c;
+++ int i, j, c;
++
++ for(const char *p = text; *p != '\0'; p++)
++ {
+Index: buildroot/package/slideshow/slideshow-03-fix_compilation_errors_with_recent_gcc.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/slideshow/slideshow-03-fix_compilation_errors_with_recent_gcc.patch 2012-02-21 16:44:09.000000000 +0100
+@@ -0,0 +1,28 @@
++On recent gcc some includes are needed to have string stuff defined.
++
++Signed-off-by: Julien Boibessot <jul...@ar...>
++
++Index: slideshow-1.1/file_list.cpp
++===================================================================
++--- slideshow-1.1.orig/file_list.cpp 2011-07-01 18:58:49.000000000 +0200
+++++ slideshow-1.1/file_list.cpp 2011-07-01 18:59:10.000000000 +0200
++@@ -8,6 +8,7 @@
++ #include <fstream>
++ #include <stdlib.h>
++ #include <ctype.h>
+++#include <string.h>
++
++ #ifdef WIN32
++ #include <io.h>
++Index: slideshow-1.1/slideshow.h
++===================================================================
++--- slideshow-1.1.orig/slideshow.h 2011-07-01 18:59:56.000000000 +0200
+++++ slideshow-1.1/slideshow.h 2011-07-01 19:00:02.000000000 +0200
++@@ -9,6 +9,7 @@
++ #pragma once
++ #endif // _MSC_VER > 1000
++
+++#include <iostream>
++ #include "SDL.h"
++ #include "cache.h"
++
+Index: buildroot/package/slideshow/slideshow-04-fix_sdl_crash.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/slideshow/slideshow-04-fix_sdl_crash.patch 2012-02-21 16:44:09.000000000 +0100
+@@ -0,0 +1,17 @@
++Otherwise crashes on APF27.
++
++Signed-off-by: Julien Boibessot <jul...@ar...>
++
++Index: slideshow-1.1/slideshow.cpp
++===================================================================
++--- slideshow-1.1.orig/slideshow.cpp 2011-07-02 13:19:00.000000000 +0200
+++++ slideshow-1.1/slideshow.cpp 2011-07-02 13:19:17.000000000 +0200
++@@ -416,7 +416,7 @@
++ else
++ flags |= SDL_FULLSCREEN;
++
++- m_sdl = SDL_SetVideoMode(m_options->width, m_options->height, 32, flags);
+++ m_sdl = SDL_SetVideoMode(m_options->width, m_options->height, 16 /*32*/, flags);
++
++ if ( !m_sdl )
++ {
diff --git a/patches/buildroot/2013.05/040-linux-makefile.patch b/patches/buildroot/2013.05/040-linux-makefile.patch
new file mode 100644
index 0000000..e771b8d
--- /dev/null
+++ b/patches/buildroot/2013.05/040-linux-makefile.patch
@@ -0,0 +1,47 @@
+Index: buildroot/linux/linux.mk
+===================================================================
+--- buildroot.orig/linux/linux.mk 2012-02-12 23:22:29.000000000 +0100
++++ buildroot/linux/linux.mk 2012-02-21 20:57:38.000000000 +0100
+@@ -50,7 +50,8 @@
+
+ # Get the real Linux version, which tells us where kernel modules are
+ # going to be installed in the target filesystem.
+-LINUX_VERSION_PROBED = $(shell $(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) --no-print-directory -s kernelrelease)
++LINUX_VERSION_PROBED = $(LINUX_VERSION)
++#LINUX_VERSION_PROBED = $(shell $(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) --no-print-directory -s kernelrelease)
+
+ ifeq ($(BR2_LINUX_KERNEL_USE_INTREE_DTS),y)
+ KERNEL_DTS_NAME = $(call qstrip,$(BR2_LINUX_KERNEL_INTREE_DTS_NAME))
+@@ -165,7 +166,14 @@
+ KERNEL_SOURCE_CONFIG = $(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE)
+ endif
+
++ifeq ($(strip $(BR2_TARGET_ARMADEUS)),y)
++define ARMADEUS_LINUX_CONFIG_HACKS
++ ln -sf $(ARMADEUS_TOPDIR)/target/linux/modules/ $(@D)/drivers/armadeus
++endef
++endif
++
+ define LINUX_CONFIGURE_CMDS
++ $(ARMADEUS_LINUX_CONFIG_HACKS)
+ cp $(KERNEL_SOURCE_CONFIG) $(KERNEL_ARCH_PATH)/configs/buildroot_defconfig
+ $(TARGET_MAKE_ENV) $(MAKE1) $(LINUX_MAKE_FLAGS) -C $(@D) buildroot_defconfig
+ rm $(KERNEL_ARCH_PATH)/configs/buildroot_defconfig
+@@ -265,7 +263,7 @@
+
+
+ define LINUX_INSTALL_IMAGES_CMDS
+- cp $(LINUX_IMAGE_PATH) $(BINARIES_DIR)
++ cp $(LINUX_IMAGE_PATH) $(BINARIES_DIR)/$(ARMADEUS_LINUX_IMAGE_NAME)
+ endef
+
+ define LINUX_INSTALL_TARGET_CMDS
+@@ -315,7 +323,7 @@
+ # Build the kernel.
+ $(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_IMAGE_NAME)
+ # Copy the kernel image to its final destination
+- cp $(LINUX_IMAGE_PATH) $(BINARIES_DIR)
++ cp $(LINUX_IMAGE_PATH) $(BINARIES_DIR)/$(ARMADEUS_LINUX_IMAGE_NAME)
+ # If there is a .ub file copy it to the final destination
+ test ! -f $(LINUX_IMAGE_PATH).ub || cp $(LINUX_IMAGE_PATH).ub $(BINARIES_DIR)
+ $(Q)touch $@
diff --git a/patches/buildroot/2013.05/043-mesa-add_packages.patch b/patches/buildroot/2013.05/043-mesa-add_packages.patch
new file mode 100644
index 0000000..3c98add
--- /dev/null
+++ b/patches/buildroot/2013.05/043-mesa-add_packages.patch
@@ -0,0 +1,287 @@
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot/package/Config.in
++++ buildroot/package/Config.in
+@@ -453,6 +453,7 @@
+ source "package/librsvg/Config.in"
+ source "package/libsvgtiny/Config.in"
+ source "package/libungif/Config.in"
++source "package/mesa/Config.in"
+ source "package/opencv/Config.in"
+ source "package/opengl/Config.in"
+ source "package/pango/Config.in"
+Index: buildroot/package/mesa/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/mesa/Config.in 2012-02-21 16:44:18.000000000 +0100
+@@ -0,0 +1,6 @@
++config BR2_PACKAGE_MESALIB
++ bool "Mesa library"
++ select BR2_PACKAGE_GPM
++ help
++ Build MesaGL. It allows you to use OpenGL on your system.
++
+Index: buildroot/package/mesa/mesa.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/mesa/mesa.mk 2012-02-21 16:44:18.000000000 +0100
+@@ -0,0 +1,66 @@
++#############################################################
++#
++# Mesa
++#
++#############################################################
++
++MESALIB_VER:=7.0
++MESALIB_SOURCE:=MesaLib-$(MESALIB_VER).tar.bz2
++MESALIB_DEMOS:=MesaDemos-$(MESALIB_VER).tar.bz2
++MESAGLUT_SOURCE:=MesaGLUT-$(MESALIB_VER).tar.bz2
++MESALIB_SITE:=http://downloads.sourceforge.net/mesa3d
++MESALIB_DIR:=$(BUILD_DIR)/Mesa-$(MESALIB_VER)
++MESALIB_CAT:=bzcat
++MESALIB_PATCH:=mesa.patch
++
++
++$(DL_DIR)/$(MESALIB_SOURCE):
++ $(call DOWNLOAD,$(MESALIB_SITE),$(MESALIB_SOURCE))
++
++$(DL_DIR)/$(MESALIB_DEMOS):
++ $(call DOWNLOAD,$(MESALIB_SITE),$(MESALIB_DEMOS))
++
++$(DL_DIR)/$(MESAGLUT_SOURCE):
++ $(call DOWNLOAD,$(MESALIB_SITE),$(MESAGLUT_SOURCE))
++
++mesa-source: $(DL_DIR)/$(MESALIB_SOURCE) $(DL_DIR)/$(MESALIB_DEMOS)
++
++$(MESALIB_DIR)/.unpacked: $(DL_DIR)/$(MESALIB_SOURCE) $(DL_DIR)/$(MESALIB_DEMOS) $(DL_DIR)/$(MESAGLUT_SOURCE)
++ $(MESALIB_CAT) $(DL_DIR)/$(MESALIB_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
++ $(MESALIB_CAT) $(DL_DIR)/$(MESALIB_DEMOS) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
++ $(MESALIB_CAT) $(DL_DIR)/$(MESAGLUT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
++ touch $@
++
++$(MESALIB_DIR)/.patched: $(MESALIB_DIR)/.unpacked
++ support/scripts/apply-patches.sh $(MESALIB_DIR) package/mesa $(MESALIB_PATCH)
++ touch $@
++
++$(MESALIB_DIR)/.compiled: $(MESALIB_DIR)/.patched
++ (cd $(MESALIB_DIR); \
++ $(MAKE) realclean; \
++ $(MAKE) CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" linux-fbdev);
++#arm-linux-osmesa
++ touch $@
++
++$(TARGET_DIR)/usr/lib/libGL.so.7.1.0: $(MESALIB_DIR)/.compiled
++ mkdir -p $(TARGET_DIR)/usr/lib/
++ cp -a $(MESALIB_DIR)/lib/* $(TARGET_DIR)/usr/lib/
++ touch $@
++
++#also depends on host-makedepend ?
++MESA mesa: gpm $(TARGET_DIR)/usr/lib/libGL.so.7.1.0
++
++mesa-clean:
++ $(MAKE) CC="$(TARGET_CC)" clean -C $(MESALIB_DIR)
++
++mesa-dirclean:
++ rm -rf $(MESALIB_DIR)
++
++#############################################################
++#
++# Toplevel Makefile options
++#
++#############################################################
++ifeq ($(strip $(BR2_PACKAGE_MESALIB)),y)
++TARGETS+=mesa
++endif
+Index: buildroot/package/mesa/mesa.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/mesa/mesa.patch 2012-02-21 16:44:18.000000000 +0100
+@@ -0,0 +1,188 @@
++diff -bruN Mesa-7.0.orig/configs/arm-linux-osmesa Mesa-7.0/configs/arm-linux-osmesa
++--- Mesa-7.0.orig/configs/arm-linux-osmesa 1970-01-01 01:00:00.000000000 +0100
+++++ Mesa-7.0/configs/arm-linux-osmesa 2007-06-26 23:00:52.000000000 +0200
++@@ -0,0 +1,25 @@
+++# Configuration for building only libOSMesa on Linux, no Xlib driver
+++# This doesn't really have any Linux dependencies, so it should be usable
+++# on other (gcc-based) systems.
+++
+++include $(TOP)/configs/default
+++
+++CONFIG_NAME = arm-linux-osmesa
+++
+++# Compiler and flags
+++CC = gcc
+++CXX = g++
+++CFLAGS = -O3 -ansi -pedantic -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS
+++CXXFLAGS = -O3 -ansi -pedantic -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
+++
+++
+++# Directories
+++SRC_DIRS = mesa
+++DRIVER_DIRS = osmesa
+++PROGRAM_DIRS = osdemos
+++
+++
+++# Dependencies
+++OSMESA_LIB_DEPS = -lm -lpthread
+++GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
+++APP_LIB_DEPS = -lOSMesa
++diff -bruN Mesa-7.0.orig/Makefile Mesa-7.0/Makefile
++--- Mesa-7.0.orig/Makefile 2007-06-22 00:14:38.000000000 +0200
+++++ Mesa-7.0/Makefile 2007-06-26 22:31:34.000000000 +0200
++@@ -111,6 +111,7 @@
++ linux-ia64-icc-static \
++ linux-icc \
++ linux-icc-static \
+++arm-linux-osmesa \
++ linux-osmesa \
++ linux-osmesa16 \
++ linux-osmesa16-static \
++diff -bruN Mesa-7.0.orig/progs/osdemos/osdemo.c Mesa-7.0/progs/osdemos/osdemo.c
++--- Mesa-7.0.orig/progs/osdemos/osdemo.c 2007-06-26 23:05:40.000000000 +0200
+++++ Mesa-7.0/progs/osdemos/osdemo.c 2007-06-26 22:44:58.000000000 +0200
++@@ -22,7 +22,7 @@
++ #include <stdlib.h>
++ #include <string.h>
++ #include "GL/osmesa.h"
++-#include "GL/glu.h"
+++/*#include "GL/glu.h"*/
++
++
++ #define SAVE_TARGA
++@@ -30,7 +30,7 @@
++ static int Width = 400;
++ static int Height = 400;
++
++-
+++/*
++ static void
++ Sphere(float radius, int slices, int stacks)
++ {
++@@ -50,7 +50,7 @@
++ gluCylinder(q, base, 0.0, height, slices, stacks);
++ gluDeleteQuadric(q);
++ }
++-
+++*/
++
++ static void
++ Torus(float innerRadius, float outerRadius, int sides, int rings)
++@@ -131,7 +131,7 @@
++ Torus(0.275, 0.85, 20, 20);
++ glPopMatrix();
++
++- glPushMatrix();
+++/* glPushMatrix();
++ glTranslatef(-0.75, -0.5, 0.0);
++ glRotatef(270.0, 1.0, 0.0, 0.0);
++ glMaterialfv( GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, green_mat );
++@@ -143,7 +143,7 @@
++ glMaterialfv( GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, blue_mat );
++ Sphere(1.0, 20, 20);
++ glPopMatrix();
++-
+++*/
++ glPopMatrix();
++
++ /* This is very important!!!
++diff -bruN Mesa-7.0.orig/progs/osdemos/ostest1.c Mesa-7.0/progs/osdemos/ostest1.c
++--- Mesa-7.0.orig/progs/osdemos/ostest1.c 2007-06-26 23:05:40.000000000 +0200
+++++ Mesa-7.0/progs/osdemos/ostest1.c 2007-06-26 22:47:58.000000000 +0200
++@@ -14,7 +14,7 @@
++ #include <stdlib.h>
++ #include <string.h>
++ #include "GL/osmesa.h"
++-#include "GL/glu.h"
+++/*#include "GL/glu.h"*/
++
++
++ #define WIDTH 600
++@@ -23,7 +23,7 @@
++ static GLboolean WriteFiles = GL_FALSE;
++ static GLboolean Gradient = GL_FALSE;
++
++-
+++/*
++ static void
++ Sphere(float radius, int slices, int stacks)
++ {
++@@ -43,7 +43,7 @@
++ gluCylinder(q, base, 0.0, height, slices, stacks);
++ gluDeleteQuadric(q);
++ }
++-
+++*/
++
++ static void
++ Torus(float innerRadius, float outerRadius, int sides, int rings)
++@@ -225,7 +225,7 @@
++ glMaterialfv( GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, red_mat );
++ Torus(0.275, 0.85, 20, 20);
++ glPopMatrix();
++-
+++/*
++ glPushMatrix();
++ glTranslatef(-1.5, -0.5, 0.0);
++ glRotatef(270.0, 1.0, 0.0, 0.0);
++@@ -241,7 +241,7 @@
++ Sphere(1.2, 20, 20);
++ glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
++ glPopMatrix();
++-
+++*/
++ #if 0
++ glPushMatrix();
++ glTranslatef(0.75, 0.0, 1.3);
++diff -bruN Mesa-7.0.orig/src/mesa/Makefile Mesa-7.0/src/mesa/Makefile
++--- Mesa-7.0.orig/src/mesa/Makefile 2007-06-22 00:10:54.000000000 +0200
+++++ Mesa-7.0/src/mesa/Makefile 2007-06-26 22:31:34.000000000 +0200
++@@ -107,7 +107,7 @@
++
++ stand-alone: depend subdirs $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME)
++
++-osmesa-only: depend subdirs $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME)
+++osmesa-only: depend $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME)
++
++ # Make the GL library
++ $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS)
++@@ -139,13 +139,13 @@
++ depend: $(ALL_SOURCES)
++ @ echo "running $(MKDEP)"
++ @ touch depend
++- @$(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDE_DIRS) $(ALL_SOURCES) \
++- > /dev/null 2>/dev/null
+++ @$(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDE_DIRS) $(ALL_SOURCES) #\
+++ #> /dev/null 2>/dev/null
++
++
++-subdirs:
++- @ (cd x86 ; $(MAKE))
++- @ (cd x86-64 ; $(MAKE))
+++#subdirs:
+++# @ (cd x86 ; $(MAKE))
+++# @ (cd x86-64 ; $(MAKE))
++
++
++ install: default
++--- Mesa-7.0.org/configs/linux-fbdev 2007-06-22 00:10:53.000000000 +0200
+++++ Mesa-7.0/configs/linux-fbdev 2007-06-29 19:13:04.000000000 +0200
++@@ -4,13 +4,14 @@
++
++ CONFIG_NAME = linux-fbdev
++
++-CFLAGS = -O3 -ffast-math -ansi -pedantic -fPIC -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS -DUSE_GLFBDEV_DRIVER
+++CFLAGS = -O3 -ffast-math -ansi -pedantic -fPIC -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS -DUSE_GLFBDEV_DRIVER -I$(TOP)/../staging_dir/usr/include -I$(TOP)/../staging_dir/include
++
++ SRC_DIRS = mesa glu glut/fbdev
++ DRIVER_DIRS = fbdev osmesa
++-PROGRAM_DIRS = fbdev demos redbook samples
+++PROGRAM_DIRS = fbdev demos osdemos redbook samples
++
++ GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread
++-OSMESA_LIB_DEPS = -lm -lpthread
++-GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lgpm -lm
+++OSMESA_LIB_DEPS = -lm -lpthread -L$(TOP)/../staging_dir/usr/lib
+++GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L$(TOP)/../staging_dir/usr/lib -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lgpm -lm
+++APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L$(TOP)/../staging_dir/usr/lib -l$(GLU_LIB) -l$(GL_LIB) -l$(GLUT_LIB) $(EXTRA_LIB_PATH) -lgpm -lm -lstdc++
++
diff --git a/patches/buildroot/2012.02/045-openssh-add_passwd_expire.patch b/patches/buildroot/2013.05/045-openssh-add_passwd_expire.patch
similarity index 100%
copy from patches/buildroot/2012.02/045-openssh-add_passwd_expire.patch
copy to patches/buildroot/2013.05/045-openssh-add_passwd_expire.patch
diff --git a/patches/buildroot/2013.05/051a-U-Boot-add-support-for-Safe-Boot-file-format-this-fo.patch b/patches/buildroot/2013.05/051a-U-Boot-add-support-for-Safe-Boot-file-format-this-fo.patch
new file mode 100644
index 0000000..a503b90
--- /dev/null
+++ b/patches/buildroot/2013.05/051a-U-Boot-add-support-for-Safe-Boot-file-format-this-fo.patch
@@ -0,0 +1,46 @@
+From c6f5dc1ac36a8b01a732b972035a1ace5b97f790 Mon Sep 17 00:00:00 2001
+From: Eric Jarrige <eri...@ar...>
+Date: Tue, 13 Mar 2012 12:42:52 +0100
+Subject: [PATCH 2/2] u-boot: add support for u-boot.sb file format
+
+add u-boot.sb binary format in BR menuconfig - Safe Boot (.sb) file format
+have to be used with Freescale CPUs like imx23, imx28, stp37xx
+
+Signed-off-by: Eric Jarrige <eri...@ar...>
+---
+ boot/uboot/Config.in | 3 +++
+ boot/uboot/uboot.mk | 4 ++++
+ 2 files changed, 7 insertions(+), 0 deletions(-)
+
+diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
+index c8db9fb..5fd5258 100644
+--- a/boot/uboot/Config.in
++++ b/boot/uboot/Config.in
+@@ -98,6 +98,9 @@ config BR2_TARGET_UBOOT_FORMAT_LDR
+ depends on BR2_bfin
+ bool "u-boot.ldr"
+
++config BR2_TARGET_UBOOT_FORMAT_SB
++ bool "u-boot.sb"
++
+ endchoice
+
+ config BR2_TARGET_UBOOT_OMAP_IFT
+diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
+index db9de8d..1394400 100644
+--- a/boot/uboot/uboot.mk
++++ b/boot/...
[truncated message content] |
|
From: Gwenhael Goavec-M. <gwe...@us...> - 2013-05-22 17:29:02
|
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 592ac6cf2102eaf37fc09eb16968d4429073d8ec (commit)
via 5f58daac859f9618d323c8d7b024dc93c721654a (commit)
via efab44f78436ad4c5a87cb58581b506925cf8d08 (commit)
via 005ac68554314d4602ecf515ad807e76eb1a5b6d (commit)
from 54997a0cd2a92ac5394ed42fb0dbe2cdaa7764f0 (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 592ac6cf2102eaf37fc09eb16968d4429073d8ec
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date: Wed May 22 19:28:31 2013 +0200
[LINUX][3.10] Add 3.10-rc2 patches support
commit 5f58daac859f9618d323c8d7b024dc93c721654a
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date: Wed May 22 19:28:06 2013 +0200
[LINUX][3.10] copy patches from 3.8
commit efab44f78436ad4c5a87cb58581b506925cf8d08
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date: Wed May 22 19:25:24 2013 +0200
[LINUX][3.10] adapts patches 0200, 0400, 0401 and 0442 from 3.8
commit 005ac68554314d4602ecf515ad807e76eb1a5b6d
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date: Wed May 22 19:23:02 2013 +0200
[LINUX][3.10] apf27, apf51: Add support for 3.10-rc2
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf27/apf27-linux-3.10-rc2.config | 1 +
...27-linux-3.8.config => apf27-linux-3.10.config} | 7 ----
...inux-3.8.config => apf51-linux-3.10-rc2.config} | 11 ------
...51-linux-3.8.config => apf51-linux-3.10.config} | 11 ------
patches/linux/3.10-rc2 | 1 +
...15-armadeus-logo-add_armadeus-project_tux.patch | 0
.../{3.8 => 3.10}/0021-armadeus-apf9328.patch | 0
...s-apf9328-add_board_to_linux_build_system.patch | 0
.../0025-armadeus-imx-correct_dma_shift.patch | 0
.../0029-armadeus-add_csi_and_spi_registers.patch | 0
.../0029b-armadeus-add_csi_registers.patch | 0
...rmadeus-devices-imx1-add_udc_registration.patch | 0
.../0030-armadeus-imx_udc-change_clk_get.patch | 0
...35-armadeus-re_add_pwm_and_correct_driver.tofix | 0
...7-armadeus-imx_udc-add_printk_when_probed.patch | 0
...s-imx_udc-prevent_crash_after_soft_reboot.patch | 0
...50-armadeus-add_custom_drivers_to_kconfig.patch | 0
.../{3.8 => 3.10}/0073-armadeus-tsc2102.patch | 0
...02_integrate_driver_to_linux_build_system.patch | 0
...chscreen-add_driver_to_linux_build_system.patch | 0
.../0074-armadeus-tsc2102-touchscreen.patch | 0
.../0075-armadeus-spi2-reg-defines.patch | 0
...eus-clock_correct_mxc_decode_pll_for_imx1.tofix | 0
...madeus-clock-imx1_avoid_crash_with_module.tofix | 0
.../0200-armadeus-add_apf27_module.patch | 38 +++++++++-----------
.../0201-armadeus-add_apf27dev_baseboard.patch | 0
...armadeus-mx27-ehci-mxc-add_per_clk_enable.patch | 0
...rmadeus-mx27-imxfb-fix_pwm_contrast_issue.patch | 0
.../0322-armadeus-add_mach_fpga_h.patch | 0
.../3.10/0400-Add-apf51-basic-dt-support.patch | 23 ++++++++++++
.../0401-armadeus-add_apf51dev_baseboard.patch | 32 ++++++++++++++++
.../0404-armadeus-fix_nand_ecc_oob.patch | 0
..._possibility_to_deactivate_SDIO_interrupt.patch | 0
.../0420-armadeus-Add-apf28dev-dts.patch | 0
..._star_completion_for_source_in_menuconfig.patch | 0
...low_to_use_the_wakeupalarm_functionnality.patch | 10 +++---
36 files changed, 79 insertions(+), 55 deletions(-)
create mode 120000 buildroot/target/device/armadeus/apf27/apf27-linux-3.10-rc2.config
copy buildroot/target/device/armadeus/apf27/{apf27-linux-3.8.config => apf27-linux-3.10.config} (95%)
copy buildroot/target/device/armadeus/apf51/{apf51-linux-3.8.config => apf51-linux-3.10-rc2.config} (94%)
copy buildroot/target/device/armadeus/apf51/{apf51-linux-3.8.config => apf51-linux-3.10.config} (94%)
create mode 120000 patches/linux/3.10-rc2
copy patches/linux/{3.7 => 3.10}/0015-armadeus-logo-add_armadeus-project_tux.patch (100%)
copy patches/linux/{3.8 => 3.10}/0021-armadeus-apf9328.patch (100%)
copy patches/linux/{3.8 => 3.10}/0024-armadeus-apf9328-add_board_to_linux_build_system.patch (100%)
copy patches/linux/{3.8 => 3.10}/0025-armadeus-imx-correct_dma_shift.patch (100%)
copy patches/linux/{3.8 => 3.10}/0029-armadeus-add_csi_and_spi_registers.patch (100%)
copy patches/linux/{3.8 => 3.10}/0029b-armadeus-add_csi_registers.patch (100%)
copy patches/linux/{3.8 => 3.10}/0030-armadeus-devices-imx1-add_udc_registration.patch (100%)
copy patches/linux/{3.8 => 3.10}/0030-armadeus-imx_udc-change_clk_get.patch (100%)
copy patches/linux/{3.7 => 3.10}/0035-armadeus-re_add_pwm_and_correct_driver.tofix (100%)
copy patches/linux/{3.8 => 3.10}/0037-armadeus-imx_udc-add_printk_when_probed.patch (100%)
copy patches/linux/{3.8 => 3.10}/0038-armadeus-imx_udc-prevent_crash_after_soft_reboot.patch (100%)
copy patches/linux/{3.8 => 3.10}/0050-armadeus-add_custom_drivers_to_kconfig.patch (100%)
copy patches/linux/{3.8 => 3.10}/0073-armadeus-tsc2102.patch (100%)
copy patches/linux/{3.8 => 3.10}/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch (100%)
copy patches/linux/{3.8 => 3.10}/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch (100%)
copy patches/linux/{3.8 => 3.10}/0074-armadeus-tsc2102-touchscreen.patch (100%)
copy patches/linux/{3.8 => 3.10}/0075-armadeus-spi2-reg-defines.patch (100%)
copy patches/linux/{3.7 => 3.10}/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix (100%)
copy patches/linux/{3.7 => 3.10}/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix (100%)
copy patches/linux/{3.8 => 3.10}/0200-armadeus-add_apf27_module.patch (90%)
copy patches/linux/{3.8 => 3.10}/0201-armadeus-add_apf27dev_baseboard.patch (100%)
copy patches/linux/{3.8 => 3.10}/0203-armadeus-mx27-ehci-mxc-add_per_clk_enable.patch (100%)
copy patches/linux/{3.8 => 3.10}/0204-armadeus-mx27-imxfb-fix_pwm_contrast_issue.patch (100%)
copy patches/linux/{3.8 => 3.10}/0322-armadeus-add_mach_fpga_h.patch (100%)
create mode 100644 patches/linux/3.10/0400-Add-apf51-basic-dt-support.patch
create mode 100644 patches/linux/3.10/0401-armadeus-add_apf51dev_baseboard.patch
copy patches/linux/{3.8 => 3.10}/0404-armadeus-fix_nand_ecc_oob.patch (100%)
copy patches/linux/{3.8 => 3.10}/0405-armadeus-esdhc-imx-add_possibility_to_deactivate_SDIO_interrupt.patch (100%)
copy patches/linux/{3.8 => 3.10}/0420-armadeus-Add-apf28dev-dts.patch (100%)
copy patches/linux/{3.8 => 3.10}/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch (100%)
copy patches/linux/{3.8 => 3.10}/0442-armadeus-rtc-mxs-allow_to_use_the_wakeupalarm_functionnality.patch (65%)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.10-rc2.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.10-rc2.config
new file mode 120000
index 0000000..de49b4f
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.10-rc2.config
@@ -0,0 +1 @@
+apf27-linux-3.10.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.8.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.config
similarity index 95%
copy from buildroot/target/device/armadeus/apf27/apf27-linux-3.8.config
copy to buildroot/target/device/armadeus/apf27/apf27-linux-3.10.config
index bc08620..266ef06 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.8.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.config
@@ -20,7 +20,6 @@ CONFIG_MODULE_UNLOAD=y
CONFIG_ARCH_MXC=y
CONFIG_MXC_IRQ_PRIOR=y
CONFIG_MACH_IMX27_DT=y
-CONFIG_MACH_APF27=y
CONFIG_PREEMPT=y
CONFIG_AEABI=y
CONFIG_ZBOOT_ROM_TEXT=0x0
@@ -201,12 +200,6 @@ CONFIG_IMX_SDMA=y
CONFIG_IMX_DMA=y
# CONFIG_IOMMU_SUPPORT is not set
CONFIG_IIO=m
-CONFIG_ARMADEUS_DRIVERS=y
-CONFIG_ARMADEUS_FPGA_DRIVERS=y
-CONFIG_ARMADEUS_FPGA_LOADER_DRIVER=m
-CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS_IRQ_MNGR=m
-CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS_BUTTON=m
-CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS_LED=m
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
CONFIG_EXT3_FS_POSIX_ACL=y
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.8.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.10-rc2.config
similarity index 94%
copy from buildroot/target/device/armadeus/apf51/apf51-linux-3.8.config
copy to buildroot/target/device/armadeus/apf51/apf51-linux-3.10-rc2.config
index 36fd5b2..4cdf93a 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-linux-3.8.config
+++ b/buildroot/target/device/armadeus/apf51/apf51-linux-3.10-rc2.config
@@ -226,17 +226,6 @@ CONFIG_RTC_MXC=y
CONFIG_RTC_DRV_WM831X=y
CONFIG_STAGING=y
CONFIG_IIO=m
-CONFIG_ARMADEUS_DRIVERS=y
-CONFIG_ARMADEUS_FPGA_DRIVERS=y
-CONFIG_ARMADEUS_FPGA_LOADER_DRIVER=m
-# CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS is not set
-CONFIG_ARMADEUS_PWM_DRIVER=m
-CONFIG_MCP49x2=m
-# CONFIG_MXC_HWEVENT is not set
-# CONFIG_MXC_VPU is not set
-# CONFIG_MXC_VPU_IRAM is not set
-CONFIG_MXC_SECURITY_SCC2=m
-CONFIG_MXC_SAHARA=m
CONFIG_EXT2_FS=y
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.8.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.config
similarity index 94%
copy from buildroot/target/device/armadeus/apf51/apf51-linux-3.8.config
copy to buildroot/target/device/armadeus/apf51/apf51-linux-3.10.config
index 36fd5b2..4cdf93a 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-linux-3.8.config
+++ b/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.config
@@ -226,17 +226,6 @@ CONFIG_RTC_MXC=y
CONFIG_RTC_DRV_WM831X=y
CONFIG_STAGING=y
CONFIG_IIO=m
-CONFIG_ARMADEUS_DRIVERS=y
-CONFIG_ARMADEUS_FPGA_DRIVERS=y
-CONFIG_ARMADEUS_FPGA_LOADER_DRIVER=m
-# CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS is not set
-CONFIG_ARMADEUS_PWM_DRIVER=m
-CONFIG_MCP49x2=m
-# CONFIG_MXC_HWEVENT is not set
-# CONFIG_MXC_VPU is not set
-# CONFIG_MXC_VPU_IRAM is not set
-CONFIG_MXC_SECURITY_SCC2=m
-CONFIG_MXC_SAHARA=m
CONFIG_EXT2_FS=y
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y
diff --git a/patches/linux/3.10-rc2 b/patches/linux/3.10-rc2
new file mode 120000
index 0000000..7c7a975
--- /dev/null
+++ b/patches/linux/3.10-rc2
@@ -0,0 +1 @@
+3.10
\ No newline at end of file
diff --git a/patches/linux/3.7/0015-armadeus-logo-add_armadeus-project_tux.patch b/patches/linux/3.10/0015-armadeus-logo-add_armadeus-project_tux.patch
similarity index 100%
copy from patches/linux/3.7/0015-armadeus-logo-add_armadeus-project_tux.patch
copy to patches/linux/3.10/0015-armadeus-logo-add_armadeus-project_tux.patch
diff --git a/patches/linux/3.8/0021-armadeus-apf9328.patch b/patches/linux/3.10/0021-armadeus-apf9328.patch
similarity index 100%
copy from patches/linux/3.8/0021-armadeus-apf9328.patch
copy to patches/linux/3.10/0021-armadeus-apf9328.patch
diff --git a/patches/linux/3.8/0024-armadeus-apf9328-add_board_to_linux_build_system.patch b/patches/linux/3.10/0024-armadeus-apf9328-add_board_to_linux_build_system.patch
similarity index 100%
copy from patches/linux/3.8/0024-armadeus-apf9328-add_board_to_linux_build_system.patch
copy to patches/linux/3.10/0024-armadeus-apf9328-add_board_to_linux_build_system.patch
diff --git a/patches/linux/3.8/0025-armadeus-imx-correct_dma_shift.patch b/patches/linux/3.10/0025-armadeus-imx-correct_dma_shift.patch
similarity index 100%
copy from patches/linux/3.8/0025-armadeus-imx-correct_dma_shift.patch
copy to patches/linux/3.10/0025-armadeus-imx-correct_dma_shift.patch
diff --git a/patches/linux/3.8/0029-armadeus-add_csi_and_spi_registers.patch b/patches/linux/3.10/0029-armadeus-add_csi_and_spi_registers.patch
similarity index 100%
copy from patches/linux/3.8/0029-armadeus-add_csi_and_spi_registers.patch
copy to patches/linux/3.10/0029-armadeus-add_csi_and_spi_registers.patch
diff --git a/patches/linux/3.8/0029b-armadeus-add_csi_registers.patch b/patches/linux/3.10/0029b-armadeus-add_csi_registers.patch
similarity index 100%
copy from patches/linux/3.8/0029b-armadeus-add_csi_registers.patch
copy to patches/linux/3.10/0029b-armadeus-add_csi_registers.patch
diff --git a/patches/linux/3.8/0030-armadeus-devices-imx1-add_udc_registration.patch b/patches/linux/3.10/0030-armadeus-devices-imx1-add_udc_registration.patch
similarity index 100%
copy from patches/linux/3.8/0030-armadeus-devices-imx1-add_udc_registration.patch
copy to patches/linux/3.10/0030-armadeus-devices-imx1-add_udc_registration.patch
diff --git a/patches/linux/3.8/0030-armadeus-imx_udc-change_clk_get.patch b/patches/linux/3.10/0030-armadeus-imx_udc-change_clk_get.patch
similarity index 100%
copy from patches/linux/3.8/0030-armadeus-imx_udc-change_clk_get.patch
copy to patches/linux/3.10/0030-armadeus-imx_udc-change_clk_get.patch
diff --git a/patches/linux/3.7/0035-armadeus-re_add_pwm_and_correct_driver.tofix b/patches/linux/3.10/0035-armadeus-re_add_pwm_and_correct_driver.tofix
similarity index 100%
copy from patches/linux/3.7/0035-armadeus-re_add_pwm_and_correct_driver.tofix
copy to patches/linux/3.10/0035-armadeus-re_add_pwm_and_correct_driver.tofix
diff --git a/patches/linux/3.8/0037-armadeus-imx_udc-add_printk_when_probed.patch b/patches/linux/3.10/0037-armadeus-imx_udc-add_printk_when_probed.patch
similarity index 100%
copy from patches/linux/3.8/0037-armadeus-imx_udc-add_printk_when_probed.patch
copy to patches/linux/3.10/0037-armadeus-imx_udc-add_printk_when_probed.patch
diff --git a/patches/linux/3.8/0038-armadeus-imx_udc-prevent_crash_after_soft_reboot.patch b/patches/linux/3.10/0038-armadeus-imx_udc-prevent_crash_after_soft_reboot.patch
similarity index 100%
copy from patches/linux/3.8/0038-armadeus-imx_udc-prevent_crash_after_soft_reboot.patch
copy to patches/linux/3.10/0038-armadeus-imx_udc-prevent_crash_after_soft_reboot.patch
diff --git a/patches/linux/3.8/0050-armadeus-add_custom_drivers_to_kconfig.patch b/patches/linux/3.10/0050-armadeus-add_custom_drivers_to_kconfig.patch
similarity index 100%
copy from patches/linux/3.8/0050-armadeus-add_custom_drivers_to_kconfig.patch
copy to patches/linux/3.10/0050-armadeus-add_custom_drivers_to_kconfig.patch
diff --git a/patches/linux/3.8/0073-armadeus-tsc2102.patch b/patches/linux/3.10/0073-armadeus-tsc2102.patch
similarity index 100%
copy from patches/linux/3.8/0073-armadeus-tsc2102.patch
copy to patches/linux/3.10/0073-armadeus-tsc2102.patch
diff --git a/patches/linux/3.8/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch b/patches/linux/3.10/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch
similarity index 100%
copy from patches/linux/3.8/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch
copy to patches/linux/3.10/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch
diff --git a/patches/linux/3.8/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch b/patches/linux/3.10/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch
similarity index 100%
copy from patches/linux/3.8/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch
copy to patches/linux/3.10/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch
diff --git a/patches/linux/3.8/0074-armadeus-tsc2102-touchscreen.patch b/patches/linux/3.10/0074-armadeus-tsc2102-touchscreen.patch
similarity index 100%
copy from patches/linux/3.8/0074-armadeus-tsc2102-touchscreen.patch
copy to patches/linux/3.10/0074-armadeus-tsc2102-touchscreen.patch
diff --git a/patches/linux/3.8/0075-armadeus-spi2-reg-defines.patch b/patches/linux/3.10/0075-armadeus-spi2-reg-defines.patch
similarity index 100%
copy from patches/linux/3.8/0075-armadeus-spi2-reg-defines.patch
copy to patches/linux/3.10/0075-armadeus-spi2-reg-defines.patch
diff --git a/patches/linux/3.7/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix b/patches/linux/3.10/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix
similarity index 100%
copy from patches/linux/3.7/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix
copy to patches/linux/3.10/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix
diff --git a/patches/linux/3.7/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix b/patches/linux/3.10/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix
similarity index 100%
copy from patches/linux/3.7/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix
copy to patches/linux/3.10/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix
diff --git a/patches/linux/3.8/0200-armadeus-add_apf27_module.patch b/patches/linux/3.10/0200-armadeus-add_apf27_module.patch
similarity index 90%
copy from patches/linux/3.8/0200-armadeus-add_apf27_module.patch
copy to patches/linux/3.10/0200-armadeus-add_apf27_module.patch
index a7e02ea..add80a1 100644
--- a/patches/linux/3.8/0200-armadeus-add_apf27_module.patch
+++ b/patches/linux/3.10/0200-armadeus-add_apf27_module.patch
@@ -13,11 +13,11 @@ Signed-off-by: Nicolas Colombain <nic...@ar...>
4 files changed, 273 insertions(+), 0 deletions(-)
create mode 100644 arch/arm/mach-imx/mach-apf27.c
-Index: linux-3.8-rc1/arch/arm/mach-imx/Kconfig
+Index: linux-3.9.1/arch/arm/mach-imx/Kconfig
===================================================================
---- linux-3.8-rc1.orig/arch/arm/mach-imx/Kconfig 2013-01-02 10:07:38.000000000 +0100
-+++ linux-3.8-rc1/arch/arm/mach-imx/Kconfig 2013-01-02 10:07:44.000000000 +0100
-@@ -500,6 +500,21 @@
+--- linux-3.9.1.orig/arch/arm/mach-imx/Kconfig
++++ linux-3.9.1/arch/arm/mach-imx/Kconfig
+@@ -492,6 +492,21 @@ config MACH_IMX27_DT
Include support for Freescale i.MX27 based platforms
using the device tree for discovery
@@ -39,11 +39,11 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/Kconfig
endif
if ARCH_MULTI_V6
-Index: linux-3.8-rc1/arch/arm/mach-imx/Makefile
+Index: linux-3.9.1/arch/arm/mach-imx/Makefile
===================================================================
---- linux-3.8-rc1.orig/arch/arm/mach-imx/Makefile 2013-01-02 10:07:38.000000000 +0100
-+++ linux-3.8-rc1/arch/arm/mach-imx/Makefile 2013-01-02 10:07:44.000000000 +0100
-@@ -66,6 +66,7 @@
+--- linux-3.9.1.orig/arch/arm/mach-imx/Makefile
++++ linux-3.9.1/arch/arm/mach-imx/Makefile
+@@ -70,6 +70,7 @@ obj-$(CONFIG_MACH_PCA100) += mach-pca100
obj-$(CONFIG_MACH_MXT_TD60) += mach-mxt_td60.o
obj-$(CONFIG_MACH_IMX27IPCAM) += mach-imx27ipcam.o
obj-$(CONFIG_MACH_IMX27_DT) += imx27-dt.o
@@ -51,11 +51,11 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/Makefile
# i.MX31 based machines
obj-$(CONFIG_MACH_MX31ADS) += mach-mx31ads.o
-Index: linux-3.8-rc1/arch/arm/mach-imx/mach-apf27.c
+Index: linux-3.9.1/arch/arm/mach-imx/mach-apf27.c
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.8-rc1/arch/arm/mach-imx/mach-apf27.c 2013-01-02 10:08:00.000000000 +0100
-@@ -0,0 +1,294 @@
+--- /dev/null
++++ linux-3.9.1/arch/arm/mach-imx/mach-apf27.c
+@@ -0,0 +1,290 @@
+ /*
+ * Support for the APF27 System On Module
+ *
@@ -335,10 +335,6 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/mach-apf27.c
+ mx27_clocks_init(26000000); /* init ext ref, even if not used */
+}
+
-+static struct sys_timer apf27_timer = {
-+ .init = apf27_timer_init,
-+};
-+
+MACHINE_START(APF27, "Armadeus APF27")
+ /* Maintainer: Julien Boibessot <jul...@ar...> */
+ .atag_offset = 0x100,
@@ -346,15 +342,15 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/mach-apf27.c
+ .init_early = imx27_init_early,
+ .init_irq = mx27_init_irq,
+ .handle_irq = imx27_handle_irq,
-+ .timer = &apf27_timer,
++ .init_time = apf27_timer_init,
+ .init_machine = apf27_init,
+ .restart = mxc_restart,
+MACHINE_END
-Index: linux-3.8-rc1/arch/arm/tools/mach-types
+Index: linux-3.9.1/arch/arm/tools/mach-types
===================================================================
---- linux-3.8-rc1.orig/arch/arm/tools/mach-types 2013-01-02 10:07:38.000000000 +0100
-+++ linux-3.8-rc1/arch/arm/tools/mach-types 2013-01-02 10:07:44.000000000 +0100
-@@ -297,6 +297,7 @@
+--- linux-3.9.1.orig/arch/arm/tools/mach-types
++++ linux-3.9.1/arch/arm/tools/mach-types
+@@ -297,6 +297,7 @@ smdk2416 MACH_SMDK2416 SMDK2416 1685
wbd111 MACH_WBD111 WBD111 1690
mv2120 MACH_MV2120 MV2120 1693
mx51_3ds MACH_MX51_3DS MX51_3DS 1696
diff --git a/patches/linux/3.8/0201-armadeus-add_apf27dev_baseboard.patch b/patches/linux/3.10/0201-armadeus-add_apf27dev_baseboard.patch
similarity index 100%
copy from patches/linux/3.8/0201-armadeus-add_apf27dev_baseboard.patch
copy to patches/linux/3.10/0201-armadeus-add_apf27dev_baseboard.patch
diff --git a/patches/linux/3.8/0203-armadeus-mx27-ehci-mxc-add_per_clk_enable.patch b/patches/linux/3.10/0203-armadeus-mx27-ehci-mxc-add_per_clk_enable.patch
similarity index 100%
copy from patches/linux/3.8/0203-armadeus-mx27-ehci-mxc-add_per_clk_enable.patch
copy to patches/linux/3.10/0203-armadeus-mx27-ehci-mxc-add_per_clk_enable.patch
diff --git a/patches/linux/3.8/0204-armadeus-mx27-imxfb-fix_pwm_contrast_issue.patch b/patches/linux/3.10/0204-armadeus-mx27-imxfb-fix_pwm_contrast_issue.patch
similarity index 100%
copy from patches/linux/3.8/0204-armadeus-mx27-imxfb-fix_pwm_contrast_issue.patch
copy to patches/linux/3.10/0204-armadeus-mx27-imxfb-fix_pwm_contrast_issue.patch
diff --git a/patches/linux/3.8/0322-armadeus-add_mach_fpga_h.patch b/patches/linux/3.10/0322-armadeus-add_mach_fpga_h.patch
similarity index 100%
copy from patches/linux/3.8/0322-armadeus-add_mach_fpga_h.patch
copy to patches/linux/3.10/0322-armadeus-add_mach_fpga_h.patch
diff --git a/patches/linux/3.10/0400-Add-apf51-basic-dt-support.patch b/patches/linux/3.10/0400-Add-apf51-basic-dt-support.patch
new file mode 100644
index 0000000..b662659
--- /dev/null
+++ b/patches/linux/3.10/0400-Add-apf51-basic-dt-support.patch
@@ -0,0 +1,23 @@
+Add apf51 basic support
+
+Signed-off-by: Laurent Cans <lau...@gm...>
+Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
+---
+Index: linux-3.9.1/arch/arm/boot/dts/imx51-apf51.dts
+===================================================================
+--- linux-3.9.1.orig/arch/arm/boot/dts/imx51-apf51.dts
++++ linux-3.9.1/arch/arm/boot/dts/imx51-apf51.dts
+@@ -36,6 +36,13 @@
+ };
+ };
+
++&nfc {
++ nand-bus-width = <8>;
++ nand-ecc-mode = "hw";
++ nand-on-flash-bbt;
++ status = "okay";
++};
++
+ &fec {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_fec_2>;
diff --git a/patches/linux/3.10/0401-armadeus-add_apf51dev_baseboard.patch b/patches/linux/3.10/0401-armadeus-add_apf51dev_baseboard.patch
new file mode 100644
index 0000000..362f12c
--- /dev/null
+++ b/patches/linux/3.10/0401-armadeus-add_apf51dev_baseboard.patch
@@ -0,0 +1,32 @@
+The APF51Dev is a docking board for an APF51 SOM
+
+Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
+Signed-off-by: Laurent Cans <lau...@gm...>
+---
+Index: linux-3.10-rc2/arch/arm/boot/dts/imx51-apf51dev.dts
+===================================================================
+--- linux-3.10-rc2.orig/arch/arm/boot/dts/imx51-apf51dev.dts
++++ linux-3.10-rc2/arch/arm/boot/dts/imx51-apf51dev.dts
+@@ -51,6 +51,14 @@
+ fsl,spi-num-chipselects = <2>;
+ cs-gpios = <&gpio3 28 1>, <&gpio3 27 1>;
+ status = "okay";
++
++ spidev: spidev@1 {
++ #address-cells = <1>;
++ #size-cells = <1>;
++ compatible = "spidev";
++ spi-max-frequency = <25000000>;
++ reg = <1>;
++ };
+ };
+
+ &esdhc1 {
+@@ -65,6 +73,7 @@
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_esdhc2_1>;
+ bus-width = <4>;
++ fsl,no_sdio_irq;
+ non-removable;
+ status = "okay";
+ };
diff --git a/patches/linux/3.8/0404-armadeus-fix_nand_ecc_oob.patch b/patches/linux/3.10/0404-armadeus-fix_nand_ecc_oob.patch
similarity index 100%
copy from patches/linux/3.8/0404-armadeus-fix_nand_ecc_oob.patch
copy to patches/linux/3.10/0404-armadeus-fix_nand_ecc_oob.patch
diff --git a/patches/linux/3.8/0405-armadeus-esdhc-imx-add_possibility_to_deactivate_SDIO_interrupt.patch b/patches/linux/3.10/0405-armadeus-esdhc-imx-add_possibility_to_deactivate_SDIO_interrupt.patch
similarity index 100%
copy from patches/linux/3.8/0405-armadeus-esdhc-imx-add_possibility_to_deactivate_SDIO_interrupt.patch
copy to patches/linux/3.10/0405-armadeus-esdhc-imx-add_possibility_to_deactivate_SDIO_interrupt.patch
diff --git a/patches/linux/3.8/0420-armadeus-Add-apf28dev-dts.patch b/patches/linux/3.10/0420-armadeus-Add-apf28dev-dts.patch
similarity index 100%
copy from patches/linux/3.8/0420-armadeus-Add-apf28dev-dts.patch
copy to patches/linux/3.10/0420-armadeus-Add-apf28dev-dts.patch
diff --git a/patches/linux/3.8/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch b/patches/linux/3.10/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
similarity index 100%
copy from patches/linux/3.8/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
copy to patches/linux/3.10/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
diff --git a/patches/linux/3.8/0442-armadeus-rtc-mxs-allow_to_use_the_wakeupalarm_functionnality.patch b/patches/linux/3.10/0442-armadeus-rtc-mxs-allow_to_use_the_wakeupalarm_functionnality.patch
similarity index 65%
copy from patches/linux/3.8/0442-armadeus-rtc-mxs-allow_to_use_the_wakeupalarm_functionnality.patch
copy to patches/linux/3.10/0442-armadeus-rtc-mxs-allow_to_use_the_wakeupalarm_functionnality.patch
index c5fde4e..1c4ab18 100644
--- a/patches/linux/3.8/0442-armadeus-rtc-mxs-allow_to_use_the_wakeupalarm_functionnality.patch
+++ b/patches/linux/3.10/0442-armadeus-rtc-mxs-allow_to_use_the_wakeupalarm_functionnality.patch
@@ -8,15 +8,15 @@ for example:
Signed-off-by: Julien Boibessot <jul...@ar...>
-Index: linux-3.4.37/drivers/rtc/rtc-stmp3xxx.c
+Index: linux-3.10-rc2/drivers/rtc/rtc-stmp3xxx.c
===================================================================
---- linux-3.4.37.orig/drivers/rtc/rtc-stmp3xxx.c 2013-04-10 11:16:54.000000000 +0200
-+++ linux-3.4.37/drivers/rtc/rtc-stmp3xxx.c 2013-04-10 12:16:21.000000000 +0200
-@@ -217,6 +217,7 @@
+--- linux-3.10-rc2.orig/drivers/rtc/rtc-stmp3xxx.c
++++ linux-3.10-rc2/drivers/rtc/rtc-stmp3xxx.c
+@@ -272,6 +272,7 @@ static int stmp3xxx_rtc_probe(struct pla
STMP3XXX_RTC_CTRL_ALARM_IRQ_EN,
rtc_data->io + STMP3XXX_RTC_CTRL_CLR);
+ device_set_wakeup_capable(&pdev->dev, 1);
- rtc_data->rtc = rtc_device_register(pdev->name, &pdev->dev,
+ rtc_data->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
&stmp3xxx_rtc_ops, THIS_MODULE);
if (IS_ERR(rtc_data->rtc)) {
hooks/post-receive
--
armadeus
|
