armadeus-commitlog Mailing List for armadeus (Page 68)
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...> - 2012-11-01 10:49: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 d574b800afe1bedd57104009fbece7a7ccfae8b1 (commit)
from f7750a020b402b0a67815d3d4e6967e057162a48 (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 d574b800afe1bedd57104009fbece7a7ccfae8b1
Author: Eric Jarrige <eri...@ar...>
Date: Thu Nov 1 11:49:44 2012 +0100
[BUILD] Fix uClibc-0.9.33.2.config and busybox-1.20.2 .config hard link - Thx Victor
-----------------------------------------------------------------------
Summary of changes:
.../target/device/armadeus/busybox-1.20.2.config | 2 +-
.../target/device/armadeus/uClibc-0.9.33.2.config | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/buildroot/target/device/armadeus/busybox-1.20.2.config b/buildroot/target/device/armadeus/busybox-1.20.2.config
index e9812f2..6dfc775 120000
--- a/buildroot/target/device/armadeus/busybox-1.20.2.config
+++ b/buildroot/target/device/armadeus/busybox-1.20.2.config
@@ -1 +1 @@
-/home/eric/arm/armadeusuboot/buildroot/target/device/armadeus/busybox-1.19.config
\ No newline at end of file
+busybox-1.20.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/uClibc-0.9.33.2.config b/buildroot/target/device/armadeus/uClibc-0.9.33.2.config
index da41279..6f124b4 120000
--- a/buildroot/target/device/armadeus/uClibc-0.9.33.2.config
+++ b/buildroot/target/device/armadeus/uClibc-0.9.33.2.config
@@ -1 +1 @@
-/home/eric/arm/armadeusuboot/buildroot/target/device/armadeus/uClibc-0.9.33.config
\ No newline at end of file
+uClibc-0.9.33.config
\ No newline at end of file
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-10-31 20:41: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 f7750a020b402b0a67815d3d4e6967e057162a48 (commit)
from 81c54ed902086d880cfc6ae1ca82699304ae7f74 (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 f7750a020b402b0a67815d3d4e6967e057162a48
Author: Philippe Reynes <tr...@ya...>
Date: Wed Oct 31 19:07:20 2012 +0100
kernel: add support for the kernel 3.7-rc3
This is a minimal support, only the board apf27 is supported.
Signed-off-by: Philippe Reynes <tr...@ya...>
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf27/apf27-linux-3.7-rc3.config | 1 +
...f27-linux-3.6.config => apf27-linux-3.7.config} | 0
patches/linux/3.7-rc3 | 1 +
...02-arm-imx27-fix-low-reference-clock-path.patch | 43 ++++++++++++++++++++
...d-device-tree-file-for-the-armadeus-apf27.patch | 37 ++++++++++-------
5 files changed, 66 insertions(+), 16 deletions(-)
create mode 120000 buildroot/target/device/armadeus/apf27/apf27-linux-3.7-rc3.config
copy buildroot/target/device/armadeus/apf27/{apf27-linux-3.6.config => apf27-linux-3.7.config} (100%)
create mode 120000 patches/linux/3.7-rc3
create mode 100644 patches/linux/3.7/0002-arm-imx27-fix-low-reference-clock-path.patch
copy patches/linux/{3.6 => 3.7}/0003-Add-device-tree-file-for-the-armadeus-apf27.patch (78%)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.7-rc3.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.7-rc3.config
new file mode 120000
index 0000000..2a64a30
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.7-rc3.config
@@ -0,0 +1 @@
+apf27-linux-3.7.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.6.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.7.config
similarity index 100%
copy from buildroot/target/device/armadeus/apf27/apf27-linux-3.6.config
copy to buildroot/target/device/armadeus/apf27/apf27-linux-3.7.config
diff --git a/patches/linux/3.7-rc3 b/patches/linux/3.7-rc3
new file mode 120000
index 0000000..548d713
--- /dev/null
+++ b/patches/linux/3.7-rc3
@@ -0,0 +1 @@
+3.7
\ No newline at end of file
diff --git a/patches/linux/3.7/0002-arm-imx27-fix-low-reference-clock-path.patch b/patches/linux/3.7/0002-arm-imx27-fix-low-reference-clock-path.patch
new file mode 100644
index 0000000..1c90423
--- /dev/null
+++ b/patches/linux/3.7/0002-arm-imx27-fix-low-reference-clock-path.patch
@@ -0,0 +1,43 @@
+diff --git a/arch/arm/mach-imx/clk-imx27.c b/arch/arm/mach-imx/clk-imx27.c
+index 3b6b640..f8d9129 100644
+--- a/arch/arm/mach-imx/clk-imx27.c
++++ b/arch/arm/mach-imx/clk-imx27.c
+@@ -51,8 +51,10 @@
+
+ static const char *vpu_sel_clks[] = { "spll", "mpll_main2", };
+ static const char *cpu_sel_clks[] = { "mpll_main2", "mpll", };
++static const char *mpll_sel_clks[] = { "fpm", "mpll_osc_sel", };
++static const char *mpll_osc_sel_clks[] = { "ckih", "ckih_div1p5", };
+ static const char *clko_sel_clks[] = {
+- "ckil", "prem", "ckih", "ckih",
++ "ckil", "fpm", "ckih", "ckih",
+ "ckih", "mpll", "spll", "cpu_div",
+ "ahb", "ipg", "per1_div", "per2_div",
+ "per3_div", "per4_div", "ssi1_div", "ssi2_div",
+@@ -79,7 +81,8 @@ enum mx27_clks {
+ vpu_ahb_gate, fec_ahb_gate, emma_ahb_gate, emi_ahb_gate, dma_ahb_gate,
+ csi_ahb_gate, brom_ahb_gate, ata_ahb_gate, wdog_ipg_gate, usb_ipg_gate,
+ uart6_ipg_gate, uart5_ipg_gate, uart4_ipg_gate, uart3_ipg_gate,
+- uart2_ipg_gate, uart1_ipg_gate, clk_max
++ uart2_ipg_gate, uart1_ipg_gate, ckih_div1p5, fpm, mpll_osc_sel,
++ mpll_sel, clk_max
+ };
+
+ static struct clk *clk[clk_max];
+@@ -91,7 +94,15 @@ int __init mx27_clocks_init(unsigned long fref)
+ clk[dummy] = imx_clk_fixed("dummy", 0);
+ clk[ckih] = imx_clk_fixed("ckih", fref);
+ clk[ckil] = imx_clk_fixed("ckil", 32768);
+- clk[mpll] = imx_clk_pllv1("mpll", "ckih", CCM_MPCTL0);
++ clk[fpm] = imx_clk_fixed_factor("fpm", "ckil", 1024, 1);
++ clk[ckih_div1p5] = imx_clk_fixed_factor("ckih_div1p5", "ckih", 2, 3);
++
++ clk[mpll_osc_sel] = imx_clk_mux("mpll_osc_sel", CCM_CSCR, 4, 1,
++ mpll_osc_sel_clks,
++ ARRAY_SIZE(mpll_osc_sel_clks));
++ clk[mpll_sel] = imx_clk_mux("mpll_sel", CCM_CSCR, 16, 1, mpll_sel_clks,
++ ARRAY_SIZE(mpll_sel_clks));
++ clk[mpll] = imx_clk_pllv1("mpll", "mpll_sel", CCM_MPCTL0);
+ clk[spll] = imx_clk_pllv1("spll", "ckih", CCM_SPCTL0);
+ clk[mpll_main2] = imx_clk_fixed_factor("mpll_main2", "mpll", 2, 3);
+
diff --git a/patches/linux/3.6/0003-Add-device-tree-file-for-the-armadeus-apf27.patch b/patches/linux/3.7/0003-Add-device-tree-file-for-the-armadeus-apf27.patch
similarity index 78%
copy from patches/linux/3.6/0003-Add-device-tree-file-for-the-armadeus-apf27.patch
copy to patches/linux/3.7/0003-Add-device-tree-file-for-the-armadeus-apf27.patch
index 3f87a27..39f70f2 100644
--- a/patches/linux/3.6/0003-Add-device-tree-file-for-the-armadeus-apf27.patch
+++ b/patches/linux/3.7/0003-Add-device-tree-file-for-the-armadeus-apf27.patch
@@ -1,26 +1,30 @@
-From 3268e6cafbdd935d42ace97328b2e8c4b2250c4b Mon Sep 17 00:00:00 2001
+From a0f1721d6b83bfd8a97775adcd81bde5e6c203d5 Mon Sep 17 00:00:00 2001
From: Philippe Reynes <tr...@ya...>
Date: Thu, 28 Jun 2012 20:16:05 +0200
-Subject: [PATCH 3/3] Add device tree file for the armadeus apf27
+Subject: [PATCH v3] Add device tree file for the armadeus apf27
Signed-off-by: Philippe Reynes <tr...@ya...>
Signed-off-by: Eric Jarrige <eri...@ar...>
---
- arch/arm/boot/dts/imx27-apf27.dts | 89 +++++++++++++++++++++++++++++++++++++
- 1 files changed, 89 insertions(+), 0 deletions(-)
+
+v3: set 26M clock to 0 (not used)
+v2: avoid enable again the watchdog
+
+ arch/arm/boot/dts/imx27-apf27.dts | 92 +++++++++++++++++++++++++++++++++++++
+ 1 files changed, 92 insertions(+), 0 deletions(-)
create mode 100644 arch/arm/boot/dts/imx27-apf27.dts
diff --git a/arch/arm/boot/dts/imx27-apf27.dts b/arch/arm/boot/dts/imx27-apf27.dts
new file mode 100644
-index 0000000..d0d0793
+index 0000000..bf07d8d
--- /dev/null
+++ b/arch/arm/boot/dts/imx27-apf27.dts
-@@ -0,0 +1,91 @@
+@@ -0,0 +1,92 @@
+/*
+ * Copyright 2012 Philippe Reynes <tr...@ya...>
++ * Copyright 2012 Armadeus Systems <su...@ar...>
+ *
-+ * Based on imx27-phytec-phycore.dts
-+ * Copyright 2012 Sascha Hauer, Pengutronix
++ * Based on code which is: Copyright 2012 Sascha Hauer, Pengutronix
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
@@ -47,17 +51,12 @@ index 0000000..d0d0793
+
+ osc26m {
+ compatible = "fsl,imx-osc26m", "fixed-clock";
-+ clock-frequency = <33554432>;
++ clock-frequency = <0>;
+ };
+ };
+
+ soc {
-+ aipi@10000000 { /* aipi */
-+
-+ wdog@10002000 {
-+ status = "okay";
-+ };
-+
++ aipi@10000000 {
+ serial@1000a000 {
+ status = "okay";
+ };
@@ -78,26 +77,32 @@ index 0000000..d0d0793
+ label = "u-boot";
+ reg = <0x0 0x100000>;
+ };
++
+ partition@100000 {
+ label = "env";
+ reg = <0x100000 0x80000>;
+ };
++
+ partition@180000 {
+ label = "env2";
+ reg = <0x180000 0x80000>;
+ };
++
+ partition@200000 {
+ label = "firmware";
+ reg = <0x200000 0x80000>;
+ };
++
+ partition@280000 {
+ label = "dtb";
+ reg = <0x280000 0x80000>;
+ };
++
+ partition@300000 {
+ label = "kernel";
+ reg = <0x300000 0x500000>;
+ };
++
+ partition@800000 {
+ label = "rootfs";
+ reg = <0x800000 0xf800000>;
@@ -108,5 +113,5 @@ index 0000000..d0d0793
+
+};
--
-1.7.1
+1.7.4.4
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-10-30 23:29: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 81c54ed902086d880cfc6ae1ca82699304ae7f74 (commit)
from 058224b8f31878f6777494c1ecb3cee0d177d123 (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 81c54ed902086d880cfc6ae1ca82699304ae7f74
Author: Eric Jarrige <eri...@ar...>
Date: Wed Oct 31 00:29:47 2012 +0100
[BUILROOT] uclibc : patch cleanup and extand accept4 patches to uclibc 0.9.33.2 - to fix QT compilation issue
-----------------------------------------------------------------------
Summary of changes:
patches/buildroot/2012.11/047-uclibc-config.patch | 32 ---------
.../182-uclibc-add_accept4_declaration_fix.patch | 71 ++++++++++++++++++++
2 files changed, 71 insertions(+), 32 deletions(-)
delete mode 100644 patches/buildroot/2012.11/047-uclibc-config.patch
diff --git a/patches/buildroot/2012.11/047-uclibc-config.patch b/patches/buildroot/2012.11/047-uclibc-config.patch
deleted file mode 100644
index f80184c..0000000
--- a/patches/buildroot/2012.11/047-uclibc-config.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Make uClibc 0.9.33 as Buildroot's default version
-
-Signed-off-by: Jérémie Scheer <jer...@ar...>
-
-Index: buildroot/toolchain/uClibc/uclibc.mk
-===================================================================
---- buildroot.orig/toolchain/uClibc/uclibc.mk 2012-02-29 23:19:47.000000000 +0100
-+++ buildroot/toolchain/uClibc/uclibc.mk 2012-03-23 16:57:54.000000000 +0100
-@@ -102,23 +102,6 @@
- -e 's,^SHARED_LIB_LOADER_PREFIX=.*,SHARED_LIB_LOADER_PREFIX=\"/lib\",g' \
- $(UCLIBC_DIR)/.oldconfig
- ifeq ($(UCLIBC_TARGET_ARCH),arm)
-- (/bin/echo "# CONFIG_GENERIC_ARM is not set"; \
-- /bin/echo "# CONFIG_ARM610 is not set"; \
-- /bin/echo "# CONFIG_ARM710 is not set"; \
-- /bin/echo "# CONFIG_ARM7TDMI is not set"; \
-- /bin/echo "# CONFIG_ARM720T is not set"; \
-- /bin/echo "# CONFIG_ARM920T is not set"; \
-- /bin/echo "# CONFIG_ARM922T is not set"; \
-- /bin/echo "# CONFIG_ARM926T is not set"; \
-- /bin/echo "# CONFIG_ARM10T is not set"; \
-- /bin/echo "# CONFIG_ARM1136JF_S is not set"; \
-- /bin/echo "# CONFIG_ARM1176JZ_S is not set"; \
-- /bin/echo "# CONFIG_ARM1176JZF_S is not set"; \
-- /bin/echo "# CONFIG_ARM_SA110 is not set"; \
-- /bin/echo "# CONFIG_ARM_SA1100 is not set"; \
-- /bin/echo "# CONFIG_ARM_XSCALE is not set"; \
-- /bin/echo "# CONFIG_ARM_IWMMXT is not set"; \
-- ) >> $(UCLIBC_DIR)/.oldconfig
- $(SED) 's/^\(CONFIG_[^_]*[_]*ARM[^=]*\)=.*/# \1 is not set/g' \
- $(UCLIBC_DIR)/.oldconfig
- $(SED) 's/^.*$(UCLIBC_ARM_TYPE).*/$(UCLIBC_ARM_TYPE)=y/g' $(UCLIBC_DIR)/.oldconfig
diff --git a/patches/buildroot/2012.11/182-uclibc-add_accept4_declaration_fix.patch b/patches/buildroot/2012.11/182-uclibc-add_accept4_declaration_fix.patch
index e5bcac0..2422cd2 100644
--- a/patches/buildroot/2012.11/182-uclibc-add_accept4_declaration_fix.patch
+++ b/patches/buildroot/2012.11/182-uclibc-add_accept4_declaration_fix.patch
@@ -2,6 +2,77 @@ Fix accept4 declaration in uClibc when not available in Linux Kernel.
Signed-off-by: Jérémie Scheer <jer...@ar...>
+Index: buildroot/toolchain/uClibc/uClibc-0.9.33.2-accept4-declaration-fix.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/toolchain/uClibc/uClibc-0.9.33.2-accept4-declaration-fix.patch 2012-03-26 16:34:32.000000000 +0200
+@@ -0,0 +1,33 @@
++From db6b038ff049a5b6e11b03d2cdb66248002eafff Mon Sep 17 00:00:00 2001
++From: Guillaume Emont <gui...@ig...>
++Date: Thu, 15 Sep 2011 20:19:19 +0200
++Subject: [PATCH 1/2] Only expose accept4 in headers if it is available
++
++---
++ include/sys/socket.h | 3 ++-
++ 1 files changed, 2 insertions(+), 1 deletions(-)
++
++diff --git a/include/sys/socket.h b/include/sys/socket.h
++index 6037f92..53b56ea 100644
++--- a/include/sys/socket.h
+++++ b/include/sys/socket.h
++@@ -22,6 +22,7 @@
++ #define _SYS_SOCKET_H 1
++
++ #include <features.h>
+++#include <bits/kernel-features.h>
++
++ __BEGIN_DECLS
++
++@@ -227,7 +228,7 @@ extern int accept (int __fd, __SOCKADDR_ARG __addr,
++ socklen_t *__restrict __addr_len);
++ libc_hidden_proto(accept)
++
++-#if defined __UCLIBC_LINUX_SPECIFIC__ && defined __USE_GNU
+++#if defined __UCLIBC_LINUX_SPECIFIC__ && defined __USE_GNU && defined __ASSUME_ACCEPT4
++ /* Similar to 'accept' but takes an additional parameter to specify flags.
++
++ This function is a cancellation point and therefore not marked with
++--
++1.7.4.1
++
+Index: buildroot/toolchain/uClibc/uClibc-0.9.33.2-assume-accept4-in-recent-arm-kernels.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/toolchain/uClibc/uClibc-0.9.33.2-assume-accept4-in-recent-arm-kernels.patch 2012-03-26 17:04:36.000000000 +0200
+@@ -0,0 +1,28 @@
++From c526492ee2284b6ae61040b2eac5b03120fb3185 Mon Sep 17 00:00:00 2001
++From: Guillaume Emont <gui...@ig...>
++Date: Thu, 15 Sep 2011 20:19:57 +0200
++Subject: [PATCH 2/2] define __ASSUME_ACCEPT4 for arm for kernels >= 2.6.36
++
++---
++ libc/sysdeps/linux/common/bits/kernel-features.h | 5 +++++
++ 1 files changed, 5 insertions(+), 0 deletions(-)
++
++diff --git a/libc/sysdeps/linux/common/bits/kernel-features.h b/libc/sysdeps/linux/common/bits/kernel-features.h
++index 6bf5544..be92f90 100644
++--- a/libc/sysdeps/linux/common/bits/kernel-features.h
+++++ b/libc/sysdeps/linux/common/bits/kernel-features.h
++@@ -479,6 +479,11 @@
++ # define __ASSUME_ACCEPT4 1
++ #endif
++
+++/* Correct support for the accept4 syscall for arm was added in 2.6.36. */
+++#if __LINUX_KERNEL_VERSION >= 0x020624 && defined __arm__
+++# define __ASSUME_ACCEPT4 1
+++#endif
+++
++ /* Support for the FUTEX_CLOCK_REALTIME flag was added in 2.6.29. */
++ #if __LINUX_KERNEL_VERSION >= 0x02061d
++ # define __ASSUME_FUTEX_CLOCK_REALTIME 1
++--
++1.7.4.1
++
Index: buildroot/toolchain/uClibc/uClibc-0.9.33-accept4-declaration-fix.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-10-30 19:16:22
|
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 058224b8f31878f6777494c1ecb3cee0d177d123 (commit)
from 37b6a38501106f6a4303dc1e4497bb0e00c6554b (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 058224b8f31878f6777494c1ecb3cee0d177d123
Author: Eric Jarrige <eri...@ar...>
Date: Tue Oct 30 20:19:18 2012 +0100
[BUILROOT] update ussp patch and cleanup_buildroot script
-----------------------------------------------------------------------
Summary of changes:
.../buildroot/2012.11/095-uucp-add_packages.patch | 63 --------------------
.../2012.11/117-ussp-push-add_package.patch | 2 +-
patches/buildroot/2012.11/cleanup_buildroot.sh | 7 --
3 files changed, 1 insertions(+), 71 deletions(-)
delete mode 100644 patches/buildroot/2012.11/095-uucp-add_packages.patch
diff --git a/patches/buildroot/2012.11/095-uucp-add_packages.patch b/patches/buildroot/2012.11/095-uucp-add_packages.patch
deleted file mode 100644
index 6ccd765..0000000
--- a/patches/buildroot/2012.11/095-uucp-add_packages.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Add uucp package to Buildroot. Only cu, which is part of uucp, was tested.
-
-Inspired by OpenWrt and Debian packages.
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: buildroot/package/Config.in
-===================================================================
---- buildroot.orig/package/Config.in 2012-02-21 16:44:41.000000000 +0100
-+++ buildroot/package/Config.in 2012-02-21 16:44:42.000000000 +0100
-@@ -526,6 +526,7 @@
- source "package/transmission/Config.in"
- source "package/ttcp/Config.in"
- source "package/udpcast/Config.in"
-+source "package/uucp/Config.in"
- source "package/ushare/Config.in"
- source "package/vpnc/Config.in"
- source "package/vsftpd/Config.in"
-Index: buildroot/package/uucp/uucp.mk
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/uucp/uucp.mk 2012-02-21 16:44:42.000000000 +0100
-@@ -0,0 +1,23 @@
-+#############################################################
-+#
-+# uucp (uucico, uusched, uuxqt, uux, uucp, uustat, uulog,
-+# uuname, uuto, uupick, and cu)
-+#
-+#############################################################
-+
-+UUCP_VERSION = 1.07
-+UUCP_SOURCE = uucp_$(UUCP_VERSION).orig.tar.gz
-+UUCP_SITE = http://ftp.debian.org/debian/pool/main/u/uucp/
-+# or ftp://ftp.gnu.org/pub/gnu/uucp/uucp-1.07.tar.gz
-+
-+define UUCP_INSTALL_STRIP_FIXUP
-+ $(SED) 's,INSTALL_SCRIPT = $${INSTALL_PROGRAM},INSTALL_SCRIPT = $${INSTALL},g' $(UUCP_DIR)/Makefile
-+endef
-+
-+# Otherwise executables aren't installed stripped
-+ifeq ($(BR2_ENABLE_DEBUG),)
-+UUCP_INSTALL_TARGET_OPT:=DESTDIR=$(TARGET_DIR) STRIPPROG='$(STRIPCMD)' install-strip
-+UUCP_POST_CONFIGURE_HOOKS += UUCP_INSTALL_STRIP_FIXUP
-+endif
-+
-+$(eval $(autotools-package))
-Index: buildroot/package/uucp/Config.in
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/uucp/Config.in 2012-02-21 16:44:42.000000000 +0100
-@@ -0,0 +1,12 @@
-+config BR2_PACKAGE_UUCP
-+ bool "uucp"
-+ help
-+ Unix to Unix Copy Program.
-+ UUCP will copy files to or from another (usually *nix) system, which also
-+ runs uucp. UUCP is used to transfer mail, news and random files between
-+ systems which are not connected by more modern networks. The communication
-+ can be made via modems, direct (hard-wired) serial connections or via an
-+ IP connection.
-+
-+ http://www.airs.com/ian/uucp.html
-+ http://packages.debian.org/lenny/uucp
diff --git a/patches/buildroot/2012.11/117-ussp-push-add_package.patch b/patches/buildroot/2012.11/117-ussp-push-add_package.patch
index a7246a9..44ed687 100644
--- a/patches/buildroot/2012.11/117-ussp-push-add_package.patch
+++ b/patches/buildroot/2012.11/117-ussp-push-add_package.patch
@@ -11,7 +11,7 @@ Index: buildroot/package/Config.in
source "package/ttcp/Config.in"
source "package/udpcast/Config.in"
+source "package/ussp-push/Config.in"
- source "package/uucp/Config.in"
+ source "package/ushare/Config.in"
source "package/vpnc/Config.in"
source "package/vsftpd/Config.in"
Index: buildroot/package/ussp-push/Config.in
diff --git a/patches/buildroot/2012.11/cleanup_buildroot.sh b/patches/buildroot/2012.11/cleanup_buildroot.sh
index 20c3256..80933e2 100755
--- a/patches/buildroot/2012.11/cleanup_buildroot.sh
+++ b/patches/buildroot/2012.11/cleanup_buildroot.sh
@@ -15,8 +15,6 @@ rm -rf buildroot/package/multimedia/flite/
rm -rf buildroot/package/libcurl/
rm -f buildroot/package/multimedia/mplayer/mplayer-1.0rc2-add_pld_asm_inst_for_non_armv5_arch.patch
rm -f buildroot/package/multimedia/madplay/madplay-audio-alsa.patch
-rm -f buildroot/toolchain/gcc/4.2.1/999-4.2.1-armeabi-aapcs-linux.patch
-rm -f buildroot/toolchain/gcc/4.2.4/999-4.2.4-armeabi-aapcs-linux.patch
rm -rf buildroot/package/games/wolf4sdl/
rm -rf buildroot/package/ussp-push/
rm -rf buildroot/package/openobex/
@@ -27,7 +25,6 @@ rm -rf buildroot/package/qtcreator
rm -rf buildroot/package/sdl/
rm -rf buildroot/package/sdlwater/
rm -rf buildroot/package/slideshow/
-rm -rf buildroot/package/python-mysql/
rm -rf buildroot/package/python-crc16/
rm -rf buildroot/package/socketcan/
rm -rf buildroot/package/lcd4linux/
@@ -59,8 +56,6 @@ rm -f buildroot/toolchain/uClibc/*.patch
rm -f buildroot/package/ntp/ntp-nano.patch
rm -f buildroot/package/busybox/busybox-1.16.2/*.patch
rm -f buildroot/target/generic/Config.in
-rm -rf buildroot/package/nanocom
-rm -rf buildroot/package/elftosb
rm -rf buildroot/package/rt-tests
rm -rf buildroot/package/libcanfestival
rm -rf buildroot/package/python
@@ -75,6 +70,4 @@ rm -rf buildroot/package/linux-firmware/
rm -rf buildroot/package/uboot-tools/
rm -rf buildroot/package/qtcreator/
rm -rf buildroot/package/marble/
-rm -rf buildroot/package/m4/m4-1.4.16-no-gets.patch
-rm -rf buildroot/package/tar/tar-1.26-no-gets.patch
rm -rf buildroot/package/cunit/
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-10-30 13:17:08
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 37b6a38501106f6a4303dc1e4497bb0e00c6554b (commit)
from ae30d17226e9f4db4dcf7ef2d5a34b5155f0686c (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 37b6a38501106f6a4303dc1e4497bb0e00c6554b
Author: Eric Jarrige <eri...@ar...>
Date: Tue Oct 30 14:20:07 2012 +0100
[BUILROOT] update the upcoming compatibility with BR 2012.11
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 +-
.../2012.11/174-imx-lib-add_package.patch | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 7f28d5b..7260a81 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ export ARMADEUS_TOPDIR
#--- User configurable stuff:
BUILDROOT_VERSION:=2012.02
-#BUILDROOT_VERSION:=20121025
+#BUILDROOT_VERSION:=20121030
include ./Makefile.in
ifeq ($(BUILDROOT_VERSION),2012.02)
BUILDROOT_SITE:=http://buildroot.uclibc.org/downloads
diff --git a/patches/buildroot/2012.11/174-imx-lib-add_package.patch b/patches/buildroot/2012.11/174-imx-lib-add_package.patch
index 35febf6..3acf660 100644
--- a/patches/buildroot/2012.11/174-imx-lib-add_package.patch
+++ b/patches/buildroot/2012.11/174-imx-lib-add_package.patch
@@ -79,9 +79,9 @@ Index: buildroot/package/Config.in
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"
- source "package/tslib/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
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-10-30 12:50:42
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via ae30d17226e9f4db4dcf7ef2d5a34b5155f0686c (commit)
from 9134e4b50311a1a933383372790353b465034102 (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 ae30d17226e9f4db4dcf7ef2d5a34b5155f0686c
Author: Eric Jarrige <eri...@ar...>
Date: Tue Oct 30 13:53:16 2012 +0100
[BUILROOT] fix PPS package .mk files to support new and legacy BR version
-----------------------------------------------------------------------
Summary of changes:
buildroot/package/armadeus/pps/pps.mk | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/buildroot/package/armadeus/pps/pps.mk b/buildroot/package/armadeus/pps/pps.mk
index 037da6b..1b00545 100644
--- a/buildroot/package/armadeus/pps/pps.mk
+++ b/buildroot/package/armadeus/pps/pps.mk
@@ -6,7 +6,11 @@
PPS_VERSION = 1.1
PPS_SITE = $(TOPDIR)/../target/pps
+ifeq ($(generic-package), )
PPS_SITE_METHOD = copy
+else
+PPS_SITE_METHOD = local
+endif
PPS_CONFIGS_DIR:=$(TOPDIR)/../target/pps/configs
PPS_CONFIGS_TARGET_DIR:=$(TARGET_DIR)/etc/
@@ -43,4 +47,9 @@ define PPS_UNINSTALL_TARGET_CMDS
rm -rf $(PPS_WWW_TARGET_DIR)/www
endef
+ifeq ($(generic-package), )
+$(eval $(call GENTARGETS))
+else
$(eval $(generic-package))
+endif
+
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-10-30 12:48:43
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 9134e4b50311a1a933383372790353b465034102 (commit)
from 2a09bac599c41786434078c17c1ecd5585227183 (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 9134e4b50311a1a933383372790353b465034102
Author: Eric Jarrige <eri...@ar...>
Date: Tue Oct 30 13:51:20 2012 +0100
[BUILROOT] fix armadeus package .mk files to support new and legacy BR version
-----------------------------------------------------------------------
Summary of changes:
.../package/armadeus/anybus-tools/anybus-tools.mk | 9 +++++++--
.../package/armadeus/as_devices/as_devices.mk | 9 +++++++--
.../imx28-usb-downloader/imx28-usb-downloader.mk | 4 ++--
buildroot/package/armadeus/imxregs/imxregs.mk | 6 +++---
buildroot/package/armadeus/rxtx/rxtx.mk | 2 +-
buildroot/package/armadeus/straton/straton.mk | 8 ++++++--
.../package/armadeus/straton_ios/straton_ios.mk | 8 ++++++--
7 files changed, 32 insertions(+), 14 deletions(-)
diff --git a/buildroot/package/armadeus/anybus-tools/anybus-tools.mk b/buildroot/package/armadeus/anybus-tools/anybus-tools.mk
index b533861..817c051 100644
--- a/buildroot/package/armadeus/anybus-tools/anybus-tools.mk
+++ b/buildroot/package/armadeus/anybus-tools/anybus-tools.mk
@@ -6,7 +6,11 @@
ANYBUS_TOOLS_VERSION = 0.1
ANYBUS_TOOLS_BIN_NAME = anybus-tools
ANYBUS_TOOLS_SITE=$(TOPDIR)/../target/packages/anybus-tools/
+ifeq ($(generic-package), )
ANYBUS_TOOLS_SITE_METHOD=copy
+else
+ANYBUS_TOOLS_SITE_METHOD=local
+endif
LINUX_DIR=$(BUILD_DIR)/linux-$(KERNEL_VERSION)/
define ANYBUS_TOOLS_BUILD_CMDS
@@ -18,8 +22,9 @@ define ANYBUS_TOOLS_INSTALL_TARGET_CMDS
$(INSTALL) -m 0755 $(ANYBUS_TOOLS_DIR)/$(ANYBUS_TOOLS_BIN_NAME) $(TARGET_DIR)/usr/bin/$(ANYBUS_TOOLS_BIN_NAME)
endef
-ifeq ($(BUILDROOT_VERSION),2012.02)
-$(eval $(call GENTARGETS,package,anybus-tools))
+ifeq ($(generic-package), )
+$(eval $(call GENTARGETS))
else
$(eval $(generic-package))
endif
+
diff --git a/buildroot/package/armadeus/as_devices/as_devices.mk b/buildroot/package/armadeus/as_devices/as_devices.mk
index 1330ca7..e619955 100644
--- a/buildroot/package/armadeus/as_devices/as_devices.mk
+++ b/buildroot/package/armadeus/as_devices/as_devices.mk
@@ -6,7 +6,11 @@
AS_DEVICES_VERSION = 0.16
AS_DEVICES_SITE = $(TOPDIR)/../target/packages/as_devices
+ifeq ($(generic-package), )
AS_DEVICES_SITE_METHOD = copy
+else
+AS_DEVICES_SITE_METHOD = local
+endif
AS_DEVICES_INSTALL_STAGING = YES
AS_DEVICES_BUILD_TARGET = c_target
@@ -74,8 +78,9 @@ define AS_DEVICES_CLEAN_CMDS
$(MAKE) -C $(@D) clean
endef
-ifeq ($(BUILDROOT_VERSION),2012.02)
-$(eval $(call GENTARGETS,package/armadeus,as_devices))
+ifeq ($(generic-package), )
+$(eval $(call GENTARGETS))
else
$(eval $(generic-package))
endif
+
diff --git a/buildroot/package/armadeus/imx28-usb-downloader/imx28-usb-downloader.mk b/buildroot/package/armadeus/imx28-usb-downloader/imx28-usb-downloader.mk
index e1224ac..177c0d6 100644
--- a/buildroot/package/armadeus/imx28-usb-downloader/imx28-usb-downloader.mk
+++ b/buildroot/package/armadeus/imx28-usb-downloader/imx28-usb-downloader.mk
@@ -6,7 +6,7 @@
IMX28_USB_DOWNLOADER_VERSION = 0.1
IMX28_USB_DOWNLOADER_BIN_NAME = gnet-imx28-usb-downloader
IMX28_USB_DOWNLOADER_SITE = $(TOPDIR)/../target/packages/gnet-imx28-usb-downloader/
-ifeq ($(BUILDROOT_VERSION),2012.02)
+ifeq ($(generic-package), )
IMX28_USB_DOWNLOADER_SITE_METHOD = copy
else
HOST_IMX28_USB_DOWNLOADER_SITE = $(TOPDIR)/../target/packages/gnet-imx28-usb-downloader/
@@ -38,7 +38,7 @@ define IMX28_USB_DOWNLOADER_INSTALL_TARGET_CMDS
$(TARGET_DIR)/usr/bin/$(IMX28_USB_DOWNLOADER_BIN_NAME)
endef
-ifeq ($(BUILDROOT_VERSION),2012.02)
+ifeq ($(generic-package), )
$(eval $(call GENTARGETS,))
$(eval $(call GENTARGETS,host))
else
diff --git a/buildroot/package/armadeus/imxregs/imxregs.mk b/buildroot/package/armadeus/imxregs/imxregs.mk
index a6f4637..51aa11f 100644
--- a/buildroot/package/armadeus/imxregs/imxregs.mk
+++ b/buildroot/package/armadeus/imxregs/imxregs.mk
@@ -6,7 +6,7 @@
IMXREGS_VERSION = 1.3
IMXREGS_SITE = $(TOPDIR)/../target/linux/debug/imxregs/
-ifeq ($(BUILDROOT_VERSION),2012.02)
+ifeq ($(generic-package), )
IMXREGS_SITE_METHOD = copy
else
IMXREGS_SITE_METHOD = local
@@ -30,8 +30,8 @@ define IMXREGS_CLEAN_CMDS
$(MAKE) -C $(@D) clean
endef
-ifeq ($(BUILDROOT_VERSION),2012.02)
-$(eval $(call GENTARGETS,package/armadeus,imxregs))
+ifeq ($(generic-package), )
+$(eval $(call GENTARGETS))
else
$(eval $(generic-package))
endif
diff --git a/buildroot/package/armadeus/rxtx/rxtx.mk b/buildroot/package/armadeus/rxtx/rxtx.mk
index a334e54..881cb32 100644
--- a/buildroot/package/armadeus/rxtx/rxtx.mk
+++ b/buildroot/package/armadeus/rxtx/rxtx.mk
@@ -9,7 +9,7 @@ RXTX_SITE = http://rxtx.qbang.org/pub/rxtx/
RXTX_DEPENDENCIES = classpath
RXTX_INSTALL_TARGET_OPT = RXTX_PATH=$(TARGET_DIR)/usr/lib/classpath JHOME=$(TARGET_DIR)/usr/lib install
-ifeq ($(BUILDROOT_VERSION),2012.02)
+ifeq ($(autotools-package), )
$(eval $(call AUTOTARGETS))
else
$(eval $(autotools-package))
diff --git a/buildroot/package/armadeus/straton/straton.mk b/buildroot/package/armadeus/straton/straton.mk
index df40915..e999850 100644
--- a/buildroot/package/armadeus/straton/straton.mk
+++ b/buildroot/package/armadeus/straton/straton.mk
@@ -10,7 +10,11 @@ STRATON_BIN_NAME = straton
# STRATON DEV
ifeq ($(BR2_PACKAGE_STRATON_DEV),y)
STRATON_SITE=$(BR2_PACKAGE_STRATON_DEV_DIR)
+ifeq ($(generic-package), )
STRATON_SITE_METHOD=copy
+else
+STRATON_SITE_METHOD=local
+endif
define STRATON_BUILD_CMDS
$(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_LD)" STAGING_DIR="$(STAGING_DIR)" \
@@ -45,8 +49,8 @@ endef
endif # STRATON_BIN
-ifeq ($(BUILDROOT_VERSION),2012.02)
-$(eval $(call GENTARGETS,package,straton))
+ifeq ($(generic-package), )
+$(eval $(call GENTARGETS))
else
$(eval $(generic-package))
endif
diff --git a/buildroot/package/armadeus/straton_ios/straton_ios.mk b/buildroot/package/armadeus/straton_ios/straton_ios.mk
index 11f084b..34f1fb1 100644
--- a/buildroot/package/armadeus/straton_ios/straton_ios.mk
+++ b/buildroot/package/armadeus/straton_ios/straton_ios.mk
@@ -7,7 +7,11 @@
STRATON_IOS_VERSION = 0.1
STRATON_IOS_DEPENDENCIES = as_devices
STRATON_IOS_BINARY:=libstraton_ios.so
+ifeq ($(generic-package), )
STRATON_IOS_SITE_METHOD=copy
+else
+STRATON_IOS_SITE_METHOD=local
+endif
STRATON_IOS_INSTALL_STAGING=YES
STRATON_IOS_SITE=$(TOPDIR)/../target/packages/straton_ios
@@ -26,8 +30,8 @@ define STRATON_IOS_INSTALL_TARGET_CMDS
$(INSTALL) -m 0755 $(STRATON_IOS_DIR)/$(STRATON_IOS_BINARY)* $(TARGET_DIR)/usr/lib/
endef
-ifeq ($(BUILDROOT_VERSION),2012.02)
-$(eval $(call GENTARGETS,package,straton_ios))
+ifeq ($(generic-package), )
+$(eval $(call GENTARGETS))
else
$(eval $(generic-package))
endif
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-10-29 19:17:20
|
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 2a09bac599c41786434078c17c1ecd5585227183 (commit)
from 439aa6c327c6e0103b8355e619f9e64a776be55e (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 2a09bac599c41786434078c17c1ecd5585227183
Author: Eric Jarrige <eri...@ar...>
Date: Mon Oct 29 20:20:01 2012 +0100
[BUILROOT] add config files for busybox 1.20.2 and uClibc 0.9.33.2
-----------------------------------------------------------------------
Summary of changes:
.../target/device/armadeus/busybox-1.20.2.config | 1 +
.../target/device/armadeus/uClibc-0.9.33.2.config | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
create mode 120000 buildroot/target/device/armadeus/busybox-1.20.2.config
create mode 120000 buildroot/target/device/armadeus/uClibc-0.9.33.2.config
diff --git a/buildroot/target/device/armadeus/busybox-1.20.2.config b/buildroot/target/device/armadeus/busybox-1.20.2.config
new file mode 120000
index 0000000..e9812f2
--- /dev/null
+++ b/buildroot/target/device/armadeus/busybox-1.20.2.config
@@ -0,0 +1 @@
+/home/eric/arm/armadeusuboot/buildroot/target/device/armadeus/busybox-1.19.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/uClibc-0.9.33.2.config b/buildroot/target/device/armadeus/uClibc-0.9.33.2.config
new file mode 120000
index 0000000..da41279
--- /dev/null
+++ b/buildroot/target/device/armadeus/uClibc-0.9.33.2.config
@@ -0,0 +1 @@
+/home/eric/arm/armadeusuboot/buildroot/target/device/armadeus/uClibc-0.9.33.config
\ No newline at end of file
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-10-29 16:13:46
|
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 439aa6c327c6e0103b8355e619f9e64a776be55e (commit)
from 0d0073e3de929d150a3586dbf054a5a9ba3ba68c (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 439aa6c327c6e0103b8355e619f9e64a776be55e
Author: Eric Jarrige <eri...@ar...>
Date: Mon Oct 29 17:16:32 2012 +0100
[BUILROOT] Add updated BR patches to support the next BR release and to push some patches to BR mainline
-----------------------------------------------------------------------
Summary of changes:
.../001-add_armadeus_device.patch | 0
.../002-add_armadeus_specific_packages.patch | 0
.../{2012.02 => 2012.11}/006-lcd4linux.patch | 0
.../{2012.02 => 2012.11}/018-allegro.patch | 0
.../021-sdl-water-config.patch | 0
patches/buildroot/2012.11/034-slideshow.patch | 224 +++
patches/buildroot/2012.11/040-linux-makefile.patch | 47 +
.../043-mesa-add_packages.patch | 0
.../045-openssh-add_passwd_expire.patch | 0
patches/buildroot/2012.11/047-uclibc-config.patch | 32 +
...support-for-Safe-Boot-file-format-this-fo.patch | 46 +
...d_possibility_to_choose_board_header_file.patch | 0
...x_in_a_standalone_way_after_configuration.patch | 0
...-linux-change_board_specific_patches_name.patch | 0
.../{2012.02 => 2012.11}/072-xenomai-package.patch | 0
.../buildroot/2012.11/081-adds_quake_package.patch | 160 ++
.../083-pygame-armadeus_addons.patch | 0
.../buildroot/2012.11/085-adds_gpm_package.patch | 168 ++
.../buildroot/2012.11/095-uucp-add_packages.patch | 63 +
.../buildroot/2012.11/097-adds_flite_package.patch | 81 +
...for_pld_asm_instruction_on_non_armv5_arch.patch | 0
...r-add_patch_for_recent_alsa_compatibility.patch | 0
.../buildroot/2012.11/107-games-add_wolf4sdl.patch | 92 +
.../buildroot/2012.11/110-bluez3-add_package.patch | 118 ++
patches/buildroot/2012.11/111-bluez3-hacks.patch | 198 +++
.../2012.11/116-openobex-add_package.patch | 146 ++
.../2012.11/117-ussp-push-add_package.patch | 48 +
.../118-snes9x-add_package.patch | 0
.../buildroot/2012.11/119-fbtest-add_package.patch | 176 ++
.../buildroot/2012.11/120-cwiid-add_package.patch | 106 ++
.../121-target-arm926t_is_arm926ej-s.patch | 0
.../buildroot/2012.11/122-urg-add_package.patch | 56 +
.../2012.11/123-pywebradio-add_package.patch | 56 +
.../buildroot/2012.11/124-e-uae-add_package.patch | 54 +
.../2012.11/125-opentyrian-add_package.patch | 83 +
.../2012.11/130-lbreakout-add_package.patch | 82 +
.../2012.11/131-ltetris-add_package.patch | 84 +
...-qt-full_integration_with_cross_compiling.patch | 44 +
.../buildroot/2012.11/133-qwt-add_package.patch | 163 ++
...ffs2-add_board_name_to_binary_rootfs_name.patch | 0
.../135-linux-add_linux26-clean_target.patch | 0
...42-ncurses-fix_compilation_with_old_hosts.patch | 25 +
...-disable_ip_busybox_if_iproute2_buildroot.patch | 0
...fix_installation_bug_on_some_host_systems.patch | 0
...lection_even_when_custom_rootfs_is_chosen.patch | 0
.../158-setserial-bump_version.patch | 0
.../2012.11/168-libcanfestival-add_package.patch | 149 ++
.../170-mplayer-make_it_compile_on_apf51.patch | 0
.../buildroot/2012.11/172-gsmmux-add_package.patch | 88 +
.../2012.11/174-imx-lib-add_package.patch | 105 ++
.../2012.11/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 | 0
.../2012.11/181-qtcreator-add_package.patch | 1001 +++++++++++
.../182-uclibc-add_accept4_declaration_fix.patch | 0
.../2012.11/183-firmware-imx-add_package.patch | 49 +
.../2012.11/184-fsl-mm-codeclib-add_package.patch | 30 +
.../2012.11/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 | 0
.../buildroot/2012.11/188-marble-add_package.patch | 88 +
.../189-dbus-fix_installation.patch | 0
.../191-madplay-requires_libintl.patch | 0
.../2012.11/196-python-crc16-add_package.patch | 58 +
.../buildroot/2012.11/197-cunit-add_package.patch | 49 +
.../{2012.02 => 2012.11}/cleanup_buildroot.sh | 0
67 files changed, 6152 insertions(+), 0 deletions(-)
copy patches/buildroot/{2012.02 => 2012.11}/001-add_armadeus_device.patch (100%)
copy patches/buildroot/{2012.02 => 2012.11}/002-add_armadeus_specific_packages.patch (100%)
copy patches/buildroot/{2012.02 => 2012.11}/006-lcd4linux.patch (100%)
copy patches/buildroot/{2012.02 => 2012.11}/018-allegro.patch (100%)
copy patches/buildroot/{2012.02 => 2012.11}/021-sdl-water-config.patch (100%)
create mode 100644 patches/buildroot/2012.11/034-slideshow.patch
create mode 100644 patches/buildroot/2012.11/040-linux-makefile.patch
copy patches/buildroot/{2012.02 => 2012.11}/043-mesa-add_packages.patch (100%)
copy patches/buildroot/{2012.02 => 2012.11}/045-openssh-add_passwd_expire.patch (100%)
create mode 100644 patches/buildroot/2012.11/047-uclibc-config.patch
create mode 100644 patches/buildroot/2012.11/051a-U-Boot-add-support-for-Safe-Boot-file-format-this-fo.patch
copy patches/buildroot/{2012.02 => 2012.11}/051d-u-boot-add_possibility_to_choose_board_header_file.patch (100%)
copy patches/buildroot/{2012.02 => 2012.11}/060-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.patch (100%)
copy patches/buildroot/{2012.02 => 2012.11}/071-linux-change_board_specific_patches_name.patch (100%)
copy patches/buildroot/{2012.02 => 2012.11}/072-xenomai-package.patch (100%)
create mode 100644 patches/buildroot/2012.11/081-adds_quake_package.patch
copy patches/buildroot/{2012.02 => 2012.11}/083-pygame-armadeus_addons.patch (100%)
create mode 100644 patches/buildroot/2012.11/085-adds_gpm_package.patch
create mode 100644 patches/buildroot/2012.11/095-uucp-add_packages.patch
create mode 100644 patches/buildroot/2012.11/097-adds_flite_package.patch
copy patches/buildroot/{2012.02 => 2012.11}/099-mplayer-add_patch_for_pld_asm_instruction_on_non_armv5_arch.patch (100%)
copy patches/buildroot/{2012.02 => 2012.11}/101-mplayer-add_patch_for_recent_alsa_compatibility.patch (100%)
create mode 100644 patches/buildroot/2012.11/107-games-add_wolf4sdl.patch
create mode 100644 patches/buildroot/2012.11/110-bluez3-add_package.patch
create mode 100644 patches/buildroot/2012.11/111-bluez3-hacks.patch
create mode 100644 patches/buildroot/2012.11/116-openobex-add_package.patch
create mode 100644 patches/buildroot/2012.11/117-ussp-push-add_package.patch
copy patches/buildroot/{2012.02 => 2012.11}/118-snes9x-add_package.patch (100%)
create mode 100644 patches/buildroot/2012.11/119-fbtest-add_package.patch
create mode 100644 patches/buildroot/2012.11/120-cwiid-add_package.patch
copy patches/buildroot/{2012.02 => 2012.11}/121-target-arm926t_is_arm926ej-s.patch (100%)
create mode 100644 patches/buildroot/2012.11/122-urg-add_package.patch
create mode 100644 patches/buildroot/2012.11/123-pywebradio-add_package.patch
create mode 100644 patches/buildroot/2012.11/124-e-uae-add_package.patch
create mode 100644 patches/buildroot/2012.11/125-opentyrian-add_package.patch
create mode 100644 patches/buildroot/2012.11/130-lbreakout-add_package.patch
create mode 100644 patches/buildroot/2012.11/131-ltetris-add_package.patch
create mode 100644 patches/buildroot/2012.11/132-qt-full_integration_with_cross_compiling.patch
create mode 100644 patches/buildroot/2012.11/133-qwt-add_package.patch
copy patches/buildroot/{2012.02 => 2012.11}/134-jffs2-add_board_name_to_binary_rootfs_name.patch (100%)
copy patches/buildroot/{2012.02 => 2012.11}/135-linux-add_linux26-clean_target.patch (100%)
create mode 100644 patches/buildroot/2012.11/142-ncurses-fix_compilation_with_old_hosts.patch
copy patches/buildroot/{2012.02 => 2012.11}/146-busybox-disable_ip_busybox_if_iproute2_buildroot.patch (100%)
copy patches/buildroot/{2012.02 => 2012.11}/150-alsa-utils-fix_installation_bug_on_some_host_systems.patch (100%)
copy patches/buildroot/{2012.02 => 2012.11}/157-buildroot-allow_generic_device_selection_even_when_custom_rootfs_is_chosen.patch (100%)
copy patches/buildroot/{2012.02 => 2012.11}/158-setserial-bump_version.patch (100%)
create mode 100644 patches/buildroot/2012.11/168-libcanfestival-add_package.patch
copy patches/buildroot/{2012.02 => 2012.11}/170-mplayer-make_it_compile_on_apf51.patch (100%)
create mode 100644 patches/buildroot/2012.11/172-gsmmux-add_package.patch
create mode 100644 patches/buildroot/2012.11/174-imx-lib-add_package.patch
create mode 100644 patches/buildroot/2012.11/176-imx-test-add_package.patch
create mode 100644 patches/buildroot/2012.11/177-restore-java-packages-classpath-jamvm.patch
create mode 100644 patches/buildroot/2012.11/178-uboot-add-missing-UBOOT_CLEAN_CMDS.patch
copy patches/buildroot/{2012.02 => 2012.11}/179-e2fsprog-allow_e4defrag_build_against_old_kernel_headers.patch (100%)
create mode 100644 patches/buildroot/2012.11/181-qtcreator-add_package.patch
copy patches/buildroot/{2012.02 => 2012.11}/182-uclibc-add_accept4_declaration_fix.patch (100%)
create mode 100644 patches/buildroot/2012.11/183-firmware-imx-add_package.patch
create mode 100644 patches/buildroot/2012.11/184-fsl-mm-codeclib-add_package.patch
create mode 100644 patches/buildroot/2012.11/185-gst-fsl-plugin-add_package.patch
create mode 100644 patches/buildroot/2012.11/186-linux-firmware-add_marvell_libertas_8686.patch
copy patches/buildroot/{2012.02 => 2012.11}/186-uboot-tools-2011.03-Ignore-env_sectors-on-NOR-and-SPI-dataflash.patch (100%)
create mode 100644 patches/buildroot/2012.11/188-marble-add_package.patch
copy patches/buildroot/{2012.02 => 2012.11}/189-dbus-fix_installation.patch (100%)
copy patches/buildroot/{2012.02 => 2012.11}/191-madplay-requires_libintl.patch (100%)
create mode 100644 patches/buildroot/2012.11/196-python-crc16-add_package.patch
create mode 100644 patches/buildroot/2012.11/197-cunit-add_package.patch
copy patches/buildroot/{2012.02 => 2012.11}/cleanup_buildroot.sh (100%)
diff --git a/patches/buildroot/2012.02/001-add_armadeus_device.patch b/patches/buildroot/2012.11/001-add_armadeus_device.patch
similarity index 100%
copy from patches/buildroot/2012.02/001-add_armadeus_device.patch
copy to patches/buildroot/2012.11/001-add_armadeus_device.patch
diff --git a/patches/buildroot/2012.02/002-add_armadeus_specific_packages.patch b/patches/buildroot/2012.11/002-add_armadeus_specific_packages.patch
similarity index 100%
copy from patches/buildroot/2012.02/002-add_armadeus_specific_packages.patch
copy to patches/buildroot/2012.11/002-add_armadeus_specific_packages.patch
diff --git a/patches/buildroot/2012.02/006-lcd4linux.patch b/patches/buildroot/2012.11/006-lcd4linux.patch
similarity index 100%
copy from patches/buildroot/2012.02/006-lcd4linux.patch
copy to patches/buildroot/2012.11/006-lcd4linux.patch
diff --git a/patches/buildroot/2012.02/018-allegro.patch b/patches/buildroot/2012.11/018-allegro.patch
similarity index 100%
copy from patches/buildroot/2012.02/018-allegro.patch
copy to patches/buildroot/2012.11/018-allegro.patch
diff --git a/patches/buildroot/2012.02/021-sdl-water-config.patch b/patches/buildroot/2012.11/021-sdl-water-config.patch
similarity index 100%
copy from patches/buildroot/2012.02/021-sdl-water-config.patch
copy to patches/buildroot/2012.11/021-sdl-water-config.patch
diff --git a/patches/buildroot/2012.11/034-slideshow.patch b/patches/buildroot/2012.11/034-slideshow.patch
new file mode 100644
index 0000000..a37edb2
--- /dev/null
+++ b/patches/buildroot/2012.11/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.orig/package/Config.in 2012-02-21 16:44:08.000000000 +0100
++++ buildroot/package/Config.in 2012-02-21 16:44:09.000000000 +0100
+@@ -124,6 +124,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/040-linux-makefile.patch b/patches/buildroot/2012.11/040-linux-makefile.patch
new file mode 100644
index 0000000..49e96a9
--- /dev/null
+++ b/patches/buildroot/2012.11/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
+@@ -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.02/043-mesa-add_packages.patch b/patches/buildroot/2012.11/043-mesa-add_packages.patch
similarity index 100%
copy from patches/buildroot/2012.02/043-mesa-add_packages.patch
copy to patches/buildroot/2012.11/043-mesa-add_packages.patch
diff --git a/patches/buildroot/2012.02/045-openssh-add_passwd_expire.patch b/patches/buildroot/2012.11/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/2012.11/045-openssh-add_passwd_expire.patch
diff --git a/patches/buildroot/2012.11/047-uclibc-config.patch b/patches/buildroot/2012.11/047-uclibc-config.patch
new file mode 100644
index 0000000..f80184c
--- /dev/null
+++ b/patches/buildroot/2012.11/047-uclibc-config.patch
@@ -0,0 +1,32 @@
+Make uClibc 0.9.33 as Buildroot's default version
+
+Signed-off-by: Jérémie Scheer <jer...@ar...>
+
+Index: buildroot/toolchain/uClibc/uclibc.mk
+===================================================================
+--- buildroot.orig/toolchain/uClibc/uclibc.mk 2012-02-29 23:19:47.000000000 +0100
++++ buildroot/toolchain/uClibc/uclibc.mk 2012-03-23 16:57:54.000000000 +0100
+@@ -102,23 +102,6 @@
+ -e 's,^SHARED_LIB_LOADER_PREFIX=.*,SHARED_LIB_LOADER_PREFIX=\"/lib\",g' \
+ $(UCLIBC_DIR)/.oldconfig
+ ifeq ($(UCLIBC_TARGET_ARCH),arm)
+- (/bin/echo "# CONFIG_GENERIC_ARM is not set"; \
+- /bin/echo "# CONFIG_ARM610 is not set"; \
+- /bin/echo "# CONFIG_ARM710 is not set"; \
+- /bin/echo "# CONFIG_ARM7TDMI is not set"; \
+- /bin/echo "# CONFIG_ARM720T is not set"; \
+- /bin/echo "# CONFIG_ARM920T is not set"; \
+- /bin/echo "# CONFIG_ARM922T is not set"; \
+- /bin/echo "# CONFIG_ARM926T is not set"; \
+- /bin/echo "# CONFIG_ARM10T is not set"; \
+- /bin/echo "# CONFIG_ARM1136JF_S is not set"; \
+- /bin/echo "# CONFIG_ARM1176JZ_S is not set"; \
+- /bin/echo "# CONFIG_ARM1176JZF_S is not set"; \
+- /bin/echo "# CONFIG_ARM_SA110 is not set"; \
+- /bin/echo "# CONFIG_ARM_SA1100 is not set"; \
+- /bin/echo "# CONFIG_ARM_XSCALE is not set"; \
+- /bin/echo "# CONFIG_ARM_IWMMXT is not set"; \
+- ) >> $(UCLIBC_DIR)/.oldconfig
+ $(SED) 's/^\(CONFIG_[^_]*[_]*ARM[^=]*\)=.*/# \1 is not set/g' \
+ $(UCLIBC_DIR)/.oldconfig
+ $(SED) 's/^.*$(UCLIBC_ARM_TYPE).*/$(UCLIBC_ARM_TYPE)=y/g' $(UCLIBC_DIR)/.oldconfig
diff --git a/patches/buildroot/2012.11/051a-U-Boot-add-support-for-Safe-Boot-file-format-this-fo.patch b/patches/buildroot/2012.11/051a-U-Boot-add-support-for-Safe-Boot-file-format-this-fo.patch
new file mode 100644
index 0000000..7d06140
--- /dev/null
+++ b/patches/buildroot/2012.11/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
+@@ -90,6 +90,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
+
+ menuconfig BR2_TARGET_UBOOT_NETWORK
+diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
+index db9de8d..1394400 100644
+--- a/boot/uboot/uboot.mk
++++ b/boot/uboot/uboot.mk
+@@ -29,6 +29,10 @@ else ifeq ($(BR2_TARGET_UBOOT_FORMAT_LDR),y)
+ UBOOT_BIN = u-boot-nand.bin
+ else ifeq ($(BR2_TARGET_UBOOT_FORMAT_IMG),y)
+ UBOOT_BIN = u-boot.img
++else ifeq ($(BR2_TARGET_UBOOT_FORMAT_SB),y)
++UBOOT_DEPENDENCIES += host-elftosb
++UBOOT_BIN = u-boot.sb
++UBOOT_MAKE_TARGET = $(UBOOT_BIN)
+ else
+ UBOOT_BIN = u-boot.bin
+ UBOOT_BIN_IFT = $(UBOOT_BIN).ift
+--
+1.7.2.5
+
diff --git a/patches/buildroot/2012.02/051d-u-boot-add_possibility_to_choose_board_header_file.patch b/patches/buildroot/2012.11/051d-u-boot-add_possibility_to_choose_board_header_file.patch
similarity index 100%
copy from patches/buildroot/2012.02/051d-u-boot-add_possibility_to_choose_board_header_file.patch
copy to patches/buildroot/2012.11/051d-u-boot-add_possibility_to_choose_board_header_file.patch
diff --git a/patches/buildroot/2012.02/060-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.patch b/patches/buildroot/2012.11/060-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.patch
similarity index 100%
copy from patches/buildroot/2012.02/060-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.patch
copy to patches/buildroot/2012.11/060-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.patch
diff --git a/patches/buildroot/2012.02/071-linux-change_board_specific_patches_name.patch b/patches/buildroot/2012.11/071-linux-change_board_specific_patches_name.patch
similarity index 100%
copy from patches/buildroot/2012.02/071-linux-change_board_specific_patches_name.patch
copy to patches/buildroot/2012.11/071-linux-change_board_specific_patches_name.patch
diff --git a/patches/buildroot/2012.02/072-xenomai-package.patch b/patches/buildroot/2012.11/072-xenomai-package.patch
similarity index 100%
copy from patches/buildroot/2012.02/072-xenomai-package.patch
copy to patches/buildroot/2012.11/072-xenomai-package.patch
diff --git a/patches/buildroot/2012.11/081-adds_quake_package.patch b/patches/buildroot/2012.11/081-adds_quake_package.patch
new file mode 100644
index 0000000..bd913d8
--- /dev/null
+++ b/patches/buildroot/2012.11/081-adds_quake_package.patch
@@ -0,0 +1,160 @@
+
+This patch adds Quake packages to buildroot:
+* Quake engine itself (SDL port)
+* a shareware data file (PAK/WAD) to test the engine
+
+It is inspired of OpenEmbedded work.
+
+Still searching a way to apply sdlquake-1.0.9-no-x86-asm.patch on all arch
+EXCEPT x86.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/games/sdlquake/sdlquake.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/games/sdlquake/sdlquake.mk 2012-07-21 19:23:16.000000000 +0200
+@@ -0,0 +1,22 @@
++#############################################################
++#
++# Quake 1 (SDL Port)
++#
++#############################################################
++
++SDLQUAKE_VERSION = 1.0.9
++SDLQUAKE_SITE = http://www.libsdl.org/projects/quake/src/
++SDLQUAKE_AUTORECONF = YES
++
++SDLQUAKE_CONF_OPT = --with-sdl-prefix=$(STAGING_DIR)/usr
++
++SDLQUAKE_DEPENDENCIES = sdl
++
++define SDLQUAKE_AUTOCONF_FIXES
++ (cd $(@D); touch INSTALL NEWS README AUTHORS ChangeLog; \
++ echo "AC_PROG_CC" >> configure.in;)
++endef
++
++SDLQUAKE_POST_PATCH_HOOKS += SDLQUAKE_AUTOCONF_FIXES
++
++$(eval $(autotools-package))
+Index: buildroot/package/games/sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/games/sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm 2012-07-21 19:13:42.000000000 +0200
+@@ -0,0 +1,35 @@
++--- /tmp/Makefile.am 2008-08-11 20:31:09.000000000 +0200
+++++ sdlquake-1.0.9/Makefile.am 2008-08-11 20:55:00.263198000 +0200
++@@ -33,7 +33,6 @@
++ crc.h \
++ cvar.c \
++ cvar.h \
++- d_copy.S \
++ d_edge.c \
++ d_fill.c \
++ d_iface.h \
++@@ -48,7 +47,6 @@
++ d_sprite.c \
++ d_surf.c \
++ d_zpoint.c \
++- dosasm.S \
++ dosisms.h \
++ draw.c \
++ draw.h \
++@@ -103,7 +101,6 @@
++ r_sprite.c \
++ r_surf.c \
++ r_vars.c \
++- r_varsa.S \
++ render.h \
++ resource.h \
++ sbar.c \
++@@ -136,7 +133,7 @@
++ world.h \
++ zone.c \
++ zone.h \
++- $(X86_SRCS) $(NONX86_SRCS)
+++ $(NONX86_SRCS)
++
++ X86_SRCS = \
++ snd_mixa.S \
+Index: buildroot/package/games/sdlquake/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/games/sdlquake/Config.in 2012-07-21 19:13:42.000000000 +0200
+@@ -0,0 +1,10 @@
++config BR2_PACKAGE_SDLQUAKE
++ bool "sdlquake"
++ select BR2_PACKAGE_SDL
++ select BR2_PACKAGE_SDL_MIXER
++ select BR2_PACKAGE_SDL_NET
++ help
++ sdlquake is a port of ID Software's popular Quake 3-D shooter game.
++ (Not supported by ID Software)
++
++ http://www.libsdl.org/projects/quake/
+Index: buildroot/package/games/quake-pak/quake-pak.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/games/quake-pak/quake-pak.mk 2012-07-21 19:13:42.000000000 +0200
+@@ -0,0 +1,34 @@
++#############################################################
++#
++# Quake shareware data files (PAK/WAD)
++#
++#############################################################
++
++QUAKE_PAK_VERSION = 1.0.6
++QUAKE_PAK_SOURCE = quakesw-$(QUAKE_PAK_VERSION).tar.gz
++QUAKE_PAK_SITE = http://www.libsdl.org/projects/quake/data/
++QUAKE_PAK_CAT = $(ZCAT)
++QUAKE_PAK_TARGET_DIR = $(TARGET_DIR)/usr/share/games/quake/
++
++$(DL_DIR)/$(QUAKE_PAK_SOURCE):
++ $(WGET) -P $(DL_DIR) $(QUAKE_PAK_SITE)/$(QUAKE_PAK_SOURCE)
++
++quake-pak-source: $(DL_DIR)/$(QUAKE_PAK_SOURCE)
++
++$(QUAKE_PAK_TARGET_DIR)/id1/pak0.pak: $(DL_DIR)/$(QUAKE_PAK_SOURCE)
++ mkdir -p $(QUAKE_PAK_TARGET_DIR)
++ $(QUAKE_PAK_CAT) $(DL_DIR)/$(QUAKE_PAK_SOURCE) | tar -C $(QUAKE_PAK_TARGET_DIR) $(TAR_OPTIONS) -
++
++quake-pak: $(QUAKE_PAK_TARGET_DIR)/id1/pak0.pak
++
++quake-pak-dirclean:
++ rm -rf $(QUAKE_PAK_TARGET_DIR)/id1/
++
++#############################################################
++#
++# Toplevel Makefile options
++#
++#############################################################
++ifeq ($(strip $(BR2_PACKAGE_QUAKE_PAK)),y)
++TARGETS+=quake-pak
++endif
+Index: buildroot/package/games/quake-pak/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/games/quake-pak/Config.in 2012-07-21 19:13:42.000000000 +0200
+@@ -0,0 +1,7 @@
++config BR2_PACKAGE_QUAKE_PAK
++ bool "shareware Quake PAK/WAD file"
++ depends on BR2_PACKAGE_SDLQUAKE
++ help
++ This will install the shareware pak/wad data file for the Quake game.
++
++ The file will be placed in the /usr/share/games/quake/ directory.
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2012-07-21 19:13:42.000000000 +0200
++++ buildroot/package/Config.in 2012-07-21 19:38:59.000000000 +0200
+@@ -93,8 +93,10 @@
+ menu "Games"
+ source "package/games/gnuchess/Config.in"
+ source "package/games/prboom/Config.in"
++source "package/games/quake-pak/Config.in"
+ source "package/games/doom-wad/Config.in"
+ source "package/games/rubix/Config.in"
++source "package/games/sdlquake/Config.in"
+ endmenu
+
+ menu "Graphic libraries and applications (graphic/text)"
diff --git a/patches/buildroot/2012.02/083-pygame-armadeus_addons.patch b/patches/buildroot/2012.11/083-pygame-armadeus_addons.patch
similarity index 100%
copy from patches/buildroot/2012.02/083-pygame-armadeus_addons.patch
copy to patches/buildroot/2012.11/083-pygame-armadeus_addons.patch
diff --git a/patches/buildroot/2012.11/085-adds_gpm_package.patch b/patches/buildroot/2012.11/085-adds_gpm_package.patch
new file mode 100644
index 0000000..1633551
--- /dev/null
+++ b/patches/buildroot/2012.11/085-adds_gpm_package.patch
@@ -0,0 +1,168 @@
+Add GPM (General Purpose Mouse server) to Buildroot.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/gpm/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/gpm/Config.in 2012-02-21 16:44:41.000000000 +0100
+@@ -0,0 +1,7 @@
++config BR2_PACKAGE_GPM
++ bool "gpm mouse server"
++ help
++ gpm means general purpose mouse and is the mouse support for Linux
++ in the console.
++
++ http://www.nico.schottelius.org/software/gpm/
+Index: buildroot/package/gpm/gpm.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/gpm/gpm.mk 2012-02-21 16:44:41.000000000 +0100
+@@ -0,0 +1,18 @@
++#############################################################
++#
++# General Purpose Mouse server for Linux console.
++#
++#############################################################
++
++GPM_VERSION = 1.20.6
++GPM_SOURCE = gpm-$(GPM_VERSION).tar.bz2
++GPM_SITE = http://unix.schottelius.org/gpm/archives/
++GPM_INSTALL_STAGING = YES
++GPM_INSTALL_TARGET = YES
++
++$(eval $(autotools-package))
++
++$(GPM_HOOK_POST_INSTALL): $(GPM_TARGET_INSTALL_TARGET)
++ $(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/usr/sbin/gpm
++ touch $@
++
+Index: buildroot/package/gpm/gpm-1.20.6-removes_obsolete_functions.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/gpm/gpm-1.20.6-removes_obsolete_functions.patch 2012-02-21 16:44:41.000000000 +0100
+@@ -0,0 +1,77 @@
++
++Replaces all "obsolete" functions (at least to compile for uClibc).
++
++diff -urN gpm-1.20.6/src/daemon/old_main.c gpm-1.20.6.mod/src/daemon/old_main.c
++--- gpm-1.20.6/src/daemon/old_main.c 2009-02-09 10:58:53.000000000 +0100
+++++ gpm-1.20.6.mod/src/daemon/old_main.c 2009-09-25 10:27:54.000000000 +0200
++@@ -85,7 +85,7 @@
++ /* control node */
++
++ if((ctlfd=socket(AF_UNIX,SOCK_STREAM,0))==-1) gpm_report(GPM_PR_OOPS,GPM_MESS_SOCKET_PROB);
++- bzero((char *)&ctladdr,sizeof(ctladdr));
+++ memset((char *)&ctladdr, 0, sizeof(ctladdr));
++ ctladdr.sun_family=AF_UNIX;
++ strcpy(ctladdr.sun_path,GPM_NODE_CTL);
++ unlink(GPM_NODE_CTL);
++diff -urN gpm-1.20.6/src/daemon/open_console.c gpm-1.20.6.mod/src/daemon/open_console.c
++--- gpm-1.20.6/src/daemon/open_console.c 2009-02-09 10:58:53.000000000 +0100
+++++ gpm-1.20.6.mod/src/daemon/open_console.c 2009-09-25 10:33:02.000000000 +0200
++@@ -21,7 +21,9 @@
++
++ #include <fcntl.h> /* open and co. */
++ #include <sys/stat.h> /* stat() */
++-#include <stropts.h> /* ioctl */
+++#if !(defined(__linux__))
+++# include <stropts.h> /* ioctl */
+++#endif
++
++ /* Linux specific (to be outsourced in gpm2 */
++ #include <linux/serial.h> /* for serial console check */
++diff -urN gpm-1.20.6/src/daemon/processconn.c gpm-1.20.6.mod/src/daemon/processconn.c
++--- gpm-1.20.6/src/daemon/processconn.c 2009-02-09 10:58:53.000000000 +0100
+++++ gpm-1.20.6.mod/src/daemon/processconn.c 2009-09-25 10:27:26.000000000 +0200
++@@ -45,7 +45,7 @@
++
++ /*....................................... Accept */
++
++- bzero((char *) &addr, sizeof(addr));
+++ memset((char *) &addr, 0, sizeof(addr));
++ addr.sun_family = AF_UNIX;
++
++ len = sizeof(addr);
++diff -urN gpm-1.20.6/src/lib/liblow.c gpm-1.20.6.mod/src/lib/liblow.c
++--- gpm-1.20.6/src/lib/liblow.c |
|
From: jorasse <jo...@us...> - 2012-10-29 16:06:19
|
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 0d0073e3de929d150a3586dbf054a5a9ba3ba68c (commit)
from ff2812af57c2ddde1458512f2fe0a752fef04adb (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 0d0073e3de929d150a3586dbf054a5a9ba3ba68c
Author: Eric Jarrige <eri...@ar...>
Date: Mon Oct 29 17:08:50 2012 +0100
[BUILROOT] prepare migration to the next BR release
-----------------------------------------------------------------------
Summary of changes:
Makefile | 19 ++++++-------------
Makefile.in | 4 ----
.../package/armadeus/anybus-tools/anybus-tools.mk | 4 ++++
.../package/armadeus/as_devices/as_devices.mk | 4 ++++
.../imx28-usb-downloader/imx28-usb-downloader.mk | 10 ++++++++++
buildroot/package/armadeus/imxregs/imxregs.mk | 10 ++++++++++
buildroot/package/armadeus/pps/pps.mk | 2 +-
buildroot/package/armadeus/rxtx/rxtx.mk | 4 ++++
buildroot/package/armadeus/straton/straton.mk | 5 +++++
.../package/armadeus/straton_ios/straton_ios.mk | 5 +++++
10 files changed, 49 insertions(+), 18 deletions(-)
diff --git a/Makefile b/Makefile
index d49487e..7f28d5b 100644
--- a/Makefile
+++ b/Makefile
@@ -27,9 +27,15 @@ export ARMADEUS_TOPDIR
#--- User configurable stuff:
BUILDROOT_VERSION:=2012.02
+#BUILDROOT_VERSION:=20121025
include ./Makefile.in
+ifeq ($(BUILDROOT_VERSION),2012.02)
BUILDROOT_SITE:=http://buildroot.uclibc.org/downloads
BUILDROOT_PATCH_DIR:=$(ARMADEUS_TOPDIR)/patches/buildroot/$(BUILDROOT_VERSION)
+else
+BUILDROOT_SITE:=http://buildroot.uclibc.org/downloads/snapshots
+BUILDROOT_PATCH_DIR:=$(ARMADEUS_TOPDIR)/patches/buildroot/2012.11
+endif
ARMADEUS_CONFIG_DIR:=$(BUILDROOT_DIR)/configs
#--- End of user conf (don't touch anything below unless you know what you're doing !! ;-) )
@@ -38,11 +44,7 @@ BUILDROOT_SOURCE:=buildroot-$(BUILDROOT_VERSION).tar.bz2
PATCH_DIR = patches
BUILDROOT_FILE_PATH:=downloads
TAR_OPTIONS=--exclude=.svn --exclude=.git --exclude=.gitignore --strip-component=1 -xf
-ifeq ($(BUILDROOT_VERSION),2012.02)
BUILDROOT_PATCH_SCRIPT = $(BUILDROOT_DIR)/support/scripts/apply-patches.sh
-else
-BUILDROOT_PATCH_SCRIPT = $(BUILDROOT_DIR)/toolchain/patch-kernel.sh
-endif
ARMADEUS_ENV_FILE:=$(ARMADEUS_TOPDIR)/armadeus_env.sh
WGET = wget --passive-ftp --tries=3
ARMADEUS_FTP_SITE = ftp://ftp2.armadeus.com/armadeusw/download/
@@ -135,19 +137,10 @@ buildauto: $(BUILDROOT_DIR)/.patched
$(MAKE) -C $(BUILDROOT_DIR)
linux26 linux: $(BUILDROOT_DIR)/.configured
-ifeq ($(BUILDROOT_VERSION),2011.05)
- @-touch $(ARMADEUS_LINUX_DIR)/.config
- @$(MAKE) -C $(BUILDROOT_DIR) $@
-else
@$(MAKE) -C $(BUILDROOT_DIR) linux-rebuild
-endif
linux26-clean linux-clean: $(BUILDROOT_DIR)/.configured
-ifneq (,$(filter $(BUILDROOT_VERSION),20081103 2010.05))
@$(MAKE) -C $(BUILDROOT_DIR) linux26clean
-else
- @$(MAKE) -C $(BUILDROOT_DIR) $@
-endif
%_defconfig: $(BUILDROOT_DIR)/.patched
@if [ -e "$(ARMADEUS_CONFIG_DIR)/$@" ] || [ -e "$(ARMADEUS_CONFIG_DIR)/$(patsubst %_defconfig,%,$@)/$@" ]; then \
diff --git a/Makefile.in b/Makefile.in
index 34cb796..a93db1e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -63,11 +63,7 @@ ARMADEUS_ROOTFS_TAR:=$(ARMADEUS_BINARIES)/$(ARMADEUS_BOARD_NAME)-rootfs.tar
ARMADEUS_LINUX_DIR:=$(BUILDROOT_PROJECT_BUILD_DIR)/linux-$(ARMADEUS_LINUX_VERSION)
ARMADEUS_LINUX_PATCH_DIR:=$(ARMADEUS_PATCH_DIR)/linux/$(ARMADEUS_LINUX_VERSION)
-ifeq ($(BUILDROOT_VERSION),2011.05)
-ARMADEUS_U_BOOT_DIR:=$(BUILDROOT_PROJECT_BUILD_DIR)/u-boot-$(ARMADEUS_U_BOOT_VERSION)
-else
ARMADEUS_U_BOOT_DIR:=$(BUILDROOT_PROJECT_BUILD_DIR)/uboot-$(ARMADEUS_U_BOOT_VERSION)
-endif
ARMADEUS_UCLIBC_DIR:=$(BUILDROOT_TOOLCHAIN_BUILD_DIR)/uClibc-$(ARMADEUS_UCLIBC_VERSION)
ARMADEUS_BOARD_DIR:=$(BUILDROOT_DIR)/target/device/armadeus/$(ARMADEUS_BOARD_NAME)
ARMADEUS_LINUX_CONFIG:=$(ARMADEUS_BOARD_DIR)/$(ARMADEUS_BOARD_NAME)-linux-$(ARMADEUS_LINUX_MAIN_VERSION).config
diff --git a/buildroot/package/armadeus/anybus-tools/anybus-tools.mk b/buildroot/package/armadeus/anybus-tools/anybus-tools.mk
index 301fe6f..b533861 100644
--- a/buildroot/package/armadeus/anybus-tools/anybus-tools.mk
+++ b/buildroot/package/armadeus/anybus-tools/anybus-tools.mk
@@ -18,4 +18,8 @@ define ANYBUS_TOOLS_INSTALL_TARGET_CMDS
$(INSTALL) -m 0755 $(ANYBUS_TOOLS_DIR)/$(ANYBUS_TOOLS_BIN_NAME) $(TARGET_DIR)/usr/bin/$(ANYBUS_TOOLS_BIN_NAME)
endef
+ifeq ($(BUILDROOT_VERSION),2012.02)
$(eval $(call GENTARGETS,package,anybus-tools))
+el |
|
From: jorasse <jo...@us...> - 2012-10-28 13:29: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 ff2812af57c2ddde1458512f2fe0a752fef04adb (commit)
via 0eaf5922c0ee45b890f2447ffb69b16bbab02606 (commit)
from 89202041278c6b3c7f25a1f3523a91213aaaf7c2 (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 ff2812af57c2ddde1458512f2fe0a752fef04adb
Author: Eric Jarrige <eri...@ar...>
Date: Sun Oct 28 14:32:00 2012 +0100
[UBOOT] APF27: 2012.10: update to support the new APF27 patch refactoring
commit 0eaf5922c0ee45b890f2447ffb69b16bbab02606
Author: Philippe Reynes <tr...@ya...>
Date: Sun Oct 28 14:29:27 2012 +0100
[UBOOT] APF27: 2012.10: refactor U-Boot patches to be pushed on the U-Boot mainline - Thanks Trem
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf27/apf27-u-boot-2012.10.h | 474 +------
.../100-SPL:-Add-u-boot-nand-build-option.patch | 30 +
...tant-to-support-the-armadeus-APF27-board.patch} | 2 +-
...-Add-support-for-the-armadeus-apf27-board.patch | 739 ----------
...-add-support-for-the-armadeus-APF27-board.patch | 1456 ++++++++++++++++++++
...303-apf27:-Add-spl-support-for-the-apf27.patch} | 336 ++---
...27:-Add-FPGA-support-for-the-apf27-board.patch} | 179 ++--
.../u-boot/2012.10/340-apf27-misc-commands.patch | 14 +-
8 files changed, 1745 insertions(+), 1485 deletions(-)
create mode 100644 patches/u-boot/2012.10/100-SPL:-Add-u-boot-nand-build-option.patch
rename patches/u-boot/2012.10/{301-Add-GPIO-Module-and-I-O-Multiplexer-constant-for-mx2.patch => 301-imx27:-Add-missing-constant-to-support-the-armadeus-APF27-board.patch} (99%)
delete mode 100644 patches/u-boot/2012.10/302-Add-support-for-the-armadeus-apf27-board.patch
create mode 100644 patches/u-boot/2012.10/302-apf27:-add-support-for-the-armadeus-APF27-board.patch
rename patches/u-boot/2012.10/{303-Add-nand-spl-support-on-apf27.patch => 303-apf27:-Add-spl-support-for-the-apf27.patch} (62%)
rename patches/u-boot/2012.10/{304-Add-FPGA-support-apf27.patch => 304-apf27:-Add-FPGA-support-for-the-apf27-board.patch} (60%)
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
index c6f570c..da1cb11 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.10.h
+++ b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.10.h
@@ -24,7 +24,7 @@
#define __CONFIG_H
#define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION "3.3"
+#define CONFIG_ENV_VERSION "3.3"
#define CONFIG_IDENT_STRING " apf27 patch 3.8"
#define CONFIG_BOARD_NAME apf27
@@ -33,13 +33,14 @@
*/
#define CONFIG_ARM926EJS /* this is an ARM926EJS CPU */
#define CONFIG_MX27 /* in a Freescale i.MX27 Chip */
-#define CONFIG_MACH_TYPE 1698 /* APF27 */
+#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
@@ -50,11 +51,24 @@
/*
* SPL
*/
-#define CONFIG_NAND_U_BOOT
/* Copy SPL+U-Boot here */
-#define CONFIG_SYS_NAND_U_BOOT_DST CONFIG_SYS_LOAD_ADDR
+#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
+#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
@@ -67,8 +81,8 @@
#define CONFIG_BOOTP_DNS
#define CONFIG_BOOTP_DNS2
-#define CONFIG_HOSTNAME CONFIG_BOARD_NAME
-#define CONFIG_ROOTPATH "/tftpboot/" MK_STR(CONFIG_BOARD_NAME) "-root"
+#define CONFIG_HOSTNAME CONFIG_BOARD_NAME
+#define CONFIG_ROOTPATH "/tftpboot/" MK_STR(CONFIG_BOARD_NAME) "-root"
/*
* U-Boot Commands
@@ -78,17 +92,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 */ /* support for RTC, date/time...*/
#define CONFIG_CMD_DHCP /* DHCP Support */
#define CONFIG_CMD_DNS
-/*#define CONFIG_CMD_EEPROM */ /* EEPROM read/write support */
#define CONFIG_CMD_EXT2
#define CONFIG_CMD_FAT /* FAT support */
-/*#define CONFIG_CMD_I2C */ /* I2C serial bus support */
#define CONFIG_CMD_IMX_FUSE /* imx iim fuse */
#define CONFIG_CMD_MII /* MII support */
#define CONFIG_CMD_MMC
-#define CONFIG_CMD_MTDPARTS /* MTD partition support */
+#define CONFIG_CMD_MTDPARTS /* MTD partition support */
#define CONFIG_CMD_NAND /* NAND support */
#define CONFIG_CMD_NAND_LOCK_UNLOCK
#define CONFIG_CMD_NAND_TRIMFFS
@@ -104,10 +115,10 @@
#define CONFIG_NR_DRAM_POPULATED 1
#define CONFIG_NR_DRAM_BANKS 2
-#define CONFIG_SYS_SDRAM_MBYTE_SYZE 64
+#define ACFG_SDRAM_MBYTE_SYZE 64
-#define PHYS_SDRAM_1 0xA0000000
-#define PHYS_SDRAM_2 0xB0000000
+#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 */
@@ -121,8 +132,7 @@
/*
* FLASH organization
*/
-/*#define CONFIG_SYS_MONITOR_BASE 0xAFF00000*/
-#define CONFIG_SYS_MONITOR_OFFSET 0x00000000
+#define ACFG_MONITOR_OFFSET 0x00000000
#define CONFIG_SYS_MONITOR_LEN 0x00100000 /* 1MiB */
#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OVERWRITE
@@ -153,7 +163,7 @@
#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_PROMPT "BIOS> " /* prompt string */
#define CONFIG_SYS_CBSIZE 2048 /* console I/O buffer */
-#define CONFIG_SYS_PBSIZE \
+#define CONFIG_SYS_PBSIZE \
(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
/* Print buffer size */
#define CONFIG_SYS_MAXARGS 16 /* max command args */
@@ -168,17 +178,16 @@
* Boot Linux
*/
#define CONFIG_CMDLINE_TAG /* send commandline to Kernel */
-#define CONFIG_SETUP_MEMORY_TAGS /* send memory definition 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 \
+#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
@@ -198,7 +207,7 @@
"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_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" \
@@ -210,7 +219,7 @@
"addubifsargs=setenv bootargs ${bootargs} " \
"ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs\0" \
"addmmcargs=setenv bootargs ${bootargs} " \
- "root=/dev/mmcblk0p1 rootfstype=ext2\0" \
+ "root=/dev/mmcblk0p1 rootfstype=ext2\0" \
"addipargs=setenv bootargs ${bootargs} " \
"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:" \
"${hostname}:eth0:off \0" \
@@ -247,7 +256,7 @@
"else echo Flashing of uboot failed;" \
"fi; \0" \
"flash_firmware=nand erase.part firmware;" \
- "if nand write.trimffs ${fileaddr} ${firmware_addr} ${filesize};"\
+ "if nand write.trimffs ${fileaddr} ${firmware_addr} ${filesize};"\
"then echo Flashing of Firmware succeed;" \
"else echo Flashing of Firmware failed;" \
"fi\0" \
@@ -285,7 +294,7 @@
*/
#define CONFIG_MXC_UART
#define CONFIG_CONS_INDEX 1
-#define CONFIG_BAUDRATE 115200
+#define CONFIG_BAUDRATE 115200
#define CONFIG_MXC_UART_BASE UART1_BASE
/*
@@ -351,20 +360,6 @@
#define CONFIG_SYS_FPGA_PROG_FEEDBACK
#define CONFIG_SYS_FPGA_CHECK_CTRLC
#define CONFIG_SYS_FPGA_CHECK_ERROR
-//#define CONFIG_SYS_FPGA_IS_PROTO /* to be defined with apf27 board prototype*/
-
-/* FPGA program pin configuration */
-#define CONFIG_SYS_FPGA_PWR (GPIO_PORTF | 19) /* FPGA prog pin */
-#define CONFIG_SYS_FPGA_PRG (GPIO_PORTF | 11) /* FPGA prog pin */
-#define CONFIG_SYS_FPGA_CLK (GPIO_PORTF | 15) /* FPGA clk pin */
-#define CONFIG_SYS_FPGA_RDATA 0xD6000000 /* FPGA data addr */
-#define CONFIG_SYS_FPGA_WDATA 0xD6000000 /* FPGA data addr */
-#define CONFIG_SYS_FPGA_INIT (GPIO_PORTF | 12) /* FPGA init pin */
-#define CONFIG_SYS_FPGA_DONE (GPIO_PORTF | 9) /* FPGA done pin */
-#define CONFIG_SYS_FPGA_RW (GPIO_PORTF | 21) /* FPGA done pin */
-#define CONFIG_SYS_FPGA_CS (GPIO_PORTF | 22) /* FPGA done pin */
-#define CONFIG_SYS_FPGA_SUSPEND (GPIO_PORTF | 10) /* FPGA done pin */
-#define CONFIG_SYS_FPGA_RESET (GPIO_PORTF | 7) /* FPGA done pin */
/*
* Fuses - IIM
@@ -388,7 +383,7 @@
#define CONFIG_I2C_CMD_TREE
#define CONFIG_I2C_MULTI_BUS 2
-#define CONFIG_SYS_I2C_NOPROBES { }
+#define CONFIG_SYS_I2C_NOPROBES { }
#ifdef CONFIG_CMD_EEPROM
# define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* EEPROM 24LC02 */
@@ -442,415 +437,22 @@
#define CONFIG_MX27_CLK32 32768 /* 32768 or 32000 Hz crystal */
#undef CONFIG_MX27_CLK26 /* No external 26MHz external clock */
-/* MPU CLOCK source before PLL */
-/* CONFIG_SYS_CLK_FREQ (2/3 MPLL clock or ext 266 MHZ) */
-#ifndef CONFIG_MX27_CLK26
-#if (CONFIG_MX27_CLK32 == 32000)
-#define CONFIG_SYS_MPCTL0_VAL 0x00211803 /* 398.998 MHz */
-#define CONFIG_SYS_MPCTL1_VAL 0
-#define CONFIG_MPLL_FREQ 399
-#else /* CONFIG_MX27_CLK32 == 32768*/
-#define CONFIG_SYS_MPCTL0_VAL 0x01EF15D5 /* 399.000 MHz */
-#define CONFIG_SYS_MPCTL1_VAL 0
-#define CONFIG_MPLL_FREQ 399
-#endif /* CONFIG_MX27_CLK32 */
-#else /* CONFIG_MX27_CLK26 in use*/
-#define CONFIG_SYS_MPCTL0_VAL 0x00331C23 /* 399.000 MHz */
-#define CONFIG_SYS_MPCTL1_VAL 0
-#define CONFIG_MPLL_FREQ 399
-#endif /* CONFIG_MX27_CLK26 */
-
-#define CONFIG_SYS_CLK_FREQ (CONFIG_MPLL_FREQ*2/3) /* 266 MHz */
-
-/* Serial clock source before PLL (should be named CONFIG_SYS_SYSPLL_CLK_FREQ)*/
-#ifndef CONFIG_MX27_CLK26
-/*#define CONFIG_SYSPLL_CLK_FREQ (1024*CONFIG_MX27_CLK32)*/
-#if (CONFIG_MX27_CLK32 == 32000)
-#define CONFIG_SYS_SPCTL0_VAL 0x04A02419 /* 300.00020 MHz */
-#define CONFIG_SYS_SPCTL1_VAL 0
-#define CONFIG_SPLL_FREQ 300 /* MHz */
-#else /* CONFIG_MX27_CLK32 == 32768*/
-#define CONFIG_SYS_SPCTL0_VAL 0x0475206F /* 299.99937 MHz */
-#define CONFIG_SYS_SPCTL1_VAL 0
-#define CONFIG_SPLL_FREQ 300 /* MHz */
-#endif /* CONFIG_MX27_CLK32 */
-#else /* CONFIG_MX27_CLK26 in use*/
-/*#define CONFIG_SYSPLL_CLK_FREQ CONFIG_MX27_CLK26*/
-#define CONFIG_SYS_SPCTL0_VAL 0x040C2C07 /* 300 MHz */
-#define CONFIG_SYS_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 */
-
-/* external bus frequency (have to be a CONFIG_SYS_CLK_FREQ ratio) */
-#define CONFIG_HCLK_FREQ 133 /* (CONFIG_SYS_CLK_FREQ/2) */
-
-#define CONFIG_PERIF1_FREQ 16 /* 16.625 MHz UART, GPT, PWM*/
-#define CONFIG_PERIF2_FREQ 33 /* 33.25 MHz CSPI and SDHC*/
-#define CONFIG_PERIF3_FREQ 33 /* 33.25 MHz LCD*/
-#define CONFIG_PERIF4_FREQ 33 /* 33.25 MHz CSI*/
-#define CONFIG_SSI1_FREQ 66 /* 66.50 MHz SSI1*/
-#define CONFIG_SSI2_FREQ 66 /* 66.50 MHz SSI2*/
-#define CONFIG_MSHC_FREQ 66 /* 66.50 MHz MSHC*/
-#define CONFIG_H264_FREQ 66 /* 66.50 MHz H264*/
-#define CONFIG_CLK0_DIV 3 /* Divide CLK0 by 4 */
-#define CONFIG_CLK0_EN 1 /* CLK0 enabled */
-
-/* external bus frequency (have to be a CONFIG_HCLK_FREQ ratio) */
-#define CONFIG_NFC_FREQ 44 /* NFC Clock up to 44 MHz wh 133MHz*/
-
-/* external serial bus frequency (have to be a CONFIG_SPLL_FREQ ratio) */
-#define CONFIG_USB_FREQ 60 /* 60 MHz */
-
-/*
- * SDRAM
- */
-#if (CONFIG_SYS_SDRAM_MBYTE_SYZE == 64) /* micron MT46H16M32LF -6 */
+#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 */
-#define CONFIG_SYS_SDRAM_NUM_COL 9 /* 8, 9, 10 or 11 column address bits */
-#define CONFIG_SYS_SDRAM_NUM_ROW 13 /* 11, 12 or 13 row address bits */
-#define CONFIG_SYS_SDRAM_REFRESH 3 /* 0=OFF 1=2048 2=4096 3=8192 refresh */
-#define CONFIG_SYS_SDRAM_EXIT_PWD 25 /* ns exit power down delay */
-#define CONFIG_SYS_SDRAM_W2R_DELAY 1 /* write to read cycle delay > 0 */
-#define CONFIG_SYS_SDRAM_ROW_PRECHARGE_DELAY 18 /* ns */
-#define CONFIG_SYS_SDRAM_TMRD_DELAY 2 /* Load mode register cycle delay 1..4 */
-#define CONFIG_SYS_SDRAM_TWR_DELAY 1 /* LPDDR: 0=2ck 1=3ck; SDRAM: 0=1ck 1=2ck*/
-#define CONFIG_SYS_SDRAM_RAS_DELAY 42 /* ns ACTIVE-to-PRECHARGE delay */
-#define CONFIG_SYS_SDRAM_RRD_DELAY 12 /* ns ACTIVE-to-ACTIVE delay */
-#define CONFIG_SYS_SDRAM_RCD_DELAY 18 /* ns Row to Column delay */
-#define CONFIG_SYS_SDRAM_RC_DELAY 70 /* ns Row cycle delay (tRFC refresh to command)*/
-#define CONFIG_SYS_SDRAM_CLOCK_CYCLE_CL_1 0 /* ns clock cycle time estimated fo CL=1 0=force 3 for lpddr*/
-#define CONFIG_SYS_SDRAM_PARTIAL_ARRAY_SR 0 /* 0=full 1=half 2=quater 3=Eighth 4=Sixteenth */
-#define CONFIG_SYS_SDRAM_DRIVE_STRENGH 0 /* 0=Full-strength 1=half 2=quater 3=Eighth */
-#define CONFIG_SYS_SDRAM_BURST_LENGTH 3 /* 2^N BYTES (N=0..3) */
-#define CONFIG_SYS_SDRAM_SINGLE_ACCESS 0 /* 1= single access; 0 = Burst mode */
#endif
-#if (CONFIG_SYS_SDRAM_MBYTE_SYZE == 128)
+#if (ACFG_SDRAM_MBYTE_SYZE == 128)
/* micron 128MB */
#define PHYS_SDRAM_1_SIZE 0x08000000 /* 128 MB */
#define PHYS_SDRAM_2_SIZE 0x08000000 /* 128 MB */
-#define CONFIG_SYS_SDRAM_NUM_COL 9 /* 8, 9, 10 or 11 column address bits */
-#define CONFIG_SYS_SDRAM_NUM_ROW 14 /* 11, 12 or 13 row address bits */
-#define CONFIG_SYS_SDRAM_REFRESH 3 /* 0=OFF 1=2048 2=4096 3=8192 refresh */
-#define CONFIG_SYS_SDRAM_EXIT_PWD 25 /* ns exit power down delay */
-#define CONFIG_SYS_SDRAM_W2R_DELAY 1 /* write to read cycle delay > 0 */
-#define CONFIG_SYS_SDRAM_ROW_PRECHARGE_DELAY 18 /* ns */
-#define CONFIG_SYS_SDRAM_TMRD_DELAY 2 /* Load mode register cycle delay 1..4 */
-#define CONFIG_SYS_SDRAM_TWR_DELAY 1 /* LPDDR: 0=2ck 1=3ck; SDRAM: 0=1ck 1=2ck*/
-#define CONFIG_SYS_SDRAM_RAS_DELAY 42 /* ns ACTIVE-to-PRECHARGE delay */
-#define CONFIG_SYS_SDRAM_RRD_DELAY 12 /* ns ACTIVE-to-ACTIVE delay */
-#define CONFIG_SYS_SDRAM_RCD_DELAY 18 /* ns Row to Column delay */
-#define CONFIG_SYS_SDRAM_RC_DELAY 70 /* ns Row cycle delay (tRFC refresh to command)*/
-#define CONFIG_SYS_SDRAM_CLOCK_CYCLE_CL_1 0 /* ns clock cycle time estimated fo CL=1 0=force 3 for lpddr*/
-#define CONFIG_SYS_SDRAM_PARTIAL_ARRAY_SR 0 /* 0=full 1=half 2=quater 3=Eighth 4=Sixteenth */
-#define CONFIG_SYS_SDRAM_DRIVE_STRENGH 0 /* 0=Full-strength 1=half 2=quater 3=Eighth */
-#define CONFIG_SYS_SDRAM_BURST_LENGTH 3 /* 2^N BYTES (N=0..3) */
-#define CONFIG_SYS_SDRAM_SINGLE_ACCESS 0 /* 1= single access; 0 = Burst mode */
#endif
-#if (CONFIG_SYS_SDRAM_MBYTE_SYZE == 256)
+#if (ACFG_SDRAM_MBYTE_SYZE == 256)
/* micron 256MB */
#define PHYS_SDRAM_1_SIZE 0x10000000 /* 256 MB */
#define PHYS_SDRAM_2_SIZE 0x10000000 /* 256 MB */
-#define CONFIG_SYS_SDRAM_NUM_COL 10 /* 8, 9, 10 or 11 column address bits */
-#define CONFIG_SYS_SDRAM_NUM_ROW 14 /* 11, 12 or 13 row address bits */
-#define CONFIG_SYS_SDRAM_REFRESH 3 /* 0=OFF 1=2048 2=4096 3=8192 refresh */
-#define CONFIG_SYS_SDRAM_EXIT_PWD 25 /* ns exit power down delay */
-#define CONFIG_SYS_SDRAM_W2R_DELAY 1 /* write to read cycle delay > 0 */
-#define CONFIG_SYS_SDRAM_ROW_PRECHARGE_DELAY 18 /* ns */
-#define CONFIG_SYS_SDRAM_TMRD_DELAY 2 /* Load mode register cycle delay 1..4 */
-#define CONFIG_SYS_SDRAM_TWR_DELAY 1 /* LPDDR: 0=2ck 1=3ck; SDRAM: 0=1ck 1=2ck*/
-#define CONFIG_SYS_SDRAM_RAS_DELAY 42 /* ns ACTIVE-to-PRECHARGE delay */
-#define CONFIG_SYS_SDRAM_RRD_DELAY 12 /* ns ACTIVE-to-ACTIVE delay */
-#define CONFIG_SYS_SDRAM_RCD_DELAY 18 /* ns Row to Column delay */
-#define CONFIG_SYS_SDRAM_RC_DELAY 70 /* ns Row cycle delay (tRFC refresh to command)*/
-#define CONFIG_SYS_SDRAM_CLOCK_CYCLE_CL_1 0 /* ns clock cycle time estimated fo CL=1 0=force 3 for lpddr*/
-#define CONFIG_SYS_SDRAM_PARTIAL_ARRAY_SR 0 /* 0=full 1=half 2=quater 3=Eighth 4=Sixteenth */
-#define CONFIG_SYS_SDRAM_DRIVE_STRENGH 0 /* 0=Full-strength 1=half 2=quater 3=Eighth */
-#define CONFIG_SYS_SDRAM_BURST_LENGTH 3 /* 2^N BYTES (N=0..3) */
-#define CONFIG_SYS_SDRAM_SINGLE_ACCESS 0 /* 1= single access; 0 = Burst mode */
-#endif
-
-/*
- * External interface
- */
-/*
- * CSCRxU_VAL:
- * 31| x | x | x x |x x x x| x x | x | x |x x x x|16
- * |SP |WP | BCD | BCS | PSZ |PME|SYNC| DOL |
- *
- * 15| x x | x x x x x x | x | x x x x | x x x x |0
- * | CNC | WSC |EW | WWS | EDC |
- *
- * CSCRxL_VAL:
- * 31| x x x x | x x x x | x x x x | x x x x |16
- * | OEA | OEN | EBWA | EBWN |
- * 15|x x x x| x |x x x |x x x x| x | x | x | x | 0
- * | CSA |EBC| DSZ | CSN |PSR|CRE|WRAP|CSEN|
- *
- * CSCRxA_VAL:
- * 31| x x x x | x x x x | x x x x | x x x x |16
- * | EBRA | EBRN | RWA | RWN |
- * 15| x | x x |x x x|x x|x x|x x| x | x | x | x | 0
- * |MUM| LAH | LBN |LBA|DWW|DCT|WWU|AGE|CNC2|FCE|
- */
-
-/* CS0 configuration for 16 bit nor flash */
-#define CONFIG_SYS_CS0U_VAL 0x0000CC03
-#define CONFIG_SYS_CS0L_VAL 0xa0330D01
-#define CONFIG_SYS_CS0A_VAL 0x00220800
-
-#define CONFIG_SYS_CS1U_VAL 0x00000f00
-#define CONFIG_SYS_CS1L_VAL 0x00000D01
-#define CONFIG_SYS_CS1A_VAL 0
-
-#define CONFIG_SYS_CS2U_VAL 0
-#define CONFIG_SYS_CS2L_VAL 0
-#define CONFIG_SYS_CS2A_VAL 0
-
-#define CONFIG_SYS_CS3U_VAL 0
-#define CONFIG_SYS_CS3L_VAL 0
-#define CONFIG_SYS_CS3A_VAL 0
-
-#define CONFIG_SYS_CS4U_VAL 0
-#define CONFIG_SYS_CS4L_VAL 0
-#define CONFIG_SYS_CS4A_VAL 0
-
-/* FPGA 16 bit data bus */
-#define CONFIG_SYS_CS5U_VAL 0x00000600
-#define CONFIG_SYS_CS5L_VAL 0x00000D01
-#define CONFIG_SYS_CS5A_VAL 0
-
-#define CONFIG_SYS_EIM_VAL 0x00002200
-
-/* FPGA specific settings */
-/* CLKO */
-#define CONFIG_SYS_CCSR_VAL 0x00000305
-/* drive strength CLKO set to 2*/
-#define CONFIG_SYS_DSCR10_VAL 0x00020000
-/* drive strength A1..A12 set to 2*/
-#define CONFIG_SYS_DSCR3_VAL 0x02AAAAA8
-/* drive strength ctrl*/
-#define CONFIG_SYS_DSCR7_VAL 0x00020880
-/* drive strength data*/
-#define CONFIG_SYS_DSCR2_VAL 0xAAAAAAAA
-
-
-/*
- * Default configuration for GPIOs and peripherals
- */
-#define CONFIG_SYS_DDIR_A_VAL 0x00000000
-#define CONFIG_SYS_OCR1_A_VAL 0x00000000
-#define CONFIG_SYS_OCR2_A_VAL 0x00000000
-#define CONFIG_SYS_ICFA1_A_VAL 0xFFFFFFFF
-#define CONFIG_SYS_ICFA2_A_VAL 0xFFFFFFFF
-#define CONFIG_SYS_ICFB1_A_VAL 0xFFFFFFFF
-#define CONFIG_SYS_ICFB2_A_VAL 0xFFFFFFFF
-#define CONFIG_SYS_DR_A_VAL 0x00000000
-#define CONFIG_SYS_GIUS_A_VAL 0xFFFFFFFF
-#define CONFIG_SYS_ICR1_A_VAL 0x00000000
-#define CONFIG_SYS_ICR2_A_VAL 0x00000000
-#define CONFIG_SYS_IMR_A_VAL 0x00000000
-#define CONFIG_SYS_GPR_A_VAL 0x00000000
-#define CONFIG_SYS_PUEN_A_VAL 0xFFFFFFFF
-
-#define CONFIG_SYS_DDIR_B_VAL 0x00000000
-#define CONFIG_SYS_OCR1_B_VAL 0x00000000
-#define CONFIG_SYS_OCR2_B_VAL 0x00000000
-#define CONFIG_SYS_ICFA1_B_VAL 0xFFFFFFFF
-#define CONFIG_SYS_ICFA2_B_VAL 0xFFFFFFFF
-#define CONFIG_SYS_ICFB1_B_VAL 0xFFFFFFFF
-#define CONFIG_SYS_ICFB2_B_VAL 0xFFFFFFFF
-#define CONFIG_SYS_DR_B_VAL 0x00000000
-#define CONFIG_SYS_GIUS_B_VAL 0xFF3FFFF0
-#define CONFIG_SYS_ICR1_B_VAL 0x00000000
-#define CONFIG_SYS_ICR2_B_VAL 0x00000000
-#define CONFIG_SYS_IMR_B_VAL 0x00000000
-#define CONFIG_SYS_GPR_B_VAL 0x00000000
-#define CONFIG_SYS_PUEN_B_VAL 0xFFFFFFFF
-
-#define CONFIG_SYS_DDIR_C_VAL 0x00000000
-#define CONFIG_SYS_OCR1_C_VAL 0x00000000
-#define CONFIG_SYS_OCR2_C_VAL 0x00000000
-#define CONFIG_SYS_ICFA1_C_VAL 0xFFFFFFFF
-#define CONFIG_SYS_ICFA2_C_VAL 0xFFFFFFFF
-#define CONFIG_SYS_ICFB1_C_VAL 0xFFFFFFFF
-#define CONFIG_SYS_ICFB2_C_VAL 0xFFFFFFFF
-#define CONFIG_SYS_DR_C_VAL 0x00000000
-#define CONFIG_SYS_GIUS_C_VAL 0xFFFFC07F
-#define CONFIG_SYS_ICR1_C_VAL 0x00000000
-#define CONFIG_SYS_ICR2_C_VAL 0x00000000
-#define CONFIG_SYS_IMR_C_VAL 0x00000000
-#define CONFIG_SYS_GPR_C_VAL 0x00000000
-#define CONFIG_SYS_PUEN_C_VAL 0xFFFFFF87
-
-#define CONFIG_SYS_DDIR_D_VAL 0x00000000
-#define CONFIG_SYS_OCR1_D_VAL 0x00000000
-#define CONFIG_SYS_OCR2_D_VAL 0x00000000
-#define CONFIG_SYS_ICFA1_D_VAL 0xFFFFFFFF
-#define CONFIG_SYS_ICFA2_D_VAL 0xFFFFFFFF
-#define CONFIG_SYS_ICFB1_D_VAL 0xFFFFFFFF
-#define CONFIG_SYS_ICFB2_D_VAL 0xFFFFFFFF
-#define CONFIG_SYS_DR_D_VAL 0x00000000
-#define CONFIG_SYS_GIUS_D_VAL 0xFFFFFFFF
-#define CONFIG_SYS_ICR1_D_VAL 0x00000000
-#define CONFIG_SYS_ICR2_D_VAL 0x00000000
-#define CONFIG_SYS_IMR_D_VAL 0x00000000
-#define CONFIG_SYS_GPR_D_VAL 0x00000000
-#define CONFIG_SYS_PUEN_D_VAL 0xFFFFFFFF
-
-#define CONFIG_SYS_DDIR_E_VAL 0x00000000
-#define CONFIG_SYS_OCR1_E_VAL 0x00000000
-#define CONFIG_SYS_OCR2_E_VAL 0x00000000
-#define CONFIG_SYS_ICFA1_E_VAL 0xFFFFFFFF
-#define CONFIG_SYS_ICFA2_E_VAL 0xFFFFFFFF
-#define CONFIG_SYS_ICFB1_E_VAL 0xFFFFFFFF
-#define CONFIG_SYS_ICFB2_E_VAL 0xFFFFFFFF
-#define CONFIG_SYS_DR_E_VAL 0x00000000
-#define CONFIG_SYS_GIUS_E_VAL 0xFCFFCCF8
-#define CONFIG_SYS_ICR1_E_VAL 0x00000000
-#define CONFIG_SYS_ICR2_E_VAL 0x00000000
-#define CONFIG_SYS_IMR_E_VAL 0x00000000
-#define CONFIG_SYS_GPR_E_VAL 0x00000000
-#define CONFIG_SYS_PUEN_E_VAL 0xFFFFFFFF
-
-#define CONFIG_SYS_DDIR_F_VAL 0x00000000
-#define CONFIG_SYS_OCR1_F_VAL 0x00000000
-#define CONFIG_SYS_OCR2_F_VAL 0x00000000
-#define CONFIG_SYS_ICFA1_F_VAL 0xFFFFFFFF
-#define CONFIG_SYS_ICFA2_F_VAL 0xFFFFFFFF
-#define CONFIG_SYS_ICFB1_F_VAL 0xFFFFFFFF
-#define CONFIG_SYS_ICFB2_F_VAL 0xFFFFFFFF
-#define CONFIG_SYS_DR_F_VAL 0x00000000
-#define CONFIG_SYS_GIUS_F_VAL 0xFF7F8000
-#define CONFIG_SYS_ICR1_F_VAL 0x00000000
-#define CONFIG_SYS_ICR2_F_VAL 0x00000000
-#define CONFIG_SYS_IMR_F_VAL 0x00000000
-#define CONFIG_SYS_GPR_F_VAL 0x00000000
-#define CONFIG_SYS_PUEN_F_VAL 0xFFFFFFFF
-
-/* Enforce DDR signal strengh & enable USB/PP/DMA burst override bits */
-#define CONFIG_SYS_GPCR_VAL 0x0003000F
-
-#define CONFIG_SYS_ESDMISC_VAL ESDMISC_LHD+ESDMISC_MDDREN
-
-/* FMCR select num LPDDR RAMs and nand 16bits, 2KB pages */
-#if (CONFIG_NR_DRAM_BANKS == 1)
-#define CONFIG_SYS_FMCR_VAL 0xFFFFFFF9
-#elif (CONFIG_NR_DRAM_BANKS == 2)
-#define CONFIG_SYS_FMCR_VAL 0xFFFFFFFB
-#endif
-
-#define CONFIG_SYS_AIPI1_PSR0_VAL 0x20040304
-#define CONFIG_SYS_AIPI1_PSR1_VAL 0xDFFBFCFB
-#define CONFIG_SYS_AIPI2_PSR0_VAL 0x00000000
-#define CONFIG_SYS_AIPI2_PSR1_VAL 0xFFFFFFFF
-
-/* PCCR enable DMA FEC I2C1 IIM SDHC1 */
-#define CONFIG_SYS_PCCR0_VAL 0x05070410
-#define CONFIG_SYS_PCCR1_VAL 0xA14A0608
-
-/*
- * From here, there should not be any user configuration.
- * All Equations are automatic
- */
-
-/* fixme none integer value (7.5ns) => 2*hclock = 15ns */
-#define CONFIG_SYS_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 CONFIG_SYS_CSCR_VAL\
- (CSCR_MASK \
- |((((CONFIG_SPLL_FREQ/CONFIG_USB_FREQ)-1)&0x07)<<28) \
- |((((CONFIG_MPLL_FREQ/CONFIG_ARM_FREQ)-1)&0x03)<<12) \
- |((((CONFIG_SYS_CLK_FREQ/CONFIG_HCLK_FREQ)-1)&0x03)<<8))
-
-/* SSIx CLKO NFC H264 MSHC */
-#define CONFIG_SYS_PCDR0_VAL\
- (((((CONFIG_SYS_CLK_FREQ/CONFIG_MSHC_FREQ)-1)&0x3F)<<0) \
- |((((CONFIG_HCLK_FREQ/CONFIG_NFC_FREQ)-1)&0x0F)<<6) \
- |(((((CONFIG_SYS_CLK_FREQ/CONFIG_H264_FREQ)-2)*2)&0x3F)<<10)\
- |(((((CONFIG_SYS_CLK_FREQ/CONFIG_SSI1_FREQ)-2)*2)&0x3F)<<16)\
- |(((CONFIG_CLK0_DIV)&0x07)<<22)\
- |(((CONFIG_CLK0_EN)&0x01)<<25)\
- |(((((CONFIG_SYS_CLK_FREQ/CONFIG_SSI2_FREQ)-2)*2)&0x3F)<<26))
-
-/* PERCLKx */
-#define CONFIG_SYS_PCDR1_VAL\
- (((((CONFIG_SYS_CLK_FREQ/CONFIG_PERIF1_FREQ)-1)&0x3F)<<0) \
- |((((CONFIG_SYS_CLK_FREQ/CONFIG_PERIF2_FREQ)-1)&0x3F)<<8) \
- |((((CONFIG_SYS_CLK_FREQ/CONFIG_PERIF3_FREQ)-1)&0x3F)<<16) \
- |((((CONFIG_SYS_CLK_FREQ/CONFIG_PERIF4_FREQ)-1)&0x3F)<<24))
-
-/* SDRAM controller programming Values */
-#if (((2*CONFIG_SYS_SDRAM_CLOCK_CYCLE_CL_1)>(3*CONFIG_SYS_2XHCLK_LGTH))\
- ||(CONFIG_SYS_SDRAM_CLOCK_CYCLE_CL_1<1))
-#define REG_FIELD_SCL_VAL 3
-#define REG_FIELD_SCLIMX_VAL 0
-#else
-#define REG_FIELD_SCL_VAL\
- ((2*CONFIG_SYS_SDRAM_CLOCK_CYCLE_CL_1+CONFIG_SYS_2XHCLK_LGTH-1)/CONFIG_SYS_2XHCLK_LGTH)
-#define REG_FIELD_SCLIMX_VAL REG_FIELD_SCL_VAL
-#endif
-
-//#define REG_FIELD_SCL_VAL 3
-//#define REG_FIELD_SCLIMX_VAL 3
-
-#if ((2*CONFIG_SYS_SDRAM_RC_DELAY)>(16*CONFIG_SYS_2XHCLK_LGTH))
-#define REG_FIELD_SRC_VAL 0
-#else
-#define REG_FIELD_SRC_VAL\
- ((2*CONFIG_SYS_SDRAM_RC_DELAY+CONFIG_SYS_2XHCLK_LGTH-1)/CONFIG_SYS_2XHCLK_LGTH)
-#endif
-
-/* TBD Power down timer ; PRCT Bit Field Encoding; burst length 8 ; FP = 0*/
-#define REG_ESDCTL_BASE_CONFIG (0x80020485\
- | (((CONFIG_SYS_SDRAM_NUM_ROW-11)&0x7)<<24)\
- | (((CONFIG_SYS_SDRAM_NUM_COL-8)&0x3)<<20)\
- | (((CONFIG_SYS_SDRAM_REFRESH)&0x7)<<13))
-
-#define CONFIG_SYS_NORMAL_RW_CMD ((0x0<<28)+REG_ESDCTL_BASE_CONFIG)
-#define CONFIG_SYS_PRECHARGE_CMD ((0x1<<28)+REG_ESDCTL_BASE_CONFIG)
-#define CONFIG_SYS_AUTOREFRESH_CMD ((0x2<<28)+REG_ESDCTL_BASE_CONFIG)
-#define CONFIG_SYS_SET_MODE_REG_CMD ((0x3<<28)+REG_ESDCTL_BASE_CONFIG)
-
-/* ESDRAMC Configuration Registers : force CL=3 to lpddr */
-#define CONFIG_SYS_SDRAM_ESDCFG_REGISTER_VAL (0x0\
- | (((((2*CONFIG_SYS_SDRAM_EXIT_PWD+CONFIG_SYS_2XHCLK_LGTH-1)/CONFIG_SYS_2XHCLK_LGTH)-1)&0x3)<<21)\
- | (((CONFIG_SYS_SDRAM_W2R_DELAY-1)&0x1)<<20)\
- | (((((2*CONFIG_SYS_SDRAM_ROW_PRECHARGE_DELAY+CONFIG_SYS_2XHCLK_LGTH-1)/CONFIG_SYS_2XHCLK_LGTH)-1)&0x3)<<18)\
- | (((CONFIG_SYS_SDRAM_TMRD_DELAY-1)&0x3)<<16)\
- | (((CONFIG_SYS_SDRAM_TWR_DELAY)&0x1)<<15)\
- | (((((2*CONFIG_SYS_SDRAM_RAS_DELAY+CONFIG_SYS_2XHCLK_LGTH-1)/CONFIG_SYS_2XHCLK_LGTH)-1)&0x7)<<12)\
- | (((((2*CONFIG_SYS_SDRAM_RRD_DELAY+CONFIG_SYS_2XHCLK_LGTH-1)/CONFIG_SYS_2XHCLK_LGTH)-1)&0x3)<<10)\
- | (((REG_FIELD_SCLIMX_VAL)&0x3)<<8)\
- | (((((2*CONFIG_SYS_SDRAM_RCD_DELAY+CONFIG_SYS_2XHCLK_LGTH-1)/CONFIG_SYS_2XHCLK_LGTH)-1)&0x7)<<4)\
- | (((REG_FIELD_SRC_VAL)&0x0F)<<0))
-
-/* Issue Mode register Command to SDRAM*/
-#define CONFIG_SYS_SDRAM_MODE_REGISTER_VAL\
- ((((CONFIG_SYS_SDRAM_BURST_LENGTH)&0x7)<<(0))\
- | (((REG_FIELD_SCL_VAL)&0x7)<<(4))\
- | ((0)<<(3)) /* sequentiql access */ \
- /*| (((CONFIG_SYS_SDRAM_SINGLE_ACCESS)&0x1)<<(1))*/)
-
-/* Issue Extended Mode register Command to SDRAM*/
-#define CONFIG_SYS_SDRAM_EXT_MODE_REGISTER_VAL\
- ((CONFIG_SYS_SDRAM_PARTIAL_ARRAY_SR<<0)\
- | (CONFIG_SYS_SDRAM_DRIVE_STRENGH<<(5))\
- | (1<<(CONFIG_SYS_SDRAM_NUM_COL+CONFIG_SYS_SDRAM_NUM_ROW+1+2)))
-
-/* Issue Precharge all Command to SDRAM*/
-#define CONFIG_SYS_SDRAM_PRECHARGE_ALL_VAL (1<<10)
#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
new file mode 100644
index 0000000..21e74fb
--- /dev/null
+++ b/patches/u-boot/2012.10/100-SPL:-Add-u-boot-nand-build-option.patch
@@ -0,0 +1,30 @@
+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/301-Add-GPIO-Module-and-I-O-Multiplexer-constant-for-mx2.patch b/patches/u-boot/2012.10/301-imx27:-Add-missing-constant-to-support-the-armadeus-APF27-board.patch
similarity index 99%
rename from patches/u-boot/2012.10/301-Add-GPIO-Module-and-I-O-Multiplexer-constant-for-mx2.patch
rename to patches/u-boot/2012.10/301-imx27:-Add-missing-constant-to-support-the-armadeus-APF27-board.patch
index 8bb64e7..6f1f1bb 100644
--- a/patches/u-boot/2012.10/301-Add-GPIO-Module-and-I-O-Multiplexer-constant-for-mx2.patch
+++ b/patches/u-boot/2012.10/301-imx27:-Add-missing-constant-to-support-the-armadeus-APF27-board.patch
@@ -1,4 +1,4 @@
-Add WEIM, NFC SYSTEM_CTL constants to the mx27 CPU
+imx27: add missing constant to support the armadeus APF27 board
Signed-off-by: Philippe Reynes <tr...@ya...>
Signed-off-by: Eric Jarrige <eri...@ar...>
diff --git a/patches/u-boot/2012.10/302-Add-support-for-the-armadeus-apf27-board.patch b/patches/u-boot/2012.10/302-Add-support-for-the-armadeus-apf27-board.patch
deleted file mode 100644
index d49e642..0000000
--- a/patches/u-boot/2012.10/302-Add-support-for-the-armadeus-apf27-board.patch
+++ /dev/null
@@ -1,739 +0,0 @@
-Add support for the armadeus APF27 board
-
-Signed-off-by: Philippe Reynes <tr...@ya...>
-Signed-off-by: Eric Jarrige <eri...@ar...>
-Signed-off-by: Nicolas Colombain <nic...@ar...>
----
- board/armadeus/apf27/Makefile | 52 ++++++
- board/armadeus/apf27/apf27.c | 326 ++++++++++++++++++++++++++++++++++
- board/armadeus/apf27/config.mk | 38 ++++
- board/armadeus/apf27/lowlevel_init.S | 275 ++++++++++++++++++++++++++++
- boards.cfg | 1 +
- 5 files changed, 692 insertions(+), 0 deletions(-)
- create mode 100644 board/armadeus/apf27/Makefile
- create mode 100644 board/armadeus/apf27/apf27.c
- create mode 100644 board/armadeus/apf27/config.mk
- create mode 100644 board/armadeus/apf27/lowlevel_init.S
-
-diff --git a/board/armadeus/apf27/Makefile b/board/armadeus/apf27/Makefile
-new file mode 100644
-index 0000000..fe6ba5c
---- /dev/null
-+++ b/board/armadeus/apf27/Makefile
-@@ -0,0 +1,52 @@
-+#
-+# (C) Copyright 2000-2004
-+# Wolfgang Denk, DENX Software Engineering, wd...@de....
-+# (C) Copyright 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 $(TOPDIR)/config.mk
-+
-+LIB = $(obj)lib$(BOARD).o
-+
-+COBJS := apf27.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 $(obj).depend
-+
-+#########################################################################
-+
-+include $(SRCTREE)/rules.mk
-+
-+sinclude $(obj).depend
-+
-+#########################################################################
-diff --git a/board/armadeus/apf27/apf27.c b/board/armadeus/apf27/apf27.c
-new file mode 100644
-index 0000000..c1ca6bd
---- /dev/null
-+++ b/board/armadeus/apf27/apf27.c
-@@ -0,0 +1,318 @@
-+/*
-+ * Copyright (C) 2007 Sascha Hauer, Pengutronix
-+ * Copyright (C) 2008-2012 Eric Jarrige <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
-+ *
-+ */
-+
-+#include <common.h>
-+#include "crc.h"
-+#include <jffs2/jffs2.h>
-+#include <nand.h>
-+#include <netdev.h>
-+#include <asm/io.h>
-+#include <asm/arch/imx-regs.h>
-+#include <asm/arch/gpio.h>
-+#include <asm/errno.h>
-+#include <environment.h>
-+
-+DECLARE_GLOBAL_DATA_PTR;
-+
-+/*
-+ * 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:
-+ * 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)
-+{
-+ struct iim_regs *iim = (struct iim_regs *)IMX_IIM_BASE;
-+
-+ return readl(&iim->bank[1].fuse_regs[8]);
-+}
-+
-+/*
-+ * 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
-+ * 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)
-+{
-+ struct iim_regs *iim = (struct iim_regs *)IMX_IIM_BASE;
-+ int nr_dram_banks = 1;
-+
-+ if ((get_board_rev() > 0) && (CONFIG_NR_DRAM_BANKS > 1))
-+ nr_dram_banks += readl(&iim->bank[1].fuse_regs[9]) & 0x01;
-+ else
-+ nr_dram_banks = CONFIG_NR_DRAM_POPULATED;
-+
-+ return nr_dram_banks;
-+}
-+
-+static void apf27_gpio_init(void)
-+{
-+ struct gpio_port_regs *regs = (struct gpio_port_regs *)IMX_GPIO_BASE;
-+
-+ /* PORT A */
-+ writel(CONFIG_SYS_DR_A_VAL, ®s->port[PORTA].gpio_dr);
-+ writel(CONFIG_SYS_OCR1_A_VAL, ®s->port[PORTA].ocr1);
-+ writel(CONFIG_SYS_OCR2_A_VAL, ®s->port[PORTA].ocr2);
-+ writel(CONFIG_SYS_ICFA1_A_VAL, ®s->port[PORTA].iconfa1);
-+ writel(CONFIG_SYS_ICFA2_A_VAL, ®s->port[PORTA].iconfa2);
-+ writel(CONFIG_SYS_ICFB1_A_VAL, ®s->port[PORTA].iconfb1);
-+ writel(CONFIG_SYS_ICFB2_A_VAL, ®s->port[PORTA].iconfb2);
-+ writel(CONFIG_SYS_ICR1_A_VAL, ®s->port[PORTA].icr1);
-+ writel(CONFIG_SYS_ICR2_A_VAL, ®s->port[PORTA].icr2);
-+ writel(CONFIG_SYS_IMR_A_VAL, ®s->port[PORTA].imr);
-+ writel(CONFIG_SYS_DDIR_A_VAL, ®s->port[PORTA].gpio_dir);
-+ writel(CONFIG_SYS_GPR_A_VAL, ®s->port[PORTA].gpr);
-+ writel(CONFIG_SYS_PUEN_A_VAL, ®s->port[PORTA].puen);
-+ writel(CONFIG_SYS_GIUS_A_VAL, ®s->port[PORTA].gius);
-+
-+ /* PORT B */
-+ writel(CONFIG_SYS_DR_B_VAL, ®s->port[PORTB].gpio_dr);
-+ writel(CONFIG_SYS_OCR1_B_VAL, ®s->port[PORTB].ocr1);
-+ writel(CONFIG_SYS_OCR2_B_VAL, ®s->port[PORTB].ocr2);
-+ writel(CONFIG_SYS_ICFA1_B_VAL, ®s->port[PORTB].iconfa1);
-+ writel(CONFIG_SYS_ICFA2_B_VAL, ®s->port[PORTB].iconfa2);
-+ writel(CONFIG_SYS_ICFB1_B_VAL, ®s->port[PORTB].iconfb1);
-+ writel(CONFIG_SYS_ICFB2_B_VAL, ®s->port[PORTB].iconfb2);
-+ writel(CONFIG_SYS_ICR1_B_VAL, ®s->port[PORTB].icr1);
-+ writel(CONFIG_SYS_ICR2_B_VAL, ®s->port[PORTB].icr2);
-+ writel(CONFIG_SYS_IMR_B_VAL, ®s->port[PORTB].imr);
-+ writel(CONFIG_SYS_DDIR_B_VAL, ®s->port[PORTB].gpio_dir);
-+ writel(CONFIG_SYS_GPR_B_VAL, ®s->port[PORTB].gpr);
-+ writel(CONFIG_SYS_PUEN_B_VAL, ®s->port[PORTB].puen);
-+ writel(CONFIG_SYS_GIUS_B_VAL, ®s->port[PORTB].gius);
-+
-+ /* PORT C */
-+ writel(CONFIG_SYS_DR_C_VAL, ®s->port[PORTC].gpio_dr);
-+ writel(CONFIG_SYS_OCR1_C_VAL, ®s->port[PORTC].ocr1);
-+ writel(CONFIG_SYS_OCR2_C_VAL, ®s->port[PORTC].ocr2);
-+ writel(CONFIG_SYS_ICFA1_C_VAL, ®s->port[PORTC].iconfa1);
-+ writel(CONFIG_SYS_ICFA2_C_VAL, ®s->port[PORTC].iconfa2);
-+ writel(CONFIG_SYS_ICFB1_C_VAL, ®s->port[PORTC].iconfb1);
-+ writel(CONFIG_SYS_ICFB2_C_VAL, ®s->port[PORTC].iconfb2);
-+ writel(CONFIG_SYS_ICR1_C_VAL, ®s->port[PORTC].icr1);
-+ writel(CONFIG_SYS_ICR2_C_VAL, ®s->port[PORTC].icr2);
-+ writel(CONFIG_SYS_IMR_C_VAL, ®s->port[PORTC].imr);
-+ writel(CONFIG_SYS_DDIR_C_VAL, ®s->port[PORTC].gpio_dir);
-+ writel(CONFIG_SYS_GPR_C_VAL, ®s->port[PORTC].gpr);
-+ writel(CONFIG_SYS_PUEN_C_VAL, ®s->port[PORTC].puen);
-+ writel(CONFIG_SYS_GIUS_C_VAL, ®s->port[PORTC].gius);
-+
-+ /* PORT D */
-+ writel(CONFIG_SYS_DR_D_VAL, ®s->port[PORTD].gpio_dr);
-+ writel(CONFIG_SYS_OCR1_D_VAL, ®s->port[PORTD].ocr1);
-+ writel(CONFIG_SYS_OCR2_D_VAL, ®s->port[PORTD].ocr2);
-+ writel(CONFIG_SYS_ICFA1_D_VAL, ®s->port[PORTD].iconfa1);
-+ writel(CONFIG_SYS_ICFA2_D_VAL, ®s->port[PORTD].iconfa2);
-+ writel(CONFIG_SYS_ICFB1_D_VAL, ®s->port[PORTD].iconfb1);
-+ writel(CONFIG_SYS_ICFB2_D_VAL, ®s->port[PORTD].iconfb2);
-+ writel(CONFIG_SYS_ICR1_D_VAL, ®s->port[PORTD].icr1);
-+ writel(CONFIG_SYS_ICR2_D_VAL, ®s->port[PORTD].icr2);
-+ writel(CONFIG_SYS_IMR_D_VAL, ®s->port[PORTD].imr);
-+ writel(CONFIG_SYS_DDIR_D_VAL, ®s->port[PORTD].gpio_dir);
-+ writel(CONFIG_SYS_GPR_D_VAL, ®s->port[PORTD].gpr);
-+ writel(CONFIG_SYS_PUEN_D_VAL, ®s->port[PORTD].puen);
-+ writel(CONFIG_SYS_GIUS_D_VAL, ®s->port[PORTD].gius);
-+
-+ /* PORT E */
-+ writel(CONFIG_SYS_DR_E_VAL, ®s->port[PORTE].gpio_dr);
-+ writel(CONFIG_SYS_OCR1_E_VAL, ®s->port[PORTE].ocr1);
-+ writel(CONFIG_SYS_OCR2_E_VAL, ®s->port[PORTE].ocr2);
-+ writel(CONFIG_SYS_ICFA1_E_VAL, ®s->port[PORTE].iconfa1);
-+ writel(CONFIG_SYS_ICFA2_E_VAL, ®s->port[PORTE].iconfa2);
-+ writel(CONFIG_SYS_ICFB1_E_VAL, ®s->port[PORTE].iconfb1);
-+ writel(CONFIG_SYS_ICFB2_E_VAL, ®s->port[PORTE].iconfb2);
-+ writel(CONFIG_SYS_ICR1_E_VAL, ®s->port[PORTE].icr1);
-+ writel(CONFIG_SYS_ICR2_E_VAL, ®s->port[PORTE].icr2);
-+ writel(CONFIG_SYS_IMR_E_VAL, ®s->port[PORTE].imr);
-+ writel(CONFIG_SYS_DDIR_E_VAL, ®s->port[PORTE].gpio_dir);
-+ writel(CONFIG_SYS_GPR_E_VAL, ®s->port[PORTE].gpr);
-+ writel(CONFIG_SYS_PUEN_E_VAL, ®s->port[PORTE].puen);
-+ writel(CONFIG_SYS_GIUS_E_VAL, ®s->port[PORTE].gius);
-+
-+ /* PORT F */
-+ writel(CONFIG_SYS_DR_F_VAL, ®s->port[PORTF].gpio_dr);
-+ writel(CONFIG_SYS_OCR1_F_VAL, ®s->port[PORTF].ocr1);
-+ writel(CONFIG_SYS_OCR2_F_VAL, ®s->port[PORTF].ocr2);
-+ writel(CONFIG_SYS_ICFA1_F_VAL, ®s->port[PORTF].iconfa1);
-+ writel(CONFIG_SYS_ICFA2_F_VAL, ®s->port[PORTF].iconfa2);
-+ writel(CONFIG_SYS_ICFB1_F_VAL, ®s->port[PORTF].iconfb1);
-+ writel(CONFIG_SYS_ICFB2_F_VAL, ®s->port[PORTF].iconfb2);
-+ writel(CONFIG_SYS_ICR1_F_VAL, ®s->port[PORTF].icr1);
-+ writel(CONFIG_SYS_ICR2_F_VAL, ®s->port[PORTF].icr2);
-+ writel(CONFIG_SYS_IMR_F_VAL, ®s->port[PORTF].imr);
-+ writel(CONFIG_SYS_DDIR_F_VAL, ®s->port[PORTF].gpio_dir);
-+ writel(CONFIG_SYS_GPR_F_VAL, ®s->port[PORTF].gpr);
-+ writel(CONFIG_SYS_PUEN_F_VAL, ®s->port[PORTF].puen);
-+ writel(CONFIG_SYS_GIUS_F_VAL, ®s->port[PORTF].gius);
-+}
-+
-+static int apf27_devices_init(void)
-+{
-+ struct gpio_port_regs *regs = (struct gpio_port_regs *)IMX_GPIO_BASE;
-+ int i;
-+ unsigned int mode[] = {
-+ PD0_AIN_FEC_TXD0,
-+ PD1_AIN_FEC_TXD1,
-+ PD2_AIN_FEC_TXD2,
-+ PD3_AIN_FEC_TXD3,
-+ PD4_AOUT_FEC_RX_ER,
-+ PD5_AOUT_FEC_RXD1,
-+ PD6_AOUT_FEC_RXD2,
-+ PD7_AOUT_FEC_RXD3,
-+ PD8_AF_FEC_MDIO,
-+ PD9_AIN_FEC_MDC | GPIO_PUEN,
-+ PD10_AOUT_FEC_CRS,
-+ PD11_AOUT_FEC_TX_CLK,
-+ PD12_AOUT_FEC_RXD0,
-+ PD13_AOUT_FEC_RX_DV,
-+ PD14_AOUT_FEC_CLR,
-+ PD15_AOUT_FEC_COL,
-+ PD16_AIN_FEC_TX_ER,
-+ PF23_AIN_FEC_TX_EN,
-+ PE12_PF_UART1_TXD,
-+ PE13_PF_UART1_RXD,
-+ };
-+
-+ for (i = 0; i < ARRAY_SIZE(mode); i++)
-+ imx_gpio_mode(mode[i]);
-+
-+#ifdef CONFIG_MXC_MMC
-+ 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);
-+#endif
-+ return 0;
-+}
-+
-+int
-+board_init(void)
-+{
-+ gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
-+
-+ apf27_gpio_init();
-+ apf27_devices_init();
-+
-+ return 0;
-+}
-+
-+int
-+dram_init(void)
-+{
-+ /* dram_init must store complete ramsize in gd->ram_size */
-+ if (get_num_ram_bank() > 1) {
-+ gd->ram_size = PHYS_SDRAM_2 - CONFIG_SYS_SDRAM_BASE
-+ + get_ram_size((void *)PHYS_SDRAM_2, PHYS_SDRAM_2_SIZE);
-+ } else {
-+ gd->ram_size = get_ram_size((void *)PHYS_SDRAM_1,
-+ PHYS_SDRAM_1_SIZE);
-+ }
-+
-+ return 0;
-+}
-+
-+void dram_init_banksize(void)
-+{
-+ phys_size_t ramsize = gd->ram_size;
-+
-+ 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;
-+ }
-+}
-+
-+/*
-+ * Miscellaneous intialization
-+ */
-+int
-+misc_init_r(void)
-+{
-+ char *s;
-+ u_char * firmware_buffer = (u_char *)(CONFIG_SYS_LOAD_ADDR + \
-+ CONFIG_SYS_MONITOR_LEN);
-+ size_t size = 0;
-+ size_t offset = -1;
-+ char *autoload = getenv("firmware_autoload");
-+ u8 pnum;
-+ struct mtd_device *dev;
-+ struct part_info *part;
-+
-+ /* 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);
-+ }
-+
-+ /* 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 (nand_unlock(&nand_info[0], offset, nand_info[0].size - offset, 0))
-+ printf("NAND flash lock/unlocked failed\n");
-+
-+
-+ return 0;
-+}
-+
-+void
-+show_boot_progress(int status)
-+{
-+#ifdef CONFIG_SHOW_BOOT_PROGRESS
-+#endif
-+ return;
-+}
-+
-+int checkboard(void)
-+{
-+ printf("Board: Armadeus APF27 revision %d\n", get_board_rev());
-+ return 0;
-+}
-+
-+void enable_caches(void)
-+{
-+#ifndef CONFIG_SYS_DCACHE_OFF
-+
-+ dcache_enable();
-+#endif
-+}
-+
-diff --git a/board/armadeus/apf27/config.mk b/board/armadeus/apf27/config.mk
-new file mode 100644
-index 0000000..9713e69
---- /dev/null
-+++ b/board/armadeus/apf27/config.mk
-@@ -0,0 +1,38 @@
-+#
-+# (C) Copyright 2003
-+# Wolfgang Denk, DENX Software Engineering, wd...@de....
-+# (C) Copyright 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
-+#
-+
-+#
-+# This config file is used for compilation of armadeus sources
-+#
-+# You might change location of U-Boot in memory by setting right TEXT_BASE.
-+# This allows for example having one copy located at the end of ram and stored
-+# in flash device and later on while developing use other location to test
-+# the code in RAM device only.
-+#
-+
-+ifndef TEXT_BASE
-+TEXT_BASE = 0xAFF00000
-+endif
-+
-diff --git a/board/armadeus/apf27/lowlevel_init.S b/board/armadeus/apf27/lowlevel_init.S
-new file mode 100644
-index 0000000..f5dbbb4
---- /dev/null
-+++ b/board/armadeus/apf27/lowlevel_init.S
-@@ -0,0 +1,275 @@
-+/*
-+ * For clock initialization, see chapter 3 of the "MCIMX27 Multimedia
-+ * Applications Processor Reference Manual, Rev. 0.2".
-+ *
-+ * (C) Copyright 2008-2012 Eric Jarrige <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
-+ */
-+
-+
-+#include <config.h>
-+#include <version.h>
-+#include <asm/macro.h>
-+#include <asm/arch/imx-regs.h>
-+#include <generated/asm-offsets.h>
-+
-+
-+
-+
-+.macro port_init
-+ write32 FMCR, CONFIG_SYS_FMCR_VAL
-+.endm /* port_init */
-+
-+.macro init_aipi
-+ /*
-+ * setup AIPI1 and AIPI2
-+ */
-+ write32 AIPI1_PSR0, CONFIG_SYS_AIPI1_PSR0_VAL
-+ write32 AIPI1_PSR1, CONFIG_SYS_AIPI1_PSR1_VAL
-+ write32 AIPI2_PSR0, CONFIG_SYS_AIPI2_PSR0_VAL
-+ write32 AIPI2_PSR1, CONFIG_SYS_AIPI2_PSR1_VAL
-+
-+ /* Change SDRAM signal strengh */
-+ ldr r0, =GPCR
-+ ldr r1, =CONFIG_SYS_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, CONFIG_SYS_MPCTL0_VAL
-+ write32 SPCTL0, CONFIG_SYS_SPCTL0_VAL
-+
-+ write32 CSCR, CONFIG_SYS_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, CONFIG_SYS_PCDR0_VAL
-+ write32 PCDR1, CONFIG_SYS_PCDR1_VAL
-+
-+ /* Configure PCCR0 and PCCR1 */
-+ write32 PCCR0, CONFIG_SYS_PCCR0_VAL
-+ write32 PCCR1, CONFIG_SYS_PCCR1_VAL
-+
-+
-+.endm /* init_clock */
-+
-+.macro sdram_init
-+ /* 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, =CONFIG_SYS_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]
-+
-+ /* write32 ESDCFG0, CONFIG_SYS_SDRAM_ESDCFG_REGISTER_VAL */
-+ ldr r0, =IMX_ESD_BASE
-+ ldr r1, =CONFIG_SYS_SDRAM_ESDCFG_REGISTER_VAL
-+ str r1, [r0, #ESDCFG0_ROF]
-+
-+ /* writel(ESDCTL0, CONFIG_SYS_PRECHARGE_CMD) */
-+ ldr r0, =IMX_ESD_BASE
-+ ldr r1, =CONFIG_SYS_PRECHARGE_CMD
-+ str r1, [r0, #ESDCTL0_ROF]
-+
-+ /* writeb(0xA0001000, any value) */
-+ ldr r1, =PHYS_SDRAM_1+CONFIG_SYS_SDRAM_PRECHARGE_ALL_VAL
-+ strb r2, [r1]
-+
-+ /* writel(ESDCTL0, CONFIG_SYS_AUTOREFRESH_CMD) */
-+ ldr r1, =CONFIG_SYS_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 /* decrease counter value */
-+ bne 1b
-+
-+ /* writel(CONFIG_SYS_PRECHARGE_CMD, CONFIG_SYS_SET_MODE_REG_CMD) */
-+ ldr r1, =CONFIG_SYS_SET_MODE_REG_CMD
-+ str r1, [r0, #ESDCTL0_ROF]
-+
-+ /* set standard mode register */
-+ ldr r4, = PHYS_SDRAM_1+CONFIG_SYS_SDRAM_MODE_REGISTER_VAL
-+ strb r2, [r4]
-+
-+ /* set extended mode register */
-+ ldr r4, =PHYS_SDRAM_1+CONFIG_SYS_SDRAM_EXT_MODE_REGISTER_VAL
-+ strb r5, [r4]
-+
-+ /* writel(CONFIG_SYS_PRECHARGE_CMD, CONFIG_SYS_NORMAL_RW_CMD) */
-+ ldr r1, =CONFIG_SYS_NORMAL_RW_CMD
-+ str r1, [r0, #ESDCTL0_ROF]
-+
-+ /* 2nd sdram */
-+ /* write32 ESDCFG1, CONFIG_SYS_SDRAM_ESDCFG_REGISTER_VAL */
-+ ldr r1, =CONFIG_SYS_SDRAM_ESDCFG_REGISTER_VAL
-+ str r1, [r0, #ESDCFG1_ROF]
-+
-+ /* writel(ESDCTL1, CONFIG_SYS_PRECHARGE_CMD) */
-+ ldr r1, =CONFIG_SYS_PRECHARGE_CMD
-+ str r1, [r0, #ESDCTL1_ROF]
-+
-+ /* writeb(0xB0001000, any value) */
-+ ldr r1, =PHYS_SDRAM_2+CONFIG_SYS_SDRAM_PRECHARGE_ALL_VAL
-+ strb r2, [r1]
-+
-+ /* writel(ESDCTL1, CONFIG_SYS_AUTOREFRESH_CMD) */
-+ ldr r1, =CONFIG_SYS_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 /* decrease counter value */
-+ bne 1b
-+
-+ /* writel(ESDCTL1, CONFIG_SYS_SET_MODE_REG_CMD) */
-+ ldr r1, =CONFIG_SYS_SET_MODE_REG_CMD
-+ str r1, [r0, #ESDCTL1_ROF]
-+
-+ /* set standard mode register */
-+ ldr r4, =PHYS_SDRAM_2+CONFIG_SYS_SDRAM_MODE_REGISTER_VAL
-+ strb r2, [r4]
-+
-+ /* set extended mode register */
-+ ldr r4, =PHYS_SDRAM_2+CONFIG_SYS_SDRAM_EXT_MODE_REGISTER_VAL
-+ strb r2, [r4]
-+
-+ /* writel(ESDCTL1, CONFIG_SYS_NORMAL_RW_CMD) */
-+ ldr r1, =CONFIG_SYS_NORMAL_RW_CMD
-+ str r1, [r0, #ESDCTL1_ROF]
-+.endm /* sdram_init */
-+
-+.globl board_init_lowlevel
-+board_init_lowlevel:
-+.globl lowlevel_init
-+lowlevel_init:
-+
-+ init_aipi
-+
-+ /* configure csx */
-+ write32 CS0U, CONFIG_SYS_CS0U_VAL
-+ write32 CS0L, CONFIG_SYS_CS0L_VAL
-+ write32 CS0A, CONFIG_SYS_CS0A_VAL
-+
-+ write32 CS1U, CONFIG_SYS_CS1U_VAL
-+ write32 CS1L, CONFIG_SYS_CS1L_VAL
-+ write32 CS1A, CONFIG_SYS_CS1A_VAL
-+
-+ write32 CS2U, CONFIG_SYS_CS2U_VAL
-+ write32 CS2L, CONFIG_SYS_CS2L_VAL
-+ write32 CS2A, CONFIG_SYS_CS2A_VAL
-+
-+ write32 CS3U, CONFIG_SYS_CS3U_VAL
-+ write32 CS3L, CONFIG_SYS_CS3L_VAL
-+ write32 CS3A, CONFIG_SYS_CS3A_VAL
-+
-+ write32 CS4U, CONFIG_SYS_CS4U_VAL
-+ write32 CS4L, CONFIG_SYS_CS4L_VAL
-+ write32 CS4A, CONFIG_SYS_CS4A_VAL
-+
-+ write32 CS5U, CONFIG_SYS_CS5U_VAL
-+ write32 CS5L, CONFIG_SYS_CS5L_VAL
-+ write32 CS5A, CONFIG_SYS_CS5A_VAL
-+
-+ write32 EIM, CONFIG_SYS_EIM_VAL
-+
-+ port_init
-+
-+ /* Configure FPGA CLKO */
-+ write32 CCSR, CONFIG_SYS_CCSR_VAL
-+
-+ /* Configure strentgh for FPGA */
-+ write32 DSCR10, CONFIG_SYS_DSCR10_VAL
-+ write32 DSCR3, CONFIG_SYS_DSCR3_VAL
-+ write32 DSCR7, CONFIG_SYS_DSCR7_VAL
-+ write32 DSCR2, CONFIG_SYS_DSCR2_VAL
-+
-+ init_clock
-+
-+ /* skip clock and sdram initialization if we run from ram */
-+ cmp pc, #0xa0000000
-+ bls 1f
-+ cmp pc, #0xc0000000
-+ bhi 1f
-+
-+ b copy2ram
-+1:
-+ sdram_init
-+
-+/* 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 /* r12 saved upper lr*/
-+
-diff --git a/boards.cfg b/boards.cfg
-index 8a40643..9df6212 100644
---- a/boards.cfg
-+++ b/boards.cfg
-@@ -77,6 +77,7 @@ integratorcp_cm926ejs arm arm926ejs integrator armltd
- aspenite arm arm926ejs - Marvell armada100
- gplugd arm arm926ejs - Marvell armada100
- afeb9260 arm arm926ejs - - at91
-+apf27 arm arm926ejs apf27 armadeus mx27
- at91sam9260ek_dataflash_cs0 arm arm926ejs at91sam9260ek atmel at91 at91sam9260ek:AT91SAM9260,SYS_USE_DATAFLASH_CS0
- at91sam9260ek_dataflash_cs1 arm arm926ejs at91sam9260ek atmel at91 at91sam9260ek:AT91SAM9260,SYS_USE_DATAFLASH_CS1
- at91sam9260ek_nandflash arm arm926ejs at91sam9260ek atmel at91 at91sam9260ek:AT91SAM9260,SYS_USE_NANDFLASH
---
-1.7.2.5
-
diff --git a/patches/u-boot/2012.10/302-apf27:-add-support-for-the-armadeus-APF27-board.patch b/patches/u-boot/2012.10/302-apf27:-add-support-for-the-armadeus-APF27-board.patch
new file mode 100644
index 0000000..2b90aec
--- /dev/null
+++ b/patches/u-boot/2012.10/302-apf27:-add-support-for-the-armadeus-APF27-board.patch
@@ -0,0 +1,1456 @@
+Add support for the armadeus APF27 board
+
+Signed-off-by: Philippe Reynes <tr...@ya...>
+Signed-off-by: Eric Jarrige <eri...@ar...>
+Signed-off-by: Nicolas Colombain <nic...@ar...>
+---
+ 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 include/configs/apf27.h
+
+diff --git a/MAINTAINERS b/MAINTAINERS
+index 1b2da94..297467a 100644
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -1011,6 +1011,11 @@ Nobuhiro Iwamatsu <nob...@re...>
+
+ armadillo-800eva R8A7740 (RMOBILE SoC)
+
++Eric Jarrige <eri...@ar...>
++Philippe Reynes <tr...@ya...>
++
++ apf27 ARM926EJS (imx27 SoC)
++
+ -------------------------------------------------------------------------
+
+ Unknown / orphaned boards:
+diff --git a/board/armadeus/apf27/Makefile b/board/armadeus/apf27/Makefile
+new file mode 100644
+index 0000000..1da9548
+--- /dev/null
++++ b/board/armadeus/apf27/Makefile
+@@ -0,0 +1,45 @@
++#
++# (C) Copyright 2000-2004
++# Wolfgang Denk, DENX Software Engineering, wd...@de....
++# (C) Copyright 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 $(TOPDIR)/config.mk
++
++LIB = $(obj)lib$(BOARD).o
++
++COBJS := apf27.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))
++
++#########################################################################
++
++include $(SRCTREE)/rules.mk
++
++sinclude $(obj).depend
++
++#########################################################################
+diff --git a/board/armadeus/apf27/apf27.c b/board/armadeus/apf27/apf27.c
+new file mode 100644
+index 0000000..bf3e5ec
+--- /dev/null
++++ b/board/armadeus/apf27/apf27.c
+@@ -0,0 +1,410 @@
++/*
++ * Copyright (C) 2007 Sascha Hauer, Pengutronix
++ * Copyright (C) 2008-2012 Eric Jarrige <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
++ *
++ */
++
++#include <common.h>
++#include "crc.h"
++#include <jffs2/jffs2.h>
++#include <nand.h>
++#include <netdev.h>
++#include <asm/io.h>
++#include <asm/arch/imx-regs.h>
++#include <asm/arch/gpio.h>
++#include <asm/errno.h>
++#include <environment.h>
++#include "apf27.h"
++
++DECLARE_GLOBAL_DATA_PTR;
++
++/*
++ * 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:
++ * 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)
++{
++ struct iim_regs *iim = (struct iim_regs *)IMX_IIM_BASE;
++
++ return readl(&iim->bank[1].fuse_regs[8]);
++}
++
++/*
++ * 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
++ * 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)
++{
++ struct iim_regs *iim = (struct iim_regs *)IMX_IIM_BASE;
++ int nr_dram_banks = 1;
++
++ if ((get_board_rev() > 0) && (CONFIG_NR_DRAM_BANKS > 1))
++ nr_dram_banks += readl(&iim->bank[1].fuse_regs[9]) & 0x01;
++ else
++ nr_dram_banks = CONFIG_NR_DRAM_POPULATED;
++
++ return nr_dram_banks;
++}
++
++static void apf27_gpio_init(void)
++{
++ 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(AC...
[truncated message content] |
|
From: jorasse <jo...@us...> - 2012-10-25 13:25: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 89202041278c6b3c7f25a1f3523a91213aaaf7c2 (commit)
from 54c2c6d583915634fe1276ccf376b2ce24e1b3ed (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 89202041278c6b3c7f25a1f3523a91213aaaf7c2
Author: Eric Jarrige <eri...@ar...>
Date: Thu Oct 25 15:28:30 2012 +0200
[UBOOT] 2012.10/apf51: update configuration - fix script flash_reset_env - no NFS support due to the boot memory constraints
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf51/apf51-u-boot-2012.10.h | 7 ++---
patches/u-boot/2012.10/401-apf51.patch | 29 ++-----------------
2 files changed, 6 insertions(+), 30 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.10.h b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.10.h
index 65a9e58..63024df 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.10.h
+++ b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.10.h
@@ -24,8 +24,8 @@
#define __CONFIG_H
#define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION "1.2"
-#define CONFIG_IDENT_STRING " apf51 patch 1.7"
+#define CONFIG_ENV_VERSION "1.3"
+#define CONFIG_IDENT_STRING " apf51 patch 1.8"
#define CONFIG_BOARD_NAME apf51
/*
@@ -201,7 +201,6 @@
*/
#define CONFIG_LOADADDR 0x90000000
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
-#define CONFIG_SYS_TFTP_LOADADDR CONFIG_LOADADDR
/*
* Extra Environments
@@ -275,7 +274,7 @@
"then echo Flashing of rootfs succeed;" \
"else echo Flashing of rootfs failed;" \
"fi\0" \
- "flash_reset_env=env default -f; saveenv;" \
+ "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" \
diff --git a/patches/u-boot/2012.10/401-apf51.patch b/patches/u-boot/2012.10/401-apf51.patch
index 5bf9ee5..290fc6a 100644
--- a/patches/u-boot/2012.10/401-apf51.patch
+++ b/patches/u-boot/2012.10/401-apf51.patch
@@ -67,7 +67,7 @@ new file mode 100644
index 0000000..8ff1381
--- /dev/null
+++ b/board/armadeus/apf51/apf51.c
-@@ -0,0 +1,1222 @@
+@@ -0,0 +1,1199 @@
+/*
+ * (C) Copyright 2010-2012 Eric Jarrige, Armadeus Project
+ *
@@ -831,31 +831,6 @@ index 0000000..8ff1381
+#endif
+}
+
-+int board_eth_init(bd_t *bis)
-+{
-+#define STR_ENV_ETHADDR "ethaddr"
-+ int rc = -ENODEV;
-+
-+#if defined(CONFIG_FEC_MXC)
-+ struct eth_device *dev;
-+ uchar eth_addr[6];
-+
-+ rc = fecmxc_initialize(bis);
-+
-+ if (!eth_getenv_enetaddr(STR_ENV_ETHADDR, eth_addr)) {
-+ dev = eth_get_dev_by_index(0);
-+ if (dev) {
-+ eth_setenv_enetaddr(STR_ENV_ETHADDR, dev->enetaddr);
-+ } else {
-+ printf("FEC APF51: Couldn't get eth device\n");
-+ rc = -1;
-+ }
-+ }
-+#endif
-+
-+ return rc;
-+}
-+
+#ifdef CONFIG_FSL_MMC
+int esdhc_active = CONFIG_DEFAULT_MMC;
+#define SD1_PAD_CFG (PAD_CTL_DRV_MAX | PAD_CTL_DRV_VOT_HIGH | \
@@ -1030,8 +1005,10 @@ index 0000000..8ff1381
+ /* 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;
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-10-24 09:22:43
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 54c2c6d583915634fe1276ccf376b2ce24e1b3ed (commit)
via 26ad215f089b88f18168d9ad940441cd789d0ec6 (commit)
from c3d0300cfdfabcc5a6fc5506a82a3f0a8ab7dc19 (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 54c2c6d583915634fe1276ccf376b2ce24e1b3ed
Author: Philippe Reynes <tr...@ya...>
Date: Wed Oct 24 08:57:25 2012 +0200
apf27: add support for kernel 3.6.3
Signed-off-by: Philippe Reynes <tr...@ya...>
commit 26ad215f089b88f18168d9ad940441cd789d0ec6
Author: Philippe Reynes <tr...@ya...>
Date: Wed Oct 24 08:57:24 2012 +0200
apf27: add kernel configuration for linux 3.6
apf27: add kernel configuration for linux 3.6
Signed-off-by: Philippe Reynes <tr...@ya...>
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf27/apf27-linux-3.6.3.config | 1 +
...linux-3.5-rc4.config => apf27-linux-3.6.config} | 1 -
patches/linux/{3.6.2 => 3.6.3} | 0
3 files changed, 1 insertions(+), 1 deletions(-)
create mode 120000 buildroot/target/device/armadeus/apf27/apf27-linux-3.6.3.config
copy buildroot/target/device/armadeus/apf27/{apf27-linux-3.5-rc4.config => apf27-linux-3.6.config} (98%)
copy patches/linux/{3.6.2 => 3.6.3} (100%)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.6.3.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.6.3.config
new file mode 120000
index 0000000..8113448
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.6.3.config
@@ -0,0 +1 @@
+apf27-linux-3.6.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.5-rc4.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.6.config
similarity index 98%
copy from buildroot/target/device/armadeus/apf27/apf27-linux-3.5-rc4.config
copy to buildroot/target/device/armadeus/apf27/apf27-linux-3.6.config
index ef43bc3..a9f3911 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.5-rc4.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.6.config
@@ -100,7 +100,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_FONTS=y
CONFIG_FONT_8x8=y
CONFIG_LOGO=y
-# CONFIG_HID_SUPPORT is not set
# CONFIG_USB_SUPPORT is not set
CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_PCF8563=y
diff --git a/patches/linux/3.6.2 b/patches/linux/3.6.3
similarity index 100%
copy from patches/linux/3.6.2
copy to patches/linux/3.6.3
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-10-24 08:11: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 c3d0300cfdfabcc5a6fc5506a82a3f0a8ab7dc19 (commit)
from c5c5552e2dd26324a89310f3641115814e04b57e (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 c3d0300cfdfabcc5a6fc5506a82a3f0a8ab7dc19
Author: Eric Jarrige <eri...@ar...>
Date: Wed Oct 24 10:13:10 2012 +0200
[UBOOT] 2012.10/apf28: update configuration - fix script flash_reset_env - fix SD pin drive strength
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf28/apf28-u-boot-2012.10.h | 8 +++-----
patches/u-boot/2012.10/502-add-apf28.patch | 8 +++++---
2 files changed, 8 insertions(+), 8 deletions(-)
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
index 28f840c..4b7db71 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.10.h
+++ b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.10.h
@@ -25,8 +25,8 @@
#include <asm/arch/regs-base.h>
#define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION "1.2"
-#define CONFIG_IDENT_STRING " apf28 patch 1.7"
+#define CONFIG_ENV_VERSION "1.3"
+#define CONFIG_IDENT_STRING " apf28 patch 1.3"
#define CONFIG_BOARD_NAME apf28
/*
@@ -135,7 +135,6 @@
#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_GBL_DATA_SIZE 128 /* Initial data */
#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. */
@@ -219,7 +218,6 @@
*/
#define CONFIG_LOADADDR 0x40000000
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
-#define CONFIG_SYS_TFTP_LOADADDR CONFIG_LOADADDR
/*
* Extra Environments
@@ -289,7 +287,7 @@
"then echo Flashing of rootfs succeed;" \
"else echo Flashing of rootfs failed;" \
"fi\0" \
- "flash_reset_env=env default -f; saveenv;" \
+ "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"\
diff --git a/patches/u-boot/2012.10/502-add-apf28.patch b/patches/u-boot/2012.10/502-add-apf28.patch
index 39e1657..ca83365 100644
--- a/patches/u-boot/2012.10/502-add-apf28.patch
+++ b/patches/u-boot/2012.10/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,191 @@
+@@ -0,0 +1,193 @@
+/*
+ * APF28 motherboard based on DENX M28 module
+ *
@@ -242,8 +242,10 @@ index 0000000..7f75494
+ /* 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;
@@ -1167,9 +1169,9 @@ index 0000000..9854cda
+ MX28_PAD_SSP0_DATA3__SSP0_D3 | MUX_CONFIG_SSP0,
+ MX28_PAD_SSP0_CMD__SSP0_CMD | MUX_CONFIG_SSP0,
+ MX28_PAD_SSP0_DETECT__SSP0_CARD_DETECT |
-+ (MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_NOPULL),
++ (MXS_PAD_3V3 | MXS_PAD_8MA | MXS_PAD_NOPULL),
+ MX28_PAD_SSP0_SCK__SSP0_SCK |
-+ (MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_NOPULL),
++ (MXS_PAD_3V3 | MXS_PAD_12MA | MXS_PAD_NOPULL),
+
+ /* GPMI NAND */
+ MX28_PAD_GPMI_D00__GPMI_D0 | MUX_CONFIG_GPMI,
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2012-10-24 06:59:43
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via c5c5552e2dd26324a89310f3641115814e04b57e (commit)
via c15c2304fed4597ba747e0a36be6ab79bd590c1e (commit)
from f5a2faada616650b930bdb8501a7f5fe79708034 (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 c5c5552e2dd26324a89310f3641115814e04b57e
Merge: c15c230 f5a2faa
Author: Fabien Marteau <fab...@ar...>
Date: Wed Oct 24 08:45:32 2012 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit c15c2304fed4597ba747e0a36be6ab79bd590c1e
Author: Fabien Marteau <fab...@ar...>
Date: Tue Oct 23 19:08:26 2012 +0200
[kernel][fpga][pod_gpio] adding irq number information when probed
-----------------------------------------------------------------------
Summary of changes:
.../fpga/virtual_components/pod_gpio/pod_gpio.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/target/linux/modules/fpga/virtual_components/pod_gpio/pod_gpio.c b/target/linux/modules/fpga/virtual_components/pod_gpio/pod_gpio.c
index 7c68911..e501128 100644
--- a/target/linux/modules/fpga/virtual_components/pod_gpio/pod_gpio.c
+++ b/target/linux/modules/fpga/virtual_components/pod_gpio/pod_gpio.c
@@ -78,6 +78,7 @@ static void pod_gpio_mask_irq(struct irq_data *data)
u16 enable_interrupt_config;
enable_interrupt_config = cg_read_reg(cg_chip, GPIO_ENABLE_INTERRUPT);
+
cg_write_reg(cg_chip , GPIO_ENABLE_INTERRUPT, enable_interrupt_config &
~(1 << (data->irq - IRQ_GPIO_POD(0))));
}
@@ -89,6 +90,8 @@ static void pod_gpio_unmask_irq(struct irq_data *data)
container_of(chip, struct pod_gpio_chip, interrupt_chip);
u16 enable_interrupt_config;
+
+
enable_interrupt_config = cg_read_reg(cg_chip, GPIO_ENABLE_INTERRUPT);
cg_write_reg(cg_chip, GPIO_ENABLE_INTERRUPT, enable_interrupt_config |
@@ -103,6 +106,7 @@ static int pod_gpio_irq_type(unsigned int _irq, unsigned int type)
interrupt_chip);
u16 edge_config;
+
edge_config = cg_read_reg(cg_chip, GPIO_INTERRUPT_EDGE_TYPE);
/* Only falling and rising edge are supporter by pod_gpio */
@@ -206,7 +210,6 @@ static int pod_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
struct pod_gpio_chip *cg_chip =
container_of(chip, struct pod_gpio_chip, chip);
-
return cg_chip->irq_base + offset;
}
@@ -316,8 +319,8 @@ static int pod_gpio_probe(struct platform_device *pdev)
goto exit_iounmap;
}
- dev_info(&pdev->dev, "pod_gpio probed. GPIO used: %d..%d\n",
- cg_chip->chip.base, cg_chip->chip.base + cg_chip->chip.ngpio-1);
+ dev_info(&pdev->dev, "pod_gpio probed. GPIO used: %d..%d, IRQ used: %d..%d\n",
+ cg_chip->chip.base, cg_chip->chip.base + cg_chip->chip.ngpio-1, IRQ_GPIO_POD(0), IRQ_GPIO_POD(16));
return 0;
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-10-23 22:14:01
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via f5a2faada616650b930bdb8501a7f5fe79708034 (commit)
from 95d90ebb39ba5c94e8de8eba0b158b9a20228838 (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 f5a2faada616650b930bdb8501a7f5fe79708034
Author: Eric Jarrige <eri...@ar...>
Date: Wed Oct 24 00:17:17 2012 +0200
[UBOOT] 2012.10/apf9328: update configuration - fix script flash_reset_env
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf9328/apf9328-u-boot-2012.10.h | 7 ++---
patches/u-boot/2012.10/103-apf9328.patch | 21 +++----------------
2 files changed, 7 insertions(+), 21 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2012.10.h b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2012.10.h
index 8ec08fb..d751c7d 100644
--- a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2012.10.h
+++ b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2012.10.h
@@ -23,8 +23,8 @@
#define __CONFIG_H
#define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION "5.3"
-#define CONFIG_IDENT_STRING " apf9328 patch 5.7"
+#define CONFIG_ENV_VERSION "5.4"
+#define CONFIG_IDENT_STRING " apf9328 patch 5.8"
#define CONFIG_BOARD_NAME apf9328
/*
@@ -180,7 +180,6 @@
*/
#define CONFIG_LOADADDR 0x08000000
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
-#define CONFIG_SYS_TFTP_LOADADDR CONFIG_LOADADDR
/*
* Extra Environments
@@ -242,7 +241,7 @@
"then echo Flashing of rootfs succeed;" \
"else echo Flashing of rootfs failed;" \
"fi\0" \
- "flash_reset_env=env default -f; saveenv;" \
+ "flash_reset_env=env default -f -a; saveenv;" \
"echo Flash environment variables erased!\0" \
"download_uboot=tftpboot ${loadaddr} ${board_name}-u-boot.bin\0"\
"download_kernel=tftpboot ${loadaddr} ${board_name}-linux.bin\0"\
diff --git a/patches/u-boot/2012.10/103-apf9328.patch b/patches/u-boot/2012.10/103-apf9328.patch
index b2c6bee..36f302a 100644
--- a/patches/u-boot/2012.10/103-apf9328.patch
+++ b/patches/u-boot/2012.10/103-apf9328.patch
@@ -89,7 +89,7 @@ new file mode 100644
index 0000000..280f749
--- /dev/null
+++ b/board/armadeus/apf9328/apf9328.c
-@@ -0,0 +1,106 @@
+@@ -0,0 +1,93 @@
+/*
+ * (C) Copyright 2005-2011
+ * Nicolas Colombain <nic...@ar...>
@@ -163,8 +163,10 @@ index 0000000..280f749
+ /* 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;
@@ -178,22 +180,7 @@ index 0000000..280f749
+#ifdef CONFIG_DRIVER_DM9000
+int board_eth_init(bd_t *bis)
+{
-+ struct eth_device *dev;
-+ unsigned char env_enetaddr[6];
-+
-+ if (dm9000_initialize(bis) != 0)
-+ return -1;
-+ if (!eth_getenv_enetaddr("ethaddr", env_enetaddr)) {
-+ dev = eth_get_dev_by_index(0);
-+ if (dev) {
-+ eth_setenv_enetaddr("ethaddr", dev->enetaddr);
-+ } else {
-+ printf("DM9000 APF9328: Couldn't get eth device\n");
-+ return -1;
-+ }
-+ }
-+
-+ return 0;
++ return dm9000_initialize(bis);
+}
+#endif
diff --git a/board/armadeus/apf9328/apf9328fpga.c b/board/armadeus/apf9328/apf9328fpga.c
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-10-23 12:32: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 95d90ebb39ba5c94e8de8eba0b158b9a20228838 (commit)
from b8f43b034204adc6b83702bb031c6fc9e8d7a3f2 (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 95d90ebb39ba5c94e8de8eba0b158b9a20228838
Author: Eric Jarrige <eri...@ar...>
Date: Tue Oct 23 14:35:52 2012 +0200
[UBOOT] 2012.10: build user friendly continuous multi RAMs memory mapping - add U-Boot feature to support non contiguous RAM banks
-----------------------------------------------------------------------
Summary of changes:
...60-arm-support-continuous-mmu-mem-mapping.patch | 52 ++++++++++++++++++++
1 files changed, 52 insertions(+), 0 deletions(-)
create mode 100644 patches/u-boot/2012.10/360-arm-support-continuous-mmu-mem-mapping.patch
diff --git a/patches/u-boot/2012.10/360-arm-support-continuous-mmu-mem-mapping.patch b/patches/u-boot/2012.10/360-arm-support-continuous-mmu-mem-mapping.patch
new file mode 100644
index 0000000..a680e73
--- /dev/null
+++ b/patches/u-boot/2012.10/360-arm-support-continuous-mmu-mem-mapping.patch
@@ -0,0 +1,52 @@
+ARM: support continuous MMU memory mapping beside the regular identity mapping.
+
+Signed-off-by: Eric Jarrige <eri...@ar...>
+---
+diff --git a/arch/arm/lib/cache-cp15.c b/arch/arm/lib/cache-cp15.c
+index 939de10..25f0ff1 100644
+--- a/arch/arm/lib/cache-cp15.c
++++ b/arch/arm/lib/cache-cp15.c
+@@ -50,7 +50,7 @@ static void cp_delay (void)
+ asm volatile("" : : : "memory");
+ }
+
+-static inline void dram_bank_mmu_setup(int bank)
++static inline void dram_bank_mmu_setup(int bank, int page_offset)
+ {
+ u32 *page_table = (u32 *)gd->tlb_addr;
+ bd_t *bd = gd->bd;
+@@ -60,7 +60,7 @@ static inline void dram_bank_mmu_setup(int bank)
+ for (i = bd->bi_dram[bank].start >> 20;
+ i < (bd->bi_dram[bank].start + bd->bi_dram[bank].size) >> 20;
+ i++) {
+- page_table[i] = i << 20 | (3 << 10) | CACHE_SETUP;
++ page_table[page_offset++] = i << 20 | (3 << 10) | CACHE_SETUP;
+ }
+ }
+
+@@ -68,7 +68,8 @@ static inline void dram_bank_mmu_setup(int bank)
+ static inline void mmu_setup(void)
+ {
+ u32 *page_table = (u32 *)gd->tlb_addr;
+- int i;
++ bd_t *bd = gd->bd;
++ int i, page_offset, continuity_offset;
+ u32 reg;
+
+ arm_init_before_mmu();
+@@ -76,8 +77,14 @@ static inline void mmu_setup(void)
+ for (i = 0; i < 4096; i++)
+ page_table[i] = i << 20 | (3 << 10) | 0x12;
+
++ continuity_offset = bd->bi_dram[0].start >> 20;
+ for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) {
+- dram_bank_mmu_setup(i);
++ page_offset = (bd->bi_dram[i].start) >> 20;
++ /* direct identity mapping */
++ dram_bank_mmu_setup(i, page_offset);
++ /* secondary mapping to build a continous memory space */
++ dram_bank_mmu_setup(i, continuity_offset);
++ continuity_offset = (bd->bi_dram[i].start + bd->bi_dram[i].size) >> 20;
+ }
+
+ /* Copy the page table address to cp15 */
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-10-23 12:26:34
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via b8f43b034204adc6b83702bb031c6fc9e8d7a3f2 (commit)
via 09d5521eaeb2a8e5cd6e254860371e4bc2aceabb (commit)
from db0708ccc78cf72953d6baccdbdc83c0856515cc (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 b8f43b034204adc6b83702bb031c6fc9e8d7a3f2
Merge: 09d5521 db0708c
Author: Eric Jarrige <eri...@ar...>
Date: Tue Oct 23 14:30:00 2012 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 09d5521eaeb2a8e5cd6e254860371e4bc2aceabb
Author: Eric Jarrige <eri...@ar...>
Date: Tue Oct 23 14:22:18 2012 +0200
[UBOOT] 2012.10/apf27: speed up U-Boot by forcing code relocation into cached memory
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-10-23 12:19: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 db0708ccc78cf72953d6baccdbdc83c0856515cc (commit)
from f8a43e3a7b99ac62923e78f1c049c14c96f102f0 (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 db0708ccc78cf72953d6baccdbdc83c0856515cc
Author: Eric Jarrige <eri...@ar...>
Date: Tue Oct 23 14:22:18 2012 +0200
[UBOOT] 2012.10/apf28: speed up U-Boot by forcing code relocation into cached memory
-----------------------------------------------------------------------
Summary of changes:
...-Add-support-for-the-armadeus-apf27-board.patch | 28 +++++++++++++++-----
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/patches/u-boot/2012.10/302-Add-support-for-the-armadeus-apf27-board.patch b/patches/u-boot/2012.10/302-Add-support-for-the-armadeus-apf27-board.patch
index f6fd612..d49e642 100644
--- a/patches/u-boot/2012.10/302-Add-support-for-the-armadeus-apf27-board.patch
+++ b/patches/u-boot/2012.10/302-Add-support-for-the-armadeus-apf27-board.patch
@@ -78,7 +78,7 @@ new file mode 100644
index 0000000..c1ca6bd
--- /dev/null
+++ b/board/armadeus/apf27/apf27.c
-@@ -0,0 +1,304 @@
+@@ -0,0 +1,318 @@
+/*
+ * Copyright (C) 2007 Sascha Hauer, Pengutronix
+ * Copyright (C) 2008-2012 Eric Jarrige <eri...@ar...>
@@ -303,10 +303,12 @@ index 0000000..c1ca6bd
+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);
+ if (get_num_ram_bank() > 1) {
-+ gd->ram_size += get_ram_size((void *)PHYS_SDRAM_2,
-+ PHYS_SDRAM_2_SIZE);
++ gd->ram_size = PHYS_SDRAM_2 - CONFIG_SYS_SDRAM_BASE
++ + get_ram_size((void *)PHYS_SDRAM_2, PHYS_SDRAM_2_SIZE);
++ } else {
++ gd->ram_size = get_ram_size((void *)PHYS_SDRAM_1,
++ PHYS_SDRAM_1_SIZE);
+ }
+
+ return 0;
@@ -314,12 +316,24 @@ index 0000000..c1ca6bd
+
+void dram_init_banksize(void)
+{
++ phys_size_t ramsize = gd->ram_size;
++
++ 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 = gd->ram_size / get_num_ram_bank();
++ 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;
-+ gd->bd->bi_dram[1].size = \
-+ gd->ram_size - gd->bd->bi_dram[0].size;
++ 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;
+ }
+}
+
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-10-22 19:34:58
|
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 f8a43e3a7b99ac62923e78f1c049c14c96f102f0 (commit)
from b03b8afd8142a8a2c3b3019e2f79d243e86c9c9b (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 f8a43e3a7b99ac62923e78f1c049c14c96f102f0
Author: Eric Jarrige <eri...@ar...>
Date: Mon Oct 22 21:38:07 2012 +0200
[UBOOT] 2012.10/apf27: update configuration - fix script flash_reset_env
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf27/apf27-u-boot-2012.10.h | 12 +++----
...-Add-support-for-the-armadeus-apf27-board.patch | 34 +++----------------
2 files changed, 11 insertions(+), 35 deletions(-)
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
index 14c7613..c6f570c 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.10.h
+++ b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.10.h
@@ -24,8 +24,8 @@
#define __CONFIG_H
#define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION "3.2"
-#define CONFIG_IDENT_STRING " apf27 patch 3.7"
+#define CONFIG_ENV_VERSION "3.3"
+#define CONFIG_IDENT_STRING " apf27 patch 3.8"
#define CONFIG_BOARD_NAME apf27
/*
@@ -109,8 +109,7 @@
#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_GBL_DATA_SIZE 256 /* Initial data */
+#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 */
@@ -190,7 +189,6 @@
*/
#define CONFIG_LOADADDR 0xA0000000
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
-#define CONFIG_SYS_TFTP_LOADADDR CONFIG_LOADADDR
/*
* Extra Environments
@@ -268,7 +266,7 @@
"then echo Flashing of rootfs succeed;" \
"else echo Flashing of rootfs failed;" \
"fi\0" \
- "flash_reset_env=env default -f; saveenv;" \
+ "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" \
@@ -286,7 +284,6 @@
* Serial Driver
*/
#define CONFIG_MXC_UART
-#define CONFIG_SYS_MX27_UART1
#define CONFIG_CONS_INDEX 1
#define CONFIG_BAUDRATE 115200
#define CONFIG_MXC_UART_BASE UART1_BASE
@@ -294,6 +291,7 @@
/*
* GPIO
*/
+#define CONFIG_MXC_GPIO
/*
* NOR
diff --git a/patches/u-boot/2012.10/302-Add-support-for-the-armadeus-apf27-board.patch b/patches/u-boot/2012.10/302-Add-support-for-the-armadeus-apf27-board.patch
index 2414608..f6fd612 100644
--- a/patches/u-boot/2012.10/302-Add-support-for-the-armadeus-apf27-board.patch
+++ b/patches/u-boot/2012.10/302-Add-support-for-the-armadeus-apf27-board.patch
@@ -78,7 +78,7 @@ new file mode 100644
index 0000000..c1ca6bd
--- /dev/null
+++ b/board/armadeus/apf27/apf27.c
-@@ -0,0 +1,326 @@
+@@ -0,0 +1,304 @@
+/*
+ * Copyright (C) 2007 Sascha Hauer, Pengutronix
+ * Copyright (C) 2008-2012 Eric Jarrige <eri...@ar...>
@@ -109,6 +109,7 @@ index 0000000..c1ca6bd
+#include <asm/arch/imx-regs.h>
+#include <asm/arch/gpio.h>
+#include <asm/errno.h>
++#include <environment.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
@@ -341,8 +342,10 @@ index 0000000..c1ca6bd
+ /* 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);
+ }
+
+ /* Unlock whole flash but U-Boot */
@@ -372,38 +375,13 @@ index 0000000..c1ca6bd
+ return 0;
+}
+
-+int board_eth_init(bd_t *bis)
-+{
-+#define STR_ENV_ETHADDR "ethaddr"
-+ int rc = -ENODEV;
-+
-+#if defined(CONFIG_FEC_MXC)
-+ struct eth_device *dev;
-+ uchar eth_addr[6];
-+
-+ rc = fecmxc_initialize(bis);
-+
-+ if (!eth_getenv_enetaddr(STR_ENV_ETHADDR, eth_addr)) {
-+ dev = eth_get_dev_by_index(0);
-+ if (dev) {
-+ eth_setenv_enetaddr(STR_ENV_ETHADDR, dev->enetaddr);
-+ } else {
-+ printf("FEC APF27: Couldn't get eth device\n");
-+ rc = -1;
-+ }
-+ }
-+#endif
-+
-+ return rc;
-+}
-+
-+/*void enable_caches(void)
++void enable_caches(void)
+{
+#ifndef CONFIG_SYS_DCACHE_OFF
+
+ dcache_enable();
+#endif
-+}*/
++}
+
diff --git a/board/armadeus/apf27/config.mk b/board/armadeus/apf27/config.mk
new file mode 100644
hooks/post-receive
--
armadeus
|
|
From: jscheer <js...@us...> - 2012-10-18 15: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 b03b8afd8142a8a2c3b3019e2f79d243e86c9c9b (commit)
from 3c6f767f9b2fa881a8ea0a8f4b6eca69cb351e1d (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 b03b8afd8142a8a2c3b3019e2f79d243e86c9c9b
Author: Jeremie Scheer <jer...@ar...>
Date: Thu Oct 18 17:58:52 2012 +0200
[BUILDROOT] Add package CUnit in patch 197.
-----------------------------------------------------------------------
Summary of changes:
.../buildroot/2012.02/197-cunit-add_package.patch | 49 ++++++++++++++++++++
patches/buildroot/2012.02/cleanup_buildroot.sh | 1 +
2 files changed, 50 insertions(+), 0 deletions(-)
create mode 100644 patches/buildroot/2012.02/197-cunit-add_package.patch
diff --git a/patches/buildroot/2012.02/197-cunit-add_package.patch b/patches/buildroot/2012.02/197-cunit-add_package.patch
new file mode 100644
index 0000000..7fd24ef
--- /dev/null
+++ b/patches/buildroot/2012.02/197-cunit-add_package.patch
@@ -0,0 +1,49 @@
+Add CUnit package.
+
+Signed-off-by: Jérémie Scheer <jer...@ar...>
+
+===================================================================
+Index: buildroot/package/cunit/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/cunit/Config.in 2012-10-11 11:43:27.000000000 +0200
+@@ -0,0 +1,4 @@
++config BR2_PACKAGE_CUNIT
++ bool "CUnit library"
++ help
++ Compile & install CUnit library.
+Index: buildroot/package/cunit/cunit.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/cunit/cunit.mk 2012-10-11 14:16:48.000000000 +0200
+@@ -0,0 +1,18 @@
++#############################################################
++#
++# CUnit
++#
++#############################################################
++
++CUNIT_VERSION = 156
++CUNIT_SITE = https://cunit.svn.sourceforge.net/svnroot/cunit
++CUNIT_SITE_METHOD = svn
++CUNIT_INSTALL_STAGING = YES
++
++define CUNIT_BOOTSTRAP_CMD
++ (cd $(@D); ./bootstrap)
++endef
++
++CUNIT_PRE_CONFIGURE_HOOKS += CUNIT_BOOTSTRAP_CMD
++
++$(eval $(call GENTARGETS,package,cunit))
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2012-10-11 11:23:28.000000000 +0200
++++ buildroot/package/Config.in 2012-10-11 14:20:32.000000000 +0200
+@@ -351,6 +351,7 @@
+ source "package/libglib2/Config.in"
+ source "package/liboil/Config.in"
+ source "package/startup-notification/Config.in"
++source "package/cunit/Config.in"
+ endmenu
+
+ menu "Text and terminal handling"
diff --git a/patches/buildroot/2012.02/cleanup_buildroot.sh b/patches/buildroot/2012.02/cleanup_buildroot.sh
index 5ee2d9c..20c3256 100755
--- a/patches/buildroot/2012.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2012.02/cleanup_buildroot.sh
@@ -77,3 +77,4 @@ rm -rf buildroot/package/qtcreator/
rm -rf buildroot/package/marble/
rm -rf buildroot/package/m4/m4-1.4.16-no-gets.patch
rm -rf buildroot/package/tar/tar-1.26-no-gets.patch
+rm -rf buildroot/package/cunit/
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-10-18 11:05:41
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 3c6f767f9b2fa881a8ea0a8f4b6eca69cb351e1d (commit)
from 17890b82448c6d88a5e6a4db0f00a7cd370542c0 (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 3c6f767f9b2fa881a8ea0a8f4b6eca69cb351e1d
Author: Eric Jarrige <eri...@ar...>
Date: Thu Oct 18 13:07:53 2012 +0200
[UBOOT] 2012.10: add APF board configuration files for U-Boot 2012.10
-----------------------------------------------------------------------
Summary of changes:
...f27-u-boot-2012.04.h => apf27-u-boot-2012.10.h} | 2 --
...f28-u-boot-2012.04.h => apf28-u-boot-2012.10.h} | 9 +++------
...f51-u-boot-2012.04.h => apf51-u-boot-2012.10.h} | 12 ++++++------
...8-u-boot-2012.04.h => apf9328-u-boot-2012.10.h} | 1 -
4 files changed, 9 insertions(+), 15 deletions(-)
copy buildroot/target/device/armadeus/apf27/{apf27-u-boot-2012.04.h => apf27-u-boot-2012.10.h} (99%)
copy buildroot/target/device/armadeus/apf28/{apf28-u-boot-2012.04.h => apf28-u-boot-2012.10.h} (97%)
copy buildroot/target/device/armadeus/apf51/{apf51-u-boot-2012.04.h => apf51-u-boot-2012.10.h} (99%)
copy buildroot/target/device/armadeus/apf9328/{apf9328-u-boot-2012.04.h => apf9328-u-boot-2012.10.h} (99%)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.04.h b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.10.h
similarity index 99%
copy from buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.04.h
copy to buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.10.h
index 315e5fc..14c7613 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.04.h
+++ b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.10.h
@@ -39,7 +39,6 @@
* Enable the call to miscellaneous platform dependent initialization.
*/
#define CONFIG_SYS_NO_FLASH /* to be define before <config_cmd_default.h> */
-#define CONFIG_SYS_DCACHE_OFF
#define CONFIG_MISC_INIT_R
/*
@@ -289,7 +288,6 @@
#define CONFIG_MXC_UART
#define CONFIG_SYS_MX27_UART1
#define CONFIG_CONS_INDEX 1
-#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
#define CONFIG_BAUDRATE 115200
#define CONFIG_MXC_UART_BASE UART1_BASE
diff --git a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.04.h b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.10.h
similarity index 97%
copy from buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.04.h
copy to buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.10.h
index 09977ca..28f840c 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.04.h
+++ b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.10.h
@@ -39,10 +39,8 @@
* Enable the call to miscellaneous platform dependent initialization.
*/
#define CONFIG_SYS_NO_FLASH /* to be define before <config_cmd_default.h>*/
-#define CONFIG_SYS_DCACHE_OFF
#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_BOARD_LATE_INIT
-#define CONFIG_ARCH_CPU_INIT
#define CONFIG_ARCH_MISC_INIT
#define CONFIG_APBH_DMA
@@ -57,10 +55,11 @@
*/
#define CONFIG_SPL
#define CONFIG_SPL_NO_CPU_SUPPORT_CODE
-#define CONFIG_SPL_START_S_PATH "arch/arm/cpu/arm926ejs/mx28"
-#define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/arm926ejs/mx28/u-boot-spl.lds"
+#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
@@ -194,7 +193,6 @@
#define CONFIG_AUTO_COMPLETE /* Command auto complete */
#define CONFIG_CMDLINE_EDITING /* Command history etc */
#define CONFIG_SYS_HUSH_PARSER /* enable the "hush" shell */
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " /* secondary prompt string */
/*
* Boot Linux
@@ -313,7 +311,6 @@
#define CONFIG_PL01x_PORTS { (void *)MXS_UARTDBG_BASE }
#define CONFIG_CONS_INDEX 0
#define CONFIG_BAUDRATE 115200 /* Default baud rate */
-#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
/*
* GPIO
diff --git a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.04.h b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.10.h
similarity index 99%
copy from buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.04.h
copy to buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.10.h
index 0c251a7..65a9e58 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.04.h
+++ b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.10.h
@@ -39,7 +39,6 @@
* Enable the call to miscellaneous platform dependent initialization.
*/
#define CONFIG_SYS_NO_FLASH /* to be define before <config_cmd_default.h> */
-#define CONFIG_SYS_DCACHE_OFF
#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_MISC_INIT_R
#define CONFIG_BOARD_LATE_INIT
@@ -47,8 +46,8 @@
/*
* Board display option
*/
-#define CONFIG_DISPLAY_BOARDINFO
-#define CONFIG_DISPLAY_CPUINFO
+/*#define CONFIG_DISPLAY_BOARDINFO*/
+/*#define CONFIG_DISPLAY_CPUINFO*/
/*
* SPL
@@ -94,18 +93,20 @@
/*#define CONFIG_CMD_DNS*/
/*#define CONFIG_CMD_EXT2*/
/*#define CONFIG_CMD_I2C*/ /* I2C serial bus support */
-#define CONFIG_CMD_IIM /* imx iim fuse */
+/*#define CONFIG_CMD_IIM*/ /* imx iim fuse */
/*#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
+#undef CONFIG_CMD_NFS
#define CONFIG_CMD_PING /* ping support */
/*#define CONFIG_CMD_SETEXPR*/ /* setexpr support */
/*#define CONFIG_CMD_UBI*/
/*#define CONFIG_CMD_UBIFS*/
+#undef CONFIG_CMD_XIMG /* Load part of Multi Image */
+
/*
* Memory configurations
*/
@@ -293,7 +294,6 @@
*/
#define CONFIG_MXC_UART
#define CONFIG_MXC_UART_BASE UART3_BASE
-#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
#define CONFIG_BAUDRATE 115200
/*
diff --git a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2012.04.h b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2012.10.h
similarity index 99%
copy from buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2012.04.h
copy to buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2012.10.h
index b5efe18..8ec08fb 100644
--- a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2012.04.h
+++ b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2012.10.h
@@ -259,7 +259,6 @@
*/
#define CONFIG_IMX_SERIAL
#define CONFIG_IMX_SERIAL1
-#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 }
#define CONFIG_BAUDRATE 115200
/*
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-10-18 09:51: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 17890b82448c6d88a5e6a4db0f00a7cd370542c0 (commit)
from 123be850730ad3c1823c496b36ab41f289f1800d (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 17890b82448c6d88a5e6a4db0f00a7cd370542c0
Author: Eric Jarrige <eri...@ar...>
Date: Thu Oct 18 11:53:39 2012 +0200
[UBOOT] update patchwork to support U-Boot 2012.10
-----------------------------------------------------------------------
Summary of changes:
patches/u-boot/2012.10/102-mx1-i2c.patch | 46 +
patches/u-boot/2012.10/103-apf9328.patch | 1358 ++++++++++++++++
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 +
...dule-and-I-O-Multiplexer-constant-for-mx2.patch | 181 +++
...-Add-support-for-the-armadeus-apf27-board.patch | 747 +++++++++
.../303-Add-nand-spl-support-on-apf27.patch | 753 +++++++++
.../2012.10/304-Add-FPGA-support-apf27.patch | 387 +++++
.../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 +++
patches/u-boot/2012.10/400-imx51.patch | 511 ++++++
patches/u-boot/2012.10/401-apf51.patch | 1624 ++++++++++++++++++++
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 | 1336 ++++++++++++++++
27 files changed, 11209 insertions(+), 0 deletions(-)
create mode 100644 patches/u-boot/2012.10/102-mx1-i2c.patch
create mode 100644 patches/u-boot/2012.10/103-apf9328.patch
create mode 100644 patches/u-boot/2012.10/104-apf9328-makefile.patch
create mode 100644 patches/u-boot/2012.10/106-mx1-pllclk.patch
create mode 100644 patches/u-boot/2012.10/107-mx1-pllclk-debug.patch
create mode 100644 patches/u-boot/2012.10/108-DM9000.patch
create mode 100644 patches/u-boot/2012.10/109-mx1-relocation.patch
create mode 100644 patches/u-boot/2012.10/111-mx1-timer.patch
create mode 100644 patches/u-boot/2012.10/301-Add-GPIO-Module-and-I-O-Multiplexer-constant-for-mx2.patch
create mode 100644 patches/u-boot/2012.10/302-Add-support-for-the-armadeus-apf27-board.patch
create mode 100644 patches/u-boot/2012.10/303-Add-nand-spl-support-on-apf27.patch
create mode 100644 patches/u-boot/2012.10/304-Add-FPGA-support-apf27.patch
create mode 100644 patches/u-boot/2012.10/311-imx-nand-lock-unlock.patch
create mode 100644 patches/u-boot/2012.10/320-spartan.patch
create mode 100644 patches/u-boot/2012.10/321-add_spartan6.patch
create mode 100644 patches/u-boot/2012.10/330-arm926-relocation.patch
create mode 100644 patches/u-boot/2012.10/340-apf27-misc-commands.patch
create mode 100644 patches/u-boot/2012.10/350-nand_large_file_download.patch
create mode 100644 patches/u-boot/2012.10/400-imx51.patch
create mode 100644 patches/u-boot/2012.10/401-apf51.patch
create mode 100644 patches/u-boot/2012.10/403-apf51-wdog.patch
create mode 100644 patches/u-boot/2012.10/407-imx51-nand.patch
create mode 100644 patches/u-boot/2012.10/409-apf51-nand-spl.patch
create mode 100644 patches/u-boot/2012.10/410-imx-iim.patch
create mode 100644 patches/u-boot/2012.10/425-cortex-relocation.patch
create mode 100644 patches/u-boot/2012.10/501-imx28-update-and-fix.patch
create mode 100644 patches/u-boot/2012.10/502-add-apf28.patch
diff --git a/patches/u-boot/2012.10/102-mx1-i2c.patch b/patches/u-boot/2012.10/102-mx1-i2c.patch
new file mode 100644
index 0000000..ff78658
--- /dev/null
+++ b/patches/u-boot/2012.10/102-mx1-i2c.patch
@@ -0,0 +1,46 @@
+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
new file mode 100644
index 0000000..b2c6bee
--- /dev/null
+++ b/patches/u-boot/2012.10/103-apf9328.patch
@@ -0,0 +1,1358 @@
+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,106 @@
++/*
++ * (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))) {
++ printf("*** Warning - Environment version change suggests: "
++ "run flash_reset_env; reset\n");
++ }
++
++ return 0;
++}
++
++void show_boot_progress(int status)
++{
++ return;
++}
++
++#ifdef CONFIG_DRIVER_DM9000
++int board_eth_init(bd_t *bis)
++{
++ struct eth_device *dev;
++ unsigned char env_enetaddr[6];
++
++ if (dm9000_initialize(bis) != 0)
++ return -1;
++ if (!eth_getenv_enetaddr("ethaddr", env_enetaddr)) {
++ dev = eth_get_dev_by_index(0);
++ if (dev) {
++ eth_setenv_enetaddr("ethaddr", dev->enetaddr);
++ } else {
++ printf("DM9000 APF9328: Couldn't get eth device\n");
++ return -1;
++ }
++ }
++
++ return 0;
++}
++#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
new file mode 100644
index 0000000..fc15410
--- /dev/null
+++ b/patches/u-boot/2012.10/104-apf9328-makefile.patch
@@ -0,0 +1,41 @@
+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 PPC405EP
+diff --git a/boards.cfg b/boards.cfg
+index 7c1fc74..8a40643 100644
+--- a/boards.cfg
++++ b/boards.cfg
+@@ -57,6 +57,7 @@ integratorap_cm720t arm arm720t integrator armltd
+ integratorap_cm920t arm arm920t integrator armltd - integratorap:CM920T
+ integratorcp_cm920t arm arm920t integrator armltd - integratorcp:CM920T
+ a320evb arm arm920t - faraday a320
++apf9328 arm arm920t apf9328 armadeus imx
+ at91rm9200ek arm arm920t at91rm9200ek atmel at91 at91rm9200ek
+ at91rm9200ek_ram arm arm920t at91rm9200ek atmel at91 at91rm9200ek:RAMBOOT
+ eb_cpux9k2 arm arm920t eb_cpux9k2 BuS at91 eb_cpux9k2
+--
+1.7.2.5
+
diff --git a/patches/u-boot/2012.10/106-mx1-pllclk.patch b/patches/u-boot/2012.10/106-mx1-pllclk.patch
new file mode 100644
index 0000000..4a96643
--- /dev/null
+++ b/patches/u-boot/2012.10/106-mx1-pllclk.patch
@@ -0,0 +1,63 @@
+mx1: improve PLL freq computation
+
+Improve PLL freq computation by using the full resolution of the PLL registers
+
+Signed-off-by: Eric Jarrige <eri...@ar...>
+Signed-off-by: Philippe Reynes <tr...@ya...>
+Cc: Stefano Babic <sb...@de...>
+---
+ arch/arm/cpu/arm920t/imx/speed.c | 29 +++++++++++------------------
+ 1 files changed, 11 insertions(+), 18 deletions(-)
+
+diff --git a/arch/arm/cpu/arm920t/imx/speed.c b/arch/arm/cpu/arm920t/imx/speed.c
+index 1e29698..b1c2bd6 100644
+--- a/arch/arm/cpu/arm920t/imx/speed.c
++++ b/arch/arm/cpu/arm920t/imx/speed.c
+@@ -36,33 +36,26 @@
+ * the specified bus in HZ.
+ */
+ /* ------------------------------------------------------------------------- */
+-
+-ulong get_systemPLLCLK(void)
++static ulong get_PLLCLK(u32 sys_clk_freq, u32 pllctl0)
+ {
+ /* FIXME: We assume System_SEL = 0 here */
+- u32 spctl0 = SPCTL0;
+- u32 mfi = (spctl0 >> 10) & 0xf;
+- u32 mfn = spctl0 & 0x3f;
+- u32 mfd = (spctl0 >> 16) & 0x3f;
+- u32 pd = (spctl0 >> 26) & 0xf;
++ u32 mfi = (pllctl0 >> 10) & 0xf;
++ u32 mfn = pllctl0 & 0x3ff;
++ u32 mfd = (pllctl0 >> 16) & 0x3ff;
++ u32 pd = (pllctl0 >> 26) & 0xf;
+
+ mfi = mfi<=5 ? 5 : mfi;
++ return (2*(u64)sys_clk_freq * (mfi*(mfd+1) + mfn))/((mfd+1)*(pd+1));
++}
+
+- return (2*(CONFIG_SYSPLL_CLK_FREQ>>10)*( (mfi<<10) + (mfn<<10)/(mfd+1)))/(pd+1);
++ulong get_systemPLLCLK(void)
++{
++ return get_PLLCLK(CONFIG_SYSPLL_CLK_FREQ, SPCTL0);
+ }
+
+ ulong get_mcuPLLCLK(void)
+ {
+- /* FIXME: We assume System_SEL = 0 here */
+- u32 mpctl0 = MPCTL0;
+- u32 mfi = (mpctl0 >> 10) & 0xf;
+- u32 mfn = mpctl0 & 0x3f;
+- u32 mfd = (mpctl0 >> 16) & 0x3f;
+- u32 pd = (mpctl0 >> 26) & 0xf;
+-
+- mfi = mfi<=5 ? 5 : mfi;
+-
+- return (2*(CONFIG_SYS_CLK_FREQ>>10)*( (mfi<<10) + (mfn<<10)/(mfd+1)))/(pd+1);
++ return get_PLLCLK(CONFIG_SYS_CLK_FREQ, MPCTL0);
+ }
+
+ ulong get_FCLK(void)
+--
+1.7.2.5
+
diff --git a/patches/u-boot/2012.10/107-mx1-pllclk-debug.patch b/patches/u-boot/2012.10/107-mx1-pllclk-debug.patch
new file mode 100644
index 0000000..f38f8e7
--- /dev/null
+++ b/patches/u-boot/2012.10/107-mx1-pllclk-debug.patch
@@ -0,0 +1,26 @@
+mx1: change a printf in speed.c to use debug instead
+
+
+Signed-off-by: Eric Jarrige <eri...@ar...>
+Signed-off-by: Philippe Reynes <tr...@ya...>
+Cc: Stefano Babic <sb...@de...>
+---
+ arch/arm/cpu/arm920t/imx/speed.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/arch/arm/cpu/arm920t/imx/speed.c b/arch/arm/cpu/arm920t/imx/speed.c
+index b1c2bd6..b8e42bf 100644
+--- a/arch/arm/cpu/arm920t/imx/speed.c
++++ b/arch/arm/cpu/arm920t/imx/speed.c
+@@ -67,7 +67,7 @@ ulong get_FCLK(void)
+ ulong get_HCLK(void)
+ {
+ u32 bclkdiv = (( CSCR >> 10 ) & 0xf) + 1;
+- printf("bclkdiv: %d\n", bclkdiv);
++ debug("bclkdiv: %d\n", bclkdiv);
+ return get_systemPLLCLK() / bclkdiv;
+ }
+
+--
+1.7.2.5
+
diff --git a/patches/u-boot/2012.10/108-DM9000.patch b/patches/u-boot/2012.10/108-DM9000.patch
new file mode 100644
index 0000000..6bfff20
--- /dev/null
+++ b/patches/u-boot/2012.10/108-DM9000.patch
@@ -0,0 +1,48 @@
+DM9000: change some printf to use debug instead
+
+Signed-off-by: Eric Jarrige <eri...@ar...>
+Signed-off-by: Philippe Reynes <tr...@ya...>
+Cc: Ben Warren <big...@gm...>
+---
+ drivers/net/dm9000x.c | 8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/net/dm9000x.c b/drivers/net/dm9000x.c
+index f0c4499..738e6ef 100644
+--- a/drivers/net/dm9000x.c
++++ b/drivers/net/dm9000x.c
+@@ -240,7 +240,7 @@ dm9000_probe(void)
+ id_val |= DM9000_ior(DM9000_PIDL) << 16;
+ id_val |= DM9000_ior(DM9000_PIDH) << 24;
+ if (id_val == DM9000_ID) {
+- printf("dm9000 i/o: 0x%x, id: 0x%x \n", CONFIG_DM9000_BASE,
++ DM9000_DBG("dm9000 i/o: 0x%x, id: 0x%x\n", CONFIG_DM9000_BASE,
+ id_val);
+ return 0;
+ } else {
+@@ -306,19 +306,19 @@ static int dm9000_init(struct eth_device *dev, bd_t *bd)
+
+ switch (io_mode) {
+ case 0x0: /* 16-bit mode */
+- printf("DM9000: running in 16 bit mode\n");
++ DM9000_DBG("DM9000: running in 16 bit mode\n");
+ db->outblk = dm9000_outblk_16bit;
+ db->inblk = dm9000_inblk_16bit;
+ db->rx_status = dm9000_rx_status_16bit;
+ break;
+ case 0x01: /* 32-bit mode */
+- printf("DM9000: running in 32 bit mode\n");
++ DM9000_DBG("DM9000: running in 32 bit mode\n");
+ db->outblk = dm9000_outblk_32bit;
+ db->inblk = dm9000_inblk_32bit;
+ db->rx_status = dm9000_rx_status_32bit;
+ break;
+ case 0x02: /* 8 bit mode */
+- printf("DM9000: running in 8 bit mode\n");
++ DM9000_DBG("DM9000: running in 8 bit mode\n");
+ db->outblk = dm9000_outblk_8bit;
+ db->inblk = dm9000_inblk_8bit;
+ db->rx_status = dm9000_rx_status_8bit;
+--
+1.7.2.5
+
diff --git a/patches/u-boot/2012.10/109-mx1-relocation.patch b/patches/u-boot/2012.10/109-mx1-relocation.patch
new file mode 100644
index 0000000..5128c42
--- /dev/null
+++ b/patches/u-boot/2012.10/109-mx1-relocation.patch
@@ -0,0 +1,33 @@
+mx1: Fix jump to the relocated board_init_r
+
+Jump to the relocated board_init_r according to the initial computation
+and remove computation against current PC addr as relocated address is
+already known and fixed.
+This helps to support CPU that miroor flash to different address at
+power on boot such as iMX1/L
+
+Signed-off-by: Eric Jarrige <eri...@ar...>
+Signed-off-by: Philippe Reynes <tr...@ya...>
+Cc: Stefano Babic <sb...@de...>
+---
+ arch/arm/cpu/arm920t/start.S | 4 +---
+ 1 files changed, 1 insertions(+), 3 deletions(-)
+
+diff --git a/arch/arm/cpu/arm920t/start.S b/arch/arm/cpu/arm920t/start.S
+index 14c9156..5a582a1 100644
+--- a/arch/arm/cpu/arm920t/start.S
++++ b/arch/arm/cpu/arm920t/start.S
+@@ -295,9 +295,7 @@ _nand_boot_ofs:
+ .word nand_boot
+ #else
+ ldr r0, _board_init_r_ofs
+- adr r1, _start
+- add lr, r0, r1
+- add lr, lr, r9
++ add lr, r0, r6
+ /* setup parameters for board_init_r */
+ mov r0, r5 /* gd_t */
+ mov r1, r6 /* dest_addr */
+--
+1.7.2.5
+
diff --git a/patches/u-boot/2012.10/111-mx1-timer.patch b/patches/u-boot/2012.10/111-mx1-timer.patch
new file mode 100644
index 0000000..45ee1ee
--- /dev/null
+++ b/patches/u-boot/2012.10/111-mx1-timer.patch
@@ -0,0 +1,25 @@
+mx1: Fix function get_timer() to adjust frequency according to CONFIG_SYS_HZ
+
+Signed-off-by: Eric Jarrige <eri...@ar...>
+Signed-off-by: Philippe Reynes <tr...@ya...>
+Cc: Stefano Babic <sb...@de...>
+---
+ arch/arm/cpu/arm920t/imx/timer.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/arch/arm/cpu/arm920t/imx/timer.c b/arch/arm/cpu/arm920t/imx/timer.c
+index 6141bd4..d6d1968 100644
+--- a/arch/arm/cpu/arm920t/imx/timer.c
++++ b/arch/arm/cpu/arm920t/imx/timer.c
+@@ -55,7 +55,7 @@ int timer_init (void)
+ */
+ ulong get_timer (ulong base)
+ {
+- return get_timer_masked() - base;
++ return get_timer_masked() / (1000000 / CONFIG_SYS_HZ) - base;
+ }
+
+ ulong get_timer_masked (void)
+--
+1.7.2.5
+
diff --git a/patches/u-boot/2012.10/301-Add-GPIO-Module-and-I-O-Multiplexer-constant-for-mx2.patch b/patches/u-boot/2012.10/301-Add-GPIO-Module-and-I-O-Multiplexer-constant-for-mx2.patch
new file mode 100644
index 0000000..8bb64e7
--- /dev/null
+++ b/patches/u-boot/2012.10/301-Add-GPIO-Module-and-I-O-Multiplexer-constant-for-mx2.patch
@@ -0,0 +1,181 @@
+Add WEIM, NFC SYSTEM_CTL constants to the mx27 CPU
+
+Signed-off-by: Philippe Reynes <tr...@ya...>
+Signed-off-by: Eric Jarrige <eri...@ar...>
+---
+ arch/arm/cpu/arm926ejs/mx27/asm-offsets.c | 34 ++++++++++++
+ arch/arm/include/asm/arch-mx27/imx-regs.h | 11 ++++-
+ arch/arm/include/asm/arch-mx27/mxc_nand.h | 83 +++++++++++++++++++++++++++++
+ 3 files changed, 127 insertions(+), 1 deletions(-)
+ create mode 100644 arch/arm/include/asm/arch-mx27/mxc_nand.h
+
+diff --git a/arch/arm/cpu/arm926ejs/mx27/asm-offsets.c b/arch/arm/cpu/arm926ejs/mx27/asm-offsets.c
+index f3a8d7b..b95c58c 100644
+--- a/arch/arm/cpu/arm926ejs/mx27/asm-offsets.c
++++ b/arch/arm/cpu/arm926ejs/mx27/asm-offsets.c
+@@ -34,6 +34,7 @@ int main(void)
+ DEFINE(PCDR1, IMX_PLL_BASE + offsetof(struct pll_regs, pcdr1));
+ DEFINE(PCCR0, IMX_PLL_BASE + offsetof(struct pll_regs, pccr0));
+ DEFINE(PCCR1, IMX_PLL_BASE + offsetof(struct pll_regs, pccr1));
++ DEFINE(CCSR, IMX_PLL_BASE + offsetof(struct pll_regs, ccsr));
+
+ DEFINE(ESDCTL0_ROF, offsetof(struct esdramc_regs, esdctl0));
+ DEFINE(ESDCFG0_ROF, offsetof(struct esdramc_regs, esdcfg0));
+@@ -41,5 +42,38 @@ 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));
++ DEFINE(DSCR2, IMX_SYSTEM_CTL_BASE +
++ offsetof(struct system_control_regs, dscr2));
++ DEFINE(DSCR3, IMX_SYSTEM_CTL_BASE +
++ offsetof(struct system_control_regs, dscr3));
++ DEFINE(DSCR7, IMX_SYSTEM_CTL_BASE +
++ offsetof(struct system_control_regs, dscr7));
++ DEFINE(DSCR10, IMX_SYSTEM_CTL_BASE +
++ offsetof(struct system_control_regs, dscr10));
++
++ DEFINE(CS0U, IMX_WEIM_BASE + offsetof(struct weim_regs, cs0u));
++ DEFINE(CS0L, IMX_WEIM_BASE + offsetof(struct weim_regs, cs0l));
++ DEFINE(CS0A, IMX_WEIM_BASE + offsetof(struct weim_regs, cs0a));
++ DEFINE(CS1U, IMX_WEIM_BASE + offsetof(struct weim_regs, cs1u));
++ DEFINE(CS1L, IMX_WEIM_BASE + offsetof(struct weim_regs, cs1l));
++ DEFINE(CS1A, IMX_WEIM_BASE + offsetof(struct weim_regs, cs1a));
++ DEFINE(CS2U, IMX_WEIM_BASE + offsetof(struct weim_regs, cs2u));
++ DEFINE(CS2L, IMX_WEIM_BASE + offsetof(struct weim_regs, cs2l));
++ DEFINE(CS2A, IMX_WEIM_BASE + offsetof(struct weim_regs, cs2a));
++ DEFINE(CS3U, IMX_WEIM_BASE + offsetof(struct weim_regs, cs3u));
++ DEFINE(CS3L, IMX_WEIM_BASE + offsetof(struct weim_regs, cs3l));
++ DEFINE(CS3A, IMX_WEIM_BASE + offsetof(struct weim_regs, cs3a));
++ DEFINE(CS4U, IMX_WEIM_BASE + offsetof(struct weim_regs, cs4u));
++ DEFINE(CS4L, IMX_WEIM_BASE + offsetof(struct weim_regs, cs4l));
++ DEFINE(CS4A, IMX_WEIM_BASE + offsetof(struct weim_regs, cs4a));
++ DEFINE(CS5U, IMX_WEIM_BASE + offsetof(struct weim_regs, cs5u));
++ DEFINE(CS5L, IMX_WEIM_BASE + offsetof(struct weim_regs, cs5l));
++ DEFINE(CS5A, IMX_WEIM_BASE + offsetof(struct weim_regs, cs5a));
++ DEFINE(EIM, IMX_WEIM_BASE + offsetof(struct weim_regs, eim));
++
+ 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 2f6c823..d3a14e1 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 {
+@@ -511,4 +511,13 @@ struct fuse_bank0_regs {
+ #define IIM_ERR_SNSE (1 << 2)
+ #define IIM_ERR_PARITYE (1 << 1)
+
++/*
++ * Memory areas of the NFC
++ */
++#define IMX_NFC_BASE (0xD8000000)
++#define IMX_NFC_MAIN_AREA0 (0xD8000000)
++#define IMX_NFC_MAIN_AREA1 (0xD8000200)
++#define IMX_NFC_SPARE_AREA0 (0xD8000800)
++#define IMX_NFC_REGS (0xD8000E00)
++
+ #endif /* _IMX_REGS_H */
+diff --git a/arch/arm/include/asm/arch-mx27/mxc_nand.h b/arch/arm/include/asm/arch-mx27/mxc_nand.h
+new file mode 100644
+index 0000000..3429601
+--- /dev/null
++++ b/arch/arm/include/asm/arch-mx27/mxc_nand.h
+@@ -0,0 +1,83 @@
++/*
++ * (c) 2012 Philippe Reynes <tr...@ya...>
++ *
++ * 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
++ */
++
++#ifndef __MXC_NAND_H
++#define __MXC_NAND_H
++
++/*
++ * NFC registers address offest
++ */
++#define NFC_OFFSET_BUFSIZE (0x00) /* Internal SRAM Size */
++#define NFC_OFFSET_BLCK_ADD_LOCK (0x02) /* NAND Flash Block Address for
++ Lock Check */
++#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_ECC_RSLT_MAIN_AREA (0x0E) /* ECC Error Position of Main
++ Area Data Error */
++#define NFC_OFFSET_ECC_RSLT_SPARE_AREA (0x10) /* ECC Error Position of Spare
++ Area Data Error */
++#define NFC_OFFSET_WRPROT (0x12) /* Nand Flash Write Protection */
++#define NFC_OFFSET_UNLOCKSTART_BLKADDR (0x14) /* Start Address for Write
++ Protection Unlock */
++#define NFC_OFFSET_UNLOCKEND_BLKADDR (0x16) /* End Address for Write
++ Protection Unlock */
++#define NFC_OFFSET_WRPR_STAT (0x18) /* Current Nand Flash Write
++ Protection Status */
++#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_ERS_MASK (0x03) /* ERS mask */
++#define NFC_ECC_STAT_ERROR1 (1<<0) /* correctable error */
++#define NFC_ECC_STAT_ERROR2 (1<<1) /* non correctable error */
++
++/* NFC_CONFIG Control Register Bit Fields */
++#define NFC_CONFIG_UNLOCKED (1<<1) /* unlocked */
++#define NFC_CONFIG_LOCKED (1<<0) /* locked */
++
++/* NFC_CONFIG1 Control Register Bit Fields */
++#define NFC_CONFIG1_CEn (1<<7) /* Flash force CE */
++#define NFC_CONFIG1_RST (1<<6) /* Reset */
++#define NFC_CONFIG1_BIG (1<<5) /* Big Endian Mode */
++#define NFC_CONFIG1_INT_MSK (1<<4) /* Mask Interrupt Bit */
++#define ...
[truncated message content] |
|
From: Fabien M <fa...@us...> - 2012-10-16 11:58:32
|
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 123be850730ad3c1823c496b36ab41f289f1800d (commit)
from 6f51bfa3d62232aabcb09dbb814c7e77d8535e5b (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 123be850730ad3c1823c496b36ab41f289f1800d
Author: Fabien Marteau <fab...@ar...>
Date: Tue Oct 16 13:57:37 2012 +0200
[buildroot][package] adding python-crc16 module
-----------------------------------------------------------------------
Summary of changes:
.../2012.02/196-python-crc16-add_package.patch | 58 ++++++++++++++++++++
patches/buildroot/2012.02/cleanup_buildroot.sh | 1 +
2 files changed, 59 insertions(+), 0 deletions(-)
create mode 100644 patches/buildroot/2012.02/196-python-crc16-add_package.patch
diff --git a/patches/buildroot/2012.02/196-python-crc16-add_package.patch b/patches/buildroot/2012.02/196-python-crc16-add_package.patch
new file mode 100644
index 0000000..7a657d9
--- /dev/null
+++ b/patches/buildroot/2012.02/196-python-crc16-add_package.patch
@@ -0,0 +1,58 @@
+Adding python module crc16
+
+Signed-off-by: Fabien Marteau <fab...@ar...>
+---
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2012-10-16 13:51:37.000000000 +0200
++++ buildroot/package/Config.in 2012-10-16 13:52:57.000000000 +0200
+@@ -273,6 +273,7 @@
+ source "package/python/Config.in"
+ if BR2_PACKAGE_PYTHON
+ menu "external python modules"
++source "package/python-crc16/Config.in"
+ source "package/python-dpkt/Config.in"
+ source "package/python-mad/Config.in"
+ source "package/python-mysql/Config.in"
+Index: buildroot/package/python-crc16/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/python-crc16/Config.in 2012-10-16 13:53:29.000000000 +0200
+@@ -0,0 +1,7 @@
++config BR2_PACKAGE_PYTHON_CRC16
++ bool "python-crc16"
++ depends on BR2_PACKAGE_PYTHON
++ help
++ calculate crc16
++
++ http://code.google.com/p/pycrc16/
+Index: buildroot/package/python-crc16/python-crc16.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/python-crc16/python-crc16.mk 2012-10-16 13:53:29.000000000 +0200
+@@ -0,0 +1,25 @@
++#############################################################
++#
++# python-serial
++#
++#############################################################
++
++PYTHON_CRC16_VERSION =0.1.1
++PYTHON_CRC16_SOURCE =crc16-$(PYTHON_CRC16_VERSION).tar.gz
++PYTHON_CRC16_SITE =http://pycrc16.googlecode.com/files/
++
++PYTHON_CRC16_DEPENDENCIES = python
++
++define PYTHON_CRC16_BUILD_CMDS
++ (cd $(@D); \
++ $(TARGET_CONFIGURE_OPTS) \
++ CFLAGS="$(TARGET_CFLAGS)" \
++ LDSHARED="$(TARGET_CROSS)gcc -shared" \
++ $(HOST_DIR)/usr/bin/python setup.py build)
++endef
++
++define PYTHON_CRC16_INSTALL_TARGET_CMDS
++ (cd $(@D); $(HOST_DIR)/usr/bin/python setup.py install --prefix=$(TARGET_DIR)/usr)
++endef
++
++$(eval $(call GENTARGETS))
diff --git a/patches/buildroot/2012.02/cleanup_buildroot.sh b/patches/buildroot/2012.02/cleanup_buildroot.sh
index 4f83c77..5ee2d9c 100755
--- a/patches/buildroot/2012.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2012.02/cleanup_buildroot.sh
@@ -28,6 +28,7 @@ rm -rf buildroot/package/sdl/
rm -rf buildroot/package/sdlwater/
rm -rf buildroot/package/slideshow/
rm -rf buildroot/package/python-mysql/
+rm -rf buildroot/package/python-crc16/
rm -rf buildroot/package/socketcan/
rm -rf buildroot/package/lcd4linux/
rm -rf buildroot/package/mesa/
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2012-10-15 08:48:59
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 6f51bfa3d62232aabcb09dbb814c7e77d8535e5b (commit)
via da7285009c0091da12836aa1323ff72a5047a4ec (commit)
from 5bce0b8d410b72e8272fff8c34fce3da9d33d517 (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 6f51bfa3d62232aabcb09dbb814c7e77d8535e5b
Author: Julien Boibessot <jul...@ar...>
Date: Sun Oct 14 21:50:52 2012 +0200
[LINUX] APF28: 3.6.2 kernel version is out
commit da7285009c0091da12836aa1323ff72a5047a4ec
Author: Julien Boibessot <jul...@ar...>
Date: Sat Oct 13 23:10:35 2012 +0200
[DEMOS] capture: fixes soft rgb565_to_yuv420 conversion
-----------------------------------------------------------------------
Summary of changes:
...linux-3.6.1.config => apf28-linux-3.6.2.config} | 0
patches/linux/{3.6.1 => 3.6.2} | 0
target/demos/camera/capture/capture.c | 4 ++--
3 files changed, 2 insertions(+), 2 deletions(-)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.6.1.config => apf28-linux-3.6.2.config} (100%)
rename patches/linux/{3.6.1 => 3.6.2} (100%)
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.6.1.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.6.2.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.6.1.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.6.2.config
diff --git a/patches/linux/3.6.1 b/patches/linux/3.6.2
similarity index 100%
rename from patches/linux/3.6.1
rename to patches/linux/3.6.2
diff --git a/target/demos/camera/capture/capture.c b/target/demos/camera/capture/capture.c
index 767facb..c22124c 100644
--- a/target/demos/camera/capture/capture.c
+++ b/target/demos/camera/capture/capture.c
@@ -262,7 +262,7 @@ static void rgb565_to_yuv420(void *rgb, int size, void *yuv)
for (i = 0; i < nbpix; i++) {
R = (src[i] & 0xf800) >> 8;
- G = (src[i] & 0x07c0) >> 3;
+ G = (src[i] & 0x07e0) >> 3;
B = (src[i] & 0x001f) << 3;
Y = 0.299 * R + 0.587 * G + 0.114 * B;
dest[i] = Y;
@@ -271,7 +271,7 @@ static void rgb565_to_yuv420(void *rgb, int size, void *yuv)
if ((y & 0x00000001) == 0) {
for (x = 0; x < mycamera.width ; x = x + 2) {
R = (src[x] & 0xf800) >> 8;
- G = (src[x] & 0x07c0) >> 3;
+ G = (src[x] & 0x07e0) >> 3;
B = (src[x] & 0x001f) << 3;
U = -0.169 * R - 0.331 * G + 0.449 * B + 128;
V = 0.499 * R - 0.418 * G - 0.0813 * B + 128;
hooks/post-receive
--
armadeus
|
