armadeus-commitlog Mailing List for armadeus (Page 83)
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: Nicolas <th...@us...> - 2012-02-06 09:51:21
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via efde8e25667e89bbd367ff7a98d82d763065b65c (commit)
from fd45f8402fc607f20d1d600b7c925e6a69f25f2f (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 efde8e25667e89bbd367ff7a98d82d763065b65c
Author: Nicolas Colombain <nic...@ar...>
Date: Mon Feb 6 10:43:34 2012 +0100
[LINUX] fix apf27 uart receive hang up after shutdown
-----------------------------------------------------------------------
Summary of changes:
.../linux/2.6.29/344-armadeus-uart_hang_up.patch | 26 ++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
create mode 100644 patches/linux/2.6.29/344-armadeus-uart_hang_up.patch
diff --git a/patches/linux/2.6.29/344-armadeus-uart_hang_up.patch b/patches/linux/2.6.29/344-armadeus-uart_hang_up.patch
new file mode 100644
index 0000000..9d1b1e9
--- /dev/null
+++ b/patches/linux/2.6.29/344-armadeus-uart_hang_up.patch
@@ -0,0 +1,26 @@
+UART receive may hang up after a shutdown while receiving data
+Perform a complete uart reset instead of a simple uart disable
+
+Signed-off-by: Nicolas Colombain <nic...@ar...>
+
+Index: linux-2.6.29/drivers/serial/imx.c
+===================================================================
+--- linux-2.6.29.orig/drivers/serial/imx.c 2012-02-06 10:24:51.000000000 +0100
++++ linux-2.6.29/drivers/serial/imx.c 2012-02-06 10:25:28.000000000 +0100
+@@ -652,12 +652,12 @@ static void imx_shutdown(struct uart_por
+ free_irq(sport->port.irq, sport);
+
+ /*
+- * Disable all interrupts, port and break condition.
++ * reset uart
+ */
+
+- temp = readl(sport->port.membase + UCR1);
+- temp &= ~(UCR1_TXMPTYEN | UCR1_RRDYEN | UCR1_RTSDEN | UCR1_UARTEN);
+- writel(temp, sport->port.membase + UCR1);
++ temp = readl(sport->port.membase + UCR2);
++ temp &= ~(UCR2_SRST);
++ writel(temp, sport->port.membase + UCR2);
+ }
+
+ static void imx_serial_dump_registers(struct imx_port *sport)
hooks/post-receive
--
armadeus
|
|
From: Nicolas <th...@us...> - 2012-02-03 09:39:23
|
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 fd45f8402fc607f20d1d600b7c925e6a69f25f2f (commit)
from 25002f1cf6ad8579bd4bbf6a6cf67b18e157bd9a (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 fd45f8402fc607f20d1d600b7c925e6a69f25f2f
Author: Nicolas Colombain <nic...@ar...>
Date: Fri Feb 3 10:38:41 2012 +0100
[U-BOOT] fix mx28 spl_power_init_irq
-----------------------------------------------------------------------
Summary of changes:
.../503-imx28-fix_spl_power_init_IRQ_bit.patch | 44 ++++++++++++++++++++
1 files changed, 44 insertions(+), 0 deletions(-)
create mode 100644 patches/u-boot/2011.12/503-imx28-fix_spl_power_init_IRQ_bit.patch
diff --git a/patches/u-boot/2011.12/503-imx28-fix_spl_power_init_IRQ_bit.patch b/patches/u-boot/2011.12/503-imx28-fix_spl_power_init_IRQ_bit.patch
new file mode 100644
index 0000000..9d5b255
--- /dev/null
+++ b/patches/u-boot/2011.12/503-imx28-fix_spl_power_init_IRQ_bit.patch
@@ -0,0 +1,44 @@
+--- u-boot-2011.12/arch/arm/cpu/arm926ejs/mx28/spl_power_init.c 1970-01-01 01:00:00.000000000 +0100
++++ u-boot-2011.12/arch/arm/cpu/arm926ejs/mx28/spl_power_init.c 2012-02-03 10:25:07.000000000 +0100
+@@ -187,7 +187,7 @@ void mx28_enable_4p2_dcdc_input(int xfer
+ writel(POWER_RESET_UNLOCK_KEY | POWER_RESET_PWD_OFF,
+ &power_regs->hw_power_reset);
+
+- clrbits_le32(&power_regs->hw_power_ctrl, POWER_CTRL_ENIRQ_VDD5V_DROOP);
++ writel(POWER_CTRL_ENIRQ_VDD5V_DROOP, &power_regs->hw_power_ctrl_clr);
+
+ if (xfer && (readl(&power_regs->hw_power_5vctrl) &
+ POWER_5VCTRL_ENABLE_DCDC)) {
+@@ -240,8 +240,8 @@ void mx28_enable_4p2_dcdc_input(int xfer
+ clrbits_le32(&power_regs->hw_power_minpwr, POWER_MINPWR_PWD_BO);
+
+ while (readl(&power_regs->hw_power_ctrl) & POWER_CTRL_VBUS_VALID_IRQ)
+- clrbits_le32(&power_regs->hw_power_ctrl,
+- POWER_CTRL_VBUS_VALID_IRQ);
++ writel(POWER_CTRL_VBUS_VALID_IRQ,
++ &power_regs->hw_power_ctrl_clr);
+
+ if (prev_5v_brnout) {
+ writel(POWER_5VCTRL_PWDN_5VBRNOUT,
+@@ -256,15 +256,15 @@ void mx28_enable_4p2_dcdc_input(int xfer
+ }
+
+ while (readl(&power_regs->hw_power_ctrl) & POWER_CTRL_VDD5V_DROOP_IRQ)
+- clrbits_le32(&power_regs->hw_power_ctrl,
+- POWER_CTRL_VDD5V_DROOP_IRQ);
++ writel(POWER_CTRL_VDD5V_DROOP_IRQ,
++ &power_regs->hw_power_ctrl_clr);
+
+ if (prev_5v_droop)
+- clrbits_le32(&power_regs->hw_power_ctrl,
+- POWER_CTRL_ENIRQ_VDD5V_DROOP);
++ writel(POWER_CTRL_ENIRQ_VDD5V_DROOP,
++ &power_regs->hw_power_ctrl_clr);
+ else
+- setbits_le32(&power_regs->hw_power_ctrl,
+- POWER_CTRL_ENIRQ_VDD5V_DROOP);
++ writel(POWER_CTRL_ENIRQ_VDD5V_DROOP,
++ &power_regs->hw_power_ctrl_clr);
+ }
+
+ void mx28_power_init_4p2_regulator(void)
hooks/post-receive
--
armadeus
|
|
From: Nicolas <th...@us...> - 2012-02-03 09:29:03
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 25002f1cf6ad8579bd4bbf6a6cf67b18e157bd9a (commit)
from 5ade65125ec32d00bba23b31ee0d55db04643491 (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 25002f1cf6ad8579bd4bbf6a6cf67b18e157bd9a
Author: Nicolas Colombain <nic...@ar...>
Date: Fri Feb 3 10:28:18 2012 +0100
[U-BOOT] fix apf28 reset
-----------------------------------------------------------------------
Summary of changes:
patches/u-boot/2011.12/502-add-apf28.patch | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/patches/u-boot/2011.12/502-add-apf28.patch b/patches/u-boot/2011.12/502-add-apf28.patch
index 2086dc3..77846ce 100644
--- a/patches/u-boot/2011.12/502-add-apf28.patch
+++ b/patches/u-boot/2011.12/502-add-apf28.patch
@@ -273,7 +273,7 @@
+#########################################################################
--- u-boot-2011.12/board/armadeus/apf28/spl_boot.c 1970-01-01 01:00:00.000000000 +0100
+++ u-boot-2011.12/board/armadeus/apf28/spl_boot.c 2012-01-29 10:12:49.295977402 +0100
-@@ -0,0 +1,195 @@
+@@ -0,0 +1,203 @@
+/*
+ * Freescale i.MX28 Boot setup for the APF28 board
+ *
@@ -466,6 +466,14 @@
+
+void board_init_ll(void)
+{
++ struct mx28_clkctrl_regs *clkctrl_regs =
++ (struct mx28_clkctrl_regs *)MXS_CLKCTRL_BASE;
++
++ /* Avoid watchdog to perform a complete POR...
++ A logic reset is more appropriate */
++ setbits_le32(&clkctrl_regs->hw_clkctrl_reset,
++ CLKCTRL_RESET_WDOG_POR_DISABLE);
++
+ mx28_common_spl_init(iomux_setup, ARRAY_SIZE(iomux_setup));
+}
+
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-02-01 04:47:51
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 5ade65125ec32d00bba23b31ee0d55db04643491 (commit)
from 54c59e87cea5d7720af7248c6e13fb5eda0517ff (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 5ade65125ec32d00bba23b31ee0d55db04643491
Author: Eric Jarrige <eri...@ar...>
Date: Wed Feb 1 05:47:31 2012 +0100
[UBOOT] make mxsboot generates nand binary files with read/write rights for everyone
-----------------------------------------------------------------------
Summary of changes:
.../u-boot/2011.12/501-imx28-update-and-fix.patch | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/patches/u-boot/2011.12/501-imx28-update-and-fix.patch b/patches/u-boot/2011.12/501-imx28-update-and-fix.patch
index e3c3c97..bd77201 100644
--- a/patches/u-boot/2011.12/501-imx28-update-and-fix.patch
+++ b/patches/u-boot/2011.12/501-imx28-update-and-fix.patch
@@ -14,6 +14,19 @@ diff -purN u-boot-custom.ori/Makefile u-boot-custom/Makefile
ifeq ($(CONFIG_SANDBOX),y)
GEN_UBOOT = \
cd $(LNDIR) && $(CC) $(SYMS) -T $(obj)u-boot.lds \
+--- u-boot-2011.12/tools/mxsboot.c 2011-12-23 20:25:35.000000000 +0100
++++ u-boot-2011.12/tools/mxsboot.c 2012-02-01 05:40:41.534152873 +0100
+@@ -664,7 +664,9 @@ int main(int argc, char **argv)
+ }
+
+ outfd = open(argv[offset + 2], O_CREAT | O_TRUNC | O_WRONLY,
+- S_IRUSR | S_IWUSR);
++ S_IRUSR | S_IWUSR
++ | S_IRGRP | S_IWGRP
++ | S_IROTH | S_IWOTH);
+ if (outfd < 0) {
+ printf("Output file can not be created\n");
+ ret = 3;
--- u-boot-2011.12/arch/arm/cpu/arm926ejs/mx28/spl_mem_init.c 2011-12-23 20:25:35.000000000 +0100
+++ u-boot-2011.12/arch/arm/cpu/arm926ejs/mx28/spl_mem_init.c 2012-01-28 21:50:38.904592972 +0100
@@ -72,7 +72,7 @@ uint32_t dram_vals[] = {
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-02-01 04:29:18
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 54c59e87cea5d7720af7248c6e13fb5eda0517ff (commit)
from 5b2ddaeb96e47d89f0c78012dbfe77faa93b960f (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 54c59e87cea5d7720af7248c6e13fb5eda0517ff
Author: Eric Jarrige <eri...@ar...>
Date: Wed Feb 1 05:28:59 2012 +0100
[UBOOT] apf28:Â add console paramater ttyAM0 to kernel boot params
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf28/apf28-u-boot-2011.12.h | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h
index cfcdbd9..cbd0f07 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h
+++ b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h
@@ -26,8 +26,8 @@
#include <asm/arch/regs-base.h>
#define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION "0.1"
-#define CONFIG_IDENT_STRING " apf28 patch 0.1"
+#define CONFIG_ENV_VERSION "0.2"
+#define CONFIG_IDENT_STRING " apf28 patch 0.2"
/*
* SoC configurations
@@ -285,7 +285,10 @@
#define CONFIG_BOOTDELAY -1
#define CONFIG_ZERO_BOOTDELAY_CHECK
#define CONFIG_BOOTFILE "uImage"
-#define CONFIG_BOOTARGS "console=ttyAM0,115200n8 "
+#define CONFIG_BOOTARGS \
+ CONFIG_CONSOLE " root=/dev/mtdblock4 rootfstype=ubifs " MTDPARTS_DEFAULT
+
+#define CONFIG_CONSOLE "console=ttyAM0,"MK_STR(CONFIG_BAUDRATE)
#define CONFIG_BOOTCOMMAND "run ubifsboot"
#define CONFIG_SYS_AUTOLOAD "no"
#define CONFIG_LOADADDR 0x40000000
@@ -296,6 +299,7 @@
*/
#define CONFIG_EXTRA_ENV_SETTINGS \
"env_version=" CONFIG_ENV_VERSION "\0" \
+ "console=" CONFIG_CONSOLE "\0" \
"mtdparts=" MTDPARTS_DEFAULT "\0" \
"partition=nand0,4\0" \
"uboot_offset=" MK_STR(CONFIG_SYS_MONITOR_OFFSET) "\0" \
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2012-01-31 13:14: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 5b2ddaeb96e47d89f0c78012dbfe77faa93b960f (commit)
via e2188a7266ca525847d62c863843ab5243da5228 (commit)
from dd31d185fbd494c45da125f51143d8c21d8c5ac3 (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 5b2ddaeb96e47d89f0c78012dbfe77faa93b960f
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jan 31 14:14:13 2012 +0100
[BUILDROOT] Fixes APF28 console device
commit e2188a7266ca525847d62c863843ab5243da5228
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jan 31 10:59:28 2012 +0100
[TOOLS] apf28_recover.py: some minor beautifying
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf28_defconfig | 2 +-
.../armadeus/rootfs/target_skeleton/etc/securetty | 1 +
software/uboot_recover/apf28_recover.py | 22 ++++++++++----------
3 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/buildroot/configs/apf28_defconfig b/buildroot/configs/apf28_defconfig
index 36b42d7..95a4448 100644
--- a/buildroot/configs/apf28_defconfig
+++ b/buildroot/configs/apf28_defconfig
@@ -31,7 +31,7 @@ BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS=y
BR2_ROOTFS_DEVICE_TABLE="$(ARMADEUS_PATH)/rootfs/device_table.txt"
BR2_ROOTFS_SKELETON_CUSTOM=y
BR2_ROOTFS_SKELETON_CUSTOM_PATH="$(ARMADEUS_PATH)/rootfs/target_skeleton"
-BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2"
+BR2_TARGET_GENERIC_GETTY_PORT="ttyAM0"
BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
BR2_TARGET_ARMADEUS=y
BR2_BOARD_NAME="apf28"
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/securetty b/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/securetty
index 1a3f5cd..59f1f78 100644
--- a/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/securetty
+++ b/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/securetty
@@ -16,3 +16,4 @@ ttymxc0
ttymxc1
ttymxc2
ttyGS0
+ttyAM0
diff --git a/software/uboot_recover/apf28_recover.py b/software/uboot_recover/apf28_recover.py
index 038f721..65750b7 100644
--- a/software/uboot_recover/apf28_recover.py
+++ b/software/uboot_recover/apf28_recover.py
@@ -335,9 +335,7 @@ class UBoot:
return ret
-if __name__ == "__main__":
-
-
+if __name__ == "__main__":
SPEED = 115200
BINARY = "apf28-u-boot.sb"
@@ -350,10 +348,12 @@ if __name__ == "__main__":
print "3] Power on your board"
print "4] Connect a USB cable from your PC to the APF28Dev OTG miniUSB connector"
print "5] Connect a USB cable from your PC to the APF28Dev console miniUSB connector"
- print "6] Connect a ethernet cable (it is a tmeporary requirement for the current version)"
- print "7] be sure to have a %s image in current dir too)" % BINARY
- print "8] be sure to have built the apf28 BSP: make apf28_defconfig; make\n"
- port = raw_input('--- Enter serial port number or name to use for console (/dev/ttyACM0 under Linux (default) or COMx under Window$): ')
+ print "6] Connect an Ethernet cable (it is a temporary requirement for the current version)"
+ print "7] Be sure to have a %s image in current dir too)" % BINARY
+ print "8] Be sure to have built the APF28 BSP: make apf28_defconfig; make"
+ print "9] Be sure to have installed apf28-u-boot.bin in your /tftpboot/"
+ print "10] Have launched this script as root (sudo)\n"
+ port = raw_input('--- Enter serial port number or device name to use for console (/dev/ttyACM0 under Linux (default) or COMx under Window$): ')
if port is '':
port = '/dev/ttyACM0'
@@ -377,7 +377,7 @@ if __name__ == "__main__":
#apfBootloader.download("90000000", BINARY, fsize, "AA")
try:
- os.system(USB_DOWNLOAD_APP+" -f "+BINARY)
+ os.system(USB_DOWNLOAD_APP + " -f " + BINARY)
except Exception, msg:
print "Failed to upload image file to the target !"
print msg
@@ -386,7 +386,7 @@ if __name__ == "__main__":
try:
ser = serial.Serial(port, SPEED, timeout=2)
except Exception, msg:
- print "unable to open serial port %s !" % port
+ print "Unable to open serial port %s !" % port
print msg
sys.exit()
ser.flush()
@@ -402,11 +402,11 @@ if __name__ == "__main__":
eraseAll = raw_input('\n--- Would you like to erase the environment variables ? y/N: ')
if eraseAll == 'y':
uboot.resetEnv()
- updateFlash = raw_input('\n--- Would you like to write UBoot in flash ? Y/n: ')
+ updateFlash = raw_input('\n--- Would you like to write U-Boot in Flash ? Y/n: ')
if updateFlash != 'n':
uboot.flash()
print "\n--- U-Boot successfully recovered !"
- print "--- Now you can remove miniUSB OTG cable and bootstrap jumper. your board is running.."
+ print "--- Now you can remove miniUSB OTG cable and bootstrap jumper. Your board is running..."
del ser
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2012-01-30 17:07:44
|
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 dd31d185fbd494c45da125f51143d8c21d8c5ac3 (commit)
via 25af426877c8889773eae3153e6188bfb58a2dbd (commit)
via 6ff817e8dd729b2959cf2db9d98f91504bb4d4ad (commit)
via 9b616f5cbcd17d46021a46e451ce76359b8409c1 (commit)
via d8a2e3b065978617e0531e985a66ce9c13768b7d (commit)
from 4a5ad0692fbb31e82ec9915b2cdff6caf9389b28 (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 dd31d185fbd494c45da125f51143d8c21d8c5ac3
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jan 30 18:06:54 2012 +0100
[BUILDROOT] Fixes elftosb build
commit 25af426877c8889773eae3153e6188bfb58a2dbd
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jan 30 18:06:14 2012 +0100
[BUILDROOT] Fixes gnet-imx28-usb-downloader build
commit 6ff817e8dd729b2959cf2db9d98f91504bb4d4ad
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jan 30 18:03:44 2012 +0100
[BUILDROOT] libusb: allows host compilation
commit 9b616f5cbcd17d46021a46e451ce76359b8409c1
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jan 30 15:10:38 2012 +0100
Indentation
commit d8a2e3b065978617e0531e985a66ce9c13768b7d
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jan 30 15:07:15 2012 +0100
Indentation
-----------------------------------------------------------------------
Summary of changes:
.../gnet-imx28-usb-downloader.mk | 15 +-
.../2011.05/165-elftosb-add_host_tools.patch | 42 +++-
.../171-libusb-allows_host_compilation.patch | 31 +++
target/packages/gnet-imx28-usb-downloader/Makefile | 15 +-
.../gnet-imx28-usb-downloader/libusb_handler.c | 285 ++++++++++----------
target/packages/gnet-imx28-usb-downloader/main.c | 181 +++++++------
6 files changed, 319 insertions(+), 250 deletions(-)
create mode 100644 patches/buildroot/2011.05/171-libusb-allows_host_compilation.patch
diff --git a/buildroot/package/armadeus/gnet-imx28-usb-downloader/gnet-imx28-usb-downloader.mk b/buildroot/package/armadeus/gnet-imx28-usb-downloader/gnet-imx28-usb-downloader.mk
index 3f958e2..843c087 100644
--- a/buildroot/package/armadeus/gnet-imx28-usb-downloader/gnet-imx28-usb-downloader.mk
+++ b/buildroot/package/armadeus/gnet-imx28-usb-downloader/gnet-imx28-usb-downloader.mk
@@ -5,15 +5,19 @@
#############################################################
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/
-IMX28_USB_DOWNLOADER_SITE_METHOD=copy
+IMX28_USB_DOWNLOADER_SITE = $(TOPDIR)/../target/packages/gnet-imx28-usb-downloader/
+IMX28_USB_DOWNLOADER_SITE_METHOD = copy
+
+IMX28_USB_DOWNLOADER_DEPENDENCIES = libusb-compat
+HOST_IMX28_USB_DOWNLOADER_DEPENDENCIES = host-libusb-compat
define HOST_IMX28_USB_DOWNLOADER_BUILD_CMDS
- $(MAKE) -C $(@D) all
+ $(MAKE) CFLAGS="$(HOST_CFLAGS)" LDFLAGS="$(HOST_LDFLAGS)" -C $(@D) all
endef
define HOST_IMX28_USB_DOWNLOADER_INSTALL_CMDS
- $(INSTALL) -D -m 0755 $(@D)/$(IMX28_USB_DOWNLOADER_BIN_NAME) $(HOST_DIR)/usr/bin/$(IMX28_USB_DOWNLOADER_BIN_NAME)
+ $(INSTALL) -D -m 0755 $(@D)/$(IMX28_USB_DOWNLOADER_BIN_NAME) \
+ $(HOST_DIR)/usr/bin/$(IMX28_USB_DOWNLOADER_BIN_NAME)
endef
define HOST_IMX28_USB_DOWNLOADER_CLEAN_CMDS
@@ -25,7 +29,8 @@ define IMX28_USB_DOWNLOADER_BUILD_CMDS
endef
define IMX28_USB_DOWNLOADER_INSTALL_TARGET_CMDS
- $(INSTALL) -m 0755 $(IMX28_USB_DOWNLOADER_DIR)/$(IMX28_USB_DOWNLOADER_BIN_NAME) $(TARGET_DIR)/usr/bin/$(IMX28_USB_DOWNLOADER_BIN_NAME)
+ $(INSTALL) -m 0755 $(@D)/$(IMX28_USB_DOWNLOADER_BIN_NAME) \
+ $(TARGET_DIR)/usr/bin/$(IMX28_USB_DOWNLOADER_BIN_NAME)
endef
$(eval $(call GENTARGETS,package,imx28-usb-downloader))
diff --git a/patches/buildroot/2011.05/165-elftosb-add_host_tools.patch b/patches/buildroot/2011.05/165-elftosb-add_host_tools.patch
index 66001ae..f0f2a8d 100644
--- a/patches/buildroot/2011.05/165-elftosb-add_host_tools.patch
+++ b/patches/buildroot/2011.05/165-elftosb-add_host_tools.patch
@@ -4,21 +4,21 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
Index: buildroot/package/elftosb/Config.in
===================================================================
---- buildroot/package/elftosb/Config.in 1970-01-01 01:00:00.000000000 +0100
-+++ buildroot/package/elftosb/Config.in 2011-12-02 12:00:57.720649075 +0100
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/elftosb/Config.in 2012-01-30 13:52:48.000000000 +0100
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_ELFTOSB
-+ bool "Enable elftosb freescale host toolset?"
-+ depends on BR2_arm
++ bool "elftosb"
++ depends on BR2_arm
+ help
-+ Freescale host toolset to generate bootcode for some iMX CPUs:
++ Freescale host toolset to generate bootcode for some i.MX CPUs:
+ iMX28...
+
Index: buildroot/package/elftosb/elftosb.mk
===================================================================
---- buildroot/package/elftosb/elftosb.mk 1970-01-01 01:00:00.000000000 +0100
-+++ buildroot/package/elftosb/elftosb.mk 2011-12-02 16:09:12.650212706 +0100
-@@ -0,0 +1,29 @@
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/elftosb/elftosb.mk 2012-01-30 14:31:44.000000000 +0100
+@@ -0,0 +1,35 @@
+#############################################################
+#
+# elftosb
@@ -28,8 +28,14 @@ Index: buildroot/package/elftosb/elftosb.mk
+ELFTOSB_SOURCE = elftosb-$(ELFTOSB_VERSION).tar.gz
+ELFTOSB_SITE = http://repository.timesys.com/buildsources/e/elftosb/elftosb-$(ELFTOSB_VERSION)
+
++ELFTOSB_HOST_CFLAGS = $(HOST_CFLAGS)
++ELFTOSB_HOST_CFLAGS += -I${@D}/elftosb2 -I${@D}/keygen -I${@D}/sbtool -I${@D}/common
++ELFTOSB_HOST_CFLAGS += -DLinux
++
+define HOST_ELFTOSB_BUILD_CMDS
-+ $(MAKE) LIBS="-lstdc++ -lm" -C $(@D) all
++ $(TARGET_MAKE_ENV) $(MAKE) \
++ CFLAGS="$(ELFTOSB_HOST_CFLAGS)" \
++ -C $(@D) all
+endef
+
+define HOST_ELFTOSB_INSTALL_CMDS
@@ -48,3 +54,21 @@ Index: buildroot/package/elftosb/elftosb.mk
+$(eval $(call GENTARGETS,package,elftosb))
+$(eval $(call GENTARGETS,package,elftosb,host))
+
+Index: buildroot/package/elftosb/elftosb10.12.01-fixes_includes.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/elftosb/elftosb10.12.01-fixes_includes.patch 2012-01-30 13:51:24.000000000 +0100
+@@ -0,0 +1,13 @@
++Index: host-elftosb-10.12.01/common/stdafx.h
++===================================================================
++--- host-elftosb-10.12.01.orig/common/stdafx.h 2012-01-30 12:43:35.000000000 +0100
+++++ host-elftosb-10.12.01/common/stdafx.h 2012-01-30 12:43:54.000000000 +0100
++@@ -27,7 +27,7 @@
++ // For Linux systems only, types.h only defines the signed
++ // integer types. This is not professional code.
++ // Update: They are defined in the header files in the more recent version of redhat enterprise gcc.
++-#include "/usr/include/sys/types.h"
+++#include <sys/types.h>
++ #include <stdint.h>
++ //typedef unsigned long uint32_t;
++ //typedef unsigned short uint16_t;
diff --git a/patches/buildroot/2011.05/171-libusb-allows_host_compilation.patch b/patches/buildroot/2011.05/171-libusb-allows_host_compilation.patch
new file mode 100644
index 0000000..5186423
--- /dev/null
+++ b/patches/buildroot/2011.05/171-libusb-allows_host_compilation.patch
@@ -0,0 +1,31 @@
+Add possibility for Host packages to ask Buildroot to build libusb.
+This way user is not obliged to install libusb devt packages on its distrib.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/libusb/libusb.mk
+===================================================================
+--- buildroot.orig/package/libusb/libusb.mk 2012-01-30 14:52:34.000000000 +0100
++++ buildroot/package/libusb/libusb.mk 2012-01-30 14:52:56.000000000 +0100
+@@ -11,3 +11,4 @@
+ LIBUSB_INSTALL_TARGET = YES
+
+ $(eval $(call AUTOTARGETS,package,libusb))
++$(eval $(call AUTOTARGETS,package,libusb,host))
+Index: buildroot/package/libusb-compat/libusb-compat.mk
+===================================================================
+--- buildroot.orig/package/libusb-compat/libusb-compat.mk 2012-01-30 15:21:20.000000000 +0100
++++ buildroot/package/libusb-compat/libusb-compat.mk 2012-01-30 15:40:32.000000000 +0100
+@@ -7,6 +7,7 @@
+ LIBUSB_COMPAT_SOURCE = libusb-compat-$(LIBUSB_COMPAT_VERSION).tar.bz2
+ LIBUSB_COMPAT_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/libusb/libusb-compat-0.1/libusb-compat-$(LIBUSB_COMPAT_VERSION)
+ LIBUSB_COMPAT_DEPENDENCIES = host-pkg-config libusb
++HOST_LIBUSB_COMPAT_DEPENDENCIES = host-pkg-config host-libusb
+ LIBUSB_COMPAT_INSTALL_STAGING = YES
+ LIBUSB_COMPAT_INSTALL_TARGET = YES
+
+@@ -19,3 +20,4 @@
+ LIBUSB_COMPAT_POST_INSTALL_STAGING_HOOKS+=LIBUSB_COMPAT_FIXUP_CONFIG
+
+ $(eval $(call AUTOTARGETS,package,libusb-compat))
++$(eval $(call AUTOTARGETS,package,libusb-compat,host))
diff --git a/target/packages/gnet-imx28-usb-downloader/Makefile b/target/packages/gnet-imx28-usb-downloader/Makefile
index a04185f..4d996e9 100644
--- a/target/packages/gnet-imx28-usb-downloader/Makefile
+++ b/target/packages/gnet-imx28-usb-downloader/Makefile
@@ -1,15 +1,16 @@
+EXEC = gnet-imx28-usb-downloader
+CC = gcc
-
-all: gnet-imx28-usb-downloader
+all: $(EXEC)
clean:
- rm *.o gnet-imx28-usb-downloader
+ rm *.o $(EXEC)
-gnet-imx28-usb-downloader: main.o libusb_handler.o
- gcc -lusb main.o libusb_handler.o -o gnet-imx28-usb-downloader
+$(EXEC): main.o libusb_handler.o
+ $(CC) $(LDFLAGS) main.o libusb_handler.o -o $(EXEC) -lusb
main.o: main.c main.h libusb_handler.h
- gcc -c -Wall -Wno-format-zero-length main.c
+ $(CC) -c $(CFLAGS) -Wall -Wno-format-zero-length main.c
libusb_handler.o: libusb_handler.c libusb_handler.h
- gcc -c -Wall libusb_handler.c
+ $(CC) -c $(CFLAGS) -Wall libusb_handler.c
diff --git a/target/packages/gnet-imx28-usb-downloader/libusb_handler.c b/target/packages/gnet-imx28-usb-downloader/libusb_handler.c
index 3ca630b..eb0276b 100644
--- a/target/packages/gnet-imx28-usb-downloader/libusb_handler.c
+++ b/target/packages/gnet-imx28-usb-downloader/libusb_handler.c
@@ -15,159 +15,164 @@
*
*/
-#include<stdio.h>
-#include<usb.h>
-#include<string.h>
-#include<unistd.h>
+#include <stdio.h>
+#include <usb.h>
+#include <string.h>
+#include <unistd.h>
+
#include "libusb_handler.h"
-inline int cpu_to_le16( int in){
- int tmp = ((in & 0x000000ff)>>8)|((in&0x0000ff00)<<8);
- return tmp;
+inline int cpu_to_le16(int in)
+{
+ int tmp = ((in & 0x000000ff) >> 8) | ((in & 0x0000ff00) << 8);
+ return tmp;
}
-
-int transferData( struct usb_dev_handle * dev, size_t tx_size, char * data){
+int transferData(struct usb_dev_handle *dev, size_t tx_size, char *data)
+{
int retval = 0;
- struct _ST_HID_CBW *cbw = NULL;
+ struct _ST_HID_CBW *cbw = NULL;
size_t writesize = 0;
- int payload_size=0;
- int numbufs;
- unsigned int tag=0;
- unsigned int userbufidx=0;
- unsigned int curbuf_ref=0;
- char* buf;
-
- writesize = TX_MSG_SIZE_1K+1;
-
- cbw = malloc(sizeof(struct _ST_HID_CBW));
- memset( cbw, 0, sizeof(struct _ST_HID_CBW ) );
- cbw->Cdb.Command = BLTC_DOWNLOAD_FW;
- cbw->Tag = ++tag;
- cbw->cmd = 1;
- cbw->Signature = CBW_BLTC_SIGNATURE;
- cbw->XferLength =tx_size;
- cbw->Flags = CBW_HOST_TO_DEVICE_DIR;
- cbw->Cdb.Length = 0xf0804a00; //tx_size;
-
- payload_size = sizeof(struct _ST_HID_CBW);
-
- retval = usb_control_msg(dev,
- HID_BLTC_REQUEST_TYPE,
- HID_BLTC_REQUEST,
- 0x0200|HID_BLTC_REPORT_TYPE_COMMAND_OUT,
- 0,
- (char*)cbw,
- payload_size,
- (int)2000);
- if(retval != payload_size){
- printf("\n%s: %s\n", __func__, usb_strerror());
- return -ERR_TX;
- }
- free(cbw);
-
- /* find the number of buffer's to transfer */
- payload_size = writesize-1;
- buf = malloc(writesize);
-
- numbufs = tx_size / payload_size;
- if(tx_size % payload_size)
- numbufs ++;
-
- userbufidx=0;
- for(curbuf_ref=0; curbuf_ref<(numbufs-1); curbuf_ref++){
- if(!(curbuf_ref/333))
+ int payload_size = 0;
+ int numbufs;
+ unsigned int tag = 0;
+ unsigned int userbufidx = 0;
+ unsigned int curbuf_ref = 0;
+ char *buf;
+
+ writesize = TX_MSG_SIZE_1K + 1;
+
+ cbw = malloc(sizeof(struct _ST_HID_CBW));
+ memset(cbw, 0, sizeof(struct _ST_HID_CBW));
+ cbw->Cdb.Command = BLTC_DOWNLOAD_FW;
+ cbw->Tag = ++tag;
+ cbw->cmd = 1;
+ cbw->Signature = CBW_BLTC_SIGNATURE;
+ cbw->XferLength = tx_size;
+ cbw->Flags = CBW_HOST_TO_DEVICE_DIR;
+ cbw->Cdb.Length = 0xf0804a00; //tx_size;
+
+ payload_size = sizeof(struct _ST_HID_CBW);
+
+ retval = usb_control_msg(dev,
+ HID_BLTC_REQUEST_TYPE,
+ HID_BLTC_REQUEST,
+ 0x0200 | HID_BLTC_REPORT_TYPE_COMMAND_OUT,
+ 0, (char *)cbw, payload_size, (int)2000);
+ if (retval != payload_size) {
+ printf("\n%s: %s\n", __func__, usb_strerror());
+ return -ERR_TX;
+ }
+ free(cbw);
+
+ /* find the number of buffer's to transfer */
+ payload_size = writesize - 1;
+ buf = malloc(writesize);
+
+ numbufs = tx_size / payload_size;
+ if (tx_size % payload_size)
+ numbufs++;
+
+ userbufidx = 0;
+ for (curbuf_ref = 0; curbuf_ref < (numbufs - 1); curbuf_ref++) {
+ if (!(curbuf_ref / 333))
printf(".");
- memcpy(buf+1, data+userbufidx, payload_size);
- userbufidx+=payload_size;
- buf[0] = HID_BLTC_REPORT_TYPE_DATA_OUT;
- retval = usb_control_msg(dev,
- HID_BLTC_REQUEST_TYPE,
- HID_BLTC_REQUEST,
- 0x0200|HID_BLTC_REPORT_TYPE_DATA_OUT,
- 0,
- buf,
- writesize,
- 2000);
- if (retval != writesize) {
- printf("\n%s: buffer %d: %s", __func__, curbuf_ref, usb_strerror());
- free(buf);
- return -ERR_TX;
- }
- }
- payload_size = tx_size - userbufidx;
- memcpy(buf+1, data+userbufidx, payload_size);
-
- buf[0] = HID_BLTC_REPORT_TYPE_DATA_OUT;
- retval = usb_control_msg(dev,
- HID_BLTC_REQUEST_TYPE,
- HID_BLTC_REQUEST,
- 0x0200|HID_BLTC_REPORT_TYPE_DATA_OUT,
- 0,
- buf,
- writesize,
- 2000);
- if (retval != writesize) {
- printf("\n%s: buffer %d: %s", __func__, curbuf_ref, usb_strerror());
- return -ERR_TX;
- }
-
-
- if( !(retval= usb_interrupt_read(dev, 1, buf, 14, 500))){
- printf("\n%s: error durring read: %s", __func__, usb_strerror());
+ memcpy(buf + 1, data + userbufidx, payload_size);
+ userbufidx += payload_size;
+ buf[0] = HID_BLTC_REPORT_TYPE_DATA_OUT;
+ retval = usb_control_msg(dev,
+ HID_BLTC_REQUEST_TYPE,
+ HID_BLTC_REQUEST,
+ 0x0200 | HID_BLTC_REPORT_TYPE_DATA_OUT,
+ 0, buf, writesize, 2000);
+ if (retval != writesize) {
+ printf("\n%s: buffer %d: %s", __func__, curbuf_ref,
+ usb_strerror());
+ free(buf);
return -ERR_TX;
+ }
+ }
+ payload_size = tx_size - userbufidx;
+ memcpy(buf + 1, data + userbufidx, payload_size);
+
+ buf[0] = HID_BLTC_REPORT_TYPE_DATA_OUT;
+ retval = usb_control_msg(dev,
+ HID_BLTC_REQUEST_TYPE,
+ HID_BLTC_REQUEST,
+ 0x0200 | HID_BLTC_REPORT_TYPE_DATA_OUT,
+ 0, buf, writesize, 2000);
+ if (retval != writesize) {
+ printf("\n%s: buffer %d: %s", __func__, curbuf_ref,
+ usb_strerror());
+ return -ERR_TX;
}
+ if (!(retval = usb_interrupt_read(dev, 1, buf, 14, 500))) {
+ printf("\n%s: error durring read: %s", __func__,
+ usb_strerror());
+ return -ERR_TX;
+ }
- free(buf);
+ free(buf);
- return SUCCESS;
+ return SUCCESS;
}
-
-int usb_write( int size, char * dataBuf)
+int usb_write(int size, char *dataBuf)
{
- struct usb_bus *bus;
- struct usb_device *dev;
- char found_dev=0;
- int retval=0;
-
- usb_init();
- usb_find_busses();
- usb_find_devices();
-
- for (bus = usb_busses; bus; bus = bus->next) {
- for (dev = bus->devices; dev; dev = dev->next) {
- usb_dev_handle *udev;
-
- if((dev->descriptor.idVendor==FREESCALE_VENDOR_ID) && (dev->descriptor.idProduct==FREESCALE_PRODUCT_ID)){
- found_dev=1;
- udev = usb_open(dev);
-
- if(udev == NULL){
- retval = -ERR_NO_DEV;
- printf("\n%s: %s\n", __func__, usb_strerror());
- }else {
- if(usb_claim_interface(udev, 0) != 0 ){
- if(usb_detach_kernel_driver_np(udev, 0) != 0 ){
- printf("\n%s: %s\n", __func__, usb_strerror());
- retval = -ERR_DEV_BUSY;
- } else {
- retval = transferData( udev, size, dataBuf);
- usb_release_interface(udev, 0);
- }
- }else{
- retval = transferData( udev, size, dataBuf);
- usb_release_interface(udev, 0);
- }
- usb_close (udev);
- }
- }
-
- }
- }
- if(found_dev == 0){
- retval = -ERR_NO_DEV;
- }
- return retval;
+ struct usb_bus *bus;
+ struct usb_device *dev;
+ char found_dev = 0;
+ int retval = 0;
+
+ usb_init();
+ usb_find_busses();
+ usb_find_devices();
+
+ for (bus = usb_busses; bus; bus = bus->next) {
+ for (dev = bus->devices; dev; dev = dev->next) {
+ usb_dev_handle *udev;
+
+ if ((dev->descriptor.idVendor == FREESCALE_VENDOR_ID)
+ && (dev->descriptor.idProduct ==
+ FREESCALE_PRODUCT_ID)) {
+ found_dev = 1;
+ udev = usb_open(dev);
+
+ if (udev == NULL) {
+ retval = -ERR_NO_DEV;
+ printf("\n%s: %s\n", __func__,
+ usb_strerror());
+ } else {
+ if (usb_claim_interface(udev, 0) != 0) {
+ if (usb_detach_kernel_driver_np
+ (udev, 0) != 0) {
+ printf("\n%s: %s\n",
+ __func__,
+ usb_strerror());
+ retval = -ERR_DEV_BUSY;
+ } else {
+ retval =
+ transferData(udev,
+ size,
+ dataBuf);
+ usb_release_interface
+ (udev, 0);
+ }
+ } else {
+ retval =
+ transferData(udev, size,
+ dataBuf);
+ usb_release_interface(udev, 0);
+ }
+ usb_close(udev);
+ }
+ }
+
+ }
+ }
+ if (found_dev == 0) {
+ retval = -ERR_NO_DEV;
+ }
+ return retval;
}
diff --git a/target/packages/gnet-imx28-usb-downloader/main.c b/target/packages/gnet-imx28-usb-downloader/main.c
index 3be13b2..b570cba 100644
--- a/target/packages/gnet-imx28-usb-downloader/main.c
+++ b/target/packages/gnet-imx28-usb-downloader/main.c
@@ -15,9 +15,8 @@
*
*/
-#include<stdio.h>
-#include<usb.h>
-#include<string.h>
+#include <stdio.h>
+#include <string.h>
#include <stdlib.h>
#include <fcntl.h>
#include <unistd.h>
@@ -26,96 +25,100 @@
#include <sys/stat.h>
#include <sys/ioctl.h>
#include <errno.h>
-#include"main.h"
-#include"libusb_handler.h"
+#include <usb.h>
+
+#include "main.h"
+#include "libusb_handler.h"
struct params {
- char file_name[1024];
+ char file_name[1024];
};
-
-void checkargs(int argc, char * argv[], struct params * param){
- int arg = 0;
- while(arg < argc){
- if(argv[arg][0] != '-'){
- arg++;
- continue;
- }
-
- if(strcmp("-h", argv[arg])==0){
- printf(HELP_MSG);
- exit(0);
- }
-
- if(strcmp("-v", argv[arg])==0){
- printf(VERSION_MSG);
- exit(0);
- }
-
- if((strcmp("-f", argv[arg]) == 0) && (strcmp("", param->file_name) == 0)){
- if(argc > arg+1){
- strcpy(param->file_name, argv[arg+1]);
- }
- }
- arg++;
- }
-
- if(strcmp("", param->file_name)==0){
- printf("No filename specified\n");
- printf(USAGE_MSG);
- exit(-EINERR);
- }
+void checkargs(int argc, char *argv[], struct params *param)
+{
+ int arg = 0;
+ while (arg < argc) {
+ if (argv[arg][0] != '-') {
+ arg++;
+ continue;
+ }
+
+ if (strcmp("-h", argv[arg]) == 0) {
+ printf(HELP_MSG);
+ exit(0);
+ }
+
+ if (strcmp("-v", argv[arg]) == 0) {
+ printf(VERSION_MSG);
+ exit(0);
+ }
+
+ if ((strcmp("-f", argv[arg]) == 0)
+ && (strcmp("", param->file_name) == 0)) {
+ if (argc > arg + 1) {
+ strcpy(param->file_name, argv[arg + 1]);
+ }
+ }
+ arg++;
+ }
+
+ if (strcmp("", param->file_name) == 0) {
+ printf("No filename specified\n");
+ printf(USAGE_MSG);
+ exit(-EINERR);
+ }
}
-int main(int argc, char *argv[]){
- FILE * infd;
- void * data;
- int retval;
- unsigned int sz, bytesRead;
- struct params params={""};
-
-
- checkargs(argc, argv, ¶ms);
-
- infd = fopen(params.file_name, "rb");
- if(infd == NULL){
- printf( "Error opening input file: %s\n", strerror( errno ) );
- exit(-EINERR);
- }
-
- fseek(infd, 0L, SEEK_END);
- sz = ftell(infd);
- fseek(infd, 0L, SEEK_SET);
-
- data = malloc(sz);
- if(data < 0){
- printf( "Error allocating internal buffer: %s\n", strerror( errno ) );
- return -EMEM;
- }
- bytesRead = 0;
- while(bytesRead < sz){
- bytesRead =+ fread(data+bytesRead, 1, sz, infd);
-
- }
-
- printf("attempting to write writing [%s] bootstream...", params.file_name);
- retval=usb_write(sz, data);
-
- switch(retval){
- case -ERR_TX:
- case -ERR_DEV_BUSY:
- case -ERR_NO_DEV:
- printf("Failed to write data to device.\n");
- break;
- case SUCCESS:
- printf("SUCCESS\n");
- break;
- default:
- printf("Unknown error\n");
- }
-
- free(data);
- fclose(infd);
- return retval;
+int main(int argc, char *argv[])
+{
+ FILE *infd;
+ void *data;
+ int retval;
+ unsigned int sz, bytesRead;
+ struct params params = { "" };
+
+ checkargs(argc, argv, ¶ms);
+
+ infd = fopen(params.file_name, "rb");
+ if (infd == NULL) {
+ printf("Error opening input file: %s\n", strerror(errno));
+ exit(-EINERR);
+ }
+
+ fseek(infd, 0L, SEEK_END);
+ sz = ftell(infd);
+ fseek(infd, 0L, SEEK_SET);
+
+ data = malloc(sz);
+ if (data < 0) {
+ printf("Error allocating internal buffer: %s\n",
+ strerror(errno));
+ return -EMEM;
+ }
+ bytesRead = 0;
+ while (bytesRead < sz) {
+ bytesRead += fread(data + bytesRead, 1, sz, infd);
+
+ }
+
+ printf("attempting to write writing [%s] bootstream...",
+ params.file_name);
+ retval = usb_write(sz, data);
+
+ switch (retval) {
+ case -ERR_TX:
+ case -ERR_DEV_BUSY:
+ case -ERR_NO_DEV:
+ printf("Failed to write data to device.\n");
+ break;
+ case SUCCESS:
+ printf("SUCCESS\n");
+ break;
+ default:
+ printf("Unknown error\n");
+ }
+
+ free(data);
+ fclose(infd);
+ return retval;
}
-
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-01-29 22:35: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 4a5ad0692fbb31e82ec9915b2cdff6caf9389b28 (commit)
via db05199bafa054f742911b7583de2abb8d290191 (commit)
from d5f761d4a037aac1698b48e2a8b2cbbe11039379 (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 4a5ad0692fbb31e82ec9915b2cdff6caf9389b28
Author: Eric Jarrige <eri...@ar...>
Date: Sun Jan 29 23:35:28 2012 +0100
[BUILDROOT] apf28: Add preliminary U-Boot recover process
commit db05199bafa054f742911b7583de2abb8d290191
Author: Eric Jarrige <eri...@ar...>
Date: Sun Jan 29 22:01:19 2012 +0100
[BUILDROOT] apf28: add reference U-Boot binary file for further board flash memory recover
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf28/apf28-u-boot-2011.12.h | 13 +-
software/uboot_recover/apf28-u-boot.sb | Bin 0 -> 407136 bytes
.../{apf51_recover.py => apf28_recover.py} | 245 +++-----------------
3 files changed, 46 insertions(+), 212 deletions(-)
create mode 100644 software/uboot_recover/apf28-u-boot.sb
copy software/uboot_recover/{apf51_recover.py => apf28_recover.py} (60%)
diff --git a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h
index 0a205c2..cfcdbd9 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h
+++ b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h
@@ -71,11 +71,11 @@
*/
#define CONFIG_NETMASK 255.255.255.0
-#define CONFIG_IPADDR 192.168.2.10
+#define CONFIG_IPADDR 192.168.0.10
#define CONFIG_BOARD_NAME "apf28"
#define CONFIG_HOSTNAME "apf28"
-#define CONFIG_GATEWAYIP 192.168.2.1
-#define CONFIG_SERVERIP 192.168.2.2
+#define CONFIG_GATEWAYIP 192.168.0.1
+#define CONFIG_SERVERIP 192.168.0.2
#define CONFIG_SRV_PATH ""
#define CONFIG_ROOTPATH "/tftpboot/apf28-root"
@@ -343,8 +343,11 @@
"nand write.raw ${loadaddr} 0x0 ${update_nand_fcb} ; " \
"setexpr update_off ${loadaddr} + ${update_nand_fcb} ; " \
"setexpr update_sz ${filesize} - ${update_nand_fcb} ; " \
- "nand write ${update_off} ${update_nand_fcb} ${update_sz} ; " \
- "fi\0" \
+ "if nand write ${update_off} ${update_nand_fcb} ${update_sz} ; " \
+ "then echo Flashing of uboot succeed;" \
+ "else echo Flashing of uboot failed;" \
+ "fi;" \
+ "fi; \0" \
"update_nand_firmware=" /* Update only firmware */ \
"if tftp ${update_nand_firmware_filename} ; then " \
"run update_nand_get_fcb_size ; " \
diff --git a/software/uboot_recover/apf28-u-boot.sb b/software/uboot_recover/apf28-u-boot.sb
new file mode 100644
index 0000000..2240fe6
Binary files /dev/null and b/software/uboot_recover/apf28-u-boot.sb differ
diff --git a/software/uboot_recover/apf51_recover.py b/software/uboot_recover/apf28_recover.py
similarity index 60%
copy from software/uboot_recover/apf51_recover.py
copy to software/uboot_recover/apf28_recover.py
index 9e31cdd..038f721 100644
--- a/software/uboot_recover/apf51_recover.py
+++ b/software/uboot_recover/apf28_recover.py
@@ -1,7 +1,7 @@
#
-# APF51 bootloader recovering tool
+# APF28 bootloader recovering tool
#
-# Copyright (C) 2010-2011 ARMadeus Systems
+# Copyright (C) 2012 Armadeus 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
@@ -17,7 +17,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
-# authors: nic...@ar..., eri...@ar...
+# authors: eri...@ar...
#
#
@@ -63,7 +63,7 @@ class Error(Exception):
return self.level
-class apf51Bootloader:
+class apf28Bootloader:
statuscode = { 0x8D: 'data specified is out of bounds',
0x55: 'error during assert verification',
@@ -242,121 +242,6 @@ class apf51Bootloader:
#print cnt
return result
- def initIOMUX(self):
- print "SDRAM INIT IOMUX APF",
- # RAS
- self.put("73FA84A4","00000006","l")
- # CAS
- self.put("73FA84A8","00000006","l")
- # SDWE
- self.put("73FA84AC","000000E6","l")
- # SDCKE0
- self.put("73FA84B0","000000E6","l")
- # SDCKE1
- self.put("73FA84B4","000000E6","l")
- # SDCLK
- self.put("73FA84B8","000000E6","l")
- # SDQS0
- self.put("73FA84BC","000000C6","l")
- # SDQS1
- self.put("73FA84C0","000000C6","l")
- # SDQS2
- self.put("73FA84C4","000000C6","l")
- # SDQS3
- self.put("73FA84C8","000000C6","l")
- # CS0
- self.put("73FA84CC","000000E6","l")
- # CS1
- self.put("73FA84D0","000000E6","l")
- # DQM0
- self.put("73FA84D4","000000E6","l")
- # DQM1
- self.put("73FA84D8","000000E6","l")
- # DQM2
- self.put("73FA84DC","000000E6","l")
- # DQM3
- self.put("73FA84E0","000000E6","l")
- # DDRPKS
- self.put("73FA8820","00000040","l")
- # DRAM_B4
- self.put("73FA882C","00000006","l")
- # PKEDDR
- self.put("73FA8838","00000080","l")
- # DDR_A0
- self.put("73FA883C","00000006","l")
- # DDR_A1
- self.put("73FA8848","00000006","l")
- # DRAM_SR_B0
- self.put("73FA8878","00000000","l")
- # DDRAPKS
- self.put("73FA887C","00000040","l")
- # DRAM_SR_B1
- self.put("73FA8880","00000000","l")
- # DDRPUS
- self.put("73FA8884","00000020","l")
- # DRAM_SR_B2
- self.put("73FA888C","00000000","l")
- # PKEADDR
- self.put("73FA8890","00000080","l")
- # DRAM_SR_B4
- self.put("73FA889C","00000000","l")
- # DRAM_B0
- self.put("73FA88A4","00000006","l")
- # DRAM_B1
- self.put("73FA88AC","00000006","l")
- # DDR_SR_A0
- self.put("73FA88B0","00000000","l")
- # DRAM_B2
- self.put("73FA88B8","00000006","l")
- # DDR_SR_A1
- self.put("73FA88BC","00000000","l")
-
- def initSDRAM2(self):
- print "SDRAM INIT2 APF",
- #ESDCTL0: 13 ROW, 10 COL, 32Bit
- self.put("83FD9008","82220000","l")
- #ESDSCR: Precharge command
- self.put("83FD9014","0400800C","l")
- #ESDSCR: Refresh command
- self.put("83FD9014","00008014","l")
- #ESDSCR: Refresh command
- self.put("83FD9014","00008014","l")
- #ESDSCR: LMR with CAS=3 and BL=3 (Burst Length = 8)
- self.put("83FD9014","0033801C","l")
- #ESDSCR: EMR with full Drive strength
- self.put("83FD9014","0000801E","l")
- #ESDCTL0: 13 ROW, 10 COL, 32Bit, SREF=4
- self.put("83FD9008","B2420000","l")
- #ESDCFG0: tRFC:22clks, tXSR:28clks, tXP:3clks, tWTR:2clk, tRP:3clks, tMRD:2clks
- #tRAS:8clks, tRRD:2clks, tWR:3clks, tRCD:3clks, tRC:11clks
- self.put("83FD900C","C33574AA","l")
- #ESDMISC: AP=10, Bank interleaving on, MIF3 en, RALAT=2
- self.put("83FD9010","000a1700","l")
-
- def initSDRAM1(self, sdramType):
- print "SDRAM INIT1 APF",
- #ESDCTL0: 13 ROW, 10 COL, 32Bit
- self.put("83FD9000","82220000","l")
-# self.put("83FD9000","82120000","l") # 64MB
- #ESDSCR: Precharge command
- self.put("83FD9014","04008008","l")
- #ESDSCR: Refresh command
- self.put("83FD9014","00008010","l")
- #ESDSCR: Refresh command
- self.put("83FD9014","00008010","l")
- #ESDSCR: LMR with CAS=3 and BL=3 (Burst Length = 8)
- self.put("83FD9014","00338018","l")
- #ESDSCR: EMR with full Drive strength
- self.put("83FD9014","0000801a","l")
- #ESDCTL0: 13 ROW, 10 COL, 32Bit, SREF=4
- self.put("83FD9000","B2220000","l")
-# self.put("83FD9000","D2120000","l") # 64MB
- #ESDCFG0: tRFC:22clks, tXSR:28clks, tXP:3clks, tWTR:2clk, tRP:3clks, tMRD:2clks
- #tRAS:8clks, tRRD:2clks, tWR:3clks, tRCD:3clks, tRC:11clks
- self.put("83FD9004","c33574aa","l")
-# self.put("83FD9004","FFFFFFFF","l") # 64MB
- #ESDMISC: AP=10, Bank interleaving on, MIF3 en, RALAT=2
- self.put("83FD9010","c00a5680","l")
def consoleDump(tid):
while 1:
@@ -372,13 +257,13 @@ class USBDevice:
dev = self.findDevice(idVendor, idProduct)
# was it found?
if dev is None:
- raise ValueError('MX51 not found')
+ raise ValueError('MX28 not found')
self.__dev = dev
handle = dev.open()
handle.setConfiguration(1) # choose the first configuration
handle.claimInterface(0) # choose the first interface
- print('Found i.MX51')
+ print('Found i.MX28')
self.__devhandle = handle
self.__epBulkIn = 0x82
@@ -439,7 +324,7 @@ class UBoot:
def flash(self):
""" Ask U-Boot to flash itself """
- self.serial.write("run flash_uboot\n")
+ self.serial.write("run update_uboot\n")
try:
ret = self.__getOutput()
except Error,e:
@@ -452,107 +337,51 @@ class UBoot:
if __name__ == "__main__":
- def testRAM():
- apfBootloader.put("90000000", "00000001", "l")
- apfBootloader.put("90000004", "00000002", "l")
- apfBootloader.put("90000008", "00000004", "l")
- apfBootloader.put("90000010", "00000008", "l")
- apfBootloader.put("90000020", "00000010", "l")
- apfBootloader.put("9000002C", "00000020", "l")
- apfBootloader.put("90000040", "00000040", "l")
- apfBootloader.put("90000080", "00000080", "l")
- apfBootloader.put("90000100", "00000100", "l")
- apfBootloader.put("90000200", "00000200", "l")
- apfBootloader.put("90000400", "00000400", "l")
- apfBootloader.put("90000800", "00000800", "l")
- apfBootloader.put("90001000", "00001000", "l")
- apfBootloader.put("90001004", "00002000", "l")
- apfBootloader.put("90002000", "00004000", "l")
- apfBootloader.put("90004000", "00008000", "l")
- apfBootloader.put("90010000", "00010000", "l")
- apfBootloader.put("90020000", "00020000", "l")
- apfBootloader.put("90040000", "00040000", "l")
- apfBootloader.put("90080000", "00080000", "l")
- apfBootloader.put("90100000", "00100000", "l")
- apfBootloader.put("90200000", "00200000", "l")
- apfBootloader.put("90400000", "00400000", "l")
- apfBootloader.put("90800000", "00800000", "l")
- apfBootloader.put("91000000", "01000000", "l")
- apfBootloader.put("92000000", "02000000", "l")
- apfBootloader.put("93000000", "04000000", "l")
- apfBootloader.put("90000024", "08000000", "l")
- apfBootloader.put("90000014", "10000000", "l")
- apfBootloader.put("90000018", "20000000", "l")
- apfBootloader.put("9000001C", "40000000", "l")
- apfBootloader.put("90000024", "80000000", "l")
-
- time.sleep(1)
-
- apfBootloader.get("90000000", "4", "l")
- apfBootloader.get("90000004", "4", "l")
- apfBootloader.get("90000008", "4", "l")
- apfBootloader.get("90000010", "4", "l")
- apfBootloader.get("90000020", "4", "l")
- apfBootloader.get("9000002C", "4", "l")
- apfBootloader.get("90000040", "4", "l")
- apfBootloader.get("90000080", "4", "l")
- apfBootloader.get("90000100", "4", "l")
- apfBootloader.get("90000200", "4", "l")
- apfBootloader.get("90000400", "4", "l")
- apfBootloader.get("90000800", "4", "l")
- apfBootloader.get("90001000", "4", "l")
- apfBootloader.get("90001004", "4", "l")
- apfBootloader.get("90002000", "4", "l")
- apfBootloader.get("90004000", "4", "l")
- apfBootloader.get("90010000", "4", "l")
- apfBootloader.get("90020000", "4", "l")
- apfBootloader.get("90040000", "4", "l")
- apfBootloader.get("90080000", "4", "l")
- apfBootloader.get("90100000", "4", "l")
- apfBootloader.get("90200000", "4", "l")
- apfBootloader.get("90400000", "4", "l")
- apfBootloader.get("90800000", "4", "l")
- apfBootloader.get("91000000", "4", "l")
- apfBootloader.get("92000000", "4", "l")
- apfBootloader.get("93000000", "4", "l")
- apfBootloader.get("90000024", "4", "l")
- apfBootloader.get("90000014", "4", "l")
- apfBootloader.get("90000018", "4", "l")
- apfBootloader.get("9000001C", "4", "l")
- apfBootloader.get("90000024", "4", "l")
SPEED = 115200
- BINARY = "apf51-u-boot.bin"
+ BINARY = "apf28-u-boot.sb"
+ USB_DOWNLOAD_APP = "../../buildroot/output/host/usr/bin/gnet-imx28-usb-downloader"
- print "\n--- APF51 Bootstrap Tool ---\n"
+ print "\n--- APF28 Bootstrap Tool ---\n"
print "Procedure to follow:"
print "1] Power off your board, close all serial terminal sessions, remove all USB cables"
print "2] Put bootstrap jumper"
print "3] Power on your board"
- print "4] Connect a USB cable from your PC to the APF51Dev OTG miniUSB connector"
- print "5] Connect a USB cable from your PC to the APF51Dev console miniUSB connector"
- print "(be sure to have a %s image in current dir too)\n" % BINARY
+ print "4] Connect a USB cable from your PC to the APF28Dev OTG miniUSB connector"
+ print "5] Connect a USB cable from your PC to the APF28Dev console miniUSB connector"
+ print "6] Connect a ethernet cable (it is a tmeporary requirement for the current version)"
+ print "7] be sure to have a %s image in current dir too)" % BINARY
+ print "8] be sure to have built the apf28 BSP: make apf28_defconfig; make\n"
port = raw_input('--- Enter serial port number or name to use for console (/dev/ttyACM0 under Linux (default) or COMx under Window$): ')
if port is '':
port = '/dev/ttyACM0'
- usb = USBDevice()
- apfBootloader = apf51Bootloader(usb)
+ if not os.path.exists(USB_DOWNLOAD_APP):
+ raise Error("gnet-imx28-usb-downloader is not present: please compile Armadeus first ",0)
- apfBootloader.getStatus()
- apfBootloader.initIOMUX()
- apfBootloader.initSDRAM1("APF51")
+ #usb = USBDevice()
+ #apfBootloader = apf28Bootloader(usb)
+
+ #apfBootloader.getStatus()
#clear configuration request
- apfBootloader.put("83FD9014","00000000","l")
- #testRAM()
- print "--- Successfully initialized APF51, now loading U-Boot"
+
+ #print "--- Successfully initialized APF28, now loading U-Boot"
if not os.path.exists(BINARY):
raise Error("file "+BINARY+" doesn't exit",0)
+
fsize = "%08x" % os.path.getsize(BINARY) #os.stat(filesize)[6]
print "Loading %s, size = %d bytes" % (BINARY, os.path.getsize(BINARY))
- apfBootloader.download("90000000", BINARY, fsize, "AA")
+
+ #apfBootloader.download("90000000", BINARY, fsize, "AA")
+
+ try:
+ os.system(USB_DOWNLOAD_APP+" -f "+BINARY)
+ except Exception, msg:
+ print "Failed to upload image file to the target !"
+ print msg
+ sys.exit()
try:
ser = serial.Serial(port, SPEED, timeout=2)
@@ -565,7 +394,7 @@ if __name__ == "__main__":
uboot = UBoot(ser)
# execute loaded code:
- apfBootloader.put("90000000", "90000004", "l")
+ #apfBootloader.put("90000000", "90000004", "l")
#self.bootstrap.getStatus() ?
uboot.waitForPrompt()
@@ -573,9 +402,11 @@ if __name__ == "__main__":
eraseAll = raw_input('\n--- Would you like to erase the environment variables ? y/N: ')
if eraseAll == 'y':
uboot.resetEnv()
- uboot.flash()
+ updateFlash = raw_input('\n--- Would you like to write UBoot in flash ? Y/n: ')
+ if updateFlash != 'n':
+ uboot.flash()
print "\n--- U-Boot successfully recovered !"
- print "--- Now you can remove miniUSB OTG cable and bootstrap jumper. Then, restart your board"
+ print "--- Now you can remove miniUSB OTG cable and bootstrap jumper. your board is running.."
del ser
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-01-29 20:54: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 d5f761d4a037aac1698b48e2a8b2cbbe11039379 (commit)
from f2678e95a481f8f4c31d56d5407777d5a405e7e8 (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 d5f761d4a037aac1698b48e2a8b2cbbe11039379
Author: Eric Jarrige <eri...@ar...>
Date: Sun Jan 29 21:33:07 2012 +0100
[BUIDROOT] fix elftosb downloard URL
-----------------------------------------------------------------------
Summary of changes:
.../2011.05/165-elftosb-add_host_tools.patch | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/patches/buildroot/2011.05/165-elftosb-add_host_tools.patch b/patches/buildroot/2011.05/165-elftosb-add_host_tools.patch
index 293f208..66001ae 100644
--- a/patches/buildroot/2011.05/165-elftosb-add_host_tools.patch
+++ b/patches/buildroot/2011.05/165-elftosb-add_host_tools.patch
@@ -26,7 +26,7 @@ Index: buildroot/package/elftosb/elftosb.mk
+#############################################################
+ELFTOSB_VERSION = 10.12.01
+ELFTOSB_SOURCE = elftosb-$(ELFTOSB_VERSION).tar.gz
-+ELFTOSB_SITE = http://repository.timesys.com/buildsources/e/elftosb/
++ELFTOSB_SITE = http://repository.timesys.com/buildsources/e/elftosb/elftosb-$(ELFTOSB_VERSION)
+
+define HOST_ELFTOSB_BUILD_CMDS
+ $(MAKE) LIBS="-lstdc++ -lm" -C $(@D) all
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-01-29 19:51: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 f2678e95a481f8f4c31d56d5407777d5a405e7e8 (commit)
via 29ab76a2b90a0d071e6870b79376163f4b1e6958 (commit)
from 58ef3130bc3ee5589dfdbb84a32f3c8160fa19aa (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 f2678e95a481f8f4c31d56d5407777d5a405e7e8
Author: Eric Jarrige <eri...@ar...>
Date: Sun Jan 29 20:50:55 2012 +0100
[BUILDROOT] Change elftosb download website - the legacy one is not accessible anymore
commit 29ab76a2b90a0d071e6870b79376163f4b1e6958
Author: Eric Jarrige <eri...@ar...>
Date: Sun Jan 29 20:44:06 2012 +0100
[UBOOT] apf28: patch clean-up - set MAC address from fuses - enable L1 instruction cache - Configure UBI Flash partition to be accessible from U-Boot
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf28/apf28-u-boot-2011.12.h | 21 +--
.../2011.05/165-elftosb-add_host_tools.patch | 2 +-
patches/u-boot/2011.12/502-add-apf28.patch | 152 ++++----------------
3 files changed, 37 insertions(+), 138 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h
index 42c05fa..0a205c2 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h
+++ b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h
@@ -1,7 +1,7 @@
/*
* Configuration settings for the Armadeus Project apf28 board.
*
- * Copyright (C) 2011 Eric Jarrige, Armadeus Project
+ * Copyright (C) 2011-2012 Eric Jarrige, Armadeus Project
* Copyright (C) 2011 Marek Vasut <mar...@gm...>
* on behalf of DENX Software Engineering GmbH
*
@@ -39,13 +39,9 @@
/*
* Define APF28 machine type by hand until it lands in mach-types
*/
-#define MACH_TYPE_APF28 3845
-
-#define CONFIG_MACH_TYPE MACH_TYPE_APF28
+#define CONFIG_MACH_TYPE 3845
#define CONFIG_SYS_NO_FLASH
-#define CONFIG_SYS_ICACHE_OFF
-#define CONFIG_SYS_DCACHE_OFF
#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_ARCH_CPU_INIT
#define CONFIG_ARCH_MISC_INIT
@@ -96,7 +92,6 @@
#define CONFIG_CMD_EXT2
#define CONFIG_CMD_FAT
#define CONFIG_CMD_GPIO
-/*#define CONFIG_CMD_I2C*/
#define CONFIG_CMD_MII
#define CONFIG_CMD_MMC
#define CONFIG_CMD_NAND
@@ -104,7 +99,6 @@
#define CONFIG_CMD_NFS
#define CONFIG_CMD_PING
#define CONFIG_CMD_SETEXPR
-/*#define CONFIG_CMD_SPI*/
#define CONFIG_CMD_USB
#define CONFIG_CMD_ASKENV /* ask for env variable */
@@ -139,7 +133,6 @@
* binary. In case there was more of this mess, 0x100 bytes are skipped.
*/
#define CONFIG_SYS_TEXT_BASE 0x44000000
-/*#define CONFIG_SPL_TEXT_BASE 0x00000000*/
/*
* FLASH organization
@@ -218,6 +211,7 @@
#define CONFIG_LZO
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
+#define CONFIG_MTDMAP "gpmi-nand.0"
#define MTDIDS_DEFAULT "nand0=gpmi-nand.0"
#define MTDPARTS_DEFAULT \
"mtdparts=gpmi-nand.0:" \
@@ -302,6 +296,8 @@
*/
#define CONFIG_EXTRA_ENV_SETTINGS \
"env_version=" CONFIG_ENV_VERSION "\0" \
+ "mtdparts=" MTDPARTS_DEFAULT "\0" \
+ "partition=nand0,4\0" \
"uboot_offset=" MK_STR(CONFIG_SYS_MONITOR_OFFSET) "\0" \
"uboot_len=" MK_STR(CONFIG_SYS_MONITOR_LEN) "\0" \
"env_offset=" MK_STR(CONFIG_ENV_OFFSET) "\0" \
@@ -384,7 +380,7 @@
" ${serverpath}${board_name}-linux.bin\0" \
"download_rootfs=tftpboot ${loadaddr} " \
" ${serverpath}${board_name}-rootfs.ubi\0" \
- "update_uboot=run download_uboot flash_uboot\0" \
+ "update_uboot=run update_nand_full\0" \
"update_kernel=run download_kernel flash_kernel\0" \
"update_rootfs=run download_rootfs flash_rootfs\0" \
"update_all=run download_kernel flash_kernel download_rootfs " \
@@ -392,8 +388,3 @@
#endif /* __APF28_H__ */
-
-#ifdef CONFIG_BOARD_NAME
-#undef CONFIG_BOARD_NAME
-#endif
-#define CONFIG_BOARD_NAME apf28
diff --git a/patches/buildroot/2011.05/165-elftosb-add_host_tools.patch b/patches/buildroot/2011.05/165-elftosb-add_host_tools.patch
index c7854b7..293f208 100644
--- a/patches/buildroot/2011.05/165-elftosb-add_host_tools.patch
+++ b/patches/buildroot/2011.05/165-elftosb-add_host_tools.patch
@@ -26,7 +26,7 @@ Index: buildroot/package/elftosb/elftosb.mk
+#############################################################
+ELFTOSB_VERSION = 10.12.01
+ELFTOSB_SOURCE = elftosb-$(ELFTOSB_VERSION).tar.gz
-+ELFTOSB_SITE = http://foss.doredevelopment.dk/mirrors/imx/
++ELFTOSB_SITE = http://repository.timesys.com/buildsources/e/elftosb/
+
+define HOST_ELFTOSB_BUILD_CMDS
+ $(MAKE) LIBS="-lstdc++ -lm" -C $(@D) all
diff --git a/patches/u-boot/2011.12/502-add-apf28.patch b/patches/u-boot/2011.12/502-add-apf28.patch
index 13fc968..2086dc3 100644
--- a/patches/u-boot/2011.12/502-add-apf28.patch
+++ b/patches/u-boot/2011.12/502-add-apf28.patch
@@ -1,9 +1,10 @@
--- u-boot-2011.12/board/armadeus/apf28/apf28.c 1970-01-01 01:00:00.000000000 +0100
-+++ u-boot-2011.12/board/armadeus/apf28/apf28.c 2012-01-28 21:50:07.612633124 +0100
-@@ -0,0 +1,228 @@
++++ u-boot-2011.12/board/armadeus/apf28/apf28.c 2012-01-29 09:57:15.183543034 +0100
+@@ -0,0 +1,218 @@
+/*
+ * APF28 motherboard based on DENX M28 module
+ *
++ * Copyright (C) 2012 Eric Jarrige <eri...@ar...>
+ * Copyright (C) 2011 Marek Vasut <mar...@gm...>
+ * on behalf of DENX Software Engineering GmbH
+ *
@@ -127,29 +128,19 @@
+
+int board_eth_init(bd_t *bis)
+{
++#define STR_ENV_ETHADDR "ethaddr"
+ struct mx28_clkctrl_regs *clkctrl_regs =
+ (struct mx28_clkctrl_regs *)MXS_CLKCTRL_BASE;
+ struct eth_device *dev;
++ uchar eth_addr[6];
+ int ret;
+
+ ret = cpu_eth_init(bis);
+
-+// clrsetbits_le32(&clkctrl_regs->hw_clkctrl_enet,
-+// CLKCTRL_ENET_TIME_SEL_MASK | CLKCTRL_ENET_CLK_OUT_EN,
-+// CLKCTRL_ENET_TIME_SEL_RMII_CLK);
-+
-+ /* MX28EVK uses ENET_CLK PAD to drive FEC clock */
++ /* uses ENET_CLK PAD to drive FEC clock */
+ writel(CLKCTRL_ENET_TIME_SEL_RMII_CLK | CLKCTRL_ENET_CLK_OUT_EN,
+ &clkctrl_regs->hw_clkctrl_enet);
+
-+ /* Power-on FECs */
-+// gpio_direction_output(MX28_PAD_SSP1_DATA3__GPIO_2_15, 0);
-+
-+ /* Reset FEC PHYs */
-+// gpio_direction_output(MX28_PAD_ENET0_RX_CLK__GPIO_4_13, 0);
-+// udelay(200);
-+// gpio_set_value(MX28_PAD_ENET0_RX_CLK__GPIO_4_13, 1);
-+
+ gpio_direction_output(MX28_PAD_ENET0_RX_CLK__GPIO_4_13, 0);
+ udelay(200);
+ gpio_set_value(MX28_PAD_ENET0_RX_CLK__GPIO_4_13, 1);
@@ -160,12 +151,6 @@
+ return ret;
+ }
+
-+/* ret = fecmxc_initialize_multi(bis, 1, 3, MXS_ENET1_BASE);
-+ if (ret) {
-+ printf("FEC MXS: Unable to init FEC1\n");
-+ return ret;
-+ }
-+*/
+ dev = eth_get_dev_by_name("FEC0");
+ if (!dev) {
+ printf("FEC MXS: Unable to get FEC0 device entry\n");
@@ -178,18 +163,16 @@
+ return ret;
+ }
+
-+/* dev = eth_get_dev_by_name("FEC1");
-+ if (!dev) {
-+ printf("FEC MXS: Unable to get FEC1 device entry\n");
-+ return -EINVAL;
++ 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 APF28: Couldn't get eth device\n");
++ ret = -1;
++ }
+ }
+
-+ ret = fecmxc_register_mii_postcall(dev, fecmxc_mii_postcall);
-+ if (ret) {
-+ printf("FEC MXS: Unable to register FEC1 mii postcall\n");
-+ return ret;
-+ }
-+*/
+ return ret;
+}
+
@@ -229,6 +212,13 @@
+#endif
+
+#endif
++
++#ifndef CONFIG_SYS_DCACHE_OFF
++void enable_caches(void)
++{
++ /* dcache_enable(); */
++}
++#endif
--- u-boot-2011.12/board/armadeus/apf28/Makefile 1970-01-01 01:00:00.000000000 +0100
+++ u-boot-2011.12/board/armadeus/apf28/Makefile 2011-11-27 11:31:22.299138403 +0100
@@ -0,0 +1,49 @@
@@ -282,11 +272,12 @@
+
+#########################################################################
--- u-boot-2011.12/board/armadeus/apf28/spl_boot.c 1970-01-01 01:00:00.000000000 +0100
-+++ u-boot-2011.12/board/armadeus/apf28/spl_boot.c 2012-01-28 21:24:29.956392651 +0100
-@@ -0,0 +1,277 @@
++++ u-boot-2011.12/board/armadeus/apf28/spl_boot.c 2012-01-29 10:12:49.295977402 +0100
+@@ -0,0 +1,195 @@
+/*
-+ * Freescale i.MX28 Boot setup
++ * Freescale i.MX28 Boot setup for the APF28 board
+ *
++ * Copyright (C) 2012 Eric Jarrige <eri...@ar...>
+ * Copyright (C) 2011 Marek Vasut <mar...@gm...>
+ * on behalf of DENX Software Engineering GmbH
+ *
@@ -317,10 +308,7 @@
+#include <asm/arch/sys_proto.h>
+
+#define MUX_CONFIG_LED (MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_NOPULL)
-+#define MUX_CONFIG_LCD (MXS_PAD_3V3 | MXS_PAD_4MA)
-+#define MUX_CONFIG_TSC (MXS_PAD_3V3 | MXS_PAD_8MA | MXS_PAD_PULLUP)
+#define MUX_CONFIG_SSP0 (MXS_PAD_3V3 | MXS_PAD_12MA | MXS_PAD_PULLUP)
-+#define MUX_CONFIG_SSP2 (MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_PULLUP)
+#define MUX_CONFIG_GPMI (MXS_PAD_1V8 | MXS_PAD_4MA | MXS_PAD_NOPULL)
+#define MUX_CONFIG_ENET (MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_PULLUP)
+#define MUX_CONFIG_EMI (MXS_PAD_3V3 | MXS_PAD_12MA | MXS_PAD_NOPULL)
@@ -329,80 +317,20 @@
+ /* LED */
+ MX28_PAD_GPMI_RDY1__GPIO_0_21 | MUX_CONFIG_LED,
+
-+ /* framebuffer */
-+/* MX28_PAD_LCD_D00__LCD_D0 | MUX_CONFIG_LCD,
-+ MX28_PAD_LCD_D01__LCD_D1 | MUX_CONFIG_LCD,
-+ MX28_PAD_LCD_D02__LCD_D2 | MUX_CONFIG_LCD,
-+ MX28_PAD_LCD_D03__LCD_D3 | MUX_CONFIG_LCD,
-+ MX28_PAD_LCD_D04__LCD_D4 | MUX_CONFIG_LCD,
-+ MX28_PAD_LCD_D05__LCD_D5 | MUX_CONFIG_LCD,
-+ MX28_PAD_LCD_D06__LCD_D6 | MUX_CONFIG_LCD,
-+ MX28_PAD_LCD_D07__LCD_D7 | MUX_CONFIG_LCD,
-+ MX28_PAD_LCD_D08__LCD_D8 | MUX_CONFIG_LCD,
-+ MX28_PAD_LCD_D09__LCD_D9 | MUX_CONFIG_LCD,
-+ MX28_PAD_LCD_D10__LCD_D10 | MUX_CONFIG_LCD,
-+ MX28_PAD_LCD_D11__LCD_D11 | MUX_CONFIG_LCD,
-+ MX28_PAD_LCD_D12__LCD_D12 | MUX_CONFIG_LCD,
-+ MX28_PAD_LCD_D13__LCD_D13 | MUX_CONFIG_LCD,
-+ MX28_PAD_LCD_D14__LCD_D14 | MUX_CONFIG_LCD,
-+ MX28_PAD_LCD_D15__LCD_D15 | MUX_CONFIG_LCD,
-+ MX28_PAD_LCD_D16__LCD_D16 | MUX_CONFIG_LCD,
-+ MX28_PAD_LCD_D17__LCD_D17 | MUX_CONFIG_LCD,
-+ MX28_PAD_LCD_D18__LCD_D18 | MUX_CONFIG_LCD,
-+ MX28_PAD_LCD_D19__LCD_D19 | MUX_CONFIG_LCD,
-+ MX28_PAD_LCD_D20__LCD_D20 | MUX_CONFIG_LCD,
-+ MX28_PAD_LCD_D21__LCD_D21 | MUX_CONFIG_LCD,
-+ MX28_PAD_LCD_D22__LCD_D22 | MUX_CONFIG_LCD,*/
-+/* MX28_PAD_LCD_D23__LCD_D23 | MUX_CONFIG_LCD,*/
-+/* MX28_PAD_LCD_RD_E__LCD_VSYNC | MUX_CONFIG_LCD,
-+ MX28_PAD_LCD_WR_RWN__LCD_HSYNC | MUX_CONFIG_LCD,
-+ MX28_PAD_LCD_RS__LCD_DOTCLK | MUX_CONFIG_LCD,
-+ MX28_PAD_LCD_CS__LCD_CS | MUX_CONFIG_LCD,
-+ MX28_PAD_LCD_VSYNC__LCD_VSYNC | MUX_CONFIG_LCD,
-+ MX28_PAD_LCD_HSYNC__LCD_HSYNC | MUX_CONFIG_LCD,
-+ MX28_PAD_LCD_DOTCLK__LCD_DOTCLK | MUX_CONFIG_LCD,
-+ MX28_PAD_LCD_ENABLE__GPIO_1_31 | MUX_CONFIG_LCD,
-+ MX28_PAD_LCD_RESET__GPIO_3_30 | MUX_CONFIG_LCD,*/
-+
-+ /* UART1 */
++ /* DEBUG UART (console) */
+ MX28_PAD_PWM0__DUART_RX,
+ MX28_PAD_PWM1__DUART_TX,
-+/* MX28_PAD_AUART0_TX__DUART_RTS,
-+ MX28_PAD_AUART0_RX__DUART_CTS,*/
-+
-+ /* UART2 */
-+/* MX28_PAD_AUART1_RX__AUART1_RX,
-+ MX28_PAD_AUART1_TX__AUART1_TX,
-+ MX28_PAD_AUART1_RTS__AUART1_RTS,
-+ MX28_PAD_AUART1_CTS__AUART1_CTS,*/
-+
-+ /* CAN */
-+/* MX28_PAD_GPMI_RDY2__CAN0_TX,
-+ MX28_PAD_GPMI_RDY3__CAN0_RX,*/
-+
-+ /* I2C */
-+/* MX28_PAD_I2C0_SCL__I2C0_SCL,
-+ MX28_PAD_I2C0_SDA__I2C0_SDA,*/
-+
-+ /* TSC2007 */
-+ /*MX28_PAD_SAIF0_MCLK__GPIO_3_20 | MUX_CONFIG_TSC,*/
+
+ /* MMC0 */
+ MX28_PAD_SSP0_DATA0__SSP0_D0 | MUX_CONFIG_SSP0,
+ MX28_PAD_SSP0_DATA1__SSP0_D1 | MUX_CONFIG_SSP0,
+ MX28_PAD_SSP0_DATA2__SSP0_D2 | MUX_CONFIG_SSP0,
+ MX28_PAD_SSP0_DATA3__SSP0_D3 | MUX_CONFIG_SSP0,
-+ MX28_PAD_SSP0_DATA4__SSP0_D4 | MUX_CONFIG_SSP0,
-+ MX28_PAD_SSP0_DATA5__SSP0_D5 | MUX_CONFIG_SSP0,
-+ MX28_PAD_SSP0_DATA6__SSP0_D6 | MUX_CONFIG_SSP0,
-+ MX28_PAD_SSP0_DATA7__SSP0_D7 | MUX_CONFIG_SSP0,
+ MX28_PAD_SSP0_CMD__SSP0_CMD | MUX_CONFIG_SSP0,
+ MX28_PAD_SSP0_DETECT__SSP0_CARD_DETECT |
+ (MXS_PAD_3V3 | MXS_PAD_12MA | MXS_PAD_NOPULL),
+ MX28_PAD_SSP0_SCK__SSP0_SCK |
+ (MXS_PAD_3V3 | MXS_PAD_12MA | MXS_PAD_NOPULL),
-+ /*MX28_PAD_PWM3__GPIO_3_28 | MUX_CONFIG_SSP0,*/ /* Power .. FIXME */
-+ /*MX28_PAD_AUART2_CTS__GPIO_3_10,*/ /* WP ... FIXME */
+
+ /* GPMI NAND */
+ MX28_PAD_GPMI_D00__GPMI_D0 | MUX_CONFIG_GPMI,
@@ -432,19 +360,10 @@
+ MX28_PAD_ENET0_TXD0__ENET0_TXD0 | MUX_CONFIG_ENET,
+ MX28_PAD_ENET0_TXD1__ENET0_TXD1 | MUX_CONFIG_ENET,
+ MX28_PAD_ENET_CLK__CLKCTRL_ENET | MUX_CONFIG_ENET,
-+ MX28_PAD_ENET0_TX_CLK__GPIO_4_5 | MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_NOPULL,
-+ MX28_PAD_ENET0_RX_CLK__GPIO_4_13 | MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_NOPULL,
-+
-+/* MX28_PAD_ENET0_COL__ENET1_TX_EN | MUX_CONFIG_ENET,
-+ MX28_PAD_ENET0_CRS__ENET1_RX_EN | MUX_CONFIG_ENET,
-+ MX28_PAD_ENET0_RXD2__ENET1_RXD0 | MUX_CONFIG_ENET,
-+ MX28_PAD_ENET0_RXD3__ENET1_RXD1 | MUX_CONFIG_ENET,
-+ MX28_PAD_ENET0_TXD2__ENET1_TXD0 | MUX_CONFIG_ENET,
-+ MX28_PAD_ENET0_TXD3__ENET1_TXD1 | MUX_CONFIG_ENET,*/
-+
-+ /* I2C */
-+/* MX28_PAD_I2C0_SCL__I2C0_SCL,
-+ MX28_PAD_I2C0_SDA__I2C0_SDA,*/
++ MX28_PAD_ENET0_TX_CLK__GPIO_4_5
++ | MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_NOPULL,
++ MX28_PAD_ENET0_RX_CLK__GPIO_4_13
++ | MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_NOPULL,
+
+ /* EMI */
+ MX28_PAD_EMI_D00__EMI_DATA0 | MUX_CONFIG_EMI,
@@ -465,8 +384,6 @@
+ MX28_PAD_EMI_D15__EMI_DATA15 | MUX_CONFIG_EMI,
+ MX28_PAD_EMI_ODT0__EMI_ODT0 | MUX_CONFIG_EMI,
+ MX28_PAD_EMI_DQM0__EMI_DQM0 | MUX_CONFIG_EMI,
-+/* MX28_PAD_EMI_ODT1__EMI_ODT1 | MUX_CONFIG_EMI,
-+ MX28_PAD_EMI_DQM1__EMI_DQM1 | MUX_CONFIG_EMI,*/
+ MX28_PAD_EMI_DDR_OPEN_FB__EMI_DDR_OPEN_FEEDBACK | MUX_CONFIG_EMI,
+ MX28_PAD_EMI_CLK__EMI_CLK | MUX_CONFIG_EMI,
+ MX28_PAD_EMI_DQS0__EMI_DQS0 | MUX_CONFIG_EMI,
@@ -495,15 +412,7 @@
+ MX28_PAD_EMI_RASN__EMI_RASN | MUX_CONFIG_EMI,
+ MX28_PAD_EMI_WEN__EMI_WEN | MUX_CONFIG_EMI,
+ MX28_PAD_EMI_CE0N__EMI_CE0N | MUX_CONFIG_EMI,
-+/* MX28_PAD_EMI_CE1N__EMI_CE1N | MUX_CONFIG_EMI,*/
+ MX28_PAD_EMI_CKE__EMI_CKE | MUX_CONFIG_EMI,
-+
-+ /* SPI2 (for flash) */
-+/* MX28_PAD_SSP2_SCK__SSP2_SCK | MUX_CONFIG_SSP2,
-+ MX28_PAD_SSP2_MOSI__SSP2_CMD | MUX_CONFIG_SSP2,
-+ MX28_PAD_SSP2_MISO__SSP2_D0 | MUX_CONFIG_SSP2,
-+ MX28_PAD_SSP2_SS0__SSP2_D3 |
-+ (MXS_PAD_3V3 | MXS_PAD_8MA | MXS_PAD_PULLUP),*/
+};
+
+uint32_t apf28_dram_vals[] = {
@@ -560,7 +469,6 @@
+ mx28_common_spl_init(iomux_setup, ARRAY_SIZE(iomux_setup));
+}
+
-+
--- u-boot-2011.12/board/armadeus/apf28/u-boot.bd 1970-01-01 01:00:00.000000000 +0100
+++ u-boot-2011.12/board/armadeus/apf28/u-boot.bd 2012-01-28 22:17:34.960258593 +0100
@@ -0,0 +1,20 @@
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-01-29 19:19: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 58ef3130bc3ee5589dfdbb84a32f3c8160fa19aa (commit)
from f337b433569c5035d47dcfaeed558e32c7ae898e (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 58ef3130bc3ee5589dfdbb84a32f3c8160fa19aa
Author: Eric Jarrige <eri...@ar...>
Date: Sun Jan 29 20:15:08 2012 +0100
[BUILDROOT] apf28: build host tool imx28-usb-downloader to recover the board (if needed..)
-----------------------------------------------------------------------
Summary of changes:
buildroot/target/device/armadeus/Makefile.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/buildroot/target/device/armadeus/Makefile.in b/buildroot/target/device/armadeus/Makefile.in
index 2b98a01..e3e9091 100644
--- a/buildroot/target/device/armadeus/Makefile.in
+++ b/buildroot/target/device/armadeus/Makefile.in
@@ -12,7 +12,7 @@ ifeq ($(BOARD_NAME),apf9328)
U_BOOT_BIN=u-boot.bin
else ifeq ($(BOARD_NAME),apf28)
U_BOOT_BIN=u-boot.nand
-TARGETS+=host-elftosb
+TARGETS+=host-elftosb host-imx28-usb-downloader
else
U_BOOT_BIN=u-boot-nand.bin
endif
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-01-29 19:11:14
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via f337b433569c5035d47dcfaeed558e32c7ae898e (commit)
from 04a50555eb68c5672da9f0c3f677f2a8566d39c9 (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 f337b433569c5035d47dcfaeed558e32c7ae898e
Author: Eric Jarrige <eri...@ar...>
Date: Sun Jan 29 20:10:02 2012 +0100
[BUILDROOT] add imx28-usb-downloader package to upload bin files in bootstrap mode - Temporary: Dev of python recover app ongoing..
-----------------------------------------------------------------------
Summary of changes:
buildroot/package/armadeus/Config.in | 1 +
.../armadeus/gnet-imx28-usb-downloader/Config.in | 5 +
.../gnet-imx28-usb-downloader.mk | 33 ++++
target/packages/gnet-imx28-usb-downloader/Makefile | 15 ++
.../gnet-imx28-usb-downloader/libusb_handler.c | 173 ++++++++++++++++++++
.../gnet-imx28-usb-downloader/libusb_handler.h | 117 +++++++++++++
target/packages/gnet-imx28-usb-downloader/main.c | 121 ++++++++++++++
target/packages/gnet-imx28-usb-downloader/main.h | 30 ++++
8 files changed, 495 insertions(+), 0 deletions(-)
create mode 100644 buildroot/package/armadeus/gnet-imx28-usb-downloader/Config.in
create mode 100644 buildroot/package/armadeus/gnet-imx28-usb-downloader/gnet-imx28-usb-downloader.mk
create mode 100644 target/packages/gnet-imx28-usb-downloader/Makefile
create mode 100644 target/packages/gnet-imx28-usb-downloader/libusb_handler.c
create mode 100644 target/packages/gnet-imx28-usb-downloader/libusb_handler.h
create mode 100644 target/packages/gnet-imx28-usb-downloader/main.c
create mode 100644 target/packages/gnet-imx28-usb-downloader/main.h
diff --git a/buildroot/package/armadeus/Config.in b/buildroot/package/armadeus/Config.in
index e77a511..285cd33 100644
--- a/buildroot/package/armadeus/Config.in
+++ b/buildroot/package/armadeus/Config.in
@@ -5,6 +5,7 @@ source package/armadeus/as_devices/Config.in
source package/armadeus/demos/Config.in
source package/armadeus/fpgaregs/Config.in
source package/armadeus/fpga_firmware/Config.in
+source package/armadeus/gnet-imx28-usb-downloader/Config.in
source package/armadeus/imxregs/Config.in
source package/armadeus/imxssi/Config.in
source package/armadeus/max5821ctrl/Config.in
diff --git a/buildroot/package/armadeus/gnet-imx28-usb-downloader/Config.in b/buildroot/package/armadeus/gnet-imx28-usb-downloader/Config.in
new file mode 100644
index 0000000..7ba174b
--- /dev/null
+++ b/buildroot/package/armadeus/gnet-imx28-usb-downloader/Config.in
@@ -0,0 +1,5 @@
+config BR2_PACKAGE_IMX28_USB_DOWNLOADER
+ bool "imx28-usb-downloader"
+ help
+ Host tooll to download iMX28 binary through USB.
+
diff --git a/buildroot/package/armadeus/gnet-imx28-usb-downloader/gnet-imx28-usb-downloader.mk b/buildroot/package/armadeus/gnet-imx28-usb-downloader/gnet-imx28-usb-downloader.mk
new file mode 100644
index 0000000..3f958e2
--- /dev/null
+++ b/buildroot/package/armadeus/gnet-imx28-usb-downloader/gnet-imx28-usb-downloader.mk
@@ -0,0 +1,33 @@
+#############################################################
+#
+# gnet-imx28-usb-downloader
+#
+#############################################################
+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/
+IMX28_USB_DOWNLOADER_SITE_METHOD=copy
+
+define HOST_IMX28_USB_DOWNLOADER_BUILD_CMDS
+ $(MAKE) -C $(@D) all
+endef
+
+define HOST_IMX28_USB_DOWNLOADER_INSTALL_CMDS
+ $(INSTALL) -D -m 0755 $(@D)/$(IMX28_USB_DOWNLOADER_BIN_NAME) $(HOST_DIR)/usr/bin/$(IMX28_USB_DOWNLOADER_BIN_NAME)
+endef
+
+define HOST_IMX28_USB_DOWNLOADER_CLEAN_CMDS
+ rm -rf $(HOST_DIR)/usr/bin/$(IMX28_USB_DOWNLOADER_BIN_NAME)
+endef
+
+define IMX28_USB_DOWNLOADER_BUILD_CMDS
+ $(MAKE) CC="$(TARGET_CC)" -C $(@D) all
+endef
+
+define IMX28_USB_DOWNLOADER_INSTALL_TARGET_CMDS
+ $(INSTALL) -m 0755 $(IMX28_USB_DOWNLOADER_DIR)/$(IMX28_USB_DOWNLOADER_BIN_NAME) $(TARGET_DIR)/usr/bin/$(IMX28_USB_DOWNLOADER_BIN_NAME)
+endef
+
+$(eval $(call GENTARGETS,package,imx28-usb-downloader))
+$(eval $(call GENTARGETS,package,imx28-usb-downloader,host))
+
diff --git a/target/packages/gnet-imx28-usb-downloader/Makefile b/target/packages/gnet-imx28-usb-downloader/Makefile
new file mode 100644
index 0000000..a04185f
--- /dev/null
+++ b/target/packages/gnet-imx28-usb-downloader/Makefile
@@ -0,0 +1,15 @@
+
+
+all: gnet-imx28-usb-downloader
+
+clean:
+ rm *.o gnet-imx28-usb-downloader
+
+gnet-imx28-usb-downloader: main.o libusb_handler.o
+ gcc -lusb main.o libusb_handler.o -o gnet-imx28-usb-downloader
+
+main.o: main.c main.h libusb_handler.h
+ gcc -c -Wall -Wno-format-zero-length main.c
+
+libusb_handler.o: libusb_handler.c libusb_handler.h
+ gcc -c -Wall libusb_handler.c
diff --git a/target/packages/gnet-imx28-usb-downloader/libusb_handler.c b/target/packages/gnet-imx28-usb-downloader/libusb_handler.c
new file mode 100644
index 0000000..3ca630b
--- /dev/null
+++ b/target/packages/gnet-imx28-usb-downloader/libusb_handler.c
@@ -0,0 +1,173 @@
+/*
+ * 2011 Grid-Net Inc Steve Iribarne <sir...@gr...>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+#include<stdio.h>
+#include<usb.h>
+#include<string.h>
+#include<unistd.h>
+#include "libusb_handler.h"
+
+inline int cpu_to_le16( int in){
+ int tmp = ((in & 0x000000ff)>>8)|((in&0x0000ff00)<<8);
+ return tmp;
+}
+
+
+int transferData( struct usb_dev_handle * dev, size_t tx_size, char * data){
+ int retval = 0;
+ struct _ST_HID_CBW *cbw = NULL;
+ size_t writesize = 0;
+ int payload_size=0;
+ int numbufs;
+ unsigned int tag=0;
+ unsigned int userbufidx=0;
+ unsigned int curbuf_ref=0;
+ char* buf;
+
+ writesize = TX_MSG_SIZE_1K+1;
+
+ cbw = malloc(sizeof(struct _ST_HID_CBW));
+ memset( cbw, 0, sizeof(struct _ST_HID_CBW ) );
+ cbw->Cdb.Command = BLTC_DOWNLOAD_FW;
+ cbw->Tag = ++tag;
+ cbw->cmd = 1;
+ cbw->Signature = CBW_BLTC_SIGNATURE;
+ cbw->XferLength =tx_size;
+ cbw->Flags = CBW_HOST_TO_DEVICE_DIR;
+ cbw->Cdb.Length = 0xf0804a00; //tx_size;
+
+ payload_size = sizeof(struct _ST_HID_CBW);
+
+ retval = usb_control_msg(dev,
+ HID_BLTC_REQUEST_TYPE,
+ HID_BLTC_REQUEST,
+ 0x0200|HID_BLTC_REPORT_TYPE_COMMAND_OUT,
+ 0,
+ (char*)cbw,
+ payload_size,
+ (int)2000);
+ if(retval != payload_size){
+ printf("\n%s: %s\n", __func__, usb_strerror());
+ return -ERR_TX;
+ }
+ free(cbw);
+
+ /* find the number of buffer's to transfer */
+ payload_size = writesize-1;
+ buf = malloc(writesize);
+
+ numbufs = tx_size / payload_size;
+ if(tx_size % payload_size)
+ numbufs ++;
+
+ userbufidx=0;
+ for(curbuf_ref=0; curbuf_ref<(numbufs-1); curbuf_ref++){
+ if(!(curbuf_ref/333))
+ printf(".");
+ memcpy(buf+1, data+userbufidx, payload_size);
+ userbufidx+=payload_size;
+ buf[0] = HID_BLTC_REPORT_TYPE_DATA_OUT;
+ retval = usb_control_msg(dev,
+ HID_BLTC_REQUEST_TYPE,
+ HID_BLTC_REQUEST,
+ 0x0200|HID_BLTC_REPORT_TYPE_DATA_OUT,
+ 0,
+ buf,
+ writesize,
+ 2000);
+ if (retval != writesize) {
+ printf("\n%s: buffer %d: %s", __func__, curbuf_ref, usb_strerror());
+ free(buf);
+ return -ERR_TX;
+ }
+ }
+ payload_size = tx_size - userbufidx;
+ memcpy(buf+1, data+userbufidx, payload_size);
+
+ buf[0] = HID_BLTC_REPORT_TYPE_DATA_OUT;
+ retval = usb_control_msg(dev,
+ HID_BLTC_REQUEST_TYPE,
+ HID_BLTC_REQUEST,
+ 0x0200|HID_BLTC_REPORT_TYPE_DATA_OUT,
+ 0,
+ buf,
+ writesize,
+ 2000);
+ if (retval != writesize) {
+ printf("\n%s: buffer %d: %s", __func__, curbuf_ref, usb_strerror());
+ return -ERR_TX;
+ }
+
+
+ if( !(retval= usb_interrupt_read(dev, 1, buf, 14, 500))){
+ printf("\n%s: error durring read: %s", __func__, usb_strerror());
+ return -ERR_TX;
+ }
+
+
+ free(buf);
+
+ return SUCCESS;
+}
+
+
+int usb_write( int size, char * dataBuf)
+{
+ struct usb_bus *bus;
+ struct usb_device *dev;
+ char found_dev=0;
+ int retval=0;
+
+ usb_init();
+ usb_find_busses();
+ usb_find_devices();
+
+ for (bus = usb_busses; bus; bus = bus->next) {
+ for (dev = bus->devices; dev; dev = dev->next) {
+ usb_dev_handle *udev;
+
+ if((dev->descriptor.idVendor==FREESCALE_VENDOR_ID) && (dev->descriptor.idProduct==FREESCALE_PRODUCT_ID)){
+ found_dev=1;
+ udev = usb_open(dev);
+
+ if(udev == NULL){
+ retval = -ERR_NO_DEV;
+ printf("\n%s: %s\n", __func__, usb_strerror());
+ }else {
+ if(usb_claim_interface(udev, 0) != 0 ){
+ if(usb_detach_kernel_driver_np(udev, 0) != 0 ){
+ printf("\n%s: %s\n", __func__, usb_strerror());
+ retval = -ERR_DEV_BUSY;
+ } else {
+ retval = transferData( udev, size, dataBuf);
+ usb_release_interface(udev, 0);
+ }
+ }else{
+ retval = transferData( udev, size, dataBuf);
+ usb_release_interface(udev, 0);
+ }
+ usb_close (udev);
+ }
+ }
+
+ }
+ }
+ if(found_dev == 0){
+ retval = -ERR_NO_DEV;
+ }
+ return retval;
+}
diff --git a/target/packages/gnet-imx28-usb-downloader/libusb_handler.h b/target/packages/gnet-imx28-usb-downloader/libusb_handler.h
new file mode 100644
index 0000000..13e57b2
--- /dev/null
+++ b/target/packages/gnet-imx28-usb-downloader/libusb_handler.h
@@ -0,0 +1,117 @@
+/*
+ * 2011 Grid-Net Inc Steve Iribarne <sir...@gr...>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+#define FREESCALE_VENDOR_ID 0x15a2
+#define FREESCALE_PRODUCT_ID 0x004f
+
+#define ERR_TX 1
+#define ERR_DEV_BUSY 2
+#define ERR_NO_DEV 3
+#define SUCCESS 0
+
+
+int usb_write( int size, char * dataBuf);
+
+
+/* USB DRIVER INFO */
+
+#define HID_BLTC_REQUEST_TYPE 0x21
+#define HID_BLTC_REQUEST 0x09
+
+#define BLTC_DOWNLOAD_FW 2
+#define HID_BLTC_REPORT_TYPE_DATA_OUT 2
+#define HID_BLTC_REPORT_TYPE_COMMAND_OUT 1
+
+#define TX_MSG_SIZE_1K 1024
+
+
+#pragma pack(1)
+ //------------------------------------------------------------------------------
+ // HID Download Firmware CDB
+ //------------------------------------------------------------------------------
+ typedef struct _CDBHIDDOWNLOAD {
+ unsigned char Command;
+ unsigned int Length;
+ unsigned char Reserved[11];
+} CDBHIDDOWNLOAD, *PCDBHIDDOWNLOAD;
+
+//------------------------------------------------------------------------------
+// HID Command Block Wrapper (CBW)
+//------------------------------------------------------------------------------
+struct _ST_HID_CBW
+{
+ unsigned char cmd;
+ unsigned int Signature; // Signature: 0x43544C42:1129598018, o "BLTC" (little endian) for the BLTC CBW
+ unsigned int Tag; // Tag: to be returned in the csw
+ unsigned int XferLength; // XferLength: number of bytes to transfer
+ unsigned char Flags; // Flags:
+ // Bit 7: direction - device shall ignore this bit if the
+ // XferLength field is zero, otherwise:
+ // 0 = data-out from the host to the device,
+ // 1 = data-in from the device to the host.
+ // Bits 6..0: reserved - shall be zero.
+ unsigned char Reserved[2]; // Reserved - shall be zero.
+ CDBHIDDOWNLOAD Cdb; // cdb: the command descriptor block
+};
+// Signature value for _ST_HID_CBW
+static const unsigned int CBW_BLTC_SIGNATURE = 0x43544C42; // "BLTC" (little endian)
+static const unsigned int CBW_PITC_SIGNATURE = 0x43544950; // "PITC" (little endian)
+// Flags values for _ST_HID_CBW
+static const unsigned char CBW_DEVICE_TO_HOST_DIR = 0x80; // "Data Out"
+static const unsigned char CBW_HOST_TO_DEVICE_DIR = 0x00; // "Data In"
+
+//------------------------------------------------------------------------------
+// HID Command Status Wrapper (CSW)
+//------------------------------------------------------------------------------
+struct _ST_HID_CSW
+{
+ unsigned char cmd;
+ unsigned int Signature; // Signature: 0x53544C42, or "BLTS" (little endian) for the BLTS CSW
+ unsigned int Tag; // Tag: matches the value from the CBW
+ unsigned int Residue; // Residue: number of bytes not transferred
+ unsigned char Status; // Status:
+ // 00h command passed ("good status")
+ // 01h command failed
+ // 02h phase error
+ // 03h to FFh reserved
+};
+// Signature value for _ST_HID_CSW
+static const unsigned int CSW_BLTS_SIGNATURE = 0x53544C42; // "BLTS" (little endian)
+static const unsigned int CSW_PITS_SIGNATURE = 0x53544950; // "PITS" (little endian)
+// Status values for _ST_HID_CSW
+static const unsigned char CSW_CMD_PASSED = 0x00;
+static const unsigned char CSW_CMD_FAILED = 0x01;
+static const unsigned char CSW_CMD_PHASE_ERROR = 0x02;
+
+struct _TSS_PACKET
+{
+ unsigned char ReportId;
+ unsigned char Payload[32];
+};
+
+struct _ST_HID_COMMMAND_REPORT
+{
+ unsigned char ReportId;
+ struct _ST_HID_CBW Cbw;
+};
+
+struct _ST_HID_STATUS_REPORT
+{
+ unsigned char ReportId;
+ struct _ST_HID_CSW Csw;
+};
+#pragma pack()
diff --git a/target/packages/gnet-imx28-usb-downloader/main.c b/target/packages/gnet-imx28-usb-downloader/main.c
new file mode 100644
index 0000000..3be13b2
--- /dev/null
+++ b/target/packages/gnet-imx28-usb-downloader/main.c
@@ -0,0 +1,121 @@
+/*
+ * 2011 Grid-Net Inc Steve Iribarne <sir...@gr...>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+#include<stdio.h>
+#include<usb.h>
+#include<string.h>
+#include <stdlib.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+#include <errno.h>
+#include"main.h"
+#include"libusb_handler.h"
+
+struct params {
+ char file_name[1024];
+};
+
+
+void checkargs(int argc, char * argv[], struct params * param){
+ int arg = 0;
+ while(arg < argc){
+ if(argv[arg][0] != '-'){
+ arg++;
+ continue;
+ }
+
+ if(strcmp("-h", argv[arg])==0){
+ printf(HELP_MSG);
+ exit(0);
+ }
+
+ if(strcmp("-v", argv[arg])==0){
+ printf(VERSION_MSG);
+ exit(0);
+ }
+
+ if((strcmp("-f", argv[arg]) == 0) && (strcmp("", param->file_name) == 0)){
+ if(argc > arg+1){
+ strcpy(param->file_name, argv[arg+1]);
+ }
+ }
+ arg++;
+ }
+
+ if(strcmp("", param->file_name)==0){
+ printf("No filename specified\n");
+ printf(USAGE_MSG);
+ exit(-EINERR);
+ }
+}
+
+int main(int argc, char *argv[]){
+ FILE * infd;
+ void * data;
+ int retval;
+ unsigned int sz, bytesRead;
+ struct params params={""};
+
+
+ checkargs(argc, argv, ¶ms);
+
+ infd = fopen(params.file_name, "rb");
+ if(infd == NULL){
+ printf( "Error opening input file: %s\n", strerror( errno ) );
+ exit(-EINERR);
+ }
+
+ fseek(infd, 0L, SEEK_END);
+ sz = ftell(infd);
+ fseek(infd, 0L, SEEK_SET);
+
+ data = malloc(sz);
+ if(data < 0){
+ printf( "Error allocating internal buffer: %s\n", strerror( errno ) );
+ return -EMEM;
+ }
+ bytesRead = 0;
+ while(bytesRead < sz){
+ bytesRead =+ fread(data+bytesRead, 1, sz, infd);
+
+ }
+
+ printf("attempting to write writing [%s] bootstream...", params.file_name);
+ retval=usb_write(sz, data);
+
+ switch(retval){
+ case -ERR_TX:
+ case -ERR_DEV_BUSY:
+ case -ERR_NO_DEV:
+ printf("Failed to write data to device.\n");
+ break;
+ case SUCCESS:
+ printf("SUCCESS\n");
+ break;
+ default:
+ printf("Unknown error\n");
+ }
+
+ free(data);
+ fclose(infd);
+ return retval;
+}
+
diff --git a/target/packages/gnet-imx28-usb-downloader/main.h b/target/packages/gnet-imx28-usb-downloader/main.h
new file mode 100644
index 0000000..af2ffbd
--- /dev/null
+++ b/target/packages/gnet-imx28-usb-downloader/main.h
@@ -0,0 +1,30 @@
+/*
+ * 2011 Grid-Net Inc Steve Iribarne <sir...@gr...>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+#define NUM_ARGS_EXPECTED 2
+#define VERSION_MSG "\ngnet_imx28_usb_downloader: \n version 0.5\n\n"
+#define USAGE_MSG "\nusage is: gnet_imx28_usb_downloader -f fileName \n\tfor help type: imx_usb_loader -h\n\n"
+#define HELP_MSG "gnet_imx28_usb_downloader:\n\nThis tool will stream the specified bootstream specified over USB to a Freescale imx280 device\nsupported switches: \n\t-f:\t specifies the input stream file (mandatory paramter)\n\t-h:\t prints this help message\n\t-v:\t prints version number\n\n"
+#define IMX_TRANSFER_PARAM_STR "/sys/module/imxldr/parameters/transfer_size"
+
+/* the first 4 are defined by libusb_handler.h */
+//#define SUCCESS 0
+//#define ERR_TX 1
+//#define ERR_DEV_BUSY 2
+//#define ERR_NO_DEV 3
+
+#define EINERR 4
+#define EMEM 5
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-01-28 22:09:23
|
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 04a50555eb68c5672da9f0c3f677f2a8566d39c9 (commit)
via d81fd2c5063a42051b9df7ef7951d33458bdcfaa (commit)
via 06e0b0166472472f40f54071cd48a3c6656f9f37 (commit)
from b46c51c30222fcc909ad88532341b59d38177e4b (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 04a50555eb68c5672da9f0c3f677f2a8566d39c9
Merge: d81fd2c b46c51c
Author: Eric Jarrige <eri...@ar...>
Date: Sat Jan 28 23:08:59 2012 +0100
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit d81fd2c5063a42051b9df7ef7951d33458bdcfaa
Author: Eric Jarrige <eri...@ar...>
Date: Sat Jan 28 23:07:36 2012 +0100
[BUILDROOT] apf28: update to U-Boot release 2011.12
commit 06e0b0166472472f40f54071cd48a3c6656f9f37
Author: Eric Jarrige <eri...@ar...>
Date: Sat Jan 28 22:51:24 2012 +0100
[UBOOT] apf28: support boot from scratch & improve reliability
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf28_defconfig | 3 +-
.../target/device/armadeus/apf28/apf28-u-boot-.h | 284 --------------
.../device/armadeus/apf28/apf28-u-boot-2011.12.h | 399 ++++++++++++++++++++
.../2011.12/02-uboot-apf28-update-makefile.patch | 16 -
.../u-boot/2011.12/501-imx28-update-and-fix.patch | 38 ++
.../{01-uboot-apf28.patch => 502-add-apf28.patch} | 113 +++++--
6 files changed, 530 insertions(+), 323 deletions(-)
delete mode 100644 buildroot/target/device/armadeus/apf28/apf28-u-boot-.h
create mode 100644 buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h
delete mode 100644 patches/u-boot/2011.12/02-uboot-apf28-update-makefile.patch
create mode 100644 patches/u-boot/2011.12/501-imx28-update-and-fix.patch
rename patches/u-boot/2011.12/{01-uboot-apf28.patch => 502-add-apf28.patch} (78%)
diff --git a/buildroot/configs/apf28_defconfig b/buildroot/configs/apf28_defconfig
index d0910ad..36b42d7 100644
--- a/buildroot/configs/apf28_defconfig
+++ b/buildroot/configs/apf28_defconfig
@@ -59,8 +59,9 @@ BR2_TARGET_ROOTFS_UBIFS=y
BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047
BR2_TARGET_ROOTFS_UBI=y
BR2_TARGET_UBOOT=y
+BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2011.12.h"
BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
-BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="ftp://ftp.denx.de/pub/u-boot/u-boot-2011.12-rc2.tar.bz2"
+BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="ftp://ftp.denx.de/pub/u-boot/u-boot-2011.12.tar.bz2"
BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2011.12"
BR2_TARGET_UBOOT_TOOL_ENV=y
# BR2_TARGET_UBOOT_NETWORK is not set
diff --git a/buildroot/target/device/armadeus/apf28/apf28-u-boot-.h b/buildroot/target/device/armadeus/apf28/apf28-u-boot-.h
deleted file mode 100644
index e42b37b..0000000
--- a/buildroot/target/device/armadeus/apf28/apf28-u-boot-.h
+++ /dev/null
@@ -1,284 +0,0 @@
-/*
- * Configuration settings for the Armadeus Project apf28 board.
- *
- * Copyright (C) 2011 Eric Jarrige, Armadeus Project
- * Copyright (C) 2011 Marek Vasut <mar...@gm...>
- * on behalf of DENX Software Engineering 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
- */
-#ifndef __APF28_H__
-#define __APF28_H__
-
-#include <asm/arch/regs-base.h>
-
-#define CONFIG_ENV_VERSION "0.1"
-#define CONFIG_IDENT_STRING " apf28 patch 0.1"
-
-/*
- * SoC configurations
- */
-#define CONFIG_MX28 /* i.MX28 SoC */
-#define CONFIG_MXS_GPIO /* GPIO control */
-#define CONFIG_SYS_HZ 1000 /* Ticks per second */
-
-/*
- * Define APF28 machine type by hand until it lands in mach-types
- */
-#define MACH_TYPE_APF28 3845
-
-#define CONFIG_MACH_TYPE MACH_TYPE_APF28
-
-#define CONFIG_SYS_NO_FLASH
-#define CONFIG_SYS_ICACHE_OFF
-#define CONFIG_SYS_DCACHE_OFF
-#define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_ARCH_CPU_INIT
-#define CONFIG_ARCH_MISC_INIT
-
-/*
- * SPL
- */
-#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_LIBCOMMON_SUPPORT
-#define CONFIG_SPL_LIBGENERIC_SUPPORT
-
-/*
- * U-Boot Commands
- */
-#include <config_cmd_default.h>
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DOS_PARTITION
-
-#define CONFIG_CMD_CACHE
-#define CONFIG_CMD_DATE
-#define CONFIG_CMD_DHCP
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_FAT
-#define CONFIG_CMD_GPIO
-/*#define CONFIG_CMD_I2C*/
-#define CONFIG_CMD_MII
-#define CONFIG_CMD_MMC
-#define CONFIG_CMD_NAND
-#define CONFIG_CMD_NET
-#define CONFIG_CMD_NFS
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_SETEXPR
-/*#define CONFIG_CMD_SPI*/
-#define CONFIG_CMD_USB
-
-/*
- * Memory configurations
- */
-#define CONFIG_NR_DRAM_BANKS 1 /* 1 bank of DRAM */
-#define PHYS_SDRAM_1 0x40000000 /* Base address */
-#define PHYS_SDRAM_1_SIZE 0x40000000 /* Max 1 GB RAM */
-#define CONFIG_STACKSIZE 0x00010000 /* 128 KB stack */
-#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 */
-#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
-/* Point initial SP in SRAM so SPL can use it too. */
-#define CONFIG_SYS_INIT_SP_ADDR 0x00002000
-/*
- * We need to sacrifice first 4 bytes of RAM here to avoid triggering some
- * strange BUG in ROM corrupting first 4 bytes of RAM when loading U-Boot
- * binary. In case there was more of this mess, 0x100 bytes are skipped.
- */
-#define CONFIG_SYS_TEXT_BASE 0x40000100
-
-/*
- * U-Boot general configurations
- */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_PROMPT "BIOS> "
-#define CONFIG_SYS_CBSIZE 1024 /* Console I/O buffer size */
-#define CONFIG_SYS_PBSIZE \
- (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
- /* Print buffer size */
-#define CONFIG_SYS_MAXARGS 32 /* Max number of command args */
-#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
- /* Boot argument buffer size */
-#define CONFIG_VERSION_VARIABLE /* U-BOOT version */
-#define CONFIG_AUTO_COMPLETE /* Command auto complete */
-#define CONFIG_CMDLINE_EDITING /* Command history etc */
-#define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-
-/*
- * Serial Driver
- */
-#define CONFIG_PL011_SERIAL
-#define CONFIG_PL011_CLOCK 24000000
-#define CONFIG_PL01x_PORTS { (void *)MXS_UARTDBG_BASE }
-#define CONFIG_CONS_INDEX 0
-#define CONFIG_BAUDRATE 115200 /* Default baud rate */
-#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
-
-/*
- * MMC Driver
- */
-#ifdef CONFIG_CMD_MMC
-#define CONFIG_MMC
-#define CONFIG_GENERIC_MMC
-#define CONFIG_MXS_MMC
-#endif
-
-/*
- * NAND
- */
-#ifdef CONFIG_CMD_NAND
-#define CONFIG_NAND_MXS
-#define CONFIG_APBH_DMA
-#define CONFIG_SYS_MAX_NAND_DEVICE 1
-#define CONFIG_SYS_NAND_BASE 0x60000000
-#define CONFIG_SYS_NAND_5_ADDR_CYCLE
-#define NAND_MAX_CHIPS 1
-
-/* Environment is in NAND */
-#define CONFIG_ENV_IS_IN_NAND
-#define CONFIG_ENV_SIZE (16 * 1024)
-#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
-#define CONFIG_ENV_SECT_SIZE (128 * 1024)
-#define CONFIG_ENV_RANGE (512 * 1024)
-#define CONFIG_ENV_OFFSET 0x300000
-#define CONFIG_ENV_OFFSET_REDUND \
- (CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE)
-
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
-#define CONFIG_CMD_MTDPARTS
-#define CONFIG_RBTREE
-#define CONFIG_LZO
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
-#define MTDIDS_DEFAULT "nand0=gpmi-nand.0"
-#define MTDPARTS_DEFAULT \
- "mtdparts=gpmi-nand.0:" \
- "3m(bootloader)ro," \
- "512k(environment)," \
- "512k(redundant-environment)," \
- "8M(kernel)," \
- "-(rootfs)"
-#endif
-
-/*
- * Ethernet on SOC (FEC)
- */
-#ifdef CONFIG_CMD_NET
-#define CONFIG_NET_MULTI
-#define CONFIG_ETHPRIME "FEC0"
-#define CONFIG_FEC_MXC
-#define CONFIG_FEC_MXC_MULTI
-#define CONFIG_MII
-#define CONFIG_DISCOVER_PHY
-#define CONFIG_FEC_XCV_TYPE RMII
-#define CONFIG_M28_FEC_MAC_IN_OCOTP
-#endif
-
-/*
- * I2C
- */
-#ifdef CONFIG_CMD_I2C
-#define CONFIG_I2C_MXS
-#define CONFIG_HARD_I2C
-#define CONFIG_SYS_I2C_SPEED 400000
-#endif
-
-/*
- * RTC
- */
-#ifdef CONFIG_CMD_DATE
-/* Use the internal RTC in the MXS chip */
-#define CONFIG_RTC_INTERNAL
-#define CONFIG_RTC_MXS
-#endif
-
-/*
- * USB
- */
-#ifdef CONFIG_CMD_USB
-#define CONFIG_USB_EHCI
-#define CONFIG_USB_EHCI_MXS
-#define CONFIG_EHCI_MXS_PORT 1
-#define CONFIG_EHCI_IS_TDI
-#define CONFIG_USB_STORAGE
-#endif
-
-/*
- * SPI
- */
-#ifdef CONFIG_CMD_SPI
-#define CONFIG_HARD_SPI
-#define CONFIG_MXS_SPI
-#define CONFIG_SPI_HALF_DUPLEX
-#define CONFIG_DEFAULT_SPI_BUS 2
-#define CONFIG_DEFAULT_SPI_MODE SPI_MODE_0
-#endif
-
-/*
- * Boot Linux
- */
-#define CONFIG_CMDLINE_TAG
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_BOOTDELAY 3
-#define CONFIG_BOOTFILE "uImage"
-#define CONFIG_BOOTARGS "console=ttyAM0,115200n8 "
-#define CONFIG_BOOTCOMMAND "run bootcmd_net"
-#define CONFIG_LOADADDR 0x42000000
-#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
-
-/*
- * Extra Environments
- */
-#define CONFIG_EXTRA_ENV_SETTINGS \
- "env_version=" CONFIG_ENV_VERSION "\0" \
- "update_nand_full_filename=u-boot.nand\0" \
- "update_nand_firmware_filename=u-boot.sb\0" \
- "update_nand_firmware_maxsz=0x100000\0" \
- "update_nand_stride=0x40\0" /* MX28 datasheet ch. 12.12 */ \
- "update_nand_count=0x4\0" /* MX28 datasheet ch. 12.12 */ \
- "update_nand_get_fcb_size=" /* Get size of FCB blocks */ \
- "nand device 0 ; " \
- "nand info ; " \
- "setexpr fcb_sz ${update_nand_stride} * ${update_nand_count};" \
- "setexpr update_nand_fcb ${fcb_sz} * ${nand_writesize}\0" \
- "update_nand_full=" /* Update FCB, DBBT and FW */ \
- "if tftp ${update_nand_full_filename} ; then " \
- "run update_nand_get_fcb_size ; " \
- "nand scrub -y 0x0 ${filesize} ; " \
- "nand write.raw ${loadaddr} 0x0 ${update_nand_fcb} ; " \
- "setexpr update_off ${loadaddr} + ${update_nand_fcb} ; " \
- "setexpr update_sz ${filesize} - ${update_nand_fcb} ; " \
- "nand write ${update_off} ${update_nand_fcb} ${update_sz} ; " \
- "fi\0" \
- "update_nand_firmware=" /* Update only firmware */ \
- "if tftp ${update_nand_firmware_filename} ; then " \
- "run update_nand_get_fcb_size ; " \
- "setexpr fcb_sz ${update_nand_fcb} * 2 ; " /* FCB + DBBT */ \
- "setexpr fw_sz ${update_nand_firmware_maxsz} * 2 ; " \
- "setexpr fw_off ${fcb_sz} + ${update_nand_firmware_maxsz};" \
- "nand erase ${fcb_sz} ${fw_sz} ; " \
- "nand write ${loadaddr} ${fcb_sz} ${filesize} ; " \
- "nand write ${loadaddr} ${fw_off} ${filesize} ; " \
- "fi\0"
-
-#endif /* __APF28_H__ */
-
diff --git a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h
new file mode 100644
index 0000000..42c05fa
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h
@@ -0,0 +1,399 @@
+/*
+ * Configuration settings for the Armadeus Project apf28 board.
+ *
+ * Copyright (C) 2011 Eric Jarrige, Armadeus Project
+ * Copyright (C) 2011 Marek Vasut <mar...@gm...>
+ * on behalf of DENX Software Engineering 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
+ */
+#ifndef __APF28_H__
+#define __APF28_H__
+
+#include <asm/arch/regs-base.h>
+
+#define CONFIG_VERSION_VARIABLE
+#define CONFIG_ENV_VERSION "0.1"
+#define CONFIG_IDENT_STRING " apf28 patch 0.1"
+
+/*
+ * SoC configurations
+ */
+#define CONFIG_MX28 /* i.MX28 SoC */
+#define CONFIG_MXS_GPIO /* GPIO control */
+#define CONFIG_SYS_HZ 1000 /* Ticks per second */
+
+/*
+ * Define APF28 machine type by hand until it lands in mach-types
+ */
+#define MACH_TYPE_APF28 3845
+
+#define CONFIG_MACH_TYPE MACH_TYPE_APF28
+
+#define CONFIG_SYS_NO_FLASH
+#define CONFIG_SYS_ICACHE_OFF
+#define CONFIG_SYS_DCACHE_OFF
+#define CONFIG_BOARD_EARLY_INIT_F
+#define CONFIG_ARCH_CPU_INIT
+#define CONFIG_ARCH_MISC_INIT
+
+/*
+ * SPL
+ */
+#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_LIBCOMMON_SUPPORT
+#define CONFIG_SPL_LIBGENERIC_SUPPORT
+
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_SUBNETMASK
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_BOOTFILESIZE
+
+/*
+#define CONFIG_BOOTP_DNS
+#define CONFIG_BOOTP_DNS2
+*/
+
+#define CONFIG_NETMASK 255.255.255.0
+#define CONFIG_IPADDR 192.168.2.10
+#define CONFIG_BOARD_NAME "apf28"
+#define CONFIG_HOSTNAME "apf28"
+#define CONFIG_GATEWAYIP 192.168.2.1
+#define CONFIG_SERVERIP 192.168.2.2
+#define CONFIG_SRV_PATH ""
+#define CONFIG_ROOTPATH "/tftpboot/apf28-root"
+
+/*
+ * U-Boot Commands
+ */
+#include <config_cmd_default.h>
+#define CONFIG_DISPLAY_CPUINFO
+#define CONFIG_DOS_PARTITION
+
+#define CONFIG_CMD_CACHE
+#define CONFIG_CMD_DATE
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_EXT2
+#define CONFIG_CMD_FAT
+#define CONFIG_CMD_GPIO
+/*#define CONFIG_CMD_I2C*/
+#define CONFIG_CMD_MII
+#define CONFIG_CMD_MMC
+#define CONFIG_CMD_NAND
+#define CONFIG_CMD_NET
+#define CONFIG_CMD_NFS
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_SETEXPR
+/*#define CONFIG_CMD_SPI*/
+#define CONFIG_CMD_USB
+
+#define CONFIG_CMD_ASKENV /* ask for env variable */
+#define CONFIG_CMD_BSP /* Board Specific functions */
+/*#define CONFIG_CMD_IIM*/ /* imx iim fuse */
+#define CONFIG_CMD_NAND_LOCK_UNLOCK
+#define CONFIG_CMD_NAND_TRIMFFS
+
+/*
+ * Memory configurations
+ */
+#define CONFIG_NR_DRAM_BANKS 1 /* 1 bank of DRAM */
+#define PHYS_SDRAM_1 0x40000000 /* Base address */
+#define PHYS_SDRAM_1_SIZE 0x20000000 /* Max 512 MiB RAM */
+#define CONFIG_STACKSIZE 0x00010000 /* 128 KB stack */
+#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 */
+#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
+/* Point initial SP in SRAM so SPL can use it too. */
+
+#define CONFIG_SYS_INIT_RAM_ADDR 0x00002000
+#define CONFIG_SYS_INIT_RAM_SIZE (128 * 1024)
+#define CONFIG_SYS_INIT_SP_OFFSET \
+ (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
+#define CONFIG_SYS_INIT_SP_ADDR \
+ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
+/*
+ * We need to sacrifice first 4 bytes of RAM here to avoid triggering some
+ * strange BUG in ROM corrupting first 4 bytes of RAM when loading U-Boot
+ * binary. In case there was more of this mess, 0x100 bytes are skipped.
+ */
+#define CONFIG_SYS_TEXT_BASE 0x44000000
+/*#define CONFIG_SPL_TEXT_BASE 0x00000000*/
+
+/*
+ * FLASH organization
+ */
+#define CONFIG_SYS_MONITOR_OFFSET 0x00000000 /* offset in NAND */
+#define CONFIG_SYS_MONITOR_LEN 0x00300000 /* 3MB */
+#define CONFIG_ENV_IS_IN_NAND
+#define CONFIG_ENV_OFFSET 0x00300000 /* NAND offset */
+#define CONFIG_ENV_SIZE 0x00020000 /* 128kB */
+#define CONFIG_ENV_RANGE 0x00080000 /* 512kB */
+#define CONFIG_ENV_OFFSET_REDUND \
+ (CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE) /* +512kB */
+#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE /* 512kB */
+#define CONFIG_KERNEL_OFFSET 0x00400000
+#define CONFIG_KERNEL_LEN 0x00800000 /* 8MB (BB ready) */
+#define CONFIG_ROOTFS_OFFSET 0x00C00000
+#define CONFIG_ROOTFS_LEN /* entire flash if not specified */
+
+/*
+ * U-Boot general configurations
+ */
+#define CONFIG_SYS_LONGHELP
+#define CONFIG_SYS_PROMPT "BIOS> "
+#define CONFIG_SYS_CBSIZE 1024 /* Console I/O buffer size */
+#define CONFIG_SYS_PBSIZE \
+ (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
+ /* Print buffer size */
+#define CONFIG_SYS_MAXARGS 32 /* Max number of command args */
+#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
+ /* Boot argument buffer size */
+#define CONFIG_AUTO_COMPLETE /* Command auto complete */
+#define CONFIG_CMDLINE_EDITING /* Command history etc */
+#define CONFIG_SYS_HUSH_PARSER
+#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
+
+/*
+ * Serial Driver
+ */
+#define CONFIG_PL011_SERIAL
+#define CONFIG_PL011_CLOCK 24000000
+#define CONFIG_PL01x_PORTS { (void *)MXS_UARTDBG_BASE }
+#define CONFIG_CONS_INDEX 0
+#define CONFIG_BAUDRATE 115200 /* Default baud rate */
+#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
+
+/*
+ * MMC Driver
+ */
+#ifdef CONFIG_CMD_MMC
+#define CONFIG_MMC
+#define CONFIG_GENERIC_MMC
+#define CONFIG_MXS_MMC
+#endif
+
+/*
+ * NAND
+ */
+#ifdef CONFIG_CMD_NAND
+#define CONFIG_NAND_MXS
+#define CONFIG_APBH_DMA
+#define CONFIG_SYS_MAX_NAND_DEVICE 1
+#define CONFIG_SYS_NAND_BASE 0x60000000
+#define CONFIG_SYS_NAND_5_ADDR_CYCLE
+#define CONFIG_FLASH_SHOW_PROGRESS 45
+#define NAND_MAX_CHIPS 1
+
+/* Environment is in NAND */
+#define CONFIG_ENV_IS_IN_NAND
+#define CONFIG_ENV_SECT_SIZE (128 * 1024)
+#define CONFIG_ENV_OVERWRITE
+
+#define CONFIG_CMD_UBI
+#define CONFIG_CMD_UBIFS
+#define CONFIG_CMD_MTDPARTS
+#define CONFIG_RBTREE
+#define CONFIG_LZO
+#define CONFIG_MTD_DEVICE
+#define CONFIG_MTD_PARTITIONS
+#define MTDIDS_DEFAULT "nand0=gpmi-nand.0"
+#define MTDPARTS_DEFAULT \
+ "mtdparts=gpmi-nand.0:" \
+ "3m(bootloader)ro," \
+ "512k(environment)," \
+ "512k(redundant-environment)," \
+ "8M(kernel)," \
+ "-(rootfs)"
+#endif
+
+/*
+ * Ethernet on SOC (FEC)
+ */
+#ifdef CONFIG_CMD_NET
+#define CONFIG_NET_MULTI
+#define CONFIG_ETHPRIME "FEC0"
+#define CONFIG_FEC_MXC
+#define CONFIG_FEC_MXC_MULTI
+#define CONFIG_MII
+#define CONFIG_DISCOVER_PHY
+#define CONFIG_FEC_XCV_TYPE RMII
+#define CONFIG_M28_FEC_MAC_IN_OCOTP
+#endif
+
+/*
+ * I2C
+ */
+#ifdef CONFIG_CMD_I2C
+#define CONFIG_I2C_MXS
+#define CONFIG_HARD_I2C
+#define CONFIG_SYS_I2C_SPEED 400000
+#endif
+
+/*
+ * RTC
+ */
+#ifdef CONFIG_CMD_DATE
+/* Use the internal RTC in the MXS chip */
+#define CONFIG_RTC_INTERNAL
+#define CONFIG_RTC_MXS
+#endif
+
+/*
+ * USB
+ */
+#ifdef CONFIG_CMD_USB
+#define CONFIG_USB_EHCI
+#define CONFIG_USB_EHCI_MXS
+#define CONFIG_EHCI_MXS_PORT 1
+#define CONFIG_EHCI_IS_TDI
+#define CONFIG_USB_STORAGE
+#endif
+
+/*
+ * SPI
+ */
+#ifdef CONFIG_CMD_SPI
+#define CONFIG_HARD_SPI
+#define CONFIG_MXS_SPI
+#define CONFIG_SPI_HALF_DUPLEX
+#define CONFIG_DEFAULT_SPI_BUS 2
+#define CONFIG_DEFAULT_SPI_MODE SPI_MODE_0
+#endif
+
+/*
+ * Boot Linux
+ */
+#define CONFIG_CMDLINE_TAG
+#define CONFIG_SETUP_MEMORY_TAGS
+#define CONFIG_INITRD_TAG
+#define CONFIG_BOOTDELAY -1
+#define CONFIG_ZERO_BOOTDELAY_CHECK
+#define CONFIG_BOOTFILE "uImage"
+#define CONFIG_BOOTARGS "console=ttyAM0,115200n8 "
+#define CONFIG_BOOTCOMMAND "run ubifsboot"
+#define CONFIG_SYS_AUTOLOAD "no"
+#define CONFIG_LOADADDR 0x40000000
+#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
+
+/*
+ * Extra Environments
+ */
+#define CONFIG_EXTRA_ENV_SETTINGS \
+ "env_version=" CONFIG_ENV_VERSION "\0" \
+ "uboot_offset=" MK_STR(CONFIG_SYS_MONITOR_OFFSET) "\0" \
+ "uboot_len=" MK_STR(CONFIG_SYS_MONITOR_LEN) "\0" \
+ "env_offset=" MK_STR(CONFIG_ENV_OFFSET) "\0" \
+ "env_len=" MK_STR(CONFIG_ENV_RANGE) "\0" \
+ "kernel_offset=" MK_STR(CONFIG_KERNEL_OFFSET) "\0" \
+ "kernel_len=" MK_STR(CONFIG_KERNEL_LEN) "\0" \
+ "rootfs_offset=" MK_STR(CONFIG_ROOTFS_OFFSET) "\0" \
+ "rootfs_len=" MK_STR(CONFIG_ROOTFS_LEN) "\0" \
+ "board_name=" MK_STR(CONFIG_BOARD_NAME) "\0" \
+ "serverpath=" MK_STR(CONFIG_SRV_PATH) "\0" \
+ "addnfsargs=setenv bootargs ${bootargs} " \
+ "root=/dev/nfs rw nfsroot=${serverip}:${rootpath}\0" \
+ "addubifsargs=setenv bootargs ${bootargs} " \
+ "ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs\0" \
+ "addmmcargs=setenv bootargs ${bootargs} " \
+ "root=${mmcroot} rootfstype=${mmcrootfstype}\0" \
+ "addipargs=setenv bootargs ${bootargs} " \
+ "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:" \
+ "${hostname}:eth0:off\0" \
+ "nfsboot=setenv bootargs ${console} ${mtdparts};" \
+ "run addnfsargs addipargs; setenv autostart yes;" \
+ "nboot.jffs2 40800000 0 ${kernel_offset}\0" \
+ "ubifsboot=setenv bootargs ${console} ${mtdparts};" \
+ "run addubifsargs addipargs; setenv autostart yes;" \
+ "nboot.jffs2 40800000 0 ${kernel_offset}\0" \
+ "mmcboot=setenv bootargs ${console} ${mtdparts};" \
+ "run addmmcargs addipargs; setenv autostart yes;" \
+ "nboot.jffs2 40800000 0 ${kernel_offset}\0" \
+ "update_nand_full_filename=apf28-u-boot.bin\0" \
+ "update_nand_firmware_filename=apf28-u-boot.sb\0" \
+ "update_nand_firmware_maxsz=0x100000\0" \
+ "update_nand_stride=0x40\0" /* MX28 datasheet ch. 12.12 */ \
+ "update_nand_count=0x4\0" /* MX28 datasheet ch. 12.12 */ \
+ "update_nand_get_fcb_size=" /* Get size of FCB blocks */ \
+ "nand device 0 ; " \
+ "nand info ; " \
+ "setexpr fcb_sz ${update_nand_stride} * ${update_nand_count};" \
+ "setexpr update_nand_fcb ${fcb_sz} * ${nand_writesize}\0" \
+ "update_nand_full=" /* Update FCB, DBBT and FW */ \
+ "if tftp ${update_nand_full_filename} ; then " \
+ "run update_nand_get_fcb_size ; " \
+ "nand scrub -y 0x0 ${filesize} ; " \
+ "nand write.raw ${loadaddr} 0x0 ${update_nand_fcb} ; " \
+ "setexpr update_off ${loadaddr} + ${update_nand_fcb} ; " \
+ "setexpr update_sz ${filesize} - ${update_nand_fcb} ; " \
+ "nand write ${update_off} ${update_nand_fcb} ${update_sz} ; " \
+ "fi\0" \
+ "update_nand_firmware=" /* Update only firmware */ \
+ "if tftp ${update_nand_firmware_filename} ; then " \
+ "run update_nand_get_fcb_size ; " \
+ "setexpr fcb_sz ${update_nand_fcb} * 2 ; " /* FCB + DBBT */ \
+ "setexpr fw_sz ${update_nand_firmware_maxsz} * 2 ; " \
+ "setexpr fw_off ${fcb_sz} + ${update_nand_firmware_maxsz};" \
+ "nand erase ${fcb_sz} ${fw_sz} ; " \
+ "nand write ${loadaddr} ${fcb_sz} ${filesize} ; " \
+ "nand write ${loadaddr} ${fw_off} ${filesize} ; " \
+ "fi\0" \
+ "flash_uboot=nand unlock ${uboot_offset} ${uboot_len};" \
+ "nand erase ${uboot_offset} ${uboot_len};" \
+ "if nand write.jffs2 ${fileaddr} ${uboot_offset} ${filesize};" \
+ "then nand lock; nand unlock ${env_offset};" \
+ "echo Flashing of uboot succeed;" \
+ "else echo Flashing of uboot failed;" \
+ "fi; \0" \
+ "flash_kernel=nand erase ${kernel_offset} ${kernel_len};" \
+ "if nand write.jffs2 ${fileaddr} ${kernel_offset} ${filesize};"\
+ "then echo Flashing of kernel succeed;" \
+ "else echo Flashing of kernel failed;" \
+ "fi\0" \
+ "flash_rootfs=nand erase.part rootfs;" \
+ "if nand write.jffs2 ${fileaddr} ${rootfs_offset} ${filesize};"\
+ "then echo Flashing of rootfs succeed;" \
+ "else echo Flashing of rootfs failed;" \
+ "fi\0" \
+ "flash_reset_env=env default -f; saveenv;" \
+ "echo Flash environment variables erased!\0" \
+ "download_uboot=tftpboot ${loadaddr} " \
+ " ${serverpath}${board_name}-u-boot.bin\0" \
+ "download_kernel=tftpboot ${loadaddr} " \
+ " ${serverpath}${board_name}-linux.bin\0" \
+ "download_rootfs=tftpboot ${loadaddr} " \
+ " ${serverpath}${board_name}-rootfs.ubi\0" \
+ "update_uboot=run download_uboot flash_uboot\0" \
+ "update_kernel=run download_kernel flash_kernel\0" \
+ "update_rootfs=run download_rootfs flash_rootfs\0" \
+ "update_all=run download_kernel flash_kernel download_rootfs " \
+ "flash_rootfs download_uboot flash_uboot\0"
+
+
+#endif /* __APF28_H__ */
+
+#ifdef CONFIG_BOARD_NAME
+#undef CONFIG_BOARD_NAME
+#endif
+#define CONFIG_BOARD_NAME apf28
diff --git a/patches/u-boot/2011.12/02-uboot-apf28-update-makefile.patch b/patches/u-boot/2011.12/02-uboot-apf28-update-makefile.patch
deleted file mode 100644
index fc8ce6a..0000000
--- a/patches/u-boot/2011.12/02-uboot-apf28-update-makefile.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -purN u-boot-custom.ori/Makefile u-boot-custom/Makefile
---- u-boot-custom.ori/Makefile 2011-11-23 21:23:45.000000000 +0100
-+++ u-boot-custom/Makefile 2011-12-04 13:48:38.335464312 +0100
-@@ -433,6 +433,12 @@ $(obj)u-boot.sb: $(obj)u-boot.bin
- elftosb -zdf imx28 -c $(TOPDIR)/board/$(BOARDDIR)/u-boot.bd \
- -o $(obj)u-boot.sb
-
-+$(obj)u-boot.nand: $(obj)u-boot.sb
-+ $(obj)tools/mxsboot nand u-boot.sb u-boot.nand
-+
-+$(obj)u-boot.sd: $(obj)u-boot.sb
-+ $(obj)tools/mxsboot sd u-boot.sb u-boot.sd
-+
- ifeq ($(CONFIG_SANDBOX),y)
- GEN_UBOOT = \
- cd $(LNDIR) && $(CC) $(SYMS) -T $(obj)u-boot.lds \
diff --git a/patches/u-boot/2011.12/501-imx28-update-and-fix.patch b/patches/u-boot/2011.12/501-imx28-update-and-fix.patch
new file mode 100644
index 0000000..e3c3c97
--- /dev/null
+++ b/patches/u-boot/2011.12/501-imx28-update-and-fix.patch
@@ -0,0 +1,38 @@
+diff -purN u-boot-custom.ori/Makefile u-boot-custom/Makefile
+--- u-boot-2011.12/Makefile 2011-11-23 21:23:45.000000000 +0100
++++ u-boot-2011.12/Makefile 2011-12-04 13:48:38.335464312 +0100
+@@ -433,6 +433,12 @@ $(obj)u-boot.sb: $(obj)u-boot.bin
+ elftosb -zdf imx28 -c $(TOPDIR)/board/$(BOARDDIR)/u-boot.bd \
+ -o $(obj)u-boot.sb
+
++$(obj)u-boot.nand: $(obj)u-boot.sb
++ $(obj)tools/mxsboot nand u-boot.sb u-boot.nand
++
++$(obj)u-boot.sd: $(obj)u-boot.sb
++ $(obj)tools/mxsboot sd u-boot.sb u-boot.sd
++
+ ifeq ($(CONFIG_SANDBOX),y)
+ GEN_UBOOT = \
+ cd $(LNDIR) && $(CC) $(SYMS) -T $(obj)u-boot.lds \
+--- u-boot-2011.12/arch/arm/cpu/arm926ejs/mx28/spl_mem_init.c 2011-12-23 20:25:35.000000000 +0100
++++ u-boot-2011.12/arch/arm/cpu/arm926ejs/mx28/spl_mem_init.c 2012-01-28 21:50:38.904592972 +0100
+@@ -72,7 +72,7 @@ uint32_t dram_vals[] = {
+ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010001
+ };
+
+-void init_m28_200mhz_ddr2(void)
++void __init_m28_200mhz_ddr2(void)
+ {
+ int i;
+
+@@ -80,6 +80,9 @@ void init_m28_200mhz_ddr2(void)
+ writel(dram_vals[i], MXS_DRAM_BASE + (4 * i));
+ }
+
++void init_m28_200mhz_ddr2(void)
++ __attribute__((weak, alias("__init_m28_200mhz_ddr2")));
++
+ void mx28_mem_init_clock(void)
+ {
+ struct mx28_clkctrl_regs *clkctrl_regs =
+
diff --git a/patches/u-boot/2011.12/01-uboot-apf28.patch b/patches/u-boot/2011.12/502-add-apf28.patch
similarity index 78%
rename from patches/u-boot/2011.12/01-uboot-apf28.patch
rename to patches/u-boot/2011.12/502-add-apf28.patch
index 72fd3c1..13fc968 100644
--- a/patches/u-boot/2011.12/01-uboot-apf28.patch
+++ b/patches/u-boot/2011.12/502-add-apf28.patch
@@ -1,6 +1,6 @@
---- u-boot-orig/board/armadeus/apf28/apf28.c 1970-01-01 01:00:00.000000000 +0100
-+++ u-boot-custom/board/armadeus/apf28/apf28.c 2011-12-01 19:05:09.737024396 +0100
-@@ -0,0 +1,216 @@
+--- u-boot-2011.12/board/armadeus/apf28/apf28.c 1970-01-01 01:00:00.000000000 +0100
++++ u-boot-2011.12/board/armadeus/apf28/apf28.c 2012-01-28 21:50:07.612633124 +0100
+@@ -0,0 +1,228 @@
+/*
+ * APF28 motherboard based on DENX M28 module
+ *
@@ -134,12 +134,24 @@
+
+ ret = cpu_eth_init(bis);
+
-+ clrsetbits_le32(&clkctrl_regs->hw_clkctrl_enet,
-+ CLKCTRL_ENET_TIME_SEL_MASK | CLKCTRL_ENET_CLK_OUT_EN,
-+ CLKCTRL_ENET_TIME_SEL_RMII_CLK);
++// clrsetbits_le32(&clkctrl_regs->hw_clkctrl_enet,
++// CLKCTRL_ENET_TIME_SEL_MASK | CLKCTRL_ENET_CLK_OUT_EN,
++// CLKCTRL_ENET_TIME_SEL_RMII_CLK);
++
++ /* MX28EVK uses ENET_CLK PAD to drive FEC clock */
++ writel(CLKCTRL_ENET_TIME_SEL_RMII_CLK | CLKCTRL_ENET_CLK_OUT_EN,
++ &clkctrl_regs->hw_clkctrl_enet);
++
++ /* Power-on FECs */
++// gpio_direction_output(MX28_PAD_SSP1_DATA3__GPIO_2_15, 0);
++
++ /* Reset FEC PHYs */
++// gpio_direction_output(MX28_PAD_ENET0_RX_CLK__GPIO_4_13, 0);
++// udelay(200);
++// gpio_set_value(MX28_PAD_ENET0_RX_CLK__GPIO_4_13, 1);
+
+ gpio_direction_output(MX28_PAD_ENET0_RX_CLK__GPIO_4_13, 0);
-+ udelay(100);
++ udelay(200);
+ gpio_set_value(MX28_PAD_ENET0_RX_CLK__GPIO_4_13, 1);
+
+ ret = fecmxc_initialize_multi(bis, 0, 0, MXS_ENET0_BASE);
@@ -217,8 +229,8 @@
+#endif
+
+#endif
---- u-boot-orig/board/armadeus/apf28/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ u-boot-custom/board/armadeus/apf28/Makefile 2011-11-27 11:31:22.299138403 +0100
+--- u-boot-2011.12/board/armadeus/apf28/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ u-boot-2011.12/board/armadeus/apf28/Makefile 2011-11-27 11:31:22.299138403 +0100
@@ -0,0 +1,49 @@
+#
+# (C) Copyright 2000-2006
@@ -269,9 +281,9 @@
+sinclude $(obj).depend
+
+#########################################################################
---- u-boot-orig/board/armadeus/apf28/spl_boot.c 1970-01-01 01:00:00.000000000 +0100
-+++ u-boot-custom/board/armadeus/apf28/spl_boot.c 2011-12-01 19:32:00.022103665 +0100
-@@ -0,0 +1,226 @@
+--- u-boot-2011.12/board/armadeus/apf28/spl_boot.c 1970-01-01 01:00:00.000000000 +0100
++++ u-boot-2011.12/board/armadeus/apf28/spl_boot.c 2012-01-28 21:24:29.956392651 +0100
+@@ -0,0 +1,277 @@
+/*
+ * Freescale i.MX28 Boot setup
+ *
@@ -494,29 +506,86 @@
+ (MXS_PAD_3V3 | MXS_PAD_8MA | MXS_PAD_PULLUP),*/
+};
+
++uint32_t apf28_dram_vals[] = {
++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
++ 0x00000000, 0x00000000, 0x00000100, 0x00000000, 0x00000000,
++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
++ 0x00000000, 0x00010101, 0x01010101, 0x000f0f01, 0x0f02020a,
++ 0x00000000, 0x00010101, 0x00000100, 0x00000100, 0x00000000,
++ 0x00000002, 0x01010000, 0x07080403, 0x06005003, 0x0a0000c8,
++ 0x02009c40, 0x0002030c, 0x0036a609, 0x031a0612, 0x02030202,
++ 0x00c8001c, 0x00000000, 0x00000000, 0x00012100, 0xffff0303,
++ 0x00012100, 0xffff0303, 0x00012100, 0xffff0303, 0x00012100,
++ 0xffff0303, 0x00000003, 0x00000000, 0x00000000, 0x00000000,
++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
++ 0x00000000, 0x00000612, 0x01000f02, 0x06120612, 0x00000200,
++ 0x00020007, 0xf4004a27, 0xf4004a27, 0xf4004a27, 0xf4004a27,
++ 0x07000300, 0x07000300, 0x07400300, 0x07400300, 0x00000005,
++ 0x00000000, 0x00000000, 0x01000000, 0x01020408, 0x08040201,
++ 0x000f1133, 0x00000000, 0x00001f04, 0x00001f04, 0x00001f04,
++ 0x00001f04, 0x00001f04, 0x00001f04, 0x00001f04, 0x00001f04,
++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
++ 0x00000000, 0x00000000, 0x00010000, 0x00030404, 0x00000003,
++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
++ 0x00000000, 0x01010000, 0x01000000, 0x03030000, 0x00010303,
++ 0x01020202, 0x00000000, 0x02040303, 0x21002103, 0x00061200,
++ 0x06120612, 0x04420442, 0x04420442, 0x00040004, 0x00040004,
++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffffffff
++};
++
++void init_m28_200mhz_ddr2(void)
++{
++ int i;
++
++ for (i = 0; i < ARRAY_SIZE(apf28_dram_vals); i++)
++ writel(apf28_dram_vals[i], MXS_DRAM_BASE + (4 * i));
++}
++
+void board_init_ll(void)
+{
+ mx28_common_spl_init(iomux_setup, ARRAY_SIZE(iomux_setup));
+}
---- u-boot-orig/board/armadeus/apf28/u-boot.bd 1970-01-01 01:00:00.000000000 +0100
-+++ u-boot-custom/board/armadeus/apf28/u-boot.bd 2011-11-27 11:31:22.299138403 +0100
-@@ -0,0 +1,14 @@
++
++
+--- u-boot-2011.12/board/armadeus/apf28/u-boot.bd 1970-01-01 01:00:00.000000000 +0100
++++ u-boot-2011.12/board/armadeus/apf28/u-boot.bd 2012-01-28 22:17:34.960258593 +0100
+@@ -0,0 +1,20 @@
+sources {
-+ u_boot_spl="spl/u-boot-spl.bin";
++ u_boot_spl="spl/u-boot-spl";
+ u_boot="u-boot.bin";
+}
+
+section (0) {
-+ load u_boot_spl > 0x0000;
-+ load ivt (entry = 0x0014) > 0x8000;
++ //----------------------------------------------------------
++ // SPL Initialization: power supply & DDR2 memory
++ //----------------------------------------------------------
++ load u_boot_spl;
++ load ivt (entry = u_boot_spl:board_init_ll) > 0x8000;
+ hab call 0x8000;
+
-+ load u_boot > 0x40000100;
-+ load ivt (entry = 0x40000100) > 0x8000;
++ //----------------------------------------------------------
++ // Load and call U-Boot
++ //----------------------------------------------------------
++ load u_boot > 0x44000000;
++ load ivt (entry = 0x44000000) > 0x8000;
+ hab call 0x8000;
+}
---- u-boot-orig/boards.cfg 2011-11-23 21:23:45.000000000 +0100
-+++ u-boot-custom/boards.cfg 2011-11-27 11:32:23.174363004 +0100
+--- u-boot-2011.12/boards.cfg 2011-11-23 21:23:45.000000000 +0100
++++ u-boot-2011.12/boards.cfg 2011-11-27 11:32:23.174363004 +0100
@@ -159,6 +159,7 @@ tx25 arm
zmx25 arm arm926ejs zmx25 syteco mx25
imx27lite arm arm926ejs imx27lite logicpd mx27
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2012-01-27 16:55:48
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via b46c51c30222fcc909ad88532341b59d38177e4b (commit)
from cbc69e2606aeb8ad56701b3191e9632dc8358653 (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 b46c51c30222fcc909ad88532341b59d38177e4b
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jan 27 17:55:07 2012 +0100
Updates version files after 4.1 release
-----------------------------------------------------------------------
Summary of changes:
.../rootfs/target_skeleton/etc/armadeus-version | 2 +-
scripts/release/changes.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/armadeus-version b/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/armadeus-version
index 7d5c902..c0feada 100644
--- a/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/armadeus-version
+++ b/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/armadeus-version
@@ -1 +1 @@
-4.1
+5.0-alpha-git
diff --git a/scripts/release/changes.sh b/scripts/release/changes.sh
index 253b6b7..5d60c58 100755
--- a/scripts/release/changes.sh
+++ b/scripts/release/changes.sh
@@ -15,7 +15,7 @@ CHANGES_TOOLS=$TEMP_DIR/tools.log
CHANGES_ASDEVICES=$TEMP_DIR/asdevices.log
CHANGES_OTHER=$TEMP_DIR/other.log
-LATEST_RELEASE_DATE="2011-07-09"
+LATEST_RELEASE_DATE="2012-01-27"
usage()
{
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2012-01-27 08:16:10
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The annotated tag, armadeus-4.1 has been created
at ccfb098d42edf5e680cc68d64dde161f2fa4b970 (tag)
tagging cbc69e2606aeb8ad56701b3191e9632dc8358653 (commit)
replaces armadeus-4.0
tagged by Julien Boibessot
on Fri Jan 27 09:14:57 2012 +0100
- Log -----------------------------------------------------------------
Creating TAG for armadeus-4.1 release
Eric Jarrige (70):
[BUILDROOT] install using cp instead of install for zlib libraries
Merge branch 'master' of ssh://jorasse@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[UBOOT] Fix clock init to support bootstrap loader
Merge branch 'master' of ssh://jorasse@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[BUILDROOT] Fix APF27 U-Boot build when using new BR 2010.11 : missing nand SPL
[UBOOT] Support patches for APF51 & config file
Merge branch 'master' of ssh://jorasse@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[UBOOT] Fix EMI clock computation when derived from AHB clock
Merge branch 'master' of ssh://jorasse@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
Support imx51 IIM fuse
[UBOOT] Remove hardcoded MAC address
[UBOOT] Use eth0 as default ethernet interface
[UBOOT] preload ethernet address to support linux current fec driver
Merge branch 'master' of ssh://jorasse@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[UBOOT] Fix default rootfs filename
[UBOOT] Check new compatibility version of environment variables
Merge branch 'master' of ssh://jorasse@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[BUILDROOT] 2010.11:Support CONFIG_SYS prefix for macros as define and requested in U-Boot 2010.xx
[UBOOT] Set NAND and SD outputs to high voltage
Merge branch 'master' of ssh://jorasse@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[BUILDROOT][APF9328] do not generate u-boot.brec file anymore - deprecated as u-boot recover script is now standard for all platforms
[BUILDROOT] Fix the exported variable ARMADEUS_ROOTFS_TAR since the naming rules changed with BUILDROOT-2010.11
[BUILDROOT] Change patches organization for U-Boot and use subdirectory for each version of U-Boot
[U-BOOT] Update apf9328 to U-Boot release 2011.06
[BUILDROOT] set U-Boot 2011.06 the default version for the apf9328
[U-BOOT] support new U-Boot release 2011.06
[BUILDROOT] update test config for apf9328
[UBOOT][2011.06] workaround to have U-Boot runnable from either Flash or RAM
[BUILROOT] split patch 155 into 2 patch files
[UBOOT] 2011.06 APF9328: Fix data cache issue that break linux boot with U-Boot upstream
[UBOOT] 2011.06 APF9328: Fix data cache issue that break linux boot with U-Boot upstream
[UBOOT] 2011.06 APF9328: Fix typo
[U-Boot] APF51: Improve mDDR XSR timing and fix EMR configuration.
[BUILDROOT] Add Freescale elftosb host tools
[BUILDROOT][APF28] Add freescale tool to build bootloader image
[UBOOT][APF28] Add preliminary U-Boot patch & config to support the apf28 board
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[BUILDROOT] update elftosb toolset to be align with the BR convention
[BUILDROOT][UBOOT] Add apf28 nand bootloader
[BUILDROOT][APF28] Update apf28 default configuration
[BUILDROOT] fix apf27 and apf9328 mkimage compilation
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[BUILDROOT] Toolchain cleanup - remove deprecrated tool ipkgs-utils
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[UBOOT][APF28] clean-up
[UBOOT][APF28] Allocate 3 MiB for bootloader - No reason to restrict this size
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[UBOOT][APF28] Update iomux minimal config and FEC0 reset
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[UBOOT][APF28] Update to the latest U-Boot 2011.12 RC1
[BUILDROOT][APF28] Add U-Boot compilation
[UBOOT][APF28] fix patch hunk
[UBOOT][APF28] Fix ethernet 0 FEC identifier
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[UBOOT][APF28] update U-Boot version
[UBOOT] Workaround to fix bug #102: reboot from Linux doesn't work on APF51, most of the time
[LINUX] apf51: make kernel auto relocatble on boot
[UBOOT] apf51: preliminary migration to u-Boot 2011.12
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[UBOOT] apf51: change PLL errata 12051 workaround to be generic
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[BUILDROOT] Pixman: Bump version 0.18.0 and fix outdated version
[UBOOT] apf51: update u-boot recover version to the latest version
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[UBOOT] apf51: Fix memory cache alignement issue
[UBOOT] apf51: Clean-up
[UBOOT] apf51:Â Clean-up and refactoring
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[UBOOT] apf51: add FPGA patches to U-Boot 2011.12
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
FabM (71):
[firmware][bus_led] Simple design to switch led,[apf_pkg] package for simulate read and write (imx), [Xtools] some tools to report synthezis problems
[FIRMWARE] bus_led synchronized
[TARGET] driver for bus_led IP
[target]Driver led upgraded with sysfs at /sys/fpgaled/
Immonde ^M supprimés
[target] Makefile and read correction
[target] Led driver with /dev, /sys and interruption
[firmware] Wisbone simple design example
[target] Interruption ok
[LINUX][DRIVERS] fpga special drivers dependance
[LINUX][DRIVERS] adding GPL, and correct some mistakes
[FIRMWARE][FPGA] correct some mistakes, and adding GPL
[KERNEL] modify patch for apf0328.c
[kernel][module] new fpgaregs, to read/write in 16bits on fpga driver+binary
[firmware][testbench] read/write function improvements (wsc can be set)
[Firmware] Hack kernel to export som irq handling functions.
[LINUX] Changing fpga driver tree
[drivers][POD] POD integration
[drivers][POD] POD integration
[DRIVERS][POD] fixing makefile
[Drivers][POD] Error patched
[DRIVERS][POD] podscript without tree cmd
[DRIVER] wb_led cleaning
[U-Boot] 50ns read cycle for CS1 (FPGA)
[FPGA][BRAMTest] Address shifted
[MAKEFILE] Little bug correction
[KERNEL][FPGA] Adding address defines for fpga
[KERNEL]
[DRIVER][FPGA] Unit test driver for i2c_ocores IP
[firmware] Makefile and testbench corrections
[Linux] Make uart2 work
[LINUX][apf9328] Suppressing uart irq declarations
[LINUX][SOFTWARE] fpgaregs update
[BUILDROOT] Adding MySQL-python in buildroot menu
[BUILDROOT] Oups ... patch error
[FIRMWARE] Updating and cleaning
[BUILDROOT] Adding some help on general makefile
[SOFTWARE]
[BUILDROOT][PACKAGE][MYSQL_CLIENT] Shrink size of mysql_client
[FIRMWARE] Do some cleaning
[FIRMWARE] README file to describe projects
[FIRMWARE] Cleanup wishbone_example directory
[LINUX] Adding a drivers directory for wishbone example (firmware/wishbone_example)
[FIRMWARE] Updating wishbone_example to be compatible with linux drivers in target/linux/module/fpga/wishbone_example/ directory
[LINUX] Drivers for wishbone_example are ready
[FIRMWARE] Adding 400k led example bitstream, rename 200k bitsream file, and do some modifications on VHDL to suppress warning
[FIRMWARE] Modify led example to use led already soldered on devfull apf9328
[FIRMWARE] Adding sub-directory for leds blinking_led and button_led
[FIRMWARE] Fill leds projects directories, with working files
[LINUX] Updating test programs for led and button in wishbone_example
[FIRMWARE] Make button_led design synchrone, and add a reset
[LINUX] Update config file for wishbone_example drivers
[FIRMWARE] Updating wishbone example to be compatible with apf27
[FIRMWARE] Adding bitstream for wishbone example apf27 and apf9328
[FIRMWARE] Updating all firmwares examples, with bitstream for apf27 and apf9328
[U-BOOT] Changing timing for fpga communication, strength for bus controls signals and CLK0 frequency (now the same frequency as weim bus -> 133MHz)
[LINUX] Suppress useless fpgaaccess driver
[LINUX][APF27] toggling fpga_reset pin to '1' when fpga is configured. Changing default firmware lenght in uboot variables
[LINUX] Rise fpga_reset when FPGA is configured
[U-BOOT] Release FPGA_RESET at the end of configuration, wait for DONE to stop toggling clock and ignore firmware size
[BUILDROOT] fpgaregs now work for apf27
[BUILDROOT] cleaning fpgaregs header
[BUILDROOT] Little bug in fpgaregs Makefile
[FIRMWARE] beautify wisbone_example VHDL code
[FIRMWARE] cleaning BRAMTest
[BUILDROOT] fpgaregs : check address conformity. ticket #44
[FIRMWARE] Cleaning PS2 project
[DEBUG] fpgaregs for apf27 bug corrected, help/error message improved
[SOFTWARE] change serial timing for uboot_recover for apf27
[DEBUG] pedantic commit
[FIRMWARE] Dynamic major number allocation
Fabien Marteau (423):
[LINUX][DRIVER][MAX1027] Scheduling bug corrected (to be reviewed)
/*
Merge branch 'master' of ssh://fabm@armadeus.git.sourceforge.net/gitroot/armadeus
[as_devices] as_apf27_pwm ok for c library, in dev for C++ wrapper
[as_device] Wrapper C++ validated for pwm (bis)
[as_devices] Little comment
[as_devices] Python wrapper added for pwm
[AsDevices] python wrapper done for pwm
[as_devices] begin buildroot integration of library
[BUILDROOT] adding makefile for AsDevices library
[as_devices] adding C libs for i2c (compile but not tested)
[as_devices] changing multiton
[as_devices] pwm and i2c C++ wrapper compiling ok
[as_devices] gpio C++ wrapper compiling
[as_devices] AD5258 in progress
Merge branch 'master' of ssh://fabm@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[BUILDROOT] Adding as_devices in .config file
[as_devices] python module in LGPL
[as_devices] Adding API for as_93lcxx memory functions
[as_devices] Adding spidev API
[as_devices] as_93lcxx lib compile, not tested
[as_devices] first version of as_spi compile
[as_devices] segfault fix on as_93lcxx_close()
[OTHERS] fix as_93lcxx lib bugs and clean indentation
Merge branch 'master' of ssh://fabm@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[OTHER] Changing spaces
[OTHER] spaces in AsDevices package
[OTHER] suppress warning and conform codings rules
[OTHER] quilt script messages update
[LINUX] spidev patch
[TOOLS] change quiltify script name
[LINUX] sign patch
[LINUX] Correct patch bug
[TOOLS] Suppress old named quilt script
[LINUX] Add comment to describe patch 339
[TOOLS] Adding eeprom 93lcxx test in AsDevices test program
[TOOL] AsDevice refactoring and bug correction in ad5258
[TOOL] little bug in ad5258 to be fixed
Merge branch 'master' of ssh://fabm@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[LINUX] Begin AMOLED p0340wql integration
[LINUX] Adding hx5116 and p0340wql amoled in default config
[LINUX] Adding spi3 in apf27-dev and manage spi with menuconfig
[LINUX] Fix little behavior bug in mxc_gpio_set()
[LINUX] Backport spi driver from 2.6.32.2 to use half duplex capabilities
[LINUX] Improve spi_gpio for single data pin
[LINUX] Not refreshed patches
[LINUX] Add comments for some patches
[LINUX] Patch 349 fixed
[LINUX] Fix spi_gpio patch
Merge branch 'master' of ssh://fabm@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[DEBUG] Adding imx-fpga communication testing program
[LINUX] Adding HX5116 Amoled driver in linux-menuconfig
[LINUX] Delete useless hx5116_backlight driver and improve hx5116.h for futur hx5116-display drivers that comming soon
Merge branch 'master' of ssh://fabm@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[LINUX] fix Makefile include error
[LINUX] HX5116-display header improve. (adding reset function in structure
[LINUX] Add hx5116-display driver in ARMadeus specific drivers directory
[LINUX] Improve configuration file to add HX5116_DISPLAY
[LINUX] Suppress traces under spi_gpio driver
[LINUX] Adding timing initialization in hx5116_display driver
[LINUX] Suppressing backlight powering capability from hx5116_display driver (this capability must be in imx_fb driver)
[LINUX] suppress power_on function callback in hx5116.h
[LINUX] add backlight power switch capability in fb driver
[LINUX][MODULE] suppress debug message
Merge branch 'master' of ssh://fabm@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[BUILDROOT] Default apf9328 configuration file correction
[linux] update apf9328 linux config file
[AsDevice] clean Makefile
[asdevices] Update Makefile
[asdevices] Update as_gpio library
[asdevices] Testbench corrections
[asdevices] Suppress apf27 reference in pwm lib
[asdevices] Fix makefile bug
[asdevices] Adding as_max1027 in progressâ¦
Merge branch 'master' of ssh://fabm@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[asdevices] Add platform parameter in compilation
Merge branch 'master' of ssh://fabm@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[as_devices] fix makefile platform variable
[asdevices] Adding test for max1027
Merge branch 'master' of ssh://fabm@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[LINUX] Update max1027 header
[asdevices] Adding reading temperature capability in as_max1027
[asdevices] Adding reading channel capability in as_max1027, not tested yet
[LINUX] Fix comments
[as_devices] Coding rules
[as_devices] Comment wrapper options
[as_devices] Gpio python wrapper in progress
codings rules
[as_devices] AsGpio python wrapper in progress
[as_devices] Compiling gpio python wrapper low level api
[as_devices] Adding python gpio multiton class
[as_devices] python class asgpio in progress
[buildroot] adding python wrapper in menu
[as_devices] AsGpio python wrapper done
coding rules
[linux] Correcting comments in loadgpio.sh
Merge branch 'master' of ssh://fabm@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[linux] Suppress i2c debuging messages from i2c-mxc.c
[linux] Fix smsc95xx led output
[linux] Adding lan9500A in smsc95xx driver
[linux] Adding ioctl for gpio pullup resistor
Revert "[linux] Adding lan9500A in smsc95xx driver"
Revert "[linux] Fix smsc95xx led output"
[linux] smsc95xx: add additional USB product IDs
[linux] shrink lan95xx patch
Merge branch 'master' of ssh://fabm@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
Suppressing old faulty patch
[linux][module] Adding irq configuration capability and suppress trailling white space
Merge branch 'master' of ssh://fabm@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[linux] Add comments in 347x patches
[linux] change patch comments
[linux][driver][gpio] Fix workaround
[linux][driver][gpio] Fix workaround (bis)
[linux] change gpio drivers version number
[linux] GPIO mask correction
Merge branch 'master' of ssh://fabm@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[AsDevices] Adding pullup capability (not tested) and suppress trailling white space
Merge branch 'master' of ssh://fabm@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[AsDevices] Add irq mode configuration function (not tested), suppress tab
[AsDevices] Add blocking read function (not tested), correct indent
indentation
[AsDevices] Adding irq and pullup function prototype for Python wrapper
[AsDevices] fix somes makefile bug
[asdevices] somes TODO in as_gpio python wrapper
[asdevices] suppressing spi tricks
cosmetic
Merge branch 'master' of git://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[buildroot] Adding camera capture tool in demos package
[buildroot] fix some bugs in demos package
[buildroot] demo capture makefile correction
Adding image to test lcd
Merge branch 'master' of git://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[as_devices] GPIO IRQ tested
Merge branch 'master' of git://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[as_devices] as_max1027 SLOW mode done
Merge branch 'master' of git://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[as_devices] adding Digital to Analog Chip as_max5821, not fully tested
Merge branch 'master' of git://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[as_devices] as_max5821 tested, little bug fixed
[as_devices] as_pwm done and tested
[as_devices] some cosmetic modifications and errors messages
[as_devices] no longer in as_devices
[as_devices] as_spi: code done, test to be done
[kernel] Adding interrupt status read/write capability on gpio driver
[kernel] adding poll capability in gpio driver (for select() )
[as_devices] adding timeout for blocking read
Merge branch 'master' of git://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[as_devices] deleting a debug message
[as_devices] Modify as_gpio to manage gpio pin independantly
[linux] Add pin management full capability on gpio driver module
merge
indentation
[kernel] fix some bugs in gpio driver, change version
[linux] change irq macro name for gpio driver
[linux] suppress both edge management in interrupt function for gpio driver
[as_devices] as_gpio: no code in header
Merge branch 'master' of ssh://fabm@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[as_devices] ioctl changed
[linux] Fix bug in irq mode gpio configuration
[as_devices] Makefile cleaning
[as_devices] {} replaced by () in Makefiles
[as_devices] suppress -DAPFXX compilation option
Merge branch 'master' of ssh://fabm@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[as_devices] suppress -DAPFXX compilation option (bis)
[buildroot] update config file for package cwiid
[buildroot] update config file for package cwiid (apf9328)
[linux][i2c] adding_mangling_capability_on_i2c_mxc_driver
Indentation & comments
Suppress some indent modification
Cosmetic again
Merge branch 'master' of ssh://fabm@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[linux] adding_as5011_joystick_driver
parenthesis
Merge branch 'master' of ssh://fabm@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[linux] Working version of as5011 joystick driver
[package][as_devices] Change data lenght for spi msg command
Merge branch 'master' of ssh://fabm@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[package] Adding jstest and jscal joystick testing programs
[package][joysticktest] armadeus buildroot is too old for GENTARGETS makefile, use manual makefile instead
[buildroot] unselect joysticktest package in config file
[linux][as5011] Do not try to free tabular pointer
[buildroot] adding joysticktest package in cleanup script
[buildroot] Add pickit2 programer command line program
[buildroot] Fix pickit2 package bugs
[buildroot] Fix joysticktest package bug
[buildroot] Adding pickit2 in default configuration (not set)
[buildroot] patch 123 and 124 in the right order
[buildroot] Cleaning pickit2 package
[buildroot] sstrip pk2cmd
[buildroot] strip joysticktest commands
[buildroot] Fix TARGET bug in joysticktest package
[buildroot] fix joysticktest package bugs
Merge branch 'master' of ssh://fabm@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[buildroot] fix little bug in strip command for joystick and pickit2 patches
[buildroot] Put joysticktest package in the right place in menuconfig
Merge branch 'master' of ssh://fabm@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[buildroot] fix buildroot patches
[linux] use as5011 joystick in low power mode
fix little patch bug
[asdevices] fix bug in as_spi
[linux] Adding AS1531 Analog to Digital Converter driver in kernel
[linux] Print channel value in milivolt
[linux] adding platform module for as1531
[linux] update apf27 linux config file for as1531
[linux] Fix gpio release bug under as1531 platform module
[AsDevices] AsGpio python wrapper functionnal
[package][mysql_client] Adding link to shared library under rootfs
[package][mysql_client] Fix library link bug
[as_devices] Change helpers name
[SOFTWARE] Add warning comment in u-boot recover
[linux] Clean as5011 patch according to checkpatch.pl kernel-2.6.36 script
[linux] Correcting as5011 driver according to kernel developper advices.
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[linux] Better error label in as5011 joystick driver
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[linux][2.6.36] adding AS5011 driver in kernel 2.6.36
[linux][i2c-imx]Â Adding mangling capability part1: ignore Ack
[linux] Adding mangling capability on i2c-imx Part 2
[linux] Adding mangling capability on i2c-imx Part 3: adding mangling capability flag
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[linux] Fix mangling capability bug in i2c-imx driver
[u-boot] Adding 16bits access memory test program : mtest16
[u-boot] Configure WEIM chip select register at boot time
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[u-boot] update apf51.h for weim registers configuration
[u-boot] cleaning apf51 patch, suppressing trailling white space and replace multiple space by TAB
[u-boot] suppress useless mtest16 fonction
[linux] Fix I2C_M_NOSTART bug in i2c-imx driver
[linux][as5011] switch to threaded irq
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[linux] Update default configuration file for linux kernel 2.6.36
[U-BOOT] Clean apf27 patch, suppressing trailling white spaces
[FIRMWARE] Adding minimum spartan3 design used to configure sp_vision spartan6 fpga
[U-BOOT] Suppress trailling white space for all patch in u-boot-2010.03
[U-BOOT] Adding patch to add spartan6 under u-boot-2010.03
[U-BOOT] Adding second load operator for sp_vision spartan6 configuration (to be cleaned)
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[LINUX] Updating as5011 drivers according to kernel developper comments
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[LINUX] Fix bug in patch 359-as5011
[U-BOOT][2010.03] fix second load operator patch for sp_vision extension card
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[U-BOOT] Adding second spartan6 in apf27.h u-boot2010 config file
[firmware] top_testconfig.bit was wrong
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[buildroot][BR2010.11] Avoid #hunk in patches
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[as_devices] Make python wrapper compiling under BR2010
[linux] Clean i2c-imx patch according to checkpatches.pl rules
[linux] Clean i2c-imx patch according to checkpatches.pl rules (bis)
[linux][spidev] Check if platform pointer is null before initialization in probe()
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[linux] Fix ethernet bug
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[linux] Adding ADC as1531 drivers
[buildroot][package][mysql_client] Update post install hooks according to new BR
[buildroot][package][mysql_client] Fix link bug
[buildroot][kernel] Update config files for buildroot 2010.11 and kernel 2.6.38-rc3
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[buildroot][package][mysql_client] Backport mysql_client-5.1.53 from official buildroot git, and fix shared library link bug
[buildroot][package][as_devices] Adding AsAdc wrapper for python
[buildroot][package][as_devices] Adding setPinDirection function under AsGpio python wrapper and suppress setpullup
[buildroot][package][as_devices] Adding function to write string in as_helpers.c
[buildroot][package][as_devices] Adding as_adc functions, and comment as_max1027
[buildroot][package][as_devices] Compile as_gpio for 2.6.29 or upper
[buildroot][package][as_devices] suppress as_gpio_set_pullup_value and as_gpio_get_pullup_value functions
[buildroot][package][as_devices] Fix littles bugs in makefile
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[as_devices] Changes as_i2c API
[uclibc] adding UCLIBC_SUSV3_LEGACY option to get time in ms
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[as_devices] Adding python dependency for wrapper
[as_devices] Adding generic as_adc class, with specific calls to as1531 and max1027 chip
[as_devices] Return error if read fail
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[as_devices] Adding as1531 chip class for adc
[as_devices] Adding generic dac class
[as_devices] Change license for python wrappers (to GNU Lesser General License)
[as_devices] Adding C wrapper for dac
[as_devices] Change name of API for dac setting value
[as_devices] fix api bug in as_dac wrapper
[as_devices] suppressing some warnings
[as_devices] Adding Dac python class
[as_devices] Fix some bugs in dac C and Python class
[linux] Adding driver for MCP4912 DAC chip, adding platform data for apf51dev
[as_devices] Suppress multiton implementation under python classes
[as_devices] Adding i2c python class wrapper
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[as_devices] Adding import AsI2c in AsDevices python init module
[buildroot][rootfs_skeleton] restore S13portmap init script
[as_devices]Adding i2c_read_msg function
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[as_devices] Fix a bug in i2c_read_msg
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[as_devices] Improvement to do in as_i2c python wrapper
[as_devices] Check size of data for i2c functions
[as_devices] Don't mix python and C in i2c python wrapper ;)
[buildroot][package][portmap] Backport new portmap from buildroot today git trunk (2011.05) -- to fix S13pormap init script copy
[linux][platform] Initialize CS gpio before registering max1027 on spi0 bus
[linux] Select dr register on output in gpiolib driver
[linux] Select gpiolib in linux2.6.38-rc3 configuration
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[linux] Fix 409 patch to compile linux for apf51
merge
[linux] 409 patch fixed
[u-boot] WEIM clock at 95MHz and 4 wait states for read/write
[software] Adding apf51 u-boot binary for u-boot-recover
[u-boot] Change nand clock to 23.75Mhz
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[u-boot][apf51][software][u-boot_recover] Delete #! tabulation
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[buildroot] Adding ngircd IRC server
[buildroot] put patch 147 in the right place
[BUILDROOT] Backport can-utils from buildroot and delete socketcan patch
[buildroot][apf51] select iproute2 by default
[buildroot][apf51] Adding fbv and can-utils by default
[linux][apf51] adding bit timings calculation for can
[buildroot][apf27] adding can utils package by default
[linux][apf27] Adding bittiming calculation for can
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[linux] Select fpga by defaut in linux for apf27
[firmware] Adding wishbone example for apf51
[firmware][apf51] Adding script and bitstream to generate dual uarts design for apf51_dev with gsm and gps
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[buildroot][package][straton] Adding straton menu
[buildroot] Adding capability to copy directory from the computer instead of downloading the package from the internet
[buildroot][package][straton] Change menuconfig to use a select list
[buildroot][package][straton] Change makefile according to new copy download target
[buildroot][package][straton] adding staging dir parameter
change binary name
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[linux][apf51][apf51dev] Adding menu for twin uart used in fpga for gsm and gps
[buildroot][package][straton] adding board_name value
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[linux][fpga][wishbone_twin_uart] kconfig avoided
[linux][configuration] adding twin uart module by default
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[buildroot][straton_ios] adding straton io library
[buildroot][package][straton] adding dependency to straton_ios
[buildroot][package][straton_ios] make straton_ios include directory
[buildroot][package][straton_ios] adding as_devices references
[buildroot][package][straton_ios] change profile name
[buildroot][package][straton_ios] fill io profile for led and button on apf27
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[linux] Set GIUS in gpio driver when direction is output
[buildroot][package][straton_ios] Change led polarity
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[buildroot][package][straton_ios] Fixing somes bugs
[buildroot][package][straton_ios] adding message when close io
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[buidroot][package][as_devices] Change as_gpio_open() argument, use gpio number instead of port letter plus pin number
[buildroot][package][straton_ios] as_gpio_open has changed
[buildroot][package][as_devices] new version number -> 0.16
[buildroot][package][straton_ios] adding support for apf51
[buildroot][package][straton_ios] Adapt straton_ios for apf51
[buildroot][package][straton_ios] Adapt straton_ios for apf51 (bis)
[buildroot][package][as_devices] Delete sleep in gpio open
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[buildroot][package][straton_ios] Artemys nitpick
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[buildroot][package][straton] Packaging completed (with demo version)
[buildroot] select cu by default for apf27 and apf51
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[demo] adding can device name in parameters
[linux][kconfig] Adding star completion capability
[linux][fpga] change structure of fpga drivers directory, work for twin_uarts
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[linux][kconfig] Adding star completion capability for kernel 2.6.29
[linux][fpga] Make wishbone example working
[linux][fpga] fix somes bugs in virtual components
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[linux][fpga] delete useless s_led.c driver code
[linux][fpga] Include armadeus Makefile.in ignoring errors
[linux][fpga] Little bug in probe error management for irq_manager
[linux] update configuration for apf51 and apf27 to match new fpga drivers
[linux] update pps and apf9328 config for new fpga drivers
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[firmware] update pod scripts to match new version of pod
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[linux][fpga] adding pod_gpio driver
[kernel] adding anybus_interface driver
[linux] change name of anybus interface driver
[linux] virtual_component pod_anybus is useless (under patch 440 now)
[uboot] Configure CS1 for fpga communication
Suppress useless end of lines under apf27-u-boot-2010.03.h file
[firmware] adding default design for sp_vision loader
[linux][fpga][sploader] little bug correction
[linux][fpga][board_designs] adding drivers for default design spvision_loader
[package][fpgaregs] manage fpga addressing memory space size
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[package][fpgaregs] better name for fpga map size
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[linux] do not initialize fpga pin if fpga drivers not selected
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[linux] adding fpga CLK0 signal as a GPIO by default
[firmware] adding blinking led constraints file and bistream for apf51
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[buildroot] Adding nanocom package
[buildroot][package][nanocom] littles nitpicks
[buildroot] cleanup nanocom directory for quiltify
[buildroot][as_devices] buildroot use python2.7 now
[buildroot][package][pyserial] python version is now 2.7
[buildroot][package][as_devices] fix gpio error
[buildroot][package][straton] adding some comments under straton makefile
[package][straton_ios] adding a usefull error message under exchange function
[demos] quit and dirty C program example to toggle gpio (led) with as_devices lib
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[package][as_devices] Check if device pointer is NULL
[linux][driver][fpga][led] adding testled program
[firmware][wishbone_example] Update bitstream for apf51 to work with board drivers
[linux][driver][fpga][button] adding test program for wishbone_example button
[linux][driver][fpga][wishbone_example] adding test program for button and led
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[package][as_devices] change irq mode macros
[firmware][linux] update sp_vision_loader for APF51
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[OTHER] Check if bitstream is in .bin format for APF51
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[OTHER] spelling mistake
Gwenhael Goavec-Merou (12):
[BUILDROOT] Add fix to build 1.16 busybox with make 3.82
[DEMO][REAL_TIME] Update all examples and Makefile according to the new Xenomai version
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
Add spvision loader
[VIRTUAL_COMPONENTS][SPLOADER] Removes the useless reading of id in the probe function
[UBOOT 1.3.4] Configure CS1 for spvision communication
[LINUX][VIRTUAL_COMPONENTS] sploader source cleanup
[LINUX][BOARD_DESIGNS] prober for sploader: suppress useless command in Makefile and variables
[LINUX][BOARD_DESIGNS] spvision loader needs to select virtual components
[BUILDROOT][APF9328] Add config file for 2.6.38 kernel
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[BUILDROOT][APF9328] Rename 2.6.38.8 kernel config to 2.6.38 and create a link for 2.6.38.8
Jaume Figeras (1):
[BUILDROOT] Add spanish keymap
Jeremie SCHEER (5):
Patch for uClibc : add the function trunc to avoid problems during Qt cross-compiling.
Merge branch 'master' of ssh://jscheer@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
Add a button Quit in ts_test to be able to terminate the application even when SIGINT is not handled.
Merge branch 'master' of ssh://jscheer@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
Full integration of Qt 4.5.3 in Buildroot :
Jeremie Scheer (70):
Change system timezone to France (CET+0).
Merge branch 'master' of ssh://jscheer@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
Change securetty serial port to ttyGS0.
[BUILDROOT] Add new package QWT 5.2.1 to Buildroot with examples that can be added to rootfs.
[BUILDROOT] Bugs correction for patches 132-qt-full_integration_with_cross_compiling.patch and 133-qwt-add_package.patch : seek Qt fonts in /usr/lib/fonts
[BUILDROOT] Correct inversion of demos and examples directories in patch 132-qt-full_integration_with_cross_compiling.patch
[BUILDROOT] Bug corrected in patch 132-qt-full_integration_with_cross_compiling.patch : Qt demos and examples not erased if they already exist in rootfs
[BUILDROOT] Modifications in patch 132-qt-full_integration_with_cross_compiling.patch : Change Qt demos & examples directory on install and target. Use the variable QT_VERSION instead of the number in the Makefile.
Merge branch 'master' of ssh://jscheer@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[BUILDROOT] Changes in patch 132-qt-full_integration_with_cross_compiling.patch : name of demos directory & use of variable QT_DEMOS_DIR.
[U-BOOT] Correction in patch 051i-u-boot-multi-version-support.patch to rename the config file according to BR2_TARGET_UBOOT_BOARDNAME instead of BR2_BOARD_NAME.
[BUILDROOT] Create patch 134-jffs2-add_board_name_to_binary_rootfs_name.patch to add board name to jffs2 binary file name in BR 2010.
[BUILD] Add PPS board configs : Linux, Buildroot, UBoot & uClibc config files and PPS baseboard kernel patch.
Merge branch 'master' of ssh://jscheer@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[LINUX] Rename the PPS' Linux configuration file.
Merge branch 'master' of ssh://jscheer@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[LINUX] Last commit correction : leave PPS's Linux original configuration file for old Buildroot.
[BUILDROOT] Add network packages (OpenSSH, OpenSSL, WPA supplicant, Wifi chipsets) and UBI Rootfs & UBoot Tool Env options to old & new BR.
[LINUX] Symbolic link for new BR PPS' Linux configuration file (pps-linux-2.6.29.6.config)
[BUILDROOT] Add PPS network test scripts package to Armadeus package with patch 135-pps-add_test_scripts_package.patch.
[TEST] Use script gpio_helpers.sh in reset_wi2wi.sh
[TEST] GPL licence added on PPS test scripts.
Merge branch 'master' of ssh://jscheer@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[BUILDROOT] Remove PPS package patch 135-pps-add_test_scripts_package.patch and manually add PPS Buildroot files to Armadeus package.
[LINUX] Change PPS baseboard prompt message in 500-pps-armadeus-add_pps_baseboard.patch.
[BUILDROOT] Add target and board APF27 PPS in target/device/armadeus/Config.in and change APF27 target name to APF27 DEV in all Buildroot config files.
[U-BOOT] For PPS boards, correction in U-Boot config files to take UBI file as rootfs instead of UBIFS.
[BUILDROOT] Add PPS Test scripts option to apf27 and apf9328 Buildroot's configuration files.
[ROOTFS] Add the gpio init file S80gpios to the rootfs when compiling a PPS board. Corrects bugs with ethernet SMSC and WPA Supplicant
[ROOTFS] Add PPS scripts path in PATH in /etc/profile when compiling a PPS board.
[ROOTFS] Correct file indentations and remove useless aliases in PPS' /etc/profile.
[ROOTFS] Add GPL license to PPS init file S80gpios.
[BUILDROOT] Bump flex, IPSec and IPTables versions with patches 137, 138 and 139 to make them work together and along with Linux 2.6.29.
[TEST] Fill GPL license year in PPS' test scripts.
[BUILDROOT] Correct Qt configuration options for MySQL module to specify libraries and headers directories.
[BUILDROOT] Create new patch for Qt's MySQL module configuration fix.
Merge branch 'master' of ssh://jscheer@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[ROOTFS] Add guest user with password to PPS board skeleton to allow SSH connections on it.
[ROOTFS] Put the guest user's file .ssh/authorized_keys in PPS' skeleton instead of creating it during system boot.
[LINUX] Add Netfilter NAT modules in PPS Linux config.
[BUILDROOT] Bug fix in BR 2010 for Qt examples installation: bad variable in Config.in.
[LINUX] Change number of patch 500-pps-armadeus-add_pps_baseboard.patch to 365.
[LINUX] Add renamed patch 365-pps-armadeus-add_pps_baseboard.patch.
[BUILDROOT] Add package TFP410CTRL setting (not set) in PPS' Buildroot configs.
[BUILDROOT] [2010.05] Run same command as for old BR in linux26-clean target.
[BUILDROOT] Add QWS Cursor option to Qt's Buildroot menuconfig.
[PPS] [LINUX] Add support for USB Gadget RS232 in PPS' Linux config.
[TEST] Correct ttyGS0 device test in PPS' USB Gadget Serial test script.
[PPS] [TEST] Add arguments to configure PPS' test scripts init_wpa, test_ipsec and test_ssh_tunnel.
[LINUX] [2.6.38.1] Make PWM device be registered in apf27.c' (patch 281).
[LINUX] [2.6.38.1] Add an option to mach-imx's Kconfig to support PWM in patch 282.
[LINUX] [2.6.38.1] Fix PWM's GPIO variable name in patch 426.
[LINUX] [2.6.38.1] Convert preprocessor variables in patch 291 (board-apf27.h) from Linux 2.6.29.6.
[LINUX] [2.6.38.1] Convert driver ad9889 from Linux 2.6.29.6 in patch 314.
[LINUX] [2.6.38.1] Convert Armadeus driver IMX Backlight from Linux 2.6.29.6 (imx_bl_2.6.23.c)
[LINUX] [2.6.38.1] Convert Armadeus driver PWM from Linux 2.6.38.1 (pwm.c).
[LINUX] [2.6.29.6] Fix bug with MXC_IO_ADDRESS in Armadeus' backlight driver.
[LINUX] Add direction to PWM0 GPIO port in patch 426.
Merge branch 'master' of ssh://jscheer@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[BUILDROOT] [AS_DEVICES] Add as_devices C++ wrappers (as_devices/cpp).
[BUILDROOT] [AS_DEVICES] Fix some bugs in as_devices C files.
[BUILDROOT] [AS_DEVICES] Add test executable for as_devices C and C++ wrappers in Buildroot options.
[BUILDROOT] [AS_DEVICES] Add device structure allocation test in C++ wrappers.
[LINUX] [2.6.38.1] Export irq_desc symbol for FPGA's irq manager in patch 199.
[LINUX] [2.6.38.1] Do not export irq_desc structure in patch 199 anymore.
[LINUX] [2.6.38.1] Fix flag CS5_BASE_ADDR in apf27.c (patch 281) to adapt it to Linux 2.6.38.1.
[TEST][PPS] Fix script test_wifi.sh by probing module mxcmmc before libertas_sdio.
[TEST][PPS] Fix script test_wifi.sh by probing module mxcmmc before libertas_sdio.
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
Jorasse (1):
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
Julien Boibessot (1012):
[LINUX] Activates Bluetooth support in 2.6.29 default configs for APF27
[BUILDROOT] Add preliminary work to build bluez
[BUILDROOT] Add preliminary work to build bluez
[DEMOS] xenomai examples: cleanup + indent checking + allows non RT kernel examples to be compiled for APF27
[BUILDROOT] Adds Boa to APF9328 test config + moves Linux/uClibc/busybox respective BR2_xx variables to according places in config file
[BUILDROOT] Updates bluez (non)selection due to automatic package detection...
[LINUX] Updates APF9328 default Linux configs according to new LCD support
[BUILD] Makes quilt script use git + some refinements
[LINUX] On APF9328 makes it possible to have UART without RTS/CTS support + configure console port accordingly
[LINUX] On APF9328 configure console port without RTS/CTS
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus
[LINUX] Updates APF27 default Linux configs according to new LCD support
Applies Linux coding rules
[TEST] Put serial port in raw mode during test
[LINUX] Makes ioctls work again in gpio driver
[TARGET] Add a directory (target/scripts/) to store useful system scripts that are not in the default rootfs skeleton
[BUILD] Preliminary work before buildroot patches moving
[BUILD] Renames Buildroot patches and moves them to patches/buildroot/
[BUILD] Renames Buildroot patches and moves them to patches/buildroot/ (Part2)
[LINUX] ISP1761: Gives correct init value to HW_MODE_REG register
[LINUX] APF9328: separates module (APF9328) and baseboards (DevFull/Light or others) hardware declaration/init parts
[LINUX] Converts a message into debug in GPIO driver
[LINUX] Makes LQ057 LCD works on APF27 (Freescale framebuffer)
[BUILDROOT] Add Quake package (patch)
[LINUX] gpio: correct deadlock bug + add an IOCTL for setting port Mode
[DEMOS] Adds a small C program to show how to use IOCTL with GPIO driver
[BUILD] Add target to get BR patched sources only: buildroot-patched-sources + simplify buildauto
Remove uneeded blank lines
correct error in a previous commit
[BUILDROOT] BR2_TARGET_U_BOOT_CONFIG_BOARD was not correctly set
[ROOTFS] Add /etc/mtab (symlink to /proc/mounts)
[LINUX] Adds new timing trick to improve i.MXL SDHC controller robustness
[TOOLS] Improve verbosity of quiltifying script
[LINUX] Separates APF27 and APF27Dev hardware declaration parts
[GIT] Add some .gitignore files
[BUILDROOT] Updates Linux 2.6.29 APF27 default configs
[LINUX] Removes bad comment in apf27.c
[LINUX] Add Optrex T51638D084 TFT support (APF27 & Freescale framebuffer)
[BUILDROOT] Updates APF27 default Linux configs (for Optrex TFT)
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[LINUX] Don't initialize i.MX27 FEC GPIOs if not configured
[LINUX] Correct small bug in gpio ioctl handling on APF27 (thanks Luca)
[LINUX] Improves Mode setting in GPIO driver
[BUILDROOT] Uses Buildroot generated ubinize, not host installed one
[TEST] Simplify GPIO test
[LINUX] Separates module and baseboard power management parts
[LINUX] USE_APF27DEV_IMX_LED_FOR_PM & USE_APF27DEV_IMX_SWITCH_FOR_PM options are only availableon the APF27DEV
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[BUILDROOT] Removes empty patches
[BUILDROOT] Re-integrates Quake package as a patch
[GIT] Adds top .gitignore file
[LINUX] Updates minors creation for APF27 in loadgpio.sh
[BUILDROOT] Adds Pygame package
[TOOLS] Corrects typos + windows format in boot recover tool
[BUILDROOT] Corrects bad installation of python files
[LINUX] Corrects bug in microSD removal detection
[LINUX] Removes (very) old kernel patches as they are no more supported (2.6.12, 2.6.17, 2.6.18.1)
[BUILDROOT] Bump default Armadeus Linux version from 2.6.29.4 to 2.6.29.6
[BUILD] Makes separate targets for buildroot sources loading, unpacking & patching
[TOOLS] Now quiltify tool can handle buildroot
[TOOLS] Remove no more needed/obsolete Linux patch management tool
[BUILDROOT] removes 2.6.18 from possible kernels selection
[LINUX] (Re)activates mouse/keyboard/joystick support for apf27 on 2.6.29. Hum... strange that it gone away...
[BUILDROOT] Move GPM into a patch that can be sent to buildroot team (when it will work ;-))
[TEST] Updates apf9328_test Linux config
[BUILD] Updates some .gitignore files
[BUILDROOT] Add patch to have Tslib working with Pygame
[DEMOS] Updates music player doc
[DEMOS] Cleanup fractal demo (now indentation has to be checked git status)
[DEMOS] Cleanup fractal demo (part 2)
[BUILDROOT] Bump proftp version 1.3.1 -> 1.3.2
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
Corrects commit 3092b276fa439a8345bf24819fec5e540ebff3ce (Hitachi LCD)
updates patches/buildroot/cleanup_buildroot.sh
[LINUX] Removes compilation warning in apf9328 when max1027 is not selected
[BUILD] Improve some .gitignore
[TOOLS] Don't try to quiltify if current view doesn't compile
[LINUX] Moves LCD config/handling outside of apf27.c
[BUILD] Improves .gitignore
[LINUX] Reorganizes LCDs for APF27 and add a custom hackable LCD entry
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[LINUX] Enhances APF27 Custom LCD source code presentation
[BUILDROOT] Updates APF27 default Linux configs
[BUILROOT] Revert commit d6300def6c2f271ef4140da342604cb88be0dc30 + add default as_devices option in APF27 Buildroot config files
[BUILDROOT] Allows nano to be selectable again
[BUILDROOT] Update APF9328 default configs
[BUILDROOT] Lets socketcan-clean target work
[BUILDROOT] Makes libjpeg download works again
[AS_DEVICES] Indentation + bad comments
[BUILDROOT] Use 2.6.29 kernel headers by default
Indentation...
[TEST] Improves testbutton & gpio test
[TOOLS] Cleanup setDAC
[TOOLS] ad9889ctrl: Cleanup + indentation
[TOOLS] Simplify setDAC tool sources
Add some .gitignore files
[DEBUG] imxssi doesn't require libpow to compile
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
Indentation
[DEMOS] Updates input_test Makefile
Indentation
[LINUX] Continue to better separate apf27.c and apf27-dev.c platform files
[LINUX] Sometimes TSC210x may need a reset before asking revision number
[BUILDROOT] ldd wasn't installed anymore in rootfs, correct that (Buildroot upstream patch)
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
Indentation + ^M at the end of lines: please don't use wordpad as text editor ! ;-) (only vim users can understand my pain)
[LINUX] Makes /sys/ (slow) mode of the max1027 more reliable + addstatistics entry
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[DEMOS] Add preliminary work for a graphical (kind of) oscilloscope using AsDevices library
[LINUX] AD9889: makes it possible to rmmod the driver when no chip was detected. Check indentation while we are at it...
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
Indentation...
Indentation...
[TEST] Cleanup and factorize test_fpga
[LINUX] Cleanup some wishbone_example Makefiles
[LINUX] Cleanup fpgaloader, check indentation while we are at it...
Updates Changelog and corresponding script
Comments
[TEST] Add new package tests
[BUILDROOT] Updates the way armadeus testsuite is installed
[TEST] Updates some packages tests for 3.2
[TEST] Update Linux drivers test for 3.2
[TEST] Updates test_release for 3.2
[BUILDROOT] Add tcpdump in apf27_test default config
[BUILDROOT] Add tcpdump in apf27_test default config
[TEST] One last test (for fun ;-))
Finish to update ChangeLog for 3.2
Finish to update ChangeLog for 3.2
[BUILDROOT] Improve GPM installation
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[OTHERS] Minor changes to AsDevice lib
[GIT] Ignore modified .so in target/packages/....
[LINUX] Add custom driver for MAX9768 audio amplifier
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
Indentation
[BUILD] Updates .gitignore files
[TOOLS] Removes ambiguous message from quiltify.sh
[LINUX] Add support for i.MX27 internal keypad controller
[BUILDROOT] Makes Mesa compile again and be better installed (Thanks CimCim)
[BUILD] Add some more .gitignore files
[DEMOS] input_test now looks up in /usr/share/images/ too to load its image file
[DEMOS] Homogenize demos build & install
[BUILD] Updates some more .gitignore files
[BUILDROOT] Add an armadeus/ dir in package/ to store all Armadeus specific utilities/tools building. Add it demos stuff to start.
[BUILDROOT] Move TestSuite to newly created package/armadeus/
[BUILDROOT] Move Drivers Helpers to newly created package/armadeus/
[BUILDROOT] Rename armadeus-tests.mk
[BUILDROOT] Move imxssi to newly created package/armadeus/
[BUILDROOT] Move as_devices to newly created package/armadeus/
[BUILDROOT] Fix 070-add_ad9889ctl_package.patch due to recent moves of packages to armadeus/
[BUILDROOT] Fixes snes9x package build
[TOOLS] quiltify.sh: Check VCS used before launching correspondig status command
[BUILDROOT] Add a fix for uClibc 0.9.29 to be able to set speed > 115200 on serial terminal/port
[DEMOS] Add a new tool to seek LCD's dead pixels
[BUILDROOT] Add missing dependancies to demos
[BUILDROOT] Add 2 new mount points in default rootfs for removable media: /media/mmc and /media/usbdisk.
[LINUX] Make Linux 2.6.27 compiles on Ubuntu 9.10 (and probably other recent releases). Thanks Sebastien V.C. for the report.
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[TOOLS] Add a small script to ease installation on Debian like systems. Thanks Sebastien.
[LINUX] Move APF27Dev extension board support in a separate file. Ease UART selection for APF27 while we are at it.
[BUILDROOT] Updates APF27 Linux default configs for wireless extension
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[DEMOS] Fixes Config.in
[TOOLS] Cleanup Buildroot patches in a better way in quiltify.sh
[BUILDROOT] Makes Quake visible/selectable in menuconfig
[LINUX] Add better serial port configuration (RTS/CTS) + config hiding when options are not available. Add configuration options for Bluetooth and WiFi on wireless extension board (APW). Add preliminary power management for APW.
[LINUX] Renamed patch 342
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[LINUX] Add debug trace for GPIO allocation
[BUILDROOT] Updates APF27 default Linux config
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[BUILDROOT] mtd-utils GIT archive format has changed: handle the new one.
Indentation
[BUILDROOT] Add ALSA's arecord to default config
[TEST] Makes mmc_perf.sh usable with USB keys
[TEST] Rename mmc_perf.sh to media_perf.sh
[LINUX] On APF27 I2C1 bus configuration is baseboard specific, so move it from apf27.c to apf27-dev.c
[LINUX] apf9328: update default config with new LCDs
[LINUX] Makes MAX9768 driver more verbose when errors occur
[BUILD] improve target/linux/.gitignore
[TOOLS] Cleanup imxssi debug tool and add it Audio In -> Audio Out loop option
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[LINUX] Updates patch 344
[LINUX] Makes TSC2101 Audio In usable on APF27 + add corresponding ALSA mixer controls. It still remains a DMA problem to fix
[LINUX] max9768: add possibility to read back internal values through /sys/ (were write only before)
[LINUX] Backport some 2.6.3x convenient patches for LAN95xx
[LINUX] tsc2101/ALSA: makes DMA (for audio in) work
[TOOLS] quiltify.sh: Correct date of renamed dir
[LINUX] tsc2101: has a mono ADC but transmit data in 2 I2S channels to i.MX
[LINUX] Add version number to tsc210x alsa pcm driver
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[TOOLS] quiltify: works on 2.6.X.y Linux sources instead of 2.6.X ones
[BUILDROOT] Moves libsndfile to autotools infrastructure and bump version to 1.0.21 while we are at it.
[BUILDROOT] libsndfile: some refinements after moving to autotools infrastructure and 1.0.21 version
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[BUILDROOT] Add uucp package (preliminary) + updates cleanup_buildroot.sh
[BUILD] Add U-Boot dir to armadeus global envt variables
[BUILD] Add U-Boot version to armadeus global envt variables
[TOOLS] Now U-Boot can be quiltified too
Updates APF27 default Buildroot config
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
Indentation...
[LINUX] tsc210x: improve error messages
[LINUX] tsc210x/ALSA: increase ALSA PCM buffer
[LINUX] Previous changes on SPI (for spidev) broke the modprobing of tsc210x module. Corrects that...
[LINUX] Cleanup 339-apf27-armadeus-spidev.patch
[TEST] Add newline before asking something to user (for clarity)
[TEST] Add test for Audio In (when applicable)
[TEST] rename test_sound.sh to test_audio.sh
[TEST] rename test_sound.sh to test_audio.sh (part 2)
[LINUX] Add support for WiFi module of APW
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[LINUX] Remove old & obsolete APF27DevTest support
[TEST] Add a test for WiFi (only for APW for the moment)
[LINUX] Improve suppor...
[truncated message content] |
|
From: Julien B a. A. <ar...@us...> - 2012-01-27 08:15: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 cbc69e2606aeb8ad56701b3191e9632dc8358653 (commit)
via 753912cf6cd3147fc516f219097eaf35accd8618 (commit)
from 449e09c41defcf282909e8937d1eee000a60c549 (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 cbc69e2606aeb8ad56701b3191e9632dc8358653
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jan 27 09:14:36 2012 +0100
Updates /etc/armadeus-version for armadeus-4.1
commit 753912cf6cd3147fc516f219097eaf35accd8618
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jan 27 09:13:21 2012 +0100
Updates Changelog for armadeus-4.1
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 263 ++++++++++++++++++++
.../rootfs/target_skeleton/etc/armadeus-version | 2 +-
2 files changed, 264 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 87498cd..6286210 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,266 @@
+
+----
+
+Changes in armadeus-4.1 (released on January 27th 2012)
+
+* Wiki dump available here: http://www.armadeus.com/assos_downloads/wiki/armadeus-4.1_wiki_dump.tar.gz
+
+* Corrected Tickets/Bugs:
+ #96 APF27: simultaneous I2C access on two different busses does not work
+ #56 Xorg won't start on APF27
+ #102 "reboot" from Linux doesn't work on APF51, most of the time
+ #107 Native toolchain compilation fails
+ #108 imx51 wrong pwm frequency
+
+* Buildroot:
+ Main changes: bug fixes and small improvements, move to Buildroot 2011.05, preliminary APF28 support
+ new packages: CanFestival libmodbus rt-test elftosb nanocom imx-lib imx-test
+
+ List of all changes:
+ - Fixes fakeroot download site
+ - Workaround mplayer build failing on APF51
+ - Updates apf27_webradio_defconfig apf51test_defconfig due to recent pygames changes
+ - Pixman: Bump version 0.18.0 and fix outdated version
+ - Fixes "copy" download method
+ - Updates pygame package with latest BR mainline commit
+ - Improve as_devices package integration/build in BR
+ - apf51test_defconfig: add gdb for target, gstreamer, pygame and pyserial to config
+ - Update python package to BR state of the art
+ - Updates pygame to 1.9 and rework BR makefile while we are at it
+ - Fixes patches/buildroot/2011.05/057-pymysql-add_package.patch
+ - Remove our custom pyserial package as it is now integrated (in another way) to BR
+ - Add CanFestival package
+ - Get mainlined mercurial download method for packages
+ - Fixes rt-tests build for non NUMA targets
+ - Toolchain cleanup - remove deprecrated tool ipkgs-utils
+ - fix apf27 and apf9328 mkimage compilation
+ - Add rt-tests package
+ - update elftosb toolset to be align with the BR convention
+ - Improve armadeus drivers-helpers installation
+ - Add Freescale elftosb host tools
+ - [package][straton] adding some comments under straton makefile
+ - [package][as_devices] fix gpio error
+ - [package][pyserial] python version is now 2.7
+ - [as_devices] buildroot use python2.7 now
+ - Adding nanocom package
+ - Makes it possible to compile 3.x Linux kernels
+ - Fixes mplayer build on APF27 & APF9328
+ - imx-test: add mxc_vpu_test build by default and let it compile on recent kernels
+ - imx-lib: better installation of libvpu in staging
+ - Add Freescale's imx-lib & imx-test packages (not selectable in menu yet)
+ - 2011.05: Add libmodbus package
+ - Bump used busybox version to 1.18.5
+ - [APF9328] Rename 2.6.38.8 kernel config to 2.6.38 and create a link for 2.6.38.8
+ - [APF9328] Add config file for 2.6.38 kernel
+ - crosstool: bump kernel headers version
+ - Re-makes 1.3.4 the default APF9328 U-Boot version
+ - Makes U-Boot's fw_printenv compile again with recent toolchains
+ - Fixes armadeus testsuite installation failure, due to recent changes in target/linux/modules/fpga/
+ - Bump setserial patches version to fix build
+ - Activate back portmap by default for all boards
+ - [2011.05] Remove no more needed 143-tslib-enable_raw_module.patch
+ - Bump default BR version to 2011.05
+ - Fixes buildroot/target/device/armadeus/uClibc-0.9.30.config for APF27
+ - [2011.05] Makes Armadeus specific Makefile.in sourced again by BR
+ - Moves all trivial armadeus rootfs specificities to a post build script
+ - Makes it possible to choose generic tty even when custom rootfs option is selected
+ - [2010.05] Makes 051h-u-boot-makes_binary_targets_name_overloadable.patch work again
+ - Cleanup: remove useless files in buildroot/target/device/armadeus/linux/
+ - Cleanup: 1] remove board specific uClibc configs and use APF common one. 2] remove useless file buildroot/target/device/armadeus/u-boot/u-boot.mk
+ - Add a common default uClibc config (0.9.30)
+ - APF51 has an FPU so add option in default config
+ - Homogenizes APF uClibc configs
+ - Get rid of buildroot/target/device/armadeus/[apf*|pps]/Makefile.in
+ - Cleanup Armadeus custom makefiles and update BR default configs accordingly
+ - Compact/minify APF51 related configs
+ - Compact/minify APF27 related configs
+ - APF51: bump default Linux version to 2.6.38.8
+ - [2011.05] Remove warnings when applying patches and add 156-u.boot-remove-u-boot-patch-prefix.patch
+ - Display build time when build is successful
+ - Continue work on BR 2011.05 support
+ - Set correct BR2_GIT variable in armadeus defconfigs
+ - Add preliminary support for BR 2011.05 (to be continued)
+ - update test config for apf9328
+ - set U-Boot 2011.06 the default version for the apf9328
+ - Change patches organization for U-Boot and use subdirectory for each version of U-Boot
+ - Add package anybus-tools
+ - Remove package anybusd
+ - Update Xenomai version and adds patch to compile again
+ - Fix the exported variable ARMADEUS_ROOTFS_TAR since the naming rules changed with BUILDROOT-2010.11
+ - [APF9328] do not generate u-boot.brec file anymore - deprecated as u-boot recover script is now standard for all platforms
+ - split patch 155 into 2 patch files
+ - Moves buildroot/target/device/armadeus/linux/kernel-patches/ content to patches/linux/
+ - [APF28] Update apf28 default configuration
+ - [APF28] Add U-Boot compilation
+ - [APF28] Add freescale tool to build bootloader image
+* Linux:
+ Main changes : Bug fixes and small improvements, preliminary APF28 support (Linux 3.1), SP_VISION support, driver HMS AnyBus, Linux 3.0 for APF51
+
+ List of all changes:
+ - 2.6.29: Fixes I2C hangup when accessing both I2C busses of APF27
+ - ov96xx: let the user the ability to drive itself reset and powerdwn lines. Makes driver less verbose on console when reading/writing registers.
+ - Fixes bug when compiling FPGA drivers others/i2ctest/ & others/ps2keyboard/
+ - Fixes wishbone test drivers activation in apf27test-linux-2.6.29.config
+ - Fixes load_fpga script when detecting .bin/.bit extension on APF51
+ - Add wishbone example's drivers to default APF51 config
+ - 2.6.38: prevents "svc: failed to register lockdv1 RPC service (errno 97)" message to be printed out in console when mounting NFS drive
+ - apf51: make kernel auto relocable on boot
+ - 3.0: add i.MX I2C mangling
+ - update sp_vision_loader for APF51
+ - [fpga][wishbone_example] adding test program for button and led
+ - [fpga][button] adding test program for wishbone_example button
+ - [fpga][led] adding testled program
+ - load_fpga: Add a sync just before to try to download FPGA on APF51
+ - APF51: activates only required FPGA drivers (twin uart)
+ - APF51: activates all related FPGA drivers as modules by default
+ - fix ecspi chipselect on iMX5x
+ - Add small hack driver to use APF27 TIN as counter in userspace
+ - 3.0: Makes patch 427 effective again
+ - update esdhc patches for linux 3.x
+ - fix 442 ecspi patch
+ - APF51: Moves 3.0 support to 3.0.12
+ - makes target/linux/modules/fpga/virtual_components/irq_mngr/main.c compatible with >= 3.0 kernels
+ - 3.0 APF51 migration: add 015 & 199 patches
+ - Add 3.0 Linux support to APF51 (experimental)
+ - Add SCC & IIM registration for APF51. Updates Armadeus systems name while we are at it.
+ - Don't make apf51proto the default baseboard for apf51
+ - Add gpiolib support to gpio_helpers.sh
+ - add (very preliminary) support for the APF28 & APF28Dev
+ - adding fpga CLK0 signal as a GPIO by default
+ - do not initialize fpga pin if fpga drivers not selected
+ - 2.6.38: Add SCC and SAHARA to APF51 default config
+ - Fixes 442-* patches
+ - 2.6.38: Fixes patches 442-*
+ - Add IIM and DCP drivers
+ - Add SCC and SAHARA drivers (from Freescale BSP)
+ - 2.6.38: PPS doesn't need sound support
+ - 2.6.38: minify APF27, PPS and APF51 configs
+ - Updates apf51-linux-2.6.38.config (add devtmpfs and V4L)
+ - POD infrastructure: Escape to the Void
+ - spvision loader needs to select virtual components
+ - Cleanup POD menuconfig a little
+ - prober for sploader: suppress useless command in Makefile and variables
+ - [fpga][board_designs] adding drivers for default design spvision_loader
+ - [fpga][sploader] little bug correction
+ - virtual_component pod_anybus is useless (under patch 440 now)
+ - adding anybus_interface driver
+ - Update HMS Anybus driver: add some define to anybus_interface.h and make irq reachable by interruption number instead of GPIO number
+ - Increase number of IRQ on APF27 and APF51
+ - change name of anybus interface driver
+ - [fpga] adding pod_gpio driver
+ - Updates APF27 & PPS 2.6.38 configs symlinks
+ - update pps and apf9328 config for new fpga drivers
+ - [SPLOADER] Removes the useless reading of id in the probe function
+ - update configuration for apf51 and apf27 to match new fpga drivers
+ - APF51: bump default Linux version to 2.6.38.8
+ - [fpga] Little bug in probe error management for irq_manager
+ - Add spvision loader
+ - Add ioctl support in Anybus driver
+ - Add HMS Anybus driver
+ - [fpga] Include armadeus Makefile.in ignoring errors
+ - [fpga] delete useless s_led.c driver code
+ - [fpga] fix somes bugs in virtual components
+ - [fpga] Make wishbone example working
+ - [kconfig] Adding star completion capability for kernel 2.6.29
+ - [fpga] change structure of fpga drivers directory, work for twin_uarts
+ - [kconfig] Adding star completion capability
+ - fix imx51 pwm clock source
+ - Update anybus_interface driver : add ioctl command, compatibility with select(), and more ...
+* U-Boot:
+ Main changes: Bug fixes, preliminary support of U-Boot 2011.xx, preliminary support of APF28
+
+ List of all changes:
+ - apf51: add FPGA patches to U-Boot 2011.12
+ - apf51:Â Clean-up and refactoring
+ - apf51: Clean-up
+ - apf51: Fix memory cache alignement issue
+ - apf51: update u-boot recover version to the latest version
+ - apf51: change PLL errata 12051 workaround to be generic
+ - apf51: preliminary migration to u-Boot 2011.12
+ - Workaround to fix bug #102: reboot from Linux doesn't work on APF51, most of the time
+ - [APF28] update U-Boot version
+ - [APF28] Fix ethernet 0 FEC identifier
+ - [APF28] fix patch hunk
+ - [APF28] Update to the latest U-Boot 2011.12 RC1
+ - [APF28] Update iomux minimal config and FEC0 reset
+ - [APF28] Allocate 3 MiB for bootloader - No reason to restrict this size
+ - [APF28] clean-up
+ - Add apf28 nand bootloader
+ - [APF28] Add preliminary U-Boot patch & config to support the apf28 board
+ - APF51: Improve mDDR XSR timing and fix EMR configuration.
+ - [2010.03] Fixes build with external recent EABI toolchains
+ - Configure CS1 for fpga communication
+ - 2011.06 APF9328: Fix typo
+ - 2011.06 APF9328: Fix data cache issue that break linux boot with U-Boot upstream
+ - [2011.06] workaround to have U-Boot runnable from either Flash or RAM
+ - support new U-Boot release 2011.06
+ - Update apf9328 to U-Boot release 2011.06
+ - Remove executable rights on some U-Boot 2010.03 patches
+ - [UBOOT 1.3.4] Configure CS1 for spvision communication
+* Firmware:
+ - [wishbone_example] Update bitstream for apf51 to work with board drivers
+ - adding blinking led constraints file and bistream for apf51
+ - adding default design for sp_vision loader
+ - update pod scripts to match new version of pod
+ - Add script and design for Anybus
+ - Check if bitstream is in .bin format for APF51
+* Demos:
+ - Add VPU option to capture menuconfig
+ - Cleanup toggle_gpio
+ - quick and dirty C program example to toggle gpio (led) with as_devices lib
+ - capture: make it compile again on APF51 when VPU is selected
+ - Fixes build of capture on recent kernels. Also fixes freescale-tools (dependancy) and add correct captures's dependancy for i.MX51
+ - Capture: add rgb565_to_yuv420 convertion and IP addr command line option
+ - Fixes STAGING_DIR usage in SDL based apps
+ - [REAL_TIME] Update all examples and Makefile according to the new Xenomai version
+ - Remove init script for automatically configure can interface
+* Debug:
+ - Add i.MX51 SCC registers to imxregs
+ - Fixes crash when imxregs is called without parameters
+ - Add i.MX51 IIM registers to imxregs
+* Test:
+ - Makes test_slideshow.sh more user friendly
+ - Add wishbone examples drivers to APF9328 Linux test config
+ - Add PPP to APF27 default test configs (Linux & BR)
+ - Makes test_imxregs.sh more verbose
+ - Fixes test_gpio.sh for old GPIO driver usage
+ - Makes test_prboom.sh more test_release.sh friendly
+ - test_wifi.sh: only wait 3 DHCP requests results and then go on
+ - test_release.sh: also shows NFS dir envt variable when starting tests
+ - fixes test_fpga.sh due to recent wishbone drivers name changes
+ - Fixes prboom launch on APF51
+ - Updates tests (for APF51). test_dac: be more vumeter friendly, test_imxregs: make it work, test_portmap: make it configurable
+ - Fixes testsuite build to work with external toolchains too
+* Tools:
+ - Fixes some freescale-tools patches
+ - [fpgaregs] better name for fpga map size
+ - [straton_ios] adding a usefull error message under exchange function
+ - [fpgaregs] manage fpga addressing memory space size
+* As_Devices:
+ - change irq mode macros
+ - Cleanup cpp build
+ - Check if device pointer is NULL
+* Other:
+ - [BUILD] merge buildroot-clean with clean target and update help of main Makefile
+ - [BUILD] Updates cleanup_buildroot.sh
+ - [BUILD] Add script that will ease export of our Linux (and U-Boot) patches to a public FTP server (for use in build systems like BR)
+ - [BUILD] scripts/quiltify.sh: check if quilt is installed before launching the beast
+ - [BUILD] Remove annoying message asking to check for /bin/sh is pointing to /bin/bash by moving detection in scripts/.
+ Message is now only displayed if the link is not correct.
+ - [BUILD] Cleanup main Makefile and move build infos display to scripts/ (fixes bug of gcc version not displayed at first build)
+ - [BUILD] Bump version to 4.1-alpha3
+ - [BUILD] Makes 'make linux' works too
+ - [BUILD] Add script to export/save minified Linux kernel configs
+ - [BUILD] Makes ARMADEUS_GCC_VERSION be evaluated only at the end of the build
+ - [BUILD] Supports external/crosstool toolchains and other libc librairies than uClibc in build end message
+ - [BUILD] Fixes scripts/quiltify.sh for U-Boot usage
+ - [BUILD] 3 tries are enough to try to download BR tarball
+ - [BUILD] Fixes ARMADEUS_QT_DIR definition
+ - [BUILD] Fixes ARMADEUS_STAGING_DIR, ARMADEUS_TOOLCHAIN_PATH, ARMADEUS_SDL_VERSION, ARMADEUS_QT_VERSION, & ARMADEUS_XENOMAI_VERSION in Makefile.in
+ - [BUILD] Fixes Makefile.in due to recent linux kernel patches move
+ - Removes patches/linux symbolic link
+ - [BUILD] Add some refinements when displaying successfull BSP build (show most important components version)
+
----
Changes in release 4.0 (released on July 9th 2011)
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/armadeus-version b/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/armadeus-version
index e4c42b3..7d5c902 100644
--- a/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/armadeus-version
+++ b/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/armadeus-version
@@ -1 +1 @@
-4.1-alpha3-git
+4.1
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2012-01-26 19:08: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 449e09c41defcf282909e8937d1eee000a60c549 (commit)
from 93d360a3e333d739d97b5b8368c384df8625ad40 (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 449e09c41defcf282909e8937d1eee000a60c549
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jan 26 20:08:20 2012 +0100
[TEST] Makes test_slideshow.sh more user friendly
-----------------------------------------------------------------------
Summary of changes:
target/test/packages/test_slideshow.sh | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/target/test/packages/test_slideshow.sh b/target/test/packages/test_slideshow.sh
index fc932b4..4159821 100755
--- a/target/test/packages/test_slideshow.sh
+++ b/target/test/packages/test_slideshow.sh
@@ -3,7 +3,7 @@
#
# Script to test a Buildroot package for Armadeus Software release
#
-# Copyright (C) 2008-2011 The Armadeus Project
+# Copyright (C) 2008-2012 The Armadeus 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
@@ -30,11 +30,14 @@ test_slideshow()
fi
# Launch it
- $EXEC_NAME -width 480 -height 272 -name $TEST_DIR
+ $EXEC_NAME -width 480 -height 272 -name $TEST_DIR -advance 3 -tran checkers &
+ PID=$!
+ sleep 10
if [ "$?" == 0 ]; then
ask_user "Did you see an image ? (y/N)"
if [ "$response" == "y" ] || [ "$response" == "yes" ]; then
+ kill $PID
echo_test_ok
exit 0
fi
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2012-01-26 16:03:25
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 93d360a3e333d739d97b5b8368c384df8625ad40 (commit)
via 29eeef6f718d0cf19b3e25fa63fbd0a76a66c6fb (commit)
from 60922d47fbf0f54d6c141d9aca244ac3858d8159 (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 93d360a3e333d739d97b5b8368c384df8625ad40
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jan 26 16:17:59 2012 +0100
[LINUX] 2.6.29: Fixes I2C hangup when accessing both I2C busses of APF27
commit 29eeef6f718d0cf19b3e25fa63fbd0a76a66c6fb
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jan 26 12:03:50 2012 +0100
[LINUX] ov96xx: let the user the ability to drive itself reset and powerdwn lines. Makes driver less verbose on console when reading/writing registers.
-----------------------------------------------------------------------
Summary of changes:
.../2.6.29/281-apf27-armadeus-add_apf27.c.patch | 58 ++------------
...deus-soc_camera_add_ov96xx_sensors_driver.patch | 18 +++--
...362-armadeus-i2c-mxc-mutual_exclusion_fix.patch | 84 ++++++++++++++++++++
3 files changed, 101 insertions(+), 59 deletions(-)
create mode 100644 patches/linux/2.6.29/362-armadeus-i2c-mxc-mutual_exclusion_fix.patch
diff --git a/patches/linux/2.6.29/281-apf27-armadeus-add_apf27.c.patch b/patches/linux/2.6.29/281-apf27-armadeus-add_apf27.c.patch
index 25876e1..45a4b5b 100644
--- a/patches/linux/2.6.29/281-apf27-armadeus-add_apf27.c.patch
+++ b/patches/linux/2.6.29/281-apf27-armadeus-add_apf27.c.patch
@@ -9,7 +9,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/arch/arm/mach-mx2/apf27.c 2011-05-18 11:27:34.000000000 +0200
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27.c 2012-01-26 10:40:27.000000000 +0100
@@ -0,0 +1,739 @@
+ /*
+ * apf27.c
@@ -753,8 +753,8 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27.c
Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c 2011-05-18 11:28:20.000000000 +0200
-@@ -0,0 +1,1138 @@
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c 2012-01-26 10:53:41.000000000 +0100
+@@ -0,0 +1,1094 @@
+ /*
+ * apf27-dev.c
+ * Support for AFP27 module's development baseboard
@@ -1654,17 +1654,8 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+#endif /* CONFIG_MMC_MXC */
+
+
-+/* APF27Dev can have an optionnal Camera module extension using i.MX27 CSI */
++/* APF27Dev can have an optional Camera module extension using i.MX27 CSI */
+#ifdef CONFIG_VIDEO_MX27
-+# ifdef CONFIG_SOC_CAMERA_OV96XX
-+#define OV9653_PWRDN (GPIO_PORTC | 30) /* SSI3_TX as POWERDOWN*/
-+#define OV9653_RESET (GPIO_PORTC | 31) /* SSI3_CLK as RESET */
-+
-+static int apf27dev_ov9653_ctl_pins[] = {
-+ (OV9653_PWRDN | GPIO_OUT | GPIO_GPIO),
-+ (OV9653_RESET | GPIO_OUT | GPIO_GPIO),
-+};
-+# endif
+
+static int apf27dev_csi_pins[] = {
+ PB10_PF_CSI_D0,
@@ -1683,29 +1674,12 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+
+static int apf27dev_camera_init(struct platform_device *pdev)
+{
-+# ifdef CONFIG_SOC_CAMERA_OV96XX
-+ int err;
-+
-+ /* Setup PWRDN/RESET pins default value */
-+ gpio_set_value(OV9653_PWRDN, 0);
-+ gpio_set_value(OV9653_RESET, 0);
-+ err = mxc_gpio_setup_multiple_pins(apf27dev_ov9653_ctl_pins,
-+ ARRAY_SIZE(apf27dev_ov9653_ctl_pins), "OV9653");
-+ if (err)
-+ printk("Error %s", __func__);
-+# endif
-+
+ return mxc_gpio_setup_multiple_pins(apf27dev_csi_pins,
+ ARRAY_SIZE(apf27dev_csi_pins), "CSI");
+}
+
+static int apf27dev_camera_exit(struct platform_device *pdev)
+{
-+# ifdef CONFIG_SOC_CAMERA_OV96XX
-+ mxc_gpio_release_multiple_pins(apf27dev_ov9653_ctl_pins,
-+ ARRAY_SIZE(apf27dev_ov9653_ctl_pins));
-+# endif
-+
+ mxc_gpio_release_multiple_pins(apf27dev_csi_pins, ARRAY_SIZE(apf27dev_csi_pins));
+
+ return 0;
@@ -1722,24 +1696,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+# ifdef CONFIG_SOC_CAMERA_OV96XX
+static int ov96xx_power(struct device *dev, int state)
+{
-+ printk(KERN_DEBUG "*** %s %d\n", __func__, state);
-+
-+ if (state) /* UP */
-+ gpio_set_value(OV9653_PWRDN, 0);
-+ else /* DOWN */
-+ gpio_set_value(OV9653_PWRDN, 1);
-+
-+ return 0;
-+}
-+
-+static int ov96xx_reset(struct device *dev)
-+{
-+ printk(KERN_DEBUG "*** %s\n", __func__);
-+
-+ gpio_set_value(OV9653_RESET, 1);
-+ msleep(10);
-+ gpio_set_value(OV9653_RESET, 0);
-+ msleep(10);
++ printk(KERN_DEBUG "*** %s %d (not implemented)\n", __func__, state);
+
+ return 0;
+}
@@ -1747,7 +1704,6 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+static struct soc_camera_link ov96xx_iclink = {
+ .bus_id = 0,
+ .power = ov96xx_power,
-+ .reset = ov96xx_reset,
+};
+# endif
+
@@ -1896,7 +1852,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-lcd.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-lcd.c 2011-05-18 11:27:34.000000000 +0200
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-lcd.c 2012-01-26 10:40:27.000000000 +0100
@@ -0,0 +1,220 @@
+/*
+ * apf27-lcd.c
@@ -2121,7 +2077,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-lcd.c
Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev-ext-apw.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev-ext-apw.c 2011-05-18 11:27:34.000000000 +0200
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev-ext-apw.c 2012-01-26 10:40:27.000000000 +0100
@@ -0,0 +1,190 @@
+ /*
+ * apf27-dev-ext-apw.c
diff --git a/patches/linux/2.6.29/319-armadeus-soc_camera_add_ov96xx_sensors_driver.patch b/patches/linux/2.6.29/319-armadeus-soc_camera_add_ov96xx_sensors_driver.patch
index 30bd4c2..8974762 100644
--- a/patches/linux/2.6.29/319-armadeus-soc_camera_add_ov96xx_sensors_driver.patch
+++ b/patches/linux/2.6.29/319-armadeus-soc_camera_add_ov96xx_sensors_driver.patch
@@ -6,8 +6,8 @@ Signed-off-by: Julien boibessot <jul...@ar...>
Index: linux-2.6.29.6/drivers/media/video/Kconfig
===================================================================
---- linux-2.6.29.6.orig/drivers/media/video/Kconfig 2010-07-01 16:25:15.000000000 +0200
-+++ linux-2.6.29.6/drivers/media/video/Kconfig 2010-07-27 17:11:53.000000000 +0200
+--- linux-2.6.29.6.orig/drivers/media/video/Kconfig 2012-01-24 17:23:41.000000000 +0100
++++ linux-2.6.29.6/drivers/media/video/Kconfig 2012-01-26 10:38:50.000000000 +0100
@@ -789,6 +789,13 @@
help
This is a ov772x camera driver
@@ -24,8 +24,8 @@ Index: linux-2.6.29.6/drivers/media/video/Kconfig
depends on VIDEO_DEV && PXA27x && SOC_CAMERA
Index: linux-2.6.29.6/drivers/media/video/Makefile
===================================================================
---- linux-2.6.29.6.orig/drivers/media/video/Makefile 2010-07-01 16:25:15.000000000 +0200
-+++ linux-2.6.29.6/drivers/media/video/Makefile 2010-07-27 17:11:53.000000000 +0200
+--- linux-2.6.29.6.orig/drivers/media/video/Makefile 2012-01-24 17:23:41.000000000 +0100
++++ linux-2.6.29.6/drivers/media/video/Makefile 2012-01-26 10:38:50.000000000 +0100
@@ -145,6 +145,7 @@
obj-$(CONFIG_SOC_CAMERA_MT9T031) += mt9t031.o
obj-$(CONFIG_SOC_CAMERA_MT9V022) += mt9v022.o
@@ -37,8 +37,8 @@ Index: linux-2.6.29.6/drivers/media/video/Makefile
Index: linux-2.6.29.6/drivers/media/video/ov96xx.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/drivers/media/video/ov96xx.c 2010-07-27 17:01:32.000000000 +0200
-@@ -0,0 +1,1672 @@
++++ linux-2.6.29.6/drivers/media/video/ov96xx.c 2012-01-26 10:38:15.000000000 +0100
+@@ -0,0 +1,1674 @@
+/*
+ * drivers/media/video/ov96xx.c
+ *
@@ -1426,7 +1426,7 @@ Index: linux-2.6.29.6/drivers/media/video/ov96xx.c
+ reg_addr = (u8)(simple_strtol(given_param, 0, 16));
+ current_reg_addr = reg_addr;
+ ov96xx_read_reg(i2c_client, reg_addr, ®_val);
-+ printk("Read 0x%02x @ 0x%02x\n", reg_val, reg_addr);
++ printk(KERN_DEBUG "Read 0x%02x @ 0x%02x\n", reg_val, reg_addr);
+
+ return len;
+}
@@ -1454,7 +1454,7 @@ Index: linux-2.6.29.6/drivers/media/video/ov96xx.c
+ }
+
+ reg_val = (u8)(simple_strtol(given_param, 0, 16));
-+ printk("Writing 0x%02x @ 0x%02x\n", reg_val, current_reg_addr);
++ printk(KERN_DEBUG "Writing 0x%02x @ 0x%02x\n", reg_val, current_reg_addr);
+/* ret = ov96xx_write(i2c_client, current_reg_addr, reg_val); */
+ ret = i2c_smbus_write_byte_data(i2c_client, current_reg_addr, reg_val);
+ udelay(100);
@@ -1484,6 +1484,7 @@ Index: linux-2.6.29.6/drivers/media/video/ov96xx.c
+ ov96xx->pix.height = ov96xx_sizes[QCIF].height;
+ ov96xx->pix.pixelformat = V4L2_PIX_FMT_RGB565; */
+
++#if 0
+ if (icl->reset) {
+ ret = icl->reset(&ov96xx->i2c_client->dev);
+ } else {
@@ -1491,6 +1492,7 @@ Index: linux-2.6.29.6/drivers/media/video/ov96xx.c
+ " using soft one\n");
+ ov96xx_reset(client); /* soft reset */
+ }
++#endif
+
+ version = ov96xx_detect(client);
+ if (version < 0) {
diff --git a/patches/linux/2.6.29/362-armadeus-i2c-mxc-mutual_exclusion_fix.patch b/patches/linux/2.6.29/362-armadeus-i2c-mxc-mutual_exclusion_fix.patch
new file mode 100644
index 0000000..41097ef
--- /dev/null
+++ b/patches/linux/2.6.29/362-armadeus-i2c-mxc-mutual_exclusion_fix.patch
@@ -0,0 +1,84 @@
+Fixes I2C mutual exclusion bug when accessing I2C busses at the same time.
+
+Signed-off-by: Nicolas Colombain <nic...@ar...>
+
+Index: linux-2.6.29.6/drivers/i2c/busses/i2c-mxc.c
+===================================================================
+--- linux-2.6.29.6.orig/drivers/i2c/busses/i2c-mxc.c 2012-01-26 15:55:03.000000000 +0100
++++ linux-2.6.29.6/drivers/i2c/busses/i2c-mxc.c 2012-01-26 16:00:27.000000000 +0100
+@@ -46,20 +46,10 @@
+ bool low_power;
+ struct imx_i2c_platform_data *pdata;
+ int trans_flag;
++ bool transfer_done;
++ bool tx_success;
+ } imx_i2c_device;
+
+-/*
+- * HACK: Why is it not channel specific?
+- * Boolean to indicate if data was transferred
+- */
+-static bool transfer_done = false;
+-
+-/*
+- * HACK: Why is it not channel specific?
+- * Boolean to indicate if we received an ACK for the data transmitted
+- */
+-static bool tx_success = false;
+-
+ struct clk_div_table {
+ int reg_value;
+ int div;
+@@ -126,15 +116,15 @@
+ else
+ retry = 4;
+
+- while (retry-- && !transfer_done) {
++ while (retry-- && !dev->transfer_done) {
+ wait_event_interruptible_timeout(dev->wq,
+- transfer_done,
++ dev->transfer_done,
+ dev->adap.timeout);
+ }
+- transfer_done = false;
++ dev->transfer_done = false;
+
+ if (retry <= 0) {
+- if (!tx_success) {
++ if (!dev->tx_success) {
+ /* An ACK was not received */
+ #ifdef I2C_DEBUG
+ printk(KERN_DEBUG "ACK not received \n");
+@@ -366,8 +356,8 @@
+ return -EREMOTEIO;
+ }
+
+- transfer_done = false;
+- tx_success = false;
++ dev->transfer_done = false;
++ dev->tx_success = false;
+ for (i = 0; i < num && ret >= 0; i++) {
+ addr_comp = 0;
+ dev->trans_flag = msgs[i].flags;
+@@ -471,16 +461,16 @@
+ #endif
+ } else {
+ /* Interrupt due byte transfer completion */
+- tx_success = false;
++ dev->tx_success = false;
+ /* Check if RXAK is received in Transmit mode */
+ if (cr & MXC_I2CR_MTX) {
+ if( !(sr & MXC_I2SR_RXAK)) {
+- tx_success = true;
+- transfer_done = true;
++ dev->tx_success = true;
++ dev->transfer_done = true;
+ }
+ } else {
+- tx_success = true;
+- transfer_done = true;
++ dev->tx_success = true;
++ dev->transfer_done = true;
+ }
+ wake_up_interruptible(&dev->wq);
+ }
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-01-25 21:50: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 60922d47fbf0f54d6c141d9aca244ac3858d8159 (commit)
via d56ba346ffe6a79d9c4949f8b11bfa14ecdaebf5 (commit)
from 5ab2d957887ad32696eee63b7b150c8ad76731f3 (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 60922d47fbf0f54d6c141d9aca244ac3858d8159
Merge: d56ba34 5ab2d95
Author: Eric Jarrige <eri...@ar...>
Date: Wed Jan 25 22:49:41 2012 +0100
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit d56ba346ffe6a79d9c4949f8b11bfa14ecdaebf5
Author: Eric Jarrige <eri...@ar...>
Date: Wed Jan 25 22:49:07 2012 +0100
[UBOOT] apf51: add FPGA patches to U-Boot 2011.12
-----------------------------------------------------------------------
Summary of changes:
.../320-spartan.patch} | 0
.../321-add_spartan6.patch} | 16 ++++++++--------
patches/u-boot/2011.12/401-apf51.patch | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
copy patches/u-boot/{2010.03/u-boot-2010.03-320-spartan.patch => 2011.12/320-spartan.patch} (100%)
copy patches/u-boot/{2010.03/u-boot-2010.03-321-add_spartan6.patch => 2011.12/321-add_spartan6.patch} (98%)
diff --git a/patches/u-boot/2010.03/u-boot-2010.03-320-spartan.patch b/patches/u-boot/2011.12/320-spartan.patch
similarity index 100%
copy from patches/u-boot/2010.03/u-boot-2010.03-320-spartan.patch
copy to patches/u-boot/2011.12/320-spartan.patch
diff --git a/patches/u-boot/2010.03/u-boot-2010.03-321-add_spartan6.patch b/patches/u-boot/2011.12/321-add_spartan6.patch
similarity index 98%
copy from patches/u-boot/2010.03/u-boot-2010.03-321-add_spartan6.patch
copy to patches/u-boot/2011.12/321-add_spartan6.patch
index 29675fd..d951afe 100644
--- a/patches/u-boot/2010.03/u-boot-2010.03-321-add_spartan6.patch
+++ b/patches/u-boot/2011.12/321-add_spartan6.patch
@@ -680,16 +680,16 @@ Index: u-boot-2010.03/drivers/fpga/spartan6.c
+#endif
Index: u-boot-2010.03/drivers/fpga/Makefile
===================================================================
---- u-boot-2010.03.orig/drivers/fpga/Makefile 2010-03-31 23:54:39.000000000 +0200
-+++ u-boot-2010.03/drivers/fpga/Makefile 2011-01-06 12:09:47.000000000 +0100
-@@ -29,6 +29,7 @@
+--- u-boot-2011.12/drivers/fpga/Makefile 2011-12-23 20:25:35.000000000 +0100
++++ u-boot-2011.12/drivers/fpga/Makefile 2012-01-25 22:33:18.911094601 +0100
+@@ -29,6 +29,7 @@ ifdef CONFIG_FPGA
COBJS-y += fpga.o
COBJS-$(CONFIG_FPGA_SPARTAN2) += spartan2.o
COBJS-$(CONFIG_FPGA_SPARTAN3) += spartan3.o
+COBJS-$(CONFIG_FPGA_SPARTAN6) += spartan6.o
COBJS-$(CONFIG_FPGA_VIRTEX2) += virtex2.o
COBJS-$(CONFIG_FPGA_XILINX) += xilinx.o
- ifdef CONFIG_FPGA_ALTERA
+ COBJS-$(CONFIG_FPGA_LATTICE) += ivm_core.o lattice.o
Index: u-boot-2010.03/include/xilinx.h
===================================================================
--- u-boot-2010.03.orig/include/xilinx.h 2010-03-31 23:54:39.000000000 +0200
@@ -717,9 +717,9 @@ Index: u-boot-2010.03/include/xilinx.h
Index: u-boot-2010.03/README
===================================================================
---- u-boot-2010.03.orig/README 2010-03-31 23:54:39.000000000 +0200
-+++ u-boot-2010.03/README 2011-01-06 12:09:47.000000000 +0100
-@@ -1639,7 +1639,7 @@
+--- u-boot-2011.12/README 2011-12-23 20:25:35.000000000 +0100
++++ u-boot-2011.12/README 2012-01-25 22:33:18.911094601 +0100
+@@ -1959,7 +1959,7 @@ The following options need to be configu
CONFIG_FPGA_<family>
Enables support for FPGA family.
@@ -728,7 +728,7 @@ Index: u-boot-2010.03/README
CONFIG_FPGA_COUNT
-Index: u-boot-2010.03/drivers/fpga/xilinx.c
+ Index: u-boot-2010.03/drivers/fpga/xilinx.c
===================================================================
--- u-boot-2010.03.orig/drivers/fpga/xilinx.c 2011-01-06 15:20:34.000000000 +0100
+++ u-boot-2010.03/drivers/fpga/xilinx.c 2011-01-06 15:20:55.000000000 +0100
diff --git a/patches/u-boot/2011.12/401-apf51.patch b/patches/u-boot/2011.12/401-apf51.patch
index d84bb7f..cd68739 100644
--- a/patches/u-boot/2011.12/401-apf51.patch
+++ b/patches/u-boot/2011.12/401-apf51.patch
@@ -934,7 +934,7 @@ Index: u-boot-2011.12/board/armadeus/apf51/apf51.c
+ return 0;
+}
+
-+#ifdef BOARD_LATE_INIT
++#ifdef CONFIG_BOARD_LATE_INIT
+int board_late_init(void)
+{
+ char *s;
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2012-01-23 21:46:51
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 5ab2d957887ad32696eee63b7b150c8ad76731f3 (commit)
via 80335c31b42a034004bd6fa72dbae103e8cf1662 (commit)
via 2b180c6789e93c2a70583b3aae7ccee3dbd44c6e (commit)
via 39e401cb672b09e94aa3c58b75de031dd539d2f6 (commit)
via 4f1f3ba0d9ceb5a7694d0828a1ef123c1a5af0d9 (commit)
from c16479363f5f4f8f6c211b50ae64a5b16b068294 (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 5ab2d957887ad32696eee63b7b150c8ad76731f3
Merge: 80335c3 c164793
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jan 23 22:46:25 2012 +0100
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 80335c31b42a034004bd6fa72dbae103e8cf1662
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jan 23 22:45:13 2012 +0100
[LINUX] Fixes bug when compiling FPGA drivers others/i2ctest/ & others/ps2keyboard/
commit 2b180c6789e93c2a70583b3aae7ccee3dbd44c6e
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jan 23 22:44:41 2012 +0100
[LINUX] Fixes bug when compiling FPGA drivers others/i2ctest/ & others/ps2keyboard/
commit 39e401cb672b09e94aa3c58b75de031dd539d2f6
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jan 23 22:42:36 2012 +0100
[TEST] Add wishbone examples drivers to APF9328 Linux test config
commit 4f1f3ba0d9ceb5a7694d0828a1ef123c1a5af0d9
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jan 23 22:41:11 2012 +0100
[TEST] Add PPP to APF27 default test configs (Linux & BR)
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27test_defconfig | 3 +-
.../armadeus/apf27/apf27test-linux-2.6.29.config | 16 +++++++--
.../apf9328/apf9328test-linux-2.6.29.config | 22 +++++++++---
target/linux/modules/fpga/Makefile | 6 ++-
target/linux/modules/fpga/others/Makefile | 35 --------------------
5 files changed, 36 insertions(+), 46 deletions(-)
delete mode 100755 target/linux/modules/fpga/others/Makefile
diff --git a/buildroot/configs/apf27test_defconfig b/buildroot/configs/apf27test_defconfig
index 8016f57..c95a9fe 100644
--- a/buildroot/configs/apf27test_defconfig
+++ b/buildroot/configs/apf27test_defconfig
@@ -113,8 +113,9 @@ BR2_PACKAGE_LINKS=y
BR2_PACKAGE_NTP=y
# BR2_PACKAGE_NTP_NTPD is not set
BR2_PACKAGE_NTP_NTPDATE=y
-BR2_PACKAGE_TCPDUMP=y
BR2_PACKAGE_PORTMAP=y
+BR2_PACKAGE_PPPD=y
+BR2_PACKAGE_TCPDUMP=y
BR2_PACKAGE_UUCP=y
BR2_PACKAGE_WIRELESS_TOOLS=y
BR2_PACKAGE_WPA_SUPPLICANT=y
diff --git a/buildroot/target/device/armadeus/apf27/apf27test-linux-2.6.29.config b/buildroot/target/device/armadeus/apf27/apf27test-linux-2.6.29.config
index 1cdbb26..a531eb0 100644
--- a/buildroot/target/device/armadeus/apf27/apf27test-linux-2.6.29.config
+++ b/buildroot/target/device/armadeus/apf27/apf27test-linux-2.6.29.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.29.6
-# Thu Jan 19 18:46:39 2012
+# Mon Jan 23 11:17:59 2012
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -720,8 +720,18 @@ CONFIG_RT2X00_LIB_CRYPTO=y
# CONFIG_USB_RTL8150 is not set
# CONFIG_USB_USBNET is not set
# CONFIG_WAN is not set
-# CONFIG_PPP is not set
+CONFIG_PPP=m
+# CONFIG_PPP_MULTILINK is not set
+# CONFIG_PPP_FILTER is not set
+CONFIG_PPP_ASYNC=m
+# CONFIG_PPP_SYNC_TTY is not set
+# CONFIG_PPP_DEFLATE is not set
+# CONFIG_PPP_BSDCOMP is not set
+# CONFIG_PPP_MPPE is not set
+# CONFIG_PPPOE is not set
+# CONFIG_PPPOL2TP is not set
# CONFIG_SLIP is not set
+CONFIG_SLHC=m
# CONFIG_NETCONSOLE is not set
# CONFIG_NETPOLL is not set
# CONFIG_NET_POLL_CONTROLLER is not set
@@ -1926,7 +1936,7 @@ CONFIG_CRYPTO_LZO=y
#
CONFIG_BITREVERSE=y
CONFIG_GENERIC_FIND_LAST_BIT=y
-# CONFIG_CRC_CCITT is not set
+CONFIG_CRC_CCITT=m
CONFIG_CRC16=y
# CONFIG_CRC_T10DIF is not set
CONFIG_CRC_ITU_T=m
diff --git a/buildroot/target/device/armadeus/apf9328/apf9328test-linux-2.6.29.config b/buildroot/target/device/armadeus/apf9328/apf9328test-linux-2.6.29.config
index 4c68f04..21c2630 100644
--- a/buildroot/target/device/armadeus/apf9328/apf9328test-linux-2.6.29.config
+++ b/buildroot/target/device/armadeus/apf9328/apf9328test-linux-2.6.29.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.29.6
-# Thu Sep 30 19:09:01 2010
+# Fri Jan 20 16:37:07 2012
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1217,11 +1217,23 @@ CONFIG_ARMADEUS_FPGA_LOADER_DRIVER=m
#
CONFIG_ARMADEUS_I2C_OCORE_IRQMNG=m
CONFIG_ARMADEUS_PS2KBD_DRIVER=m
-CONFIG_ARMADEUS_WISHBONE_EXAMPLE_DRIVERS=y
-CONFIG_ARMADEUS_WISHBONE_EXAMPLE_BUTTON_DRIVER=m
-CONFIG_ARMADEUS_WISHBONE_EXAMPLE_LED_DRIVER=m
-CONFIG_ARMADEUS_WISHBONE_EXAMPLE_IRQ_MNGR_DRIVER=m
+
+#
+# Specific designs
+#
+CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS=y
+CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS_IRQ_MNGR=m
+CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS_BUTTON=m
+CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS_LED=m
+# CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS_GPIO is not set
+# CONFIG_ARMADEUS_FPGA_VIRTUAL_SPVISION_LOADER is not set
# CONFIG_POD_DRIVERS is not set
+CONFIG_ARMADEUS_FPGA_BOARD_DESIGNS=y
+CONFIG_ARMADEUS_FPGA_BOARD_DESIGNS_WISHBONE_EXAMPLE=y
+CONFIG_ARMADEUS_FPGA_BOARD_DESIGNS_WISHBONE_EXAMPLE_BUTTON_DRIVER=m
+CONFIG_ARMADEUS_FPGA_BOARD_DESIGNS_WISHBONE_EXAMPLE_LED_DRIVER=m
+CONFIG_ARMADEUS_FPGA_BOARD_DESIGNS_WISHBONE_EXAMPLE_IRQ_MNGR_DRIVER=m
+# CONFIG_ARMADEUS_FPGA_BOARD_DESIGNS_SPVISION_PROBER is not set
#
# Handheld related
diff --git a/target/linux/modules/fpga/Makefile b/target/linux/modules/fpga/Makefile
index c63449d..d13b61f 100755
--- a/target/linux/modules/fpga/Makefile
+++ b/target/linux/modules/fpga/Makefile
@@ -7,8 +7,10 @@
ifneq ($(KERNELRELEASE),)
# Part executed when called from kernel build system:
-obj-$(CONFIG_ARMADEUS_FPGA_DRIVERS) += dev_tools/ others/ board_designs/ virtual_components/
-obj-$(CONFIG_POD_DRIVERS) += POD/
+obj-$(CONFIG_ARMADEUS_FPGA_DRIVERS) += dev_tools/ board_designs/ virtual_components/
+obj-$(CONFIG_POD_DRIVERS) += POD/
+obj-$(CONFIG_ARMADEUS_I2C_OCORE_IRQMNG) += others/i2ctest/
+obj-$(CONFIG_ARMADEUS_PS2KBD_DRIVER) += others/ps2keyboard/
else
# Part executed when called from standard make in this directory:
diff --git a/target/linux/modules/fpga/others/Makefile b/target/linux/modules/fpga/others/Makefile
deleted file mode 100755
index bcb3d11..0000000
--- a/target/linux/modules/fpga/others/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Main Makefile for the Armadeus FPGA related drivers
-#
-# Add your subdirectories to obj- target
-#
-
-ifneq ($(KERNELRELEASE),)
-
-# Part executed when called from kernel build system:
-
-obj-$(CONFIG_ARMADEUS_I2C_OCORE_IRQMNG) += i2ctest/
-obj-$(CONFIG_ARMADEUS_PS2KBD_DRIVER) += ps2keyboard/
-
-else
-
-# Part executed when called from standard make in this directory:
-
-ARMADEUS_BASE_DIR=../../../../..
-include $(ARMADEUS_BASE_DIR)/Makefile.in
-
-ifeq ($(LINUX_DIR),)
-LINUX_DIR:=$(ARMADEUS_LINUX_DIR)
-endif
-KDIR := $(LINUX_DIR)
-PWD := $(shell pwd)
-
-# Armadeus custom drivers common targets (default, clean, etc...)
-include ../../Makefile.in
-
-install:
- echo "Installing Armadeus drivers..."
- $(MAKE) -C $(LINUX_DIR) SUBDIRS=$(PWD) INSTALL_MOD_PATH=$(TARGET_DIR) modules_install
-
-endif
-
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-01-22 23:39: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 c16479363f5f4f8f6c211b50ae64a5b16b068294 (commit)
via d89a77993b5f861a177cd48b17a56202df697bf5 (commit)
from 2a4878215e04e9ded40308691b602860b6883c8e (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 c16479363f5f4f8f6c211b50ae64a5b16b068294
Merge: d89a779 2a48782
Author: Eric Jarrige <eri...@ar...>
Date: Mon Jan 23 00:39:29 2012 +0100
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit d89a77993b5f861a177cd48b17a56202df697bf5
Author: Eric Jarrige <eri...@ar...>
Date: Mon Jan 23 00:39:04 2012 +0100
[UBOOT] apf51:Â Clean-up and refactoring
-----------------------------------------------------------------------
Summary of changes:
patches/u-boot/2011.12/400-imx51.patch | 587 +++++++------
patches/u-boot/2011.12/401-apf51.patch | 924 ++++++++++----------
patches/u-boot/2011.12/403-apf51-wdog.patch | 3 +-
patches/u-boot/2011.12/409-apf51-nand-spl.patch | 198 +++--
patches/u-boot/2011.12/410-imx-iim.patch | 19 +-
.../2011.12/411-Fix-high-voltage-nand-sd.patch | 14 -
6 files changed, 877 insertions(+), 868 deletions(-)
diff --git a/patches/u-boot/2011.12/400-imx51.patch b/patches/u-boot/2011.12/400-imx51.patch
index 4db9287..8ead685 100644
--- a/patches/u-boot/2011.12/400-imx51.patch
+++ b/patches/u-boot/2011.12/400-imx51.patch
@@ -11,166 +11,100 @@
tmo = 1;
--- u-boot-2011.12/arch/arm/cpu/armv7/mx5/lowlevel_init.S 2011-12-23 20:25:35.000000000 +0100
+++ u-boot-2011.12/arch/arm/cpu/armv7/mx5/lowlevel_init.S 2012-01-08 16:57:41.168590215 +0100
-@@ -23,6 +23,71 @@
+@@ -23,6 +23,34 @@
#include <asm/arch/imx-regs.h>
#include <generated/asm-offsets.h>
-+#ifndef CONFIG_SYS_PLL_DP_CTL_VAL
++#ifndef CONFIG_SYS_PLL_DP_CTL
+/* use internal oscillator */
-+#define CONFIG_SYS_PLL_DP_CTL_VAL 0x00001232
++#define CONFIG_SYS_PLL_DP_CTL 0x00001232
+#endif
+
-+#ifndef CONFIG_SYS_CCSR_VAL
++#ifndef CONFIG_SYS_CLKCTL_CCSR
+/* use internal oscillator */
-+#define CONFIG_SYS_CCSR_VAL 0x00000000
++#define CONFIG_SYS_CLKCTL_CCSR 0x00000000
+#endif
+
-+/* define default SDRAM config */
-+#ifndef CONFIG_SYS_DRR_MR_VAL
-+#define CONFIG_SYS_DRR_MR_VAL 0x0632
++#ifndef CONFIG_SYS_CLKTL_CBCDR
++#define CONFIG_SYS_CLKTL_CBCDR 0x59E35100
+#endif
+
-+#ifndef CONFIG_SYS_DRR_EMR_VAL
-+#define CONFIG_SYS_DRR_EMR_VAL 0x040
-+#endif
-+
-+#ifndef CONFIG_SYS_SDRAM_ESDCTL_REGISTER_VAL
-+#define CONFIG_SYS_SDRAM_ESDCTL_REGISTER_VAL 0xb2a20000
-+#endif
-+#ifndef CONFIG_SYS_SDRAM_ESDCFG_REGISTER_VAL
-+#define CONFIG_SYS_SDRAM_ESDCFG_REGISTER_VAL 0xE99668BA
-+#endif
-+#ifndef CONFIG_SYS_SDRAM_ESDMISC_REGISTER_VAL
-+#define CONFIG_SYS_SDRAM_ESDMISC_REGISTER_VAL 0x000ad6d0
-+#endif
-+#ifndef CONFIG_SYS_SDRAM_ESDCDLY1_REGISTER_VAL
-+#define CONFIG_SYS_SDRAM_ESDCDLY1_REGISTER_VAL 0x00F48000
-+#endif
-+#ifndef CONFIG_SYS_SDRAM_ESDCDLY2_REGISTER_VAL
-+#define CONFIG_SYS_SDRAM_ESDCDLY2_REGISTER_VAL 0x00F48000
-+#endif
-+#ifndef CONFIG_SYS_SDRAM_ESDCDLY3_REGISTER_VAL
-+#define CONFIG_SYS_SDRAM_ESDCDLY3_REGISTER_VAL 0x00F48000
-+#endif
-+#ifndef CONFIG_SYS_SDRAM_ESDCDLY4_REGISTER_VAL
-+#define CONFIG_SYS_SDRAM_ESDCDLY4_REGISTER_VAL 0x00F48000
-+#endif
-+#ifndef CONFIG_SYS_SDRAM_ESDCDLY5_REGISTER_VAL
-+#define CONFIG_SYS_SDRAM_ESDCDLY5_REGISTER_VAL 0x00F48000
-+#endif
-+#ifndef CONFIG_SYS_SDRAM_ESDGPR_REGISTER_VAL
-+#define CONFIG_SYS_SDRAM_ESDGPR_REGISTER_VAL 0x90000000
-+#endif
-+
-+#ifndef CONFIG_SYS_CBCDR_VAL
-+#define CONFIG_SYS_CBCDR_VAL 0x59E35100
-+#endif
-+
-+#ifndef CONFIG_SYS_CBCMR_VAL
++#ifndef CONFIG_SYS_CLKTL_CBCMR
+/* Use lp_apm (24MHz) source for perclk */
-+#define CONFIG_SYS_CBCMR_VAL 0x000020C2
++#define CONFIG_SYS_CLKTL_CBCMR 0x000020C2
+#endif
+
-+#ifndef CONFIG_SYS_CSCDR1_VAL
-+#define CONFIG_SYS_CSCDR1_VAL 0x00C30321
++#ifndef CONFIG_SYS_CLKTL_CSCDR1
++#define CONFIG_SYS_CLKTL_CSCDR1 0x00C30321
+#endif
+
-+#ifndef CONFIG_SYS_CBCMR1_VAL
++#ifndef CONFIG_SYS_CLKTL_CBCMR1
+/* Use PLL 2 for UART's, get 66.5MHz from it */
-+#define CONFIG_SYS_CBCMR1_VAL 0xA5A2A020
++#define CONFIG_SYS_CLKTL_CBCMR1 0xA5A2A020
+#endif
+
/*
* L2CC Cache setup/invalidation/disable
*/
-@@ -81,23 +146,23 @@
- ldr r0, =M4IF_BASE_ADDR
-
- ldr r1, =0x00000203
-- str r1, [r0, #0x40]
-+ str r1, [r0, #M4IF_FBPM0]
-
- ldr r1, =0x0
-- str r1, [r0, #0x44]
-+ str r1, [r0, #M4IF_FBPM1]
-
- ldr r1, =0x00120125
-- str r1, [r0, #0x9C]
-+ str r1, [r0, #M4IF_FPWC]
-
- ldr r1, =0x001901A3
-- str r1, [r0, #0x48]
-+ str r1, [r0, #M4IF_MIF4]
-
- #endif
- .endm /* init_m4if */
+@@ -97,7 +125,7 @@
.macro setup_pll pll, freq
ldr r0, =\pll
- ldr r1, =0x00001232
-+ ldr r1, =CONFIG_SYS_PLL_DP_CTL_VAL
++ ldr r1, =CONFIG_SYS_PLL_DP_CTL
str r1, [r0, #PLL_DP_CTL] /* Set DPLL ON (set UPEN bit): BRMO=1 */
mov r1, #0x2
str r1, [r0, #PLL_DP_CONFIG] /* Enable auto-restart AREN bit */
-@@ -114,7 +179,7 @@
+@@ -114,7 +142,7 @@
str r1, [r0, #PLL_DP_MFN]
str r1, [r0, #PLL_DP_HFS_MFN]
- ldr r1, =0x00001232
-+ ldr r1, =CONFIG_SYS_PLL_DP_CTL_VAL
++ ldr r1, =CONFIG_SYS_PLL_DP_CTL
str r1, [r0, #PLL_DP_CTL]
1: ldr r1, [r0, #PLL_DP_CTL]
ands r1, r1, #0x1
-@@ -125,7 +190,7 @@
+@@ -125,7 +153,7 @@
ldr r2, =\pll
mov r1, #0x0
str r1, [r2, #PLL_DP_CONFIG] /* Disable auto-restart AREN bit */
- ldr r1, =0x00001236
-+ ldr r1, =CONFIG_SYS_PLL_DP_CTL_VAL | 0x04
++ ldr r1, =CONFIG_SYS_PLL_DP_CTL | 0x04
str r1, [r2, #PLL_DP_CTL] /* Restart PLL with PLM=1 */
1: ldr r1, [r2, #PLL_DP_CTL] /* Wait for lock */
ands r1, r1, #0x1
-@@ -154,6 +219,16 @@
+@@ -154,6 +182,16 @@
ldr r0, =CCM_BASE_ADDR
#if defined(CONFIG_MX51)
-+#ifdef CONFIG_SYS_CCR_VAL
-+ ldr r1, =CONFIG_SYS_CCR_VAL
++#ifdef CONFIG_SYS_CLKCTL_CCMR
++ ldr r1, =CONFIG_SYS_CLKCTL_CCMR
+ str r1, [r0, #CLKCTL_CCMR]
+
+ /* make sure clocks are ready */
+1: ldr r1, [r0, #CLKCTL_CSR]
-+ cmp r1, #CONFIG_SYS_CSR_VAL
++ cmp r1, #CONFIG_SYS_CLKCTL_CSR
+ bne 1b
+#endif
+
/* Gate of clocks to the peripherals first */
ldr r1, =0x3FFFFFFF
str r1, [r0, #CLKCTL_CCGR0]
-@@ -198,7 +273,7 @@
+@@ -198,7 +236,7 @@
#endif
/* Switch ARM to step clock */
- mov r1, #0x4
-+ mov r1, #CONFIG_SYS_CCSR_VAL | 0x04
++ mov r1, #CONFIG_SYS_CLKCTL_CCSR | 0x04
str r1, [r0, #CLKCTL_CCSR]
#if defined(CONFIG_MX51_PLL_ERRATA)
-@@ -233,7 +308,7 @@
- /* Set the platform clock dividers */
- ldr r0, =ARM_BASE_ADDR
- ldr r1, =0x00000725
-- str r1, [r0, #0x14]
-+ str r1, [r0, #CORTEX_A8_ICGC]
-
- ldr r0, =CCM_BASE_ADDR
-
-@@ -250,16 +325,16 @@
+@@ -250,16 +288,16 @@
#endif
str r1, [r0, #CLKCTL_CACRR]
/* Switch ARM back to PLL 1 */
- mov r1, #0
-+ mov r1, #CONFIG_SYS_CCSR_VAL
++ mov r1, #CONFIG_SYS_CLKCTL_CCSR
str r1, [r0, #CLKCTL_CCSR]
#if defined(CONFIG_MX51)
@@ -178,7 +112,7 @@
- /* Use lp_apm (24MHz) source for perclk */
- ldr r1, =0x000020C2
+ /* select source for perclk */
-+ ldr r1, =CONFIG_SYS_CBCMR_VAL
++ ldr r1, =CONFIG_SYS_CLKTL_CBCMR
orr r1,r1,#CONFIG_SYS_DDR_CLKSEL
str r1, [r0, #CLKCTL_CBCMR]
- /* ddr clock from PLL 1, all perclk dividers are 1 since using 24MHz */
@@ -186,31 +120,19 @@
ldr r1, =CONFIG_SYS_CLKTL_CBCDR
str r1, [r0, #CLKCTL_CBCDR]
#endif
-@@ -279,9 +354,9 @@
+@@ -279,9 +317,9 @@
#if defined(CONFIG_MX51)
/* Use PLL 2 for UART's, get 66.5MHz from it */
- ldr r1, =0xA5A2A020
-+ ldr r1, =CONFIG_SYS_CBCMR1_VAL
++ ldr r1, =CONFIG_SYS_CLKTL_CBCMR1
str r1, [r0, #CLKCTL_CSCMR1]
- ldr r1, =0x00C30321
-+ ldr r1, =CONFIG_SYS_CSCDR1_VAL
++ ldr r1, =CONFIG_SYS_CLKTL_CSCDR1
str r1, [r0, #CLKCTL_CSCDR1]
#elif defined(CONFIG_MX53)
ldr r1, [r0, #CLKCTL_CSCDR1]
-@@ -324,6 +399,11 @@ lowlevel_init:
- str r1, [r0, #0x4]
- #endif
-
-+ /* ARM errata ID #468414 */
-+ mrc 15, 0, r1, c1, c0, 1
-+ orr r1, r1, #(1 << 5) /* enable L1NEON bit */
-+ mcr 15, 0, r1, c1, c0, 1
-+
- init_l2cc
-
- init_aips
-@@ -332,9 +412,34 @@ lowlevel_init:
+@@ -332,9 +370,34 @@ lowlevel_init:
init_clock
@@ -264,155 +186,302 @@
#define CHIP_REV_1_0 0x10
#define CHIP_REV_1_1 0x11
-@@ -282,6 +284,148 @@
-
- #define IMX_IIM_BASE (IIM_BASE_ADDR)
-
-+/* DDR commands */
-+/* cs ChipSelect in range of 0..1 */
-+/* ba Bank Address in range of 0..3 */
-+/* addr Pseudo Address as expected by the DDR */
-+
-+#define CONFIG_SYS_DDR_NOP_CMD(cs) (0x00008000 + (cs << 2))
-+#define CONFIG_SYS_DRR_PRECHARGE_CMD(cs, ba) (0x04008008 + (cs << 2) + ba)
-+#define CONFIG_SYS_DRR_AUTOREFRESH_CMD(cs) (0x00008010 + (cs << 2))
-+#define CONFIG_SYS_DRR_LMR_CMD(cs, ba, addr) (0x00008018 + (addr << 16) + (cs << 2) + ba)
-+
-+//#ifdef __ASSEMBLY__
-+
-+/* ESDCTL */
-+#define ESDCTL_ESDCTL0 0x00
-+#define ESDCTL_ESDCFG0 0x04
-+#define ESDCTL_ESDCTL1 0x08
-+#define ESDCTL_ESDCFG1 0x0C
-+#define ESDCTL_ESDMISC 0x10
-+#define ESDCTL_ESDSCR 0x14
-+#define ESDCTL_ESDCDLY1 0x20
-+#define ESDCTL_ESDCDLY2 0x24
-+#define ESDCTL_ESDCDLY3 0x28
-+#define ESDCTL_ESDCDLY4 0x2C
-+#define ESDCTL_ESDCDLY5 0x30
-+#define ESDCTL_ESDCDLYGD 0x34
-+
-+/* M4IF */
-+#define M4IF_PSM0 0x000
-+#define M4IF_PSM1 0x004
-+#define M4IF_MDSR6 0x018
-+#define M4IF_MDSR7 0x01C
-+#define M4IF_MDSR8 0x020
-+#define M4IF_MDSR0 0x024
-+#define M4IF_MDSR1 0x028
-+#define M4IF_MDSR2 0x02C
-+#define M4IF_MDSR3 0x030
-+#define M4IF_MDSR4 0x034
-+#define M4IF_MDSR5 0x038
-+/*#define M4IF_FBPM0 0x040*/
-+#define M4IF_FBPM1 0x044
-+#define M4IF_MIF4 0x048
-+#define M4IF_SBAR0 0x04C
-+#define M4IF_SERL0 0x050
-+#define M4IF_SERH0 0x054
-+#define M4IF_SSRL0 0x058
-+#define M4IF_SSRH0 0x05C
-+#define M4IF_SBAR1 0x060
-+#define M4IF_SERL1 0x064
-+#define M4IF_SERH1 0x068
-+#define M4IF_SSRL1 0x06C
-+#define M4IF_SSRH1 0x070
-+#define M4IF_I2ULA 0x074
-+#define M4IF_I2ACR 0x078
-+#define M4IF_RINT2 0x07C
-+#define M4IF_SBS0 0x084
-+#define M4IF_SBS1 0x088
-+#define M4IF_MCR0 0x08C
-+#define M4IF_MCR1 0x090
-+#define M4IF_MDCR 0x094
-+#define M4IF_FACR 0x098
-+#define M4IF_FPWC 0x09C
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ u-boot-2011.12/arch/arm/include/asm/arch-mx5/regs_esdctl.h 2012-01-17 07:51:33.551987358 +0100
+@@ -0,0 +1,130 @@
++/*
++ * Copyright (C) 2012
++ * Eric Jarrige, 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
++ */
+
-+/* IOMUX */
-+#define IOMUXC_SW_PAD_CTL_PAD_DRAM_RAS 0x04A4
-+#define IOMUXC_SW_PAD_CTL_PAD_DRAM_CAS 0x04A8
-+#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDWE 0x04AC
-+#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDCKE0 0x04B0
-+#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDCKE1 0x04B4
-+#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDCLK 0x04B8
-+#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS0 0x04BC
-+#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS1 0x04C0
-+#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS2 0x04C4
-+#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS3 0x04C8
-+#define IOMUXC_SW_PAD_CTL_PAD_DRAM_CS0 0x04CC
-+#define IOMUXC_SW_PAD_CTL_PAD_DRAM_CS1 0x04D0
+
-+#define IOMUXC_SW_PAD_CTL_PAD_DRAM_DQM0 0x04D4
-+#define IOMUXC_SW_PAD_CTL_PAD_DRAM_DQM1 0x04D8
-+#define IOMUXC_SW_PAD_CTL_PAD_DRAM_DQM2 0x04DC
-+#define IOMUXC_SW_PAD_CTL_PAD_DRAM_DQM3 0x04E0
-+#define IOMUXC_SW_PAD_CTL_PAD_EIM_SDBA2 0x050C
-+#define IOMUXC_SW_PAD_CTL_PAD_EIM_SDODT1 0x050C
-+#define IOMUXC_SW_PAD_CTL_PAD_EIM_SDODT0 0x0510
++#ifndef __REGS_ESDCTL_H__
++#define __REGS_ESDCTL_H__
+
-+#define IOMUXC_SW_PAD_CTL_GRP_DDRPKS 0x0820
-+#define IOMUXC_SW_PAD_CTL_GRP_DRAM_B4 0x082C
-+#define IOMUXC_SW_PAD_CTL_GRP_INDDR 0x0830
-+#define IOMUXC_SW_PAD_CTL_GRP_PKEDDR 0x0838
-+#define IOMUXC_SW_PAD_CTL_GRP_DDR_A0 0x083C
-+#define IOMUXC_SW_PAD_CTL_GRP_DDR_A1 0x0848
-+#define IOMUXC_SW_PAD_CTL_GRP_DDRAPUS 0x084C
-+#define IOMUXC_SW_PAD_CTL_GRP_HYSDDR0 0x085C
-+#define IOMUXC_SW_PAD_CTL_GRP_HYSDDR1 0x0864
-+#define IOMUXC_SW_PAD_CTL_GRP_HYSDDR2 0x086C
-+#define IOMUXC_SW_PAD_CTL_GRP_HVDDR 0x0870
-+#define IOMUXC_SW_PAD_CTL_GRP_HYSDDR3 0x0874
-+#define IOMUXC_SW_PAD_CTL_GRP_DRAM_SR_B0 0x0878
-+#define IOMUXC_SW_PAD_CTL_GRP_DDRAPKS 0x087C
+
-+#define IOMUXC_SW_PAD_CTL_GRP_DRAM_SR_B1 0x0880
-+#define IOMUXC_SW_PAD_CTL_GRP_DDRPUS 0x0884
-+#define IOMUXC_SW_PAD_CTL_GRP_DRAM_SR_B2 0x088C
-+#define IOMUXC_SW_PAD_CTL_GRP_PKEADDR 0x0890
-+#define IOMUXC_SW_PAD_CTL_GRP_DRAM_SR_B4 0x089C
-+#define IOMUXC_SW_PAD_CTL_GRP_INMODE1 0x08A0
-+#define IOMUXC_SW_PAD_CTL_GRP_DRAM_B0 0x08A4
-+#define IOMUXC_SW_PAD_CTL_GRP_DRAM_B1 0x08AC
-+
-+#define IOMUXC_SW_PAD_CTL_GRP_DDR_SR_A0 0x08B0
-+
-+#define IOMUXC_SW_PAD_CTL_GRP_DRAM_B2 0x08B8
++#ifndef __ASSEMBLY__
++/* ESDCTL registers */
++#if defined(CONFIG_MX51)
++struct esdctl_regs {
++ u32 esdctl0;
++ u32 esdcfg0;
++ u32 esdctl1;
++ u32 esdcfg1;
++ u32 esdmisc;
++ u32 esdscr;
++ u32 reserved[2];
++ u32 esdcdly1;
++ u32 esdcdly2;
++ u32 esdcdly3;
++ u32 esdcdly4;
++ u32 esdcdly5;
++ u32 esdgpr;
++ u32 esdprct0;
++ u32 esdprct1;
++};
++#elif defined(CONFIG_MX53)
++struct esdctl_regs {
++ u32 esdctl;
++ u32 esdpdc;
++ u32 esdotc;
++ u32 esdcfg0;
++ u32 esdcfg1;
++ u32 esdcfg2;
++ u32 esdmisc;
++ u32 esdscr;
++ u32 esdref;
++ u32 esdwcc;
++ u32 esdrcc;
++ u32 esdrwd;
++ u32 esdor;
++ u32 esdmrr;
++ u32 esdcfg3_lp;
++ u32 esdmr4;
++ u32 zqhwctrl;
++ u32 zqswctrl;
++ u32 wlgcr;
++ u32 wldectrl0;
++ u32 wldectrl1;
++ u32 wldlst;
++ u32 odtctrl;
++ u32 rddqby0dl;
++ u32 rddqby1dl;
++ u32 rddqby2dl;
++ u32 rddqby3dl;
++ u32 wrdqby0dl;
++ u32 wrdqby1dl;
++ u32 wrdqby2dl;
++ u32 wrdqby3dl;
++ u32 dgctrl0;
++ u32 dgctrl1;
++ u32 dgdlst;
++ u32 rddlctl;
++ u32 rddlst;
++ u32 wrlctl;
++ u32 wrlst;
++ u32 sdctrl;
++ u32 zqlp2ctl;
++ u32 rddlhwctl;
++ u32 wrdlhwctl;
++ u32 rddlhwst0;
++ u32 rddlhwst1;
++ u32 wrdlhwst0;
++ u32 wrdlhwst1;
++ u32 wlhwerr;
++ u32 dghwst0;
++ u32 dghwst1;
++ u32 dghwst2;
++ u32 dghwst3;
++ u32 pdcmpr1;
++ u32 pdcmpr2;
++ u32 swdar;
++ u32 swdrdr0;
++ u32 swdrdr1;
++ u32 swdrdr2;
++ u32 swdrdr3;
++ u32 swdrdr4;
++ u32 swdrdr5;
++ u32 swdrdr6;
++ u32 swdrdr7;
++ u32 mur;
++ u32 wrcadl;
++};
++#endif
+
-+#define IOMUXC_SW_PAD_CTL_GRP_DDR_SR_A1 0x08BC
-+#ifdef __ASSEMBLY__
-+#define PAD_CTL_SRE_SLOW (0x0 << 0) /* Slow slew rate */
-+#define PAD_CTL_SRE_FAST (0x1 << 0) /* Fast slew rate */
-+#define PAD_CTL_DRV_LOW (0x0 << 1) /* Low drive strength */
-+#define PAD_CTL_DRV_MEDIUM (0x1 << 1) /* Medium drive strength */
-+#define PAD_CTL_DRV_HIGH (0x2 << 1) /* High drive strength */
-+#define PAD_CTL_DRV_MAX (0x3 << 1) /* Max drive strength */
-+#define PAD_CTL_ODE_OPENDRAIN_NONE (0x0 << 3) /* Opendrain disable */
-+#define PAD_CTL_ODE_OPENDRAIN_ENABLE (0x1 << 3)/* Opendrain enable */
-+#define PAD_CTL_100K_PD (0x0 << 4) /* 100Kohm pulldown */
-+#define PAD_CTL_47K_PU (0x1 << 4) /* 47Kohm pullup */
-+#define PAD_CTL_100K_PU (0x2 << 4) /* 100Kohm pullup */
-+#define PAD_CTL_22K_PU (0x3 << 4) /* 22Kohm pullup */
-+#define PAD_CTL_PUE_KEEPER (0x0 << 6) /* enable pulldown */
-+#define PAD_CTL_PUE_PULL (0x1 << 6) /* enable pullup */
-+#define PAD_CTL_PKE_NONE (0x0 << 7) /* Disable pullup/pulldown */
-+#define PAD_CTL_PKE_ENABLE (0x1 << 7) /* Enable pullup/pulldown */
-+#define PAD_CTL_HYS_NONE (0x0 << 8) /* Hysteresis disabled */
-+#define PAD_CTL_HYS_ENABLE (0x1 << 8) /* Hysteresis enabled */
-+#define PAD_CTL_DDR_INPUT_CMOS (0x0 << 9)/* DDR input CMOS */
-+#define PAD_CTL_DDR_INPUT_DDR (0x1 << 9)/* DDR input DDR */
-+#define PAD_CTL_DRV_VOT_LOW (0x0 << 13) /* Low voltage mode */
-+#define PAD_CTL_DRV_VOT_HIGH (0x1 << 13)/* High voltage mode */
+#endif /* __ASSEMBLY__ */
-+/* ARM CORTEX A8*/
-+#define CORTEX_A8_ICGC 0x14
+
-+//#endif /* __ASSEMBLY__ */
++/* DDR commands */
++/* cs ChipSelect in range of 0..1 */
++/* ba Bank Address in range of 0..3 */
++/* addr Pseudo Address as expected by the DDR */
+
- #if !(defined(__KERNEL_STRICT_NAMES) || defined(__ASSEMBLY__))
- #include <asm/types.h>
++#define DDR_NOP_CMD(cs) (0x00008000 + (cs << 2))
++#define DRR_PRECHARGE_CMD(cs, ba) (0x04008008 + (cs << 2) + ba)
++#define DRR_AUTOREFRESH_CMD(cs) (0x00008010 + (cs << 2))
++#define DRR_LMR_CMD(cs, ba, addr) (0x00008018 + (addr << 16) + (cs << 2) + ba)
++
++#endif /* __REGS_ESDCTL_H__ */
+--- u-boot-2011.12/arch/arm/cpu/armv7/mx5/asm-offsets.c 2011-12-23 20:25:35.000000000 +0100
++++ u-boot-2011.12/arch/arm/cpu/armv7/mx5/asm-offsets.c 2012-01-17 01:23:23.299009688 +0100
+@@ -17,13 +17,15 @@
+
+ #include <common.h>
+ #include <asm/arch/imx-regs.h>
+-
++#include <asm/arch/iomux.h>
++#include <asm/arch/regs_esdctl.h>
+ #include <linux/kbuild.h>
+
+ int main(void)
+ {
+
+ /* Round up to make sure size gives nice stack alignment */
++ COMMENT("ESDCTL");
+ DEFINE(CLKCTL_CCMR, offsetof(struct clkctl, ccr));
+ DEFINE(CLKCTL_CCDR, offsetof(struct clkctl, ccdr));
+ DEFINE(CLKCTL_CSR, offsetof(struct clkctl, csr));
+@@ -62,7 +64,8 @@ int main(void)
+ DEFINE(CLKCTL_CCGR7, offsetof(struct clkctl, ccgr7));
+ #endif
+- /* DPLL */
++ BLANK();
++ COMMENT("DPLL");
+ DEFINE(PLL_DP_CTL, offsetof(struct dpll, dp_ctl));
+ DEFINE(PLL_DP_CONFIG, offsetof(struct dpll, dp_config));
+ DEFINE(PLL_DP_OP, offsetof(struct dpll, dp_op));
+@@ -72,5 +75,133 @@ int main(void)
+ DEFINE(PLL_DP_HFS_MFD, offsetof(struct dpll, dp_hfs_mfd));
+ DEFINE(PLL_DP_HFS_MFN, offsetof(struct dpll, dp_hfs_mfn));
+
++#if defined(CONFIG_MX51)
++ BLANK();
++ COMMENT("ESDCTL");
++ DEFINE(ESDCTL_ESDCTL0, offsetof(struct esdctl_regs, esdctl0));
++ DEFINE(ESDCTL_ESDCFG0, offsetof(struct esdctl_regs, esdcfg0));
++ DEFINE(ESDCTL_ESDCTL1, offsetof(struct esdctl_regs, esdctl1));
++ DEFINE(ESDCTL_ESDCFG1, offsetof(struct esdctl_regs, esdcfg1));
++ DEFINE(ESDCTL_ESDMISC, offsetof(struct esdctl_regs, esdmisc));
++ DEFINE(ESDCTL_ESDSCR, offsetof(struct esdctl_regs, esdscr));
++ DEFINE(ESDCTL_ESDCDLY1, offsetof(struct esdctl_regs, esdcdly1));
++ DEFINE(ESDCTL_ESDCDLY2, offsetof(struct esdctl_regs, esdcdly2));
++ DEFINE(ESDCTL_ESDCDLY3, offsetof(struct esdctl_regs, esdcdly3));
++ DEFINE(ESDCTL_ESDCDLY4, offsetof(struct esdctl_regs, esdcdly4));
++ DEFINE(ESDCTL_ESDCDLY5, offsetof(struct esdctl_regs, esdcdly5));
++ DEFINE(ESDCTL_ESDGPR, offsetof(struct esdctl_regs, esdgpr));
++ DEFINE(ESDCTL_ESDPRCT0, offsetof(struct esdctl_regs, esdprct0));
++ DEFINE(ESDCTL_ESDPRCT1, offsetof(struct esdctl_regs, esdprct1));
++ BLANK();
++ COMMENT( "IOMUX" );
++ DEFINE(IOMUXC_SW_PAD_CTL_GRP_DDRPKS, PAD_I_START
++ + PIN_TO_IOMUX_PAD(MX51_PIN_CTL_GRP_DDRPKS));
++ DEFINE(IOMUXC_SW_PAD_CTL_GRP_PKEDDR, PAD_I_START
++ + PIN_TO_IOMUX_PAD(MX51_PIN_CTL_GRP_PKEDDR));
++ DEFINE(IOMUXC_SW_PAD_CTL_GRP_PKEADDR, PAD_I_START
++ + PIN_TO_IOMUX_PAD(MX51_PIN_CTL_GRP_PKEADDR));
++ DEFINE(IOMUXC_SW_PAD_CTL_GRP_DDRAPKS, PAD_I_START
++ + PIN_TO_IOMUX_PAD(MX51_PIN_CTL_GRP_DDRAPKS));
++ DEFINE(IOMUXC_SW_PAD_CTL_GRP_DDRAPUS, PAD_I_START
++ + PIN_TO_IOMUX_PAD(MX51_PIN_CTL_GRP_DDRAPUS));
++ DEFINE(IOMUXC_SW_PAD_CTL_GRP_DDRPUS, PAD_I_START
++ + PIN_TO_IOMUX_PAD(MX51_PIN_CTL_GRP_DDRPUS));
++ DEFINE(IOMUXC_SW_PAD_CTL_GRP_HYSDDR0, PAD_I_START
++ + PIN_TO_IOMUX_PAD(MX51_PIN_CTL_GRP_HYSDDR0));
++ DEFINE(IOMUXC_SW_PAD_CTL_GRP_HYSDDR1, PAD_I_START
++ + PIN_TO_IOMUX_PAD(MX51_PIN_CTL_GRP_HYSDDR1));
++ DEFINE(IOMUXC_SW_PAD_CTL_GRP_HYSDDR2, PAD_I_START
++ + PIN_TO_IOMUX_PAD(MX51_PIN_CTL_GRP_HYSDDR2));
++ DEFINE(IOMUXC_SW_PAD_CTL_GRP_HYSDDR3, PAD_I_START
++ + PIN_TO_IOMUX_PAD(MX51_PIN_CTL_GRP_HYSDDR3));
++ DEFINE(IOMUXC_SW_PAD_CTL_GRP_DDR_SR_B0, PAD_I_START
++ + PIN_TO_IOMUX_PAD(MX51_PIN_CTL_GRP_DDR_SR_B0));
++ DEFINE(IOMUXC_SW_PAD_CTL_GRP_DDR_SR_B1, PAD_I_START
++ + PIN_TO_IOMUX_PAD(MX51_PIN_CTL_GRP_DDR_SR_B1));
++ DEFINE(IOMUXC_SW_PAD_CTL_GRP_DDR_SR_B2, PAD_I_START
++ + PIN_TO_IOMUX_PAD(MX51_PIN_CTL_GRP_DDR_SR_B2));
++ DEFINE(IOMUXC_SW_PAD_CTL_GRP_DDR_SR_B4, PAD_I_START
++ + PIN_TO_IOMUX_PAD(MX51_PIN_CTL_GRP_DDR_SR_B4));
++ DEFINE(IOMUXC_SW_PAD_CTL_GRP_DRAM_B0, PAD_I_START
++ + PIN_TO_IOMUX_PAD(MX51_PIN_CTL_GRP_DRAM_B0));
++ DEFINE(IOMUXC_SW_PAD_CTL_GRP_DRAM_B1, PAD_I_START
++ + PIN_TO_IOMUX_PAD(MX51_PIN_CTL_GRP_DRAM_B1));
++ DEFINE(IOMUXC_SW_PAD_CTL_GRP_DRAM_B2, PAD_I_START
++ + PIN_TO_IOMUX_PAD(MX51_PIN_CTL_GRP_DRAM_B2));
++ DEFINE(IOMUXC_SW_PAD_CTL_GRP_DRAM_B4, PAD_I_START
++ + PIN_TO_IOMUX_PAD(MX51_PIN_CTL_GRP_DRAM_B4));
++ DEFINE(IOMUXC_SW_PAD_CTL_GRP_INMODE1, PAD_I_START
++ + PIN_TO_IOMUX_PAD(MX51_PIN_CTL_GRP_INMODE1));
++ DEFINE(IOMUXC_SW_PAD_CTL_GRP_DDR_SR_A0, PAD_I_START
++ + PIN_TO_IOMUX_PAD(MX51_PIN_CTL_GRP_DDR_SR_A0));
++ DEFINE(IOMUXC_SW_PAD_CTL_GRP_EMI_DS5, PAD_I_START
++ + PIN_TO_IOMUX_PAD(MX51_PIN_CTL_GRP_EMI_DS5));
++ DEFINE(IOMUXC_SW_PAD_CTL_GRP_DDR_SR_A1, PAD_I_START
++ + PIN_TO_IOMUX_PAD(MX51_PIN_CTL_GRP_DDR_SR_A1));
++ DEFINE(IOMUXC_SW_PAD_CTL_GRP_DDR_A0, PAD_I_START
++ + PIN_TO_IOMUX_PAD(MX51_PIN_CTL_GRP_DDR_A0));
++ DEFINE(IOMUXC_SW_PAD_CTL_GRP_DDR_A1, PAD_I_START
++ + PIN_TO_IOMUX_PAD(MX51_PIN_CTL_GRP_DDR_A1));
++ DEFINE(IOMUXC_SW_PAD_CTL_GRP_DISP_PKE0, PAD_I_START
++ + PIN_TO_IOMUX_PAD(MX51_PIN_CTL_GRP_DISP_PKE0));
++ DEFINE(IOMUXC_SW_PAD_CTL_PAD_DRAM_RAS, PAD_I_START
++ + PIN_TO_IOMUX_PAD(MX51_PIN_CTL_DRAM_RAS));
++ DEFINE(IOMUXC_SW_PAD_CTL_PAD_DRAM_CAS, PAD_I_START
++ + PIN_TO_IOMUX_PAD(MX51_PIN_CTL_DRAM_CAS));
++ DEFINE(IOMUXC_SW_PAD_CTL_PAD_DRAM_SDWE, PAD_I_START
++ + PIN_TO_IOMUX_PAD(MX51_PIN_CTL_DRAM_SDWE));
++ DEFINE(IOMUXC_SW_PAD_CTL_PAD_DRAM_SDCKE0, PAD_I_START
++ + PIN_TO_IOMUX_PAD(MX51_PIN_CTL_DRAM_SDCKE0));
++ DEFINE(IOMUXC_SW_PAD_CTL_PAD_DRAM_SDCKE1, PAD_I_START
++ + PIN_TO_IOMUX_PAD(MX51_PIN_CTL_DRAM_SDCKE1));
++ DEFINE(IOMUXC_SW_PAD_CTL_PAD_DRAM_SDCLK, PAD_I_START
++ + PIN_TO_IOMUX_PAD(MX51_PIN_CTL_DRAM_SDCLK));
++ DEFINE(IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS0, PAD_I_START
++ + PIN_TO_IOMUX_PAD(MX51_PIN_CTL_DRAM_SDQS0));
++ DEFINE(IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS1, PAD_I_START
++ + PIN_TO_IOMUX_PAD(MX51_PIN_CTL_DRAM_SDQS1));
++ DEFINE(IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS2, PAD_I_START
++ + PIN_TO_IOMUX_PAD(MX51_PIN_CTL_DRAM_SDQS2));
++ DEFINE(IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS3, PAD_I_START
++ + PIN_TO_IOMUX_PAD(MX51_PIN_CTL_DRAM_SDQS3));
++ DEFINE(IOMUXC_SW_PAD_CTL_PAD_DRAM_CS0, PAD_I_START
++ + PIN_TO_IOMUX_PAD(MX51_PIN_CTL_DRAM_CS0));
++ DEFINE(IOMUXC_SW_PAD_CTL_PAD_DRAM_CS1, PAD_I_START
++ + PIN_TO_IOMUX_PAD(MX51_PIN_CTL_DRAM_CS1));
++ DEFINE(IOMUXC_SW_PAD_CTL_PAD_DRAM_DQM0, PAD_I_START
++ + PIN_TO_IOMUX_PAD(MX51_PIN_CTL_DRAM_DQM0));
++ DEFINE(IOMUXC_SW_PAD_CTL_PAD_DRAM_DQM1, PAD_I_START
++ + PIN_TO_IOMUX_PAD(MX51_PIN_CTL_DRAM_DQM1));
++ DEFINE(IOMUXC_SW_PAD_CTL_PAD_DRAM_DQM2, PAD_I_START
++ + PIN_TO_IOMUX_PAD(MX51_PIN_CTL_DRAM_DQM2));
++ DEFINE(IOMUXC_SW_PAD_CTL_PAD_DRAM_DQM3, PAD_I_START
++ + PIN_TO_IOMUX_PAD(MX51_PIN_CTL_DRAM_DQM3));
++
++ BLANK();
++ COMMENT("various IOMUX pad functions");
++ DEFINE(PAD_CTL_SRE_SLOW, PAD_CTL_SRE_SLOW);
++ DEFINE(PAD_CTL_SRE_FAST, PAD_CTL_SRE_FAST);
++ DEFINE(PAD_CTL_DRV_LOW, PAD_CTL_DRV_LOW);
++ DEFINE(PAD_CTL_DRV_MEDIUM, PAD_CTL_DRV_MEDIUM);
++ DEFINE(PAD_CTL_DRV_HIGH, PAD_CTL_DRV_HIGH);
++ DEFINE(PAD_CTL_DRV_MAX, PAD_CTL_DRV_MAX);
++ DEFINE(PAD_CTL_ODE_OPENDRAIN_NONE, PAD_CTL_ODE_OPENDRAIN_NONE);
++ DEFINE(PAD_CTL_ODE_OPENDRAIN_ENABLE, PAD_CTL_ODE_OPENDRAIN_ENABLE);
++ DEFINE(PAD_CTL_100K_PD, PAD_CTL_100K_PD);
++ DEFINE(PAD_CTL_47K_PU, PAD_CTL_47K_PU);
++ DEFINE(PAD_CTL_100K_PU, PAD_CTL_100K_PU);
++ DEFINE(PAD_CTL_22K_PU, PAD_CTL_22K_PU);
++ DEFINE(PAD_CTL_PUE_KEEPER, PAD_CTL_PUE_KEEPER);
++ DEFINE(PAD_CTL_PUE_PULL, PAD_CTL_PUE_PULL);
++ DEFINE(PAD_CTL_PUE_PULL, PAD_CTL_PUE_PULL);
++ DEFINE(PAD_CTL_PKE_NONE, PAD_CTL_PKE_NONE);
++ DEFINE(PAD_CTL_PKE_ENABLE, PAD_CTL_PKE_ENABLE);
++ DEFINE(PAD_CTL_HYS_NONE, PAD_CTL_HYS_NONE);
++ DEFINE(PAD_CTL_HYS_ENABLE, PAD_CTL_HYS_ENABLE);
++ DEFINE(PAD_CTL_DDR_INPUT_CMOS, PAD_CTL_DDR_INPUT_CMOS);
++ DEFINE(PAD_CTL_DDR_INPUT_DDR, PAD_CTL_DDR_INPUT_DDR);
++ DEFINE(PAD_CTL_DRV_VOT_HIGH, PAD_CTL_DRV_VOT_HIGH);
++ DEFINE(PAD_CTL_DRV_VOT_LOW, PAD_CTL_DRV_VOT_LOW);
++#endif
+ return 0;
+ }
--- u-boot-2011.12/arch/arm/cpu/armv7/cpu.c 2011-12-23 20:25:35.000000000 +0100
+++ u-boot-2011.12/arch/arm/cpu/armv7/cpu.c 2012-01-09 22:44:26.148876883 +0100
@@ -79,5 +79,9 @@ int cleanup_before_linux(void)
@@ -420,25 +489,9 @@
invalidate_dcache_all();
+#ifndef CONFIG_L2_OFF
-+ v7_outer_cache_enable();
++/* v7_outer_cache_enable();*/
+#endif
+
return 0;
}
---- u-boot-2011.12/arch/arm/lib/cache-cp15.c 2011-12-23 20:25:35.000000000 +0100
-+++ u-boot-2011.12/arch/arm/lib/cache-cp15.c 2012-01-09 22:28:01.960696861 +0100
-@@ -86,6 +86,13 @@ static inline void mmu_setup(void)
- /* Set the access control to all-supervisor */
- asm volatile("mcr p15, 0, %0, c3, c0, 0"
- : : "r" (~0));
-+
-+ /* Workaround for arm errata #709718 */
-+ /* Setup PRRR so device is always mapped to non-shared */
-+ asm volatile ("mrc p15, 0, %0, c10, c2, 0" : "=r"(i) : /*:*/);
-+ i &= (~(3 << 0x10));
-+ asm volatile ("mcr p15, 0, %0, c10, c2, 0" : : "r"(i) /*:*/);
-+
- /* and enable the mmu */
- reg = get_cr(); /* get control reg. */
- cp_delay();
diff --git a/patches/u-boot/2011.12/401-apf51.patch b/patches/u-boot/2011.12/401-apf51.patch
index fe9dc14..d84bb7f 100644
--- a/patches/u-boot/2011.12/401-apf51.patch
+++ b/patches/u-boot/2011.12/401-apf51.patch
@@ -2,7 +2,7 @@ Index: u-boot-2011.12/board/armadeus/apf51/apf51.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ u-boot-custom/board/armadeus/apf51/apf51.c 2012-01-12 17:19:58.434303119 +0100
-@@ -0,0 +1,1263 @@
+@@ -0,0 +1,1221 @@
+/*
+ * (C) Copyright 2010-2012 Eric Jarrige, Armadeus Project
+ *
@@ -34,23 +34,20 @@ Index: u-boot-2011.12/board/armadeus/apf51/apf51.c
+#include <asm/arch/crm_regs.h>
+#include <asm/arch/mx5x_pins.h>
+#include <asm/arch/iomux.h>
++#include <asm/arch/regs_esdctl.h>
+#include <asm/arch/sys_proto.h>
+#include <asm/gpio.h>
+#include <asm/errno.h>
+#include <i2c.h>
-+//#include <asm/arch/imx_spi.h>
-+//#include <asm/arch/gpio.h>
+#include <asm/arch/mxc_nand.h>
+#include "fpga.h"
+#include <nand.h>
+
-+
+DECLARE_GLOBAL_DATA_PTR;
+
+unsigned long boot_verb = 0;
+
-+
-+static int read_firmware (size_t offset, size_t end, u_char * buf)
++static int read_firmware(size_t offset, size_t end, u_char * buf)
+{
+ size_t amount_loaded = 0;
+ size_t blocksize;
@@ -64,7 +61,8 @@ Index: u-boot-2011.12/board/armadeus/apf51/apf51.c
+ offset += blocksize;
+ } else {
+ char_ptr = &buf[amount_loaded];
-+ if (nand_read(&nand_info[0], offset, &blocksize, char_ptr))
++ if (nand_read
++ (&nand_info[0], offset, &blocksize, char_ptr))
+ return 1;
+ offset += blocksize;
+ amount_loaded += blocksize;
@@ -74,10 +72,9 @@ Index: u-boot-2011.12/board/armadeus/apf51/apf51.c
+ return amount_loaded;
+}
+
-+
+int dram_init(void)
+{
-+ u32 size1, size2=0;
++ u32 size1, size2 = 0;
+
+ size1 = get_ram_size((void *)CSD0_BASE_ADDR, PHYS_SDRAM_1_SIZE);
+#if ( CONFIG_NR_DRAM_BANKS > 1 )
@@ -103,8 +100,8 @@ Index: u-boot-2011.12/board/armadeus/apf51/apf51.c
+ /*
+ * Configure iomux for USB interfaces
+ */
-+#define USB_PAD_CFG (PAD_CTL_HYS_NONE | PAD_CTL_PKE_ENABLE | \
-+ PAD_CTL_PUE_KEEPER | PAD_CTL_100K_PU | \
++#define USB_PAD_CFG (PAD_CTL_HYS_NONE | PAD_CTL_PKE_ENABLE |\
++ PAD_CTL_PUE_KEEPER | PAD_CTL_100K_PU | \
+ PAD_CTL_DRV_HIGH | PAD_CTL_SRE_FAST)
+ /*
+ * usboh1
@@ -173,8 +170,8 @@ Index: u-boot-2011.12/board/armadeus/apf51/apf51.c
+ /*
+ * Configure iomux for UART interfaces
+ */
-+#define UART_PAD_CFG (PAD_CTL_HYS_NONE | PAD_CTL_PKE_ENABLE | \
-+ PAD_CTL_PUE_PULL | PAD_CTL_100K_PU | \
++#define UART_PAD_CFG (PAD_CTL_HYS_NONE | PAD_CTL_PKE_ENABLE |\
++ PAD_CTL_PUE_PULL | PAD_CTL_100K_PU | \
+ PAD_CTL_DRV_HIGH | PAD_CTL_SRE_FAST)
+ /*
+ * uart1
@@ -202,26 +199,21 @@ Index: u-boot-2011.12/board/armadeus/apf51/apf51.c
+ mxc_iomux_set_pad(MX51_PIN_UART2_RXD, UART_PAD_CFG);
+ mxc_iomux_set_pad(MX51_PIN_UART2_TXD, UART_PAD_CFG);
+
-+ mxc_iomux_set_input(MX51_UART2_IPP_UART_RXD_MUX_SELECT_INPUT,INPUT_CTL_PATH2);
-+ mxc_iomux_set_input(MX51_UART2_IPP_UART_RTS_B_SELECT_INPUT,INPUT_CTL_PATH3);
++ mxc_iomux_set_input(MX51_UART2_IPP_UART_RXD_MUX_SELECT_INPUT,
++ INPUT_CTL_PATH2);
++ mxc_iomux_set_input(MX51_UART2_IPP_UART_RTS_B_SELECT_INPUT,
++ INPUT_CTL_PATH3);
+ /*
+ * uart3
+ */
-+#ifdef APF51_RECOVER /* temporary */
-+ mxc_request_iomux(MX51_PIN_AUD3_BB_RXD, IOMUX_CONFIG_ALT1);
-+ mxc_request_iomux(MX51_PIN_AUD3_BB_FS, IOMUX_CONFIG_ALT1);
-+ mxc_iomux_set_pad(MX51_PIN_AUD3_BB_RXD, UART_PAD_CFG);
-+ mxc_iomux_set_pad(MX51_PIN_AUD3_BB_FS, UART_PAD_CFG);
-+ mxc_iomux_set_input(MUX_IN_UART3_IPP_UART_RXD_MUX_SELECT_INPUT,INPUT_CTL_PATH2);dddd
-+#else
+ mxc_request_iomux(MX51_PIN_UART3_RXD, IOMUX_CONFIG_ALT1);
+ mxc_request_iomux(MX51_PIN_UART3_TXD, IOMUX_CONFIG_ALT1);
+
+ mxc_iomux_set_pad(MX51_PIN_UART3_RXD, UART_PAD_CFG);
+ mxc_iomux_set_pad(MX51_PIN_UART3_TXD, UART_PAD_CFG);
+
-+ mxc_iomux_set_input(MX51_UART3_IPP_UART_RXD_MUX_SELECT_INPUT,INPUT_CTL_PATH4);
-+#endif
++ mxc_iomux_set_input(MX51_UART3_IPP_UART_RXD_MUX_SELECT_INPUT,
++ INPUT_CTL_PATH4);
+}
+
+void setup_audio(void)
@@ -229,8 +221,8 @@ Index: u-boot-2011.12/board/armadeus/apf51/apf51.c
+ /*
+ * Configure iomux for audio interfaces
+ */
-+#define AUD_PAD_CFG (PAD_CTL_HYS_NONE | PAD_CTL_PKE_ENABLE | \
-+ PAD_CTL_PUE_KEEPER | PAD_CTL_100K_PU | \
++#define AUD_PAD_CFG (PAD_CTL_HYS_NONE | PAD_CTL_PKE_ENABLE |\
++ PAD_CTL_PUE_KEEPER | PAD_CTL_100K_PU | \
+ PAD_CTL_DRV_HIGH | PAD_CTL_SRE_FAST)
+ /*
+ * audmux3
@@ -261,8 +253,10 @@ Index: u-boot-2011.12/board/armadeus/apf51/apf51.c
+ mxc_iomux_set_pad(MX51_PIN_EIM_CS4, AUD_PAD_CFG);
+ mxc_iomux_set_pad(MX51_PIN_EIM_CS5, AUD_PAD_CFG);
+
-+ mxc_iomux_set_input(MX51_AUDMUX_P5_INPUT_TXCLK_AMX_SELECT_INPUT,INPUT_CTL_PATH1);
-+ mxc_iomux_set_input(MX51_AUDMUX_P5_INPUT_TXFS_AMX_SELECT_INPUT,INPUT_CTL_PATH1);
++ mxc_iomux_set_input(MX51_AUDMUX_P5_INPUT_TXCLK_AMX_SELECT_INPUT,
++ INPUT_CTL_PATH1);
++ mxc_iomux_set_input(MX51_AUDMUX_P5_INPUT_TXFS_AMX_SELECT_INPUT,
++ INPUT_CTL_PATH1);
+ /*
+ * audmux6
+ */
@@ -282,14 +276,14 @@ Index: u-boot-2011.12/board/armadeus/apf51/apf51.c
+ /*
+ * Configure iomux for CSI interfaces
+ */
-+#define CSI_PAD_CFG (PAD_CTL_HYS_NONE | PAD_CTL_PKE_ENABLE | \
-+ PAD_CTL_PUE_KEEPER | PAD_CTL_100K_PU | \
++#define CSI_PAD_CFG (PAD_CTL_HYS_NONE | PAD_CTL_PKE_ENABLE |\
++ PAD_CTL_PUE_KEEPER | PAD_CTL_100K_PU | \
+ PAD_CTL_DRV_HIGH | PAD_CTL_SRE_FAST)
+ /*
+ * csi1
+ */
-+ mxc_request_iomux(MX51_PIN_CSI1_D8 , IOMUX_CONFIG_ALT0);
-+ mxc_request_iomux(MX51_PIN_CSI1_D9 , IOMUX_CONFIG_ALT0);
++ mxc_request_iomux(MX51_PIN_CSI1_D8, IOMUX_CONFIG_ALT0);
++ mxc_request_iomux(MX51_PIN_CSI1_D9, IOMUX_CONFIG_ALT0);
+ mxc_request_iomux(MX51_PIN_CSI1_D10, IOMUX_CONFIG_ALT0);
+ mxc_request_iomux(MX51_PIN_CSI1_D11, IOMUX_CONFIG_ALT0);
+ mxc_request_iomux(MX51_PIN_CSI1_D12, IOMUX_CONFIG_ALT0);
@@ -305,8 +299,8 @@ Index: u-boot-2011.12/board/armadeus/apf51/apf51.c
+ mxc_request_iomux(MX51_PIN_CSI1_PIXCLK, IOMUX_CONFIG_ALT0);
+ mxc_request_iomux(MX51_PIN_CSI1_MCLK, IOMUX_CONFIG_ALT0);
+
-+ mxc_iomux_set_pad(MX51_PIN_CSI1_D8 , CSI_PAD_CFG);
-+ mxc_iomux_set_pad(MX51_PIN_CSI1_D9 , CSI_PAD_CFG);
++ mxc_iomux_set_pad(MX51_PIN_CSI1_D8, CSI_PAD_CFG);
++ mxc_iomux_set_pad(MX51_PIN_CSI1_D9, CSI_PAD_CFG);
+ mxc_iomux_set_pad(MX51_PIN_CSI1_D10, CSI_PAD_CFG);
+ mxc_iomux_set_pad(MX51_PIN_CSI1_D11, CSI_PAD_CFG);
+ mxc_iomux_set_pad(MX51_PIN_CSI1_D12, CSI_PAD_CFG);
@@ -325,6 +319,7 @@ Index: u-boot-2011.12/board/armadeus/apf51/apf51.c
+
+void setup_eim(void)
+{
++struct weim *weim = (struct weim *)WEIM_BASE_ADDR;
+ /*
+ * Configure iomux for EIM interface
+ */
@@ -346,56 +341,56 @@ Index: u-boot-2011.12/board/armadeus/apf51/apf51.c
+ mxc_request_iomux(MX51_PIN_EIM_DA15, IOMUX_CONFIG_ALT0);
+ mxc_request_iomux(MX51_PIN_EIM_EB0, IOMUX_CONFIG_ALT0);
+ mxc_request_iomux(MX51_PIN_EIM_EB1, IOMUX_CONFIG_ALT0);
-+ mxc_request_iomux(MX51_PIN_EIM_OE , IOMUX_CONFIG_ALT0);
++ mxc_request_iomux(MX51_PIN_EIM_OE, IOMUX_CONFIG_ALT0);
+ mxc_request_iomux(MX51_PIN_EIM_CS0, IOMUX_CONFIG_ALT0);
+ mxc_request_iomux(MX51_PIN_EIM_CS1, IOMUX_CONFIG_ALT0);
+ mxc_request_iomux(MX51_PIN_EIM_DTACK, IOMUX_CONFIG_ALT0);
-+// missing in DS mxc_request_iomux(MX51_PIN_EIM_WAIT, IOMUX_CONFIG_ALT0);
++// missing in DS mxc_request_iomux(MX51_PIN_EIM_WAIT, IOMUX_CONFIG_ALT0);
+ mxc_request_iomux(MX51_PIN_EIM_LBA, IOMUX_CONFIG_ALT0);
-+// missing in DS mxc_request_iomux(MX51_PIN_EIM_BCLK, IOMUX_CONFIG_ALT0);
-+// missing in DS mxc_request_iomux(MX51_PIN_EIM_RW , IOMUX_CONFIG_ALT0);
++// missing in DS mxc_request_iomux(MX51_PIN_EIM_BCLK, IOMUX_CONFIG_ALT0);
++// missing in DS mxc_request_iomux(MX51_PIN_EIM_RW , IOMUX_CONFIG_ALT0);
+
+ /*
+ * Configure Register for each chip select
+ */
-+ __REG(CONFIG_WCR_ADDR) = CONFIG_WCR_VALUE;
-+ __REG(CONFIG_WIAR_ADDR) = CONFIG_WIAR_VALUE;
-+
-+ __REG(CONFIG_CS1GCR1_ADDR) = CONFIG_CS1GCR1_VALUE;
-+ __REG(CONFIG_CS2GCR1_ADDR) = CONFIG_CS2GCR1_VALUE;
-+ __REG(CONFIG_CS3GCR1_ADDR) = CONFIG_CS3GCR1_VALUE;
-+ __REG(CONFIG_CS4GCR1_ADDR) = CONFIG_CS4GCR1_VALUE;
-+ __REG(CONFIG_CS5GCR1_ADDR) = CONFIG_CS5GCR1_VALUE;
-+
-+ __REG(CONFIG_CS1GCR2_ADDR) = CONFIG_CS1GCR2_VALUE;
-+ __REG(CONFIG_CS2GCR2_ADDR) = CONFIG_CS2GCR2_VALUE;
-+ __REG(CONFIG_CS3GCR2_ADDR) = CONFIG_CS3GCR2_VALUE;
-+ __REG(CONFIG_CS4GCR2_ADDR) = CONFIG_CS4GCR2_VALUE;
-+ __REG(CONFIG_CS5GCR2_ADDR) = CONFIG_CS5GCR2_VALUE;
-+
-+ __REG(CONFIG_CS1RCR1_ADDR) = CONFIG_CS1RCR1_VALUE;
-+ __REG(CONFIG_CS2RCR1_ADDR) = CONFIG_CS2RCR1_VALUE;
-+ __REG(CONFIG_CS3RCR1_ADDR) = CONFIG_CS3RCR1_VALUE;
-+ __REG(CONFIG_CS4RCR1_ADDR) = CONFIG_CS4RCR1_VALUE;
-+ __REG(CONFIG_CS5RCR1_ADDR) = CONFIG_CS5RCR1_VALUE;
-+
-+ __REG(CONFIG_CS1RCR2_ADDR) = CONFIG_CS1RCR2_VALUE;
-+ __REG(CONFIG_CS2RCR2_ADDR) = CONFIG_CS2RCR2_VALUE;
-+ __REG(CONFIG_CS3RCR2_ADDR) = CONFIG_CS3RCR2_VALUE;
-+ __REG(CONFIG_CS4RCR2_ADDR) = CONFIG_CS4RCR2_VALUE;
-+ __REG(CONFIG_CS5RCR2_ADDR) = CONFIG_CS5RCR2_VALUE;
-+
-+ __REG(CONFIG_CS1WCR1_ADDR) = CONFIG_CS1WCR1_VALUE;
-+ __REG(CONFIG_CS2WCR1_ADDR) = CONFIG_CS2WCR1_VALUE;
-+ __REG(CONFIG_CS3WCR1_ADDR) = CONFIG_CS3WCR1_VALUE;
-+ __REG(CONFIG_CS4WCR1_ADDR) = CONFIG_CS4WCR1_VALUE;
-+ __REG(CONFIG_CS5WCR1_ADDR) = CONFIG_CS5WCR1_VALUE;
-+
-+ __REG(CONFIG_CS1WCR2_ADDR) = CONFIG_CS1WCR2_VALUE;
-+ __REG(CONFIG_CS2WCR2_ADDR) = CONFIG_CS2WCR2_VALUE;
-+ __REG(CONFIG_CS3WCR2_ADDR) = CONFIG_CS3WCR2_VALUE;
-+ __REG(CONFIG_CS4WCR2_ADDR) = CONFIG_CS4WCR2_VALUE;
-+ __REG(CONFIG_CS5WCR2_ADDR) = CONFIG_CS5WCR2_VALUE;
++ writel(ACFG_WCR_VALUE, &weim->wcr);
++ writel(ACFG_WIAR_VALUE, &weim->wiar);
++
++ writel(ACFG_CS1GCR1_VALUE, &weim->cs1gcr1);
++ writel(ACFG_CS2GCR1_VALUE, &weim->cs2gcr1);
++ writel(ACFG_CS3GCR1_VALUE, &weim->cs3gcr1);
++ writel(ACFG_CS4GCR1_VALUE, &weim->cs4gcr1);
++ writel(ACFG_CS5GCR1_VALUE, &weim->cs5gcr1);
++
++ writel(ACFG_CS1GCR2_VALUE, &weim->cs1gcr2);
++ writel(ACFG_CS2GCR2_VALUE, &weim->cs2gcr2);
++ writel(ACFG_CS3GCR2_VALUE, &weim->cs3gcr2);
++ writel(ACFG_CS4GCR2_VALUE, &weim->cs4gcr2);
++ writel(ACFG_CS5GCR2_VALUE, &weim->cs5gcr2);
++
++ writel(ACFG_CS1RCR1_VALUE, &weim->cs1rcr1);
++ writel(ACFG_CS2RCR1_VALUE, &weim->cs2rcr1);
++ writel(ACFG_CS3RCR1_VALUE, &weim->cs3rcr1);
++ writel(ACFG_CS4RCR1_VALUE, &weim->cs4rcr1);
++ writel(ACFG_CS5RCR1_VALUE, &weim->cs5rcr1);
++
++ writel(ACFG_CS1RCR2_VALUE, &weim->cs1rcr2);
++ writel(ACFG_CS2RCR2_VALUE, &weim->cs2rcr2);
++ writel(ACFG_CS3RCR2_VALUE, &weim->cs3rcr2);
++ writel(ACFG_CS4RCR2_VALUE, &weim->cs4rcr2);
++ writel(ACFG_CS5RCR2_VALUE, &weim->cs5rcr2);
++
++ writel(ACFG_CS1WCR1_VALUE, &weim->cs1wcr1);
++ writel(ACFG_CS2WCR1_VALUE, &weim->cs2wcr1);
++ writel(ACFG_CS3WCR1_VALUE, &weim->cs3wcr1);
++ writel(ACFG_CS4WCR1_VALUE, &weim->cs4wcr1);
++ writel(ACFG_CS5WCR1_VALUE, &weim->cs5wcr1);
++
++ writel(ACFG_CS1WCR2_VALUE, &weim->cs1wcr2);
++ writel(ACFG_CS2WCR2_VALUE, &weim->cs2wcr2);
++ writel(ACFG_CS3WCR2_VALUE, &weim->cs3wcr2);
++ writel(ACFG_CS4WCR2_VALUE, &weim->cs4wcr2);
++ writel(ACFG_CS5WCR2_VALUE, &weim->cs5wcr2);
+
+}
+
@@ -421,12 +416,12 @@ Index: u-boot-2011.12/board/armadeus/apf51/apf51.c
+ /*
+ * Configure iomux for misc interfaces
+ */
-+#define GPIO_PAD_CFG (PAD_CTL_HYS_NONE | PAD_CTL_PKE_ENABLE | \
-+ PAD_CTL_PUE_KEEPER | PAD_CTL_100K_PU | \
++#define GPIO_PAD_CFG (PAD_CTL_HYS_NONE | PAD_CTL_PKE_ENABLE |\
++ PAD_CTL_PUE_KEEPER | PAD_CTL_100K_PU | \
+ PAD_CTL_DRV_HIGH | PAD_CTL_SRE_FAST)
+
+ /* pwm 1 & 2 */
-+ mxc_request_iomux(MX51_PIN_GPIO1_2, IOMUX_CONFIG_ALT0);
++ mxc_request_iomux(MX51_PIN_GPIO1_2, IOMUX_CONFIG_ALT1);
+ mxc_iomux_set_pad(MX51_PIN_GPIO1_2, GPIO_PAD_CFG);
+
+ mxc_request_iomux(MX51_PIN_GPIO1_3, IOMUX_CONFIG_ALT1);
@@ -466,25 +461,25 @@ Index: u-boot-2011.12/board/armadeus/apf51/apf51.c
+
+void setup_fpga(void)
+{
-+ /* FPGA PWR */
-+ mxc_request_iomux(CONFIG_SYS_FPGA_PWR, IOMUX_CONFIG_ALT4);
-+ mxc_iomux_set_pad(CONFIG_SYS_FPGA_PWR, GPIO_PAD_CFG);
++ /* FPGA PWR */
++ mxc_request_iomux(ACFG_FPGA_PWR, IOMUX_CONFIG_ALT4);
++ mxc_iomux_set_pad(ACFG_FPGA_PWR, GPIO_PAD_CFG);
+
-+ /* FPGA SUSPEND */
-+ mxc_request_iomux(CONFIG_SYS_FPGA_SUSPEND, IOMUX_CONFIG_ALT4);
-+ mxc_iomux_set_pad(CONFIG_SYS_FPGA_SUSPEND, GPIO_PAD_CFG);
++ /* FPGA SUSPEND */
++ mxc_request_iomux(ACFG_FPGA_SUSPEND, IOMUX_CONFIG_ALT4);
++ mxc_iomux_set_pad(ACFG_FPGA_SUSPEND, GPIO_PAD_CFG);
+
-+ /* FPGA PROG */
-+ mxc_request_iomux(CONFIG_SYS_FPGA_PRG, IOMUX_CONFIG_ALT3);
-+ mxc_iomux_set_pad(CONFIG_SYS_FPGA_PRG, GPIO_PAD_CFG);
++ /* FPGA PROG */
++ mxc_request_iomux(ACFG_FPGA_PRG, IOMUX_CONFIG_ALT3);
++ mxc_iomux_set_pad(ACFG_FPGA_PRG, GPIO_PAD_CFG);
+
-+ /* FPGA DONE */
-+ mxc_request_iomux(CONFIG_SYS_FPGA_DONE, IOMUX_CONFIG_ALT3);
-+ mxc_iomux_set_pad(CONFIG_SYS_FPGA_DONE, GPIO_PAD_CFG);
++ /* FPGA DONE */
++ mxc_request_iomux(ACFG_FPGA_DONE, IOMUX_CONFIG_ALT3);
++ mxc_iomux_set_pad(ACFG_FPGA_DONE, GPIO_PAD_CFG);
+
-+ /* FPGA INIT# */
-+ mxc_request_iomux(CONFIG_SYS_FPGA_INIT, IOMUX_CONFIG_ALT3);
-+ mxc_iomux_set_pad(CONFIG_SYS_FPGA_INIT, GPIO_PAD_CFG);
++ /* FPGA INIT# */
++ mxc_request_iomux(ACFG_FPGA_INIT, IOMUX_CONFIG_ALT3);
++ mxc_iomux_set_pad(ACFG_FPGA_INIT, GPIO_PAD_CFG);
+
+}
+
@@ -494,10 +489,10 @@ Index: u-boot-2011.12/board/armadeus/apf51/apf51.c
+ * Configure iomux for display 1 interface
+ */
+ mxc_request_iomux(MX51_PIN_DI1_D1_CS, IOMUX_CONFIG_ALT4);
-+// missing in DS mxc_request_iomux(MX51_PIN_DI1_DISP_CLK, IOMUX_CONFIG_ALT0);
++// missing in DS mxc_request_iomux(MX51_PIN_DI1_DISP_CLK, IOMUX_CONFIG_ALT0);
+ mxc_request_iomux(MX51_PIN_DI1_PIN2, IOMUX_CONFIG_ALT0);
+ mxc_request_iomux(MX51_PIN_DI1_PIN3, IOMUX_CONFIG_ALT0);
-+// missing in DS mxc_request_iomux(MX51_PIN_DI1_PIN15, IOMUX_CONFIG_ALT0);
++// missing in DS mxc_request_iomux(MX51_PIN_DI1_PIN15, IOMUX_CONFIG_ALT0);
+
+ mxc_request_iomux(MX51_PIN_DISP1_DAT0, IOMUX_CONFIG_ALT0);
+ mxc_request_iomux(MX51_PIN_DISP1_DAT1, IOMUX_CONFIG_ALT0);
@@ -530,61 +525,61 @@ Index: u-boot-2011.12/board/armadeus/apf51/apf51.c
+ /*
+ * Configure iomux for NFC interface
+ */
-+#define NAND_PAD47K_CFG (PAD_CTL_DRV_VOT_HIGH | PAD_CTL_HYS_NONE | \
-+ PAD_CTL_PKE_ENABLE | PAD_CTL_47K_PU | \
++#define NAND_PAD47K_CFG (PAD_CTL_DRV_VOT_HIGH | PAD_CTL_HYS_NONE | \
++ PAD_CTL_PKE_ENABLE | PAD_CTL_47K_PU | \
+ PAD_CTL_DRV_HIGH)
+
-+#define NAND_PAD100K_CFG (PAD_CTL_DRV_VOT_HIGH | PAD_CTL_HYS_NONE | \
-+ PAD_CTL_PKE_ENABLE | PAD_CTL_100K_PU | \
++#define NAND_PAD100K_CFG (PAD_CTL_DRV_VOT_HIGH | PAD_CTL_HYS_NONE | \
++ PAD_CTL_PKE_ENABLE | PAD_CTL_100K_PU | \
+ PAD_CTL_DRV_HIGH)
+
+ mxc_request_iomux(MX51_PIN_NANDF_WE_B, IOMUX_CONFIG_ALT0);
-+ mxc_iomux_set_pad(MX51_PIN_NANDF_WE_B, NAND_PAD47K_CFG);
++ mxc_iomux_set_pad(MX51_PIN_NANDF_WE_B, NAND_PAD47K_CFG);
+
+ mxc_request_iomux(MX51_PIN_NANDF_RE_B, IOMUX_CONFIG_ALT0);
-+ mxc_iomux_set_pad(MX51_PIN_NANDF_RE_B, NAND_PAD47K_CFG);
++ mxc_iomux_set_pad(MX51_PIN_NANDF_RE_B, NAND_PAD47K_CFG);
+
-+ mxc_request_iomux(MX51_PIN_NANDF_ALE , IOMUX_CONFIG_ALT0);
-+ mxc_iomux_set_pad(MX51_PIN_NANDF_ALE , NAND_PAD47K_CFG);
++ mxc_request_iomux(MX51_PIN_NANDF_ALE, IOMUX_CONFIG_ALT0);
++ mxc_iomux_set_pad(MX51_PIN_NANDF_ALE, NAND_PAD47K_CFG);
+
-+ mxc_request_iomux(MX51_PIN_NANDF_CLE , IOMUX_CONFIG_ALT0);
-+ mxc_iomux_set_pad(MX51_PIN_NANDF_CLE , NAND_PAD47K_CFG);
++ mxc_request_iomux(MX51_PIN_NANDF_CLE, IOMUX_CONFIG_ALT0);
++ mxc_iomux_set_pad(MX51_PIN_NANDF_CLE, NAND_PAD47K_CFG);
+
+ mxc_request_iomux(MX51_PIN_NANDF_WP_B, IOMUX_CONFIG_ALT0);
-+ mxc_iomux_set_pad(MX51_PIN_NANDF_WP_B, NAND_PAD100K_CFG);
++ mxc_iomux_set_pad(MX51_PIN_NANDF_WP_B, NAND_PAD100K_CFG);
+
-+ mxc_request_iomux(MX51_PIN_NANDF_RB0 , IOMUX_CONFIG_ALT0);
-+ mxc_iomux_set_pad(MX51_PIN_NANDF_RB0 , PAD_CTL_DRV_VOT_HIGH |
-+ PAD_CTL_HYS_NONE | PAD_CTL_PKE_ENABLE |
-+ PAD_CTL_PUE_PULL | PAD_CTL_100K_PU);
++ mxc_request_iomux(MX51_PIN_NANDF_RB0, IOMUX_CONFIG_ALT0);
++ mxc_iomux_set_pad(MX51_PIN_NANDF_RB0, PAD_CTL_DRV_VOT_HIGH |
++ PAD_CTL_HYS_NONE | PAD_CTL_PKE_ENABLE |
++ PAD_CTL_PUE_PULL | PAD_CTL_100K_PU);
+
+ mxc_request_iomux(MX51_PIN_NANDF_CS0, IOMUX_CONFIG_ALT0);
+
+ /* MX51_PIN_NANDF_RDY_INT */
+
+ mxc_request_iomux(MX51_PIN_NANDF_D0, IOMUX_CONFIG_ALT0);
-+ mxc_iomux_set_pad(MX51_PIN_NANDF_D0, NAND_PAD100K_CFG);
++ mxc_iomux_set_pad(MX51_PIN_NANDF_D0, NAND_PAD100K_CFG);
+
+ mxc_request_iomux(MX51_PIN_NANDF_D1, IOMUX_CONFIG_ALT0);
-+ mxc_iomux_set_pad(MX51_PIN_NANDF_D1, NAND_PAD100K_CFG);
++ mxc_iomux_set_pad(MX51_PIN_NANDF_D1, NAND_PAD100K_CFG);
+
+ mxc_request_iomux(MX51_PIN_NANDF_D2, IOMUX_CONFIG_ALT0);
-+ mxc_iomux_set_pad(MX51_PIN_NANDF_D2, NAND_PAD100K_CFG);
++ mxc_iomux_set_pad(MX51_PIN_NANDF_D2, NAND_PAD100K_CFG);
+
+ mxc_request_iomux(MX51_PIN_NANDF_D3, IOMUX_CONFIG_ALT0);
-+ mxc_iomux_set_pad(MX51_PIN_NANDF_D3, NAND_PAD100K_CFG);
++ mxc_iomux_set_pad(MX51_PIN_NANDF_D3, NAND_PAD100K_CFG);
+
+ mxc_request_iomux(MX51_PIN_NANDF_D4, IOMUX_CONFIG_ALT0);
-+ mxc_iomux_set_pad(MX51_PIN_NANDF_D4, NAND_PAD100K_CFG);
++ mxc_iomux_set_pad(MX51_PIN_NANDF_D4, NAND_PAD100K_CFG);
+
+ mxc_request_iomux(MX51_PIN_NANDF_D5, IOMUX_CONFIG_ALT0);
-+ mxc_iomux_set_pad(MX51_PIN_NANDF_D5, NAND_PAD100K_CFG);
++ mxc_iomux_set_pad(MX51_PIN_NANDF_D5, NAND_PAD100K_CFG);
+
+ mxc_request_iomux(MX51_PIN_NANDF_D6, IOMUX_CONFIG_ALT0);
-+ mxc_iomux_set_pad(MX51_PIN_NANDF_D6, NAND_PAD100K_CFG);
++ mxc_iomux_set_pad(MX51_PIN_NANDF_D6, NAND_PAD100K_CFG);
+
+ mxc_request_iomux(MX51_PIN_NANDF_D7, IOMUX_CONFIG_ALT0);
-+ mxc_iomux_set_pad(MX51_PIN_NANDF_D7, NAND_PAD100K_CFG);
++ mxc_iomux_set_pad(MX51_PIN_NANDF_D7, NAND_PAD100K_CFG);
+
+ writel(0, NFC_IPC);
+ NFC_SET_FW(1);
@@ -595,8 +590,8 @@ Index: u-boot-2011.12/board/armadeus/apf51/apf51.c
+ /*
+ * Configure iomux for SPI interface
+ */
-+#define CSPI_PAD_CFG (PAD_CTL_HYS_NONE | PAD_CTL_PKE_ENABLE | \
-+ PAD_CTL_PUE_KEEPER | PAD_CTL_100K_PU | \
++#define CSPI_PAD_CFG (PAD_CTL_HYS_NONE | PAD_CTL_PKE_ENABLE | \
++ PAD_CTL_PUE_KEEPER | PAD_CTL_100K_PU | \
+ PAD_CTL_DRV_HIGH | PAD_CTL_SRE_FAST)
+ /*
+ * ECSPI1
@@ -628,7 +623,7 @@ Index: u-boot-2011.12/board/armadeus/apf51/apf51.c
+ mxc_iomux_set_pad(MX51_PIN_NANDF_D15, CSPI_PAD_CFG);
+
+ mxc_iomux_set_input(MX51_CSPI_IPP_IND_SS_B_1_SELECT_INPUT,
-+ INPUT_CTL_PATH1);
++ INPUT_CTL_PATH1);
+}
+
+#ifdef CONFIG_I2C_MXC
@@ -644,23 +639,23 @@ Index: u-boot-2011.12/board/armadeus/apf51/apf51.c
+ case I2C1_BASE_ADDR:
+ /* SCL */
+ mxc_request_iomux(MX51_PIN_I2C1_CLK,
-+ IOMUX_CONFIG_ALT0 | IOMUX_CONFIG_SION);
++ IOMUX_CONFIG_ALT0 | IOMUX_CONFIG_SION);
+
+ /* SDA */
+ mxc_request_iomux(MX51_PIN_I2C1_DAT,
-+ IOMUX_CONFIG_ALT0 | IOMUX_CONFIG_SION);
++ IOMUX_CONFIG_ALT0 | IOMUX_CONFIG_SION);
+ break;
+
-+ case I2C2_BASE_ADDR: /* do not use without disabling UART3 first */
++ case I2C2_BASE_ADDR: /* do not use without disabling UART3 first */
+ /* SCL */
+ mxc_request_iomux(MX51_PIN_EIM_D24,
-+ IOMUX_CONFIG_ALT4 | IOMUX_CONFIG_SION);
++ IOMUX_CONFIG_ALT4 | IOMUX_CONFIG_SION);
+
+ /* SDA */
+ mxc_request_iomux(MX51_PIN_EIM_D27,
-+ IOMUX_CONFIG_ALT4 | IOMUX_CONFIG_SION);
++ IOMUX_CONFIG_ALT4 | IOMUX_CONFIG_SION);
+ mxc_iomux_set_input(MX51_I2C2_IPP_SDA_IN_SELECT_INPUT,
-+ INPUT_CTL_PATH0);
++ INPUT_CTL_PATH0);
+ break;
+
+ default:
@@ -676,7 +671,6 @@ Index: u-boot-2011.12/board/armadeus/apf51/apf51.c
+#define CFG_FEC_PAD (PAD_CTL_DRV_MEDIUM | PAD_CTL_PUE_KEEPER | \
+ PAD_CTL_HYS_ENABLE | PAD_CTL_DRV_VOT_HIGH)
+
-+
+ gpio_set_value(CONFIG_SYS_PHY_RESET_GPIO, 0);
+ gpio_direction_output(CONFIG_SYS_PHY_RESET_GPIO, 0);
+
@@ -752,7 +746,10 @@ Index: u-boot-2011.12/board/armadeus/apf51/apf51.c
+ mxc_request_iomux(MX51_PIN_DISP2_DAT15, IOMUX_CONFIG_ALT2);
+ mxc_iomux_set_pad(MX51_PIN_DISP2_DAT15, CFG_FEC_PAD);
+
-+ /* FEC signals involved in daisy chain should be mapped to DISP2/DI2 pads */
++ /*
++ * FEC signals involved in daisy chain should be mapped
++ * to DISP2/DI2 pads
++ */
+ mxc_iomux_set_input(MX51_FEC_FEC_COL_SELECT_INPUT, INPUT_CTL_PATH1);
+ mxc_iomux_set_input(MX51_FEC_FEC_CRS_SELECT_INPUT, INPUT_CTL_PATH1);
+ mxc_iomux_set_input(MX51_FEC_FEC_MDI_SELECT_INPUT, INPUT_CTL_PATH1);
@@ -765,13 +762,13 @@ Index: u-boot-2011.12/board/armadeus/apf51/apf51.c
+ mxc_iomux_set_input(MX51_FEC_FEC_RX_ER_SELECT_INPUT, INPUT_CTL_PATH1);
+ mxc_iomux_set_input(MX51_FEC_FEC_TX_CLK_SELECT_INPUT, INPUT_CTL_PATH1);
+
-+ /* Ethernet PHY leave Reset state (POR only)*/
++ /* Ethernet PHY leave Reset state (POR only) */
+ gpio_set_value(CONFIG_SYS_PHY_RESET_GPIO, 1);
+ gpio_direction_output(CONFIG_SYS_PHY_RESET_GPIO, 1);
+#endif
+}
+
-+int board_eth_init(bd_t *bis)
++int board_eth_init(bd_t * bis)
+{
+#define STR_ENV_ETHADDR "ethaddr"
+ int rc = -ENODEV;
@@ -781,7 +778,7 @@ Index: u-boot-2011.12/board/armadeus/apf51/apf51.c
+ 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) {
@@ -797,11 +794,10 @@ Index: u-boot-2011.12/board/armadeus/apf51/apf51.c
+}
+
+#ifdef CONFIG_FSL_MMC
-+volatile u32 *esdhc_base_pointer;
+int esdhc_active = CONFIG_DEFAULT_MMC;
-+#define SD1_PAD_CFG (PAD_CTL_DRV_MAX | PAD_CTL_DRV_VOT_HIGH | \
-+ PAD_CTL_HYS_NONE | PAD_CTL_47K_PU | \
-+ PAD_CTL_PUE_PULL | PAD_CTL_PKE_ENABLE | \
++#define SD1_PAD_CFG (PAD_CTL_DRV_MAX | PAD_CTL_DRV_VOT_HIGH | \
++ PAD_CTL_HYS_NONE | PAD_CTL_47K_PU | \
++ PAD_CTL_PUE_PULL | PAD_CTL_PKE_ENABLE | \
+ PAD_CTL_SRE_FAST)
+int sdhc_init(void)
+{
@@ -809,11 +805,11 @@ Index: u-boot-2011.12/board/armadeus/apf51/apf51.c
+
+ switch (esdhc_active) {
+ case 0:
-+ esdhc_base_pointer = (volatile u32 *)MMC_SDHC1_BASE_ADDR;
-+
-+// mxc_request_iomux(MX51_PIN_GPIO1_0, IOMUX_CONFIG_ALT0 | IOMUX_CONFIG_SION);
-+// mxc_iomux_set_pad(MX51_PIN_GPIO1_0, SD1_PAD_CFG);
-+
++/*
++ mxc_request_iomux(MX51_PIN_GPIO1_0, IOMUX_CONFIG_ALT0 |
++ IOMUX_CONFIG_SION);
++ mxc_iomux_set_pad(MX51_PIN_GPIO1_0, SD1_PAD_CFG);
++*/
+ /* SD1_CMD */
+ mxc_request_iomux(MX51_PIN_SD1_CMD, IOMUX_CONFIG_ALT0);
+ mxc_iomux_set_pad(MX51_PIN_SD1_CMD, SD1_PAD_CFG);
@@ -842,11 +838,11 @@ Index: u-boot-2011.12/board/armadeus/apf51/apf51.c
+ status = 1;
+ break;
+ case 1:
-+ esdhc_base_pointer = (volatile u32 *)MMC_SDHC2_BASE_ADDR;
-+
-+// mxc_request_iomux(MX51_PIN_GPIO1_0, IOMUX_CONFIG_ALT0 | IOMUX_CONFIG_SION);
-+// mxc_iomux_set_pad(MX51_PIN_GPIO1_0, SD1_PAD_CFG);
-+
++/*
++ mxc_request_iomux(MX51_PIN_GPIO1_0, IOMUX_CONFIG_ALT0 |
++ IOMUX_CONFIG_SION);
++ mxc_iomux_set_pad(MX51_PIN_GPIO1_0, SD1_PAD_CFG);
++*/
+ /* SD2_CMD */
+ mxc_request_iomux(MX51_PIN_SD2_CMD, IOMUX_CONFIG_ALT0);
+ mxc_iomux_set_pad(MX51_PIN_SD2_CMD, SD1_PAD_CFG);
@@ -877,7 +873,8 @@ Index: u-boot-2011.12/board/armadeus/apf51/apf51.c
+ case 2:
+ case 3:
+ default:
-+ printf("*** ERROR: SD/MMC interface %d not supported\n", esdhc_active);
++ printf("*** ERROR: SD/MMC interface %d not supported\n",
++ esdhc_active);
+ status = 1;
+ break;
+ }
@@ -891,9 +888,8 @@ Index: u-boot-2011.12/board/armadeus/apf51/apf51.c
+ struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)MXC_CCM_BASE;
+ struct src *src = (struct src *)SRC_BASE_ADDR;
+
-+ /* Increase freq to CONFIG_ARM_CLK_FREQ (800MHz) */
-+ writel((CONFIG_PLL1_FREQ/CONFIG_ARM_CLK_FREQ)-1,
-+ &mxc_ccm->cacrr);
++ /* Increase freq to APF_ARM_CLK (800MHz) */
++ writel((ACFG_PLL1_CLK / APF_ARM_CLK) - 1, &mxc_ccm->cacrr);
+
+ /* Disable warm reset */
+ writel(0x560, &src->scr);
@@ -930,8 +926,7 @@ Index: u-boot-2011.12/board/armadeus/apf51/apf51.c
+/*
+ * Miscellaneous intialization
+ */
-+int
-+misc_init_r (void)
++int misc_init_r(void)
+{
+#ifdef CONFIG_I2C_MXC
+ i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
@@ -943,15 +938,16 @@ Index: u-boot-2011.12/board/armadeus/apf51/apf51.c
+int board_late_init(void)
+{
+ char *s;
-+ u_char * firmware_buffer = (u_char *)(CONFIG_SYS_LOAD_ADDR + CONFIG_SYS_MONITOR_LEN);
-+ size_t end = 0;
-+ size_t size = 0;
-+ size_t offset = -1;
-+ char *autoload = getenv ("firmware_autoload");
++ u_char *firmware_buffer =
++ (u_char *) (CONFIG_SYS_LOAD_ADDR + CONFIG_SYS_MONITOR_LEN);
++ size_t end = 0;
++ size_t size = 0;
++ size_t offset = -1;
++ char *autoload = getenv("firmware_autoload");
+
+#if defined(CONFIG_FPGA)
+ /* init and download fpga */
-+ if (( autoload ) && (0 == strcmp(autoload, "1"))) {
++ if ((autoload) && (0 == strcmp(autoload, "1"))) {
+ if ((s = getenv("firmware_offset")) != NULL) {
+ offset = simple_strtoul(s, NULL, 16);
+ }
@@ -959,17 +955,17 @@ Index: u-boot-2011.12/board/armadeus/apf51/apf51.c
+ end = offset + simple_strtoul(s, NULL, 16);
+ }
+ if ((-1 != offset) && (offset != end)) {
-+ size = read_firmware (offset, end, firmware_buffer);
++ size = read_firmware(offset, end, firmware_buffer);
+ }
+ }
-+ APF51_init_fpga (firmware_buffer, size);
++ APF51_init_fpga(firmware_buffer, size);
+#endif
+
+ /* detect compatibility issue of environment version */
-+ s = getenv ("env_version");
-+ if (( NULL == s ) || (0 != strcmp(s, CONFIG_ENV_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");
++ "run flash_reset_env; reset\n");
+ }
+
+ return 0;
@@ -997,97 +993,11 @@ Index: u-boot-2011.12/board/armadeus/apf51/apf51.c
+ return 0;
+}
+
-+#define cache_flush(void) \
-+{ \
-+ asm volatile ( \
-+ "stmfd sp!, {r0-r5, r7, r9-r11};" \
-+ "mrc p15, 1, r0, c0, c0, 1;" /*@ read clidr*/ \
-+ /* @ extract loc from clidr */ \
-+ "ands r3, r0, #0x7000000;" \
-+ /* @ left align loc bit field*/ \
-+ "mov r3, r3, lsr #23;" \
-+ /* @ if loc is 0, then no need to clean*/ \
-+ "beq 555f;" /* finished;" */ \
-+ /* @ start clean at cache level 0*/ \
-+ "mov r10, #0;" \
-+ "111:" /*"loop1: */ \
-+ /* @ work out 3x current cache level */ \
-+ "add r2, r10, r10, lsr #1;" \
-+ /* @ extract cache type bits from clidr */ \
-+ "mov r1, r0, lsr r2;" \
-+ /* @ mask of the bits for current cache only */ \
-+ "and r1, r1, #7;" \
-+ /* @ see what cache we have at this level*/ \
-+ "cmp r1, #2;" \
-+ /* @ skip if no cache, or just i-cache*/ \
-+ "blt 444f;" /* skip;" */ \
-+ /* @ select current cache level in cssr*/ \
-+ "mcr p15, 2, r10, c0, c0, 0;" \
-+ /* @ isb to sych the new cssr&csidr */ \
-+ "mcr p15, 0, r10, c7, c5, 4;" \
-+ /* @ read the new csidr */ \
-+ "mrc p15, 1, r1, c0, c0, 0;" \
-+ /* @ extract the length of the cache lines */ \
-+ "and r2, r1, #7;" \
-+ /* @ add 4 (line length offset) */ \
-+ "add r2, r2, #4;" \
-+ "ldr r4, =0x3ff;" \
-+ /* @ find maximum number on the way size*/ \
-+ "ands r4, r4, r1, lsr #3;" \
-+ /*"clz r5, r4;" @ find bit position of way size increment*/ \
-+ ".word 0xE16F5F14;" \
-+ "ldr r7, =0x7fff;" \
-+ /* @ extract max number of the index size*/ \
-+ "ands r7, r7, r1, lsr #13;" \
-+ "222:" /* loop2:" */ \
-+ /* @ create working copy of max way size*/ \
-+ "mov r9, r4;" \
-+ "333:" /* loop3:" */ \
-+ /* @ factor way and cache number into r11*/ \
-+ "orr r11, r10, r9, lsl r5;" \
-+ /* @ factor index number into r11*/ \
-+ "orr r11, r11, r7, lsl r2;" \
-+ /* @ clean & invalidate by set/way */ \
-+ "mcr p15, 0, r11, c7, c14, 2;" \
-+ /* @ decrement the way */ \
-+ "subs r9, r9, #1;" \
-+ "bge 333b;" /* loop3;" */ \
-+ /* @ decrement the index */ \
-+ "subs r7, r7, #1;" \
-+ "bge 222b;" /* loop2;" */ \
-+ "444:" /* skip: */ \
-+ /*@ increment cache number */ \
-+ "add r10, r10, #2;" \
-+ "cmp r3, r10;" \
-+ "bgt 111b;" /* loop1; */ \
-+ "555:" /* "finished:" */ \
-+ /* @ swith back to cache level 0 */ \
-+ "mov r10, #0;" \
-+ /* @ select current cache level in cssr */ \
-+ "mcr p15, 2, r10, c0, c0, 0;" \
-+ /* @ isb to sych the new cssr&csidr */ \
-+ "mcr p15, 0, r10, c7, c5, 4;" \
-+ "ldmfd sp!, {r0-r5, r7, r9-r11};" \
-+ "666:" /* iflush:" */ \
-+ "mov r0, #0x0;" \
-+ /* @ invalidate I+BTB */ \
-+ "mcr p15, 0, r0, c7, c5, 0;" \
-+ /* @ drain WB */ \
-+ "mcr p15, 0, r0, c7, c10, 4;" \
-+ : \
-+ : \
-+ : "r0" /* Clobber list */ \
-+ ); \
-+}
-+
+#ifndef CONFIG_SYS_DCACHE_OFF
+void enable_caches(void)
+{
+ /* Enable D-cache. I-cache is already enabled in start.S */
+ //dcache_enable();
-+#ifndef CONFIG_L2_OFF
-+ //v7_outer_cache_enable();
-+#endif
+}
+
+#endif
@@ -1106,166 +1016,214 @@ Index: u-boot-2011.12/board/armadeus/apf51/apf51.c
+ asm("bic r0, r0, #0x2");
+ asm("mcr 15, 0, r0, c1, c0, 1");
+}
-+
-+/*
-+void v7_outer_cache_flush_all(void)
-+{
-+}
-+
-+void v7_outer_cache_inval_all(void)
-+{
-+}
-+
-+void v7_outer_cache_flush_range(u32 start, u32 end)
-+{
-+}
-+
-+void v7_outer_cache_inval_range(u32 start, u32 end)
-+{
-+}
-+*/
+#endif
+
-+
++#if defined(CONFIG_CMD_BSP)
+/*
+ * display dcd table. to delete
+ */
-+int do_mx51_show_dcd_tab(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
++int do_mx51_show_dcd_tab(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
+{
+ ulong i = 1;
++ struct esdctl_regs *esdctl = (struct esdctl_regs *)ESDCTL_BASE_ADDR;
+ char dcd_item[] = "MXC_DCD_ITEM(%ld, %ld, %#010lX, %#010lX)\n";
+
-+ printf(dcd_item, i++, 4, IOMUXC_BASE_ADDR + IOMUXC_SW_PAD_CTL_PAD_DRAM_RAS,
-+ CONFIG_IOMUX_PAD_DRAM_RAS);
-+ printf(dcd_item, i++, 4, IOMUXC_BASE_ADDR + IOMUXC_SW_PAD_CTL_PAD_DRAM_CAS,
-+ CONFIG_IOMUX_PAD_DRAM_CAS);
-+ printf(dcd_item, i++, 4, IOMUXC_BASE_ADDR + IOMUXC_SW_PAD_CTL_PAD_DRAM_SDWE,
-+ CONFIG_IOMUX_PAD_DRAM_SDWE);
-+ printf(dcd_item, i++, 4, IOMUXC_BASE_ADDR + IOMUXC_SW_PAD_CTL_PAD_DRAM_SDCKE0,
-+ CONFIG_IOMUX_PAD_DRAM_SDCKE0);
-+ printf(dcd_item, i++, 4, IOMUXC_BASE_ADDR + IOMUXC_SW_PAD_CTL_PAD_DRAM_SDCKE1,
-+ CONFIG_IOMUX_PAD_DRAM_SDCKE1);
-+ printf(dcd_item, i++, 4, IOMUXC_BASE_ADDR + IOMUXC_SW_PAD_CTL_PAD_DRAM_SDCLK,
-+ CONFIG_IOMUX_PAD_DRAM_SDCLK);
-+ printf(dcd_item, i++, 4, IOMUXC_BASE_ADDR + IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS0,
-+ CONFIG_IOMUX_PAD_DRAM_SDQS0);
-+ printf(dcd_item, i++, 4, IOMUXC_BASE_ADDR + IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS1,
-+ CONFIG_IOMUX_PAD_DRAM_SDQS1);
-+ printf(dcd_item, i++, 4, IOMUXC_BASE_ADDR + IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS2,
-+ CONFIG_IOMUX_PAD_DRAM_SDQS2);
-+ printf(dcd_item, i++, 4, IOMUXC_BASE_ADDR + IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS3,
-+ CONFIG_IOMUX_PAD_DRAM_SDQS3);
-+ printf(dcd_item, i++, 4, IOMUXC_BASE_ADDR + IOMUXC_SW_PAD_CTL_PAD_DRAM_CS0,
-+ CONFIG_IOMUX_PAD_DRAM_CS0);
-+ printf(dcd_item, i++, 4, IOMUXC_BASE_ADDR + IOMUXC_SW_PAD_CTL_PAD_DRAM_CS1,
-+ CONFIG_IOMUX_PAD_DRAM_CS1);
-+ printf(dcd_item, i++, 4, IOMUXC_BASE_ADDR + IOMUXC_SW_PAD_CTL_PAD_DRAM_DQM0,
-+ CONFIG_IOMUX_PAD_DRAM_DQM0);
-+ printf(dcd_item, i++, 4, IOMUXC_BASE_ADDR + IOMUXC_SW_PAD_CTL_PAD_DRAM_DQM1,
-+ CONFIG_IOMUX_PAD_DRAM_DQM1);
-+ printf(dcd_item, i++, 4, IOMUXC_BASE_ADDR + IOMUXC_SW_PAD_CTL_PAD_DRAM_DQM2,
-+ CONFIG_IOMUX_PAD_DRAM_DQM2);
-+ printf(dcd_item, i++, 4, IOMUXC_BASE_ADDR + IOMUXC_SW_PAD_CTL_PAD_DRAM_DQM3,
-+ CONFIG_IOMUX_PAD_DRAM_DQM3);
-+// printf(dcd_item, i++, 4, IOMUXC_BASE_ADDR + IOMUXC_SW_PAD_CTL_PAD_EIM_SDBA2,
-+// CONFIG_IOMUX_PAD_EIM_SDBA2);
-+// printf(dcd_item, i++, 4, IOMUXC_BASE_ADDR + IOMUXC_SW_PAD_CTL_PAD_EIM_SDODT1,
-+// CONFIG_IOMUX_PAD_EIM_SDODT1);
-+// printf(dcd_item, i++, 4, IOMUXC_BASE_ADDR + IOMUXC_SW_PAD_CTL_PAD_EIM_SDODT0,
-+// CONFIG_IOMUX_PAD_EIM_SDODT0);
-+ printf(dcd_item, i++, 4, IOMUXC_BASE_ADDR + IOMUXC_SW_PAD_CTL_GRP_DDRPKS,
-+ CONFIG_IOMUX_GRP_DDRPKS);
-+ printf(dcd_item, i++, 4, IOMUXC_BASE_ADDR + IOMUXC_SW_PAD_CTL_GRP_DRAM_B4,
-+ CONFIG_IOMUX_GRP_DRAM_B4);
-+// printf(dcd_item, i++, 4, IOMUXC_BASE_ADDR + IOMUXC_SW_PAD_CTL_GRP_INDDR,
-+// CONFIG_IOMUX_GRP_INDDR);
-+ printf(dcd_item, i++, 4, IOMUXC_BASE_ADDR + IOMUXC_SW_PAD_CTL_GRP_PKEDDR,
-+ CONFIG_IOMUX_GRP_PKEDDR);
-+ printf(dcd_item, i++, 4, IOMUXC_BASE_ADDR + IOMUXC_SW_PAD_CTL_GRP_DDR_A0,
-+ CONFIG_IOMUX_GRP_DDR_A0);
-+ printf(dcd_item, i++, 4, IOMUXC_BASE_ADDR + IOMUXC_SW_PAD_CTL_GRP_DDR_A1,
-+ CONFIG_IOMUX_GRP_DDR_A1);
-+// printf(dcd_item, i++, 4, IOMUXC_BASE_ADDR + IOMUXC_SW_PAD_CTL_GRP_DDRAPUS,
-+// CONFIG_IOMUX_GRP_DDRAPUS);
-+// printf(dcd_item, i++, 4, IOMUXC_BASE_ADDR + IOMUXC_SW_PAD_CTL_GRP_HYSDDR0,
-+// CONFIG_IOMUX_GRP_HYSDDR0);
-+// printf(dcd_item, i++, 4, IOMUXC_BASE_ADDR + IOMUXC_SW_PAD_CTL_GRP_HYSDDR1,
-+// CONFIG_IOMUX_GRP_HYSDDR1);
-+// printf(dcd_item, i++, 4, IOMUXC_BASE_ADDR + IOMUXC_SW_PAD_CTL_GRP_HYSDDR2,
-+// CONFIG_IOMUX_GRP_HYSDDR2);
-+// printf(dcd_item, i++, 4, IOMUXC_BASE_ADDR + IOMUXC_SW_PAD_CTL_GRP_HVDDR,
-+// CONFIG_IOMUX_GRP_HVDDR);
-+// printf(dcd_item, i++, 4, IOMUXC_BASE_ADDR + IOMUXC_SW_PAD_CTL_GRP_HYSDDR3,
-+// CONFIG_IOMUX_GRP_HYSDDR3);
-+ printf(dcd_item, i++, 4, IOMUXC_BASE_ADDR + IOMUXC_SW_PAD_CTL_GRP_DRAM_SR_B0,
-+ CONFIG_IOMUX_GRP_DRAM_SR_B0);
-+ printf(dcd_item, i++, 4, IOMUXC_BASE_ADDR + IOMUXC_SW_PAD_CTL_GRP_DDRAPKS,
-+ CONFIG_IOMUX_GRP_DDRAPKS);
-+ printf(dcd_item, i++, 4, IOMUXC_BASE_ADDR + IOMUXC_SW_PAD_CTL_GRP_DRAM_SR_B1,
-+ CONFIG_IOMUX_GRP_DRAM_SR_B1);
-+ printf(dcd_item, i++, 4, IOMUXC_BASE_ADDR + IOMUXC_SW_PAD_CTL_GRP_DDRPUS,
-+ CONFIG_IOMUX_GRP_DDRPUS);
-+ printf(dcd_item, i++, 4, IOMUXC_BASE_ADDR + IOMUXC_SW_PAD_CTL_GRP_DRAM_SR_B2,
-+ CONFIG_IOMUX_GRP_DRAM_SR_B2);
-+ printf(dcd_item, i++, 4, IOMUXC_BASE_ADDR + IOMUXC_SW_PAD_CTL_GRP_PKEADDR,
-+ CONFIG_IOMUX_GRP_PKEADDR);
-+ printf(dcd_item, i++, 4, IOMUXC_BASE_ADDR + IOMUXC_SW_PAD_CTL_GRP_DRAM_SR_B4,
-+ CONFIG_IOMUX_GRP_DRAM_SR_B4);
-+// printf(dcd_item, i++, 4, IOMUXC_BASE_ADDR + IOMUXC_SW_PAD_CTL_GRP_INMODE1,
-+// CONFIG_...
[truncated message content] |
|
From: Julien B a. A. <ar...@us...> - 2012-01-19 18:29:38
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 2a4878215e04e9ded40308691b602860b6883c8e (commit)
via d3b4995e052179f3015972f0f27697b72bc920da (commit)
via 33e9f689813e9cad7bd10f3d3e6fa8a53d70854e (commit)
via b6a066c41271c035e76f3130018a81295c518d71 (commit)
from 4f42e9ad29f106e70a46383b6511951391de53e6 (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 2a4878215e04e9ded40308691b602860b6883c8e
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jan 19 19:28:52 2012 +0100
[TEST] Makes test_imxregs.sh more verbose
commit d3b4995e052179f3015972f0f27697b72bc920da
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jan 19 19:28:12 2012 +0100
[TEST] Fixes test_gpio.sh for old GPIO driver usage
commit 33e9f689813e9cad7bd10f3d3e6fa8a53d70854e
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jan 19 19:27:18 2012 +0100
[TEST] Makes test_prboom.sh more test_release.sh friendly
commit b6a066c41271c035e76f3130018a81295c518d71
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jan 19 19:26:02 2012 +0100
[LINUX] Fixes wishbone test drivers activation in apf27test-linux-2.6.29.config
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf27/apf27test-linux-2.6.29.config | 22 +++++++++++++++----
target/test/packages/test_imxregs.sh | 2 +
target/test/packages/test_prboom.sh | 8 +++++-
target/test/test_gpio.sh | 8 +++---
4 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf27/apf27test-linux-2.6.29.config b/buildroot/target/device/armadeus/apf27/apf27test-linux-2.6.29.config
index ecb06b0..1cdbb26 100644
--- a/buildroot/target/device/armadeus/apf27/apf27test-linux-2.6.29.config
+++ b/buildroot/target/device/armadeus/apf27/apf27test-linux-2.6.29.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.29.6
-# Fri Jul 1 15:19:18 2011
+# Thu Jan 19 18:46:39 2012
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1477,11 +1477,23 @@ CONFIG_ARMADEUS_FPGA_LOADER_DRIVER=m
#
# CONFIG_ARMADEUS_I2C_OCORE_IRQMNG is not set
# CONFIG_ARMADEUS_PS2KBD_DRIVER is not set
-CONFIG_ARMADEUS_WISHBONE_EXAMPLE_DRIVERS=y
-CONFIG_ARMADEUS_WISHBONE_EXAMPLE_BUTTON_DRIVER=m
-CONFIG_ARMADEUS_WISHBONE_EXAMPLE_LED_DRIVER=m
-CONFIG_ARMADEUS_WISHBONE_EXAMPLE_IRQ_MNGR_DRIVER=m
+
+#
+# Specific designs
+#
+CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS=y
+CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS_IRQ_MNGR=m
+CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS_BUTTON=m
+CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS_LED=m
+# CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS_GPIO is not set
+# CONFIG_ARMADEUS_FPGA_VIRTUAL_SPVISION_LOADER is not set
# CONFIG_POD_DRIVERS is not set
+CONFIG_ARMADEUS_FPGA_BOARD_DESIGNS=y
+CONFIG_ARMADEUS_FPGA_BOARD_DESIGNS_WISHBONE_EXAMPLE=y
+CONFIG_ARMADEUS_FPGA_BOARD_DESIGNS_WISHBONE_EXAMPLE_BUTTON_DRIVER=m
+CONFIG_ARMADEUS_FPGA_BOARD_DESIGNS_WISHBONE_EXAMPLE_LED_DRIVER=m
+CONFIG_ARMADEUS_FPGA_BOARD_DESIGNS_WISHBONE_EXAMPLE_IRQ_MNGR_DRIVER=m
+# CONFIG_ARMADEUS_FPGA_BOARD_DESIGNS_SPVISION_PROBER is not set
#
# Handheld related
diff --git a/target/test/packages/test_imxregs.sh b/target/test/packages/test_imxregs.sh
index 46bbf00..747072f 100755
--- a/target/test/packages/test_imxregs.sh
+++ b/target/test/packages/test_imxregs.sh
@@ -21,9 +21,11 @@ set_ids()
{
echo -n "Running on an $1"
if [ "$1" == "APF27" ]; then
+ echo "(Requires a run unlock_regs in U-Boot)"
ID_REG="CID"
ID_VAL="0x2882101d"
elif [ "$1" == "APF9328" ]; then
+ echo "(Requires a run unlock_regs in U-Boot)"
ID_REG="SIDR"
ID_VAL="0x00d4c01d"
elif [ "$1" == "APF51" ]; then
diff --git a/target/test/packages/test_prboom.sh b/target/test/packages/test_prboom.sh
index a77d255..52ce898 100755
--- a/target/test/packages/test_prboom.sh
+++ b/target/test/packages/test_prboom.sh
@@ -40,10 +40,14 @@ test_prboom()
execute_for_target set_exec_options
# Launch it
- ask_user "After having press ENTER, PrBoom will be launched. Press Ctrl+C at any time to stop."
+ ask_user "After having press ENTER, PrBoom will be launched. Press ENTER at any time in serial console to stop."
modprobe snd-pcm-oss
modprobe snd-mixer-oss
- $EXEC_NAME $EXEC_OPTIONS
+ $EXEC_NAME $EXEC_OPTIONS &
+ PID=$!
+ read
+ kill $PID
+ sleep 1
ask_user "Did you have good time ;-) ? (y/N)"
if [ "$response" == "y" ] || [ "$response" == "yes" ]; then
diff --git a/target/test/test_gpio.sh b/target/test/test_gpio.sh
index b6e2c1e..c46d6ea 100755
--- a/target/test/test_gpio.sh
+++ b/target/test/test_gpio.sh
@@ -3,7 +3,7 @@
#
# Script to test Armadeus Software release
#
-# Copyright (C) 2008-2011 The Armadeus Project - ARMadeus Systems
+# Copyright (C) 2008-2012 The Armadeus Project - Armadeus systems
#
# 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
@@ -73,12 +73,12 @@ blink_led()
done
elif [ "$1" == "APF27" ]; then
LED_NAME="D14"
- echo "oO- Old way to do it... -Oo"
+ echo "oO- Old way to do it (custom GPIO driver)... -Oo"
gpio_mode PF14 1
for i in `seq 0 5`; do
- gpio_set_value PF14 0
+ gpio_set_value_old PF14 0
usleep 500000
- gpio_set_value PF14 1
+ gpio_set_value_old PF14 1
usleep 500000
done
echo "oO- New way to do it (gpiolib)... -Oo"
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2012-01-18 18:05: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 4f42e9ad29f106e70a46383b6511951391de53e6 (commit)
via 8f250d3aaab6059291b1a5963430dbf4ca540df6 (commit)
via 5dc46d59128826052d98e1ecf04fd5897401e099 (commit)
via 1db803b684c665efaa6ac8d82fa4e921e4426984 (commit)
via a7188979467cc8288d437127322598a7618b667c (commit)
via 1a74e01ba51f8aec4912fb9e5c46cb98184af356 (commit)
from 3b911398433b964a1d6f28f224072cb312483517 (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 4f42e9ad29f106e70a46383b6511951391de53e6
Author: Julien Boibessot <jul...@ar...>
Date: Wed Jan 18 19:03:52 2012 +0100
[TEST] test_wifi.sh: only wait 3 DHCP requests results and then go on
commit 8f250d3aaab6059291b1a5963430dbf4ca540df6
Author: Julien Boibessot <jul...@ar...>
Date: Wed Jan 18 19:02:37 2012 +0100
[TEST] test_release.sh: also shows NFS dir envt variable when starting tests
commit 5dc46d59128826052d98e1ecf04fd5897401e099
Author: Julien Boibessot <jul...@ar...>
Date: Wed Jan 18 19:01:30 2012 +0100
[TEST] fixes test_fpga.sh due to recent wishbone drivers name changes
commit 1db803b684c665efaa6ac8d82fa4e921e4426984
Author: Julien Boibessot <jul...@ar...>
Date: Wed Jan 18 19:00:33 2012 +0100
[TEST] Fixes prboom launch on APF51
commit a7188979467cc8288d437127322598a7618b667c
Author: Julien Boibessot <jul...@ar...>
Date: Wed Jan 18 18:59:34 2012 +0100
[LINUX] Fixes load_fpga script when detecting .bin/.bit extension on APF51
commit 1a74e01ba51f8aec4912fb9e5c46cb98184af356
Author: Julien Boibessot <jul...@ar...>
Date: Wed Jan 18 18:57:47 2012 +0100
[BUILDROOT] Fixes fakeroot download site
-----------------------------------------------------------------------
Summary of changes:
.../2011.05/038-fakeroot-bump_version.patch | 11 +++++++----
.../linux/modules/fpga/dev_tools/loader/load_fpga | 4 +++-
target/test/packages/test_prboom.sh | 14 ++++++++++++--
target/test/test_fpga.sh | 4 ++--
target/test/test_release.sh | 3 ++-
target/test/test_wifi.sh | 4 ++--
6 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/patches/buildroot/2011.05/038-fakeroot-bump_version.patch b/patches/buildroot/2011.05/038-fakeroot-bump_version.patch
index c477c53..00de890 100644
--- a/patches/buildroot/2011.05/038-fakeroot-bump_version.patch
+++ b/patches/buildroot/2011.05/038-fakeroot-bump_version.patch
@@ -1,13 +1,16 @@
Index: buildroot/package/fakeroot/fakeroot.mk
===================================================================
---- buildroot.orig/package/fakeroot/fakeroot.mk 2011-08-08 12:12:00.000000000 +0200
-+++ buildroot/package/fakeroot/fakeroot.mk 2011-08-08 12:12:45.000000000 +0200
-@@ -3,7 +3,7 @@
+--- buildroot.orig/package/fakeroot/fakeroot.mk 2011-05-27 16:18:21.000000000 +0200
++++ buildroot/package/fakeroot/fakeroot.mk 2012-01-18 18:53:56.000000000 +0100
+@@ -3,9 +3,9 @@
# fakeroot
#
#############################################################
-FAKEROOT_VERSION:=1.9.5
+FAKEROOT_VERSION:=1.11
FAKEROOT_SOURCE:=fakeroot_$(FAKEROOT_VERSION).tar.gz
- FAKEROOT_SITE:=http://snapshot.debian.org/archive/debian/20080427T000000Z/pool/main/f/fakeroot/
+-FAKEROOT_SITE:=http://snapshot.debian.org/archive/debian/20080427T000000Z/pool/main/f/fakeroot/
++FAKEROOT_SITE:=http://ftp.debian.org/debian/pool/main/f/fakeroot/
FAKEROOT_CONF_OPT = --program-prefix=''
+
+ define FAKEROOT_PATCH_FAKEROOT_IN
diff --git a/target/linux/modules/fpga/dev_tools/loader/load_fpga b/target/linux/modules/fpga/dev_tools/loader/load_fpga
index da3e454..dc06a7d 100755
--- a/target/linux/modules/fpga/dev_tools/loader/load_fpga
+++ b/target/linux/modules/fpga/dev_tools/loader/load_fpga
@@ -16,7 +16,9 @@ if [ ! -f "$1" ]; then
fi
if [ "$PLATFORM" == "APF51" ]; then
- if [ "${1#*.}" != "bin" ]; then
+ filename="$1"
+ ext=${filename/*./}
+ if [ "$ext" != "bin" ]; then
echo "Wrong bitstream format, binary file in *.bin format must be used."
exit 1
fi
diff --git a/target/test/packages/test_prboom.sh b/target/test/packages/test_prboom.sh
index 5e5f75b..a77d255 100755
--- a/target/test/packages/test_prboom.sh
+++ b/target/test/packages/test_prboom.sh
@@ -3,7 +3,7 @@
#
# Script to test a Buildroot package for Armadeus Software release
#
-# Copyright (C) 2008 The Armadeus Project
+# Copyright (C) 2008-2012 The Armadeus 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
@@ -17,7 +17,15 @@ source ./test_env.sh
# Validates: prboom & SDL_net & SDL_mixer
# Requires: SDL & ALSA OSS emulation
EXEC_NAME="/usr/games/prboom"
-EXEC_OPTIONS="-width 320 -height 240 &"
+
+set_exec_options()
+{
+ if [ "$1" == "APF51" ]; then
+ EXEC_OPTIONS="-width 640 -height 480 -vidmode 16bit &"
+ else
+ EXEC_OPTIONS="-width 320 -height 240 &"
+ fi
+}
test_prboom()
{
@@ -29,6 +37,8 @@ test_prboom()
exit_failed
fi
+ execute_for_target set_exec_options
+
# Launch it
ask_user "After having press ENTER, PrBoom will be launched. Press Ctrl+C at any time to stop."
modprobe snd-pcm-oss
diff --git a/target/test/test_fpga.sh b/target/test/test_fpga.sh
index 2d76e4d..5aef5c9 100755
--- a/target/test/test_fpga.sh
+++ b/target/test/test_fpga.sh
@@ -3,7 +3,7 @@
#
# Script to test Armadeus Software release
#
-# Copyright (C) 2008-2011 The Armadeus Project - ARMadeus Systems
+# Copyright (C) 2008-2012 The Armadeus Project - Armadeus systems
#
# 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
@@ -85,7 +85,7 @@ test_fpga_it()
exit_failed
fi
- modprobe irq_ocore && modprobe board_irq_mng && modprobe gbutton && modprobe board_buttons
+ modprobe irq_ocore && modprobe wb_example_irq_mngr && modprobe button_ocore && modprobe wb_example_buttons
DEVICE_NODE=`cat /proc/devices | grep BUTTON | cut -d " " -f 1`
if [ "$?" != 0 ] || [ "$DEVICE_NODE" == "" ]; then
echo "Some modules failed to load"
diff --git a/target/test/test_release.sh b/target/test/test_release.sh
index bd169f9..1c897ef 100755
--- a/target/test/test_release.sh
+++ b/target/test/test_release.sh
@@ -3,7 +3,7 @@
#
# Script to test Armadeus Software release (main launching script)
#
-# Copyright (C) 2008 The Armadeus Project
+# Copyright (C) 2008-2012 The Armadeus 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
@@ -31,6 +31,7 @@ show_test_banner "All supported drivers/packages"
echo "Your test environments variables are:"
echo " - temporary directory: $TEMP_DIR"
echo " - Host IP: $SERVER_IP"
+echo " - Host NFS exported dir: $SERVER_NFS_DIR"
ask_user "Please confirm that these variables are correct (y/N)"
if [ "$response" != "y" ] && [ "$response" != "yes" ]; then
echo "Please update $THIS_DIR/test_env.sh"
diff --git a/target/test/test_wifi.sh b/target/test/test_wifi.sh
index c55f8f7..1423d1f 100755
--- a/target/test/test_wifi.sh
+++ b/target/test/test_wifi.sh
@@ -3,7 +3,7 @@
#
# Script to test Armadeus Software release
#
-# Copyright (C) 2010-2011 The Armadeus Project - ARMadeus Systems
+# Copyright (C) 2010-2012 The Armadeus Project - Armadeus systems
#
# 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
@@ -81,7 +81,7 @@ test_wifi()
exit_failed
fi
echo -e "\n Asking for an IP address"
- udhcpc -i $WLAN_IF
+ udhcpc -t 3 -i $WLAN_IF -b
ask_user "I will now download $FILE_TO_LOAD from your TFTP server ($SERVER_IP).\nBe sure that the file and its correspondig md5sum is available. Then press ENTER."
echo -e "\n Pinging server:"
ping -c 3 $SERVER_IP
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2012-01-17 16:04: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 3b911398433b964a1d6f28f224072cb312483517 (commit)
via 6b548704a3192344864277fcdededfc6e59dbbf7 (commit)
via 07e33214993cf37719dd1d23dc974ded52ecaa2e (commit)
via f8dcbd45439fdc843c89c0185f0f9d936f6a1854 (commit)
from 72213a456b849ceb6b2379216a2a739abc93c729 (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 3b911398433b964a1d6f28f224072cb312483517
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jan 17 17:02:53 2012 +0100
[TEST] Updates tests (for APF51). test_dac: be more vumeter friendly, test_imxregs: make it work, test_portmap: make it configurable
commit 6b548704a3192344864277fcdededfc6e59dbbf7
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jan 17 16:50:33 2012 +0100
[LINUX] Add wishbone example's drivers to default APF51 config
commit 07e33214993cf37719dd1d23dc974ded52ecaa2e
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jan 17 15:05:23 2012 +0100
Lindentation
commit f8dcbd45439fdc843c89c0185f0f9d936f6a1854
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jan 17 12:09:54 2012 +0100
[BUILDROOT] Workaround mplayer build failing on APF51
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf51/apf51-linux-2.6.38.config | 4 +
.../170-mplayer-make_it_compile_on_apf51.patch | 17 ++++
.../fpga/dev_tools/loader/apf51-fpga-loader.c | 85 ++++++++++++--------
target/test/packages/test_imxregs.sh | 8 +-
target/test/packages/test_portmap.sh | 20 ++---
target/test/test_dac.sh | 10 ++-
target/test/test_env.sh | 5 +-
target/test/test_usb_host.sh | 12 ++--
8 files changed, 100 insertions(+), 61 deletions(-)
create mode 100644 patches/buildroot/2011.05/170-mplayer-make_it_compile_on_apf51.patch
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config b/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config
index 25526b3..71fbd68 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config
+++ b/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config
@@ -225,6 +225,10 @@ CONFIG_ARMADEUS_DRIVERS=y
CONFIG_ARMADEUS_FPGA_DRIVERS=y
CONFIG_ARMADEUS_FPGA_LOADER_DRIVER=m
CONFIG_ARMADEUS_FPGA_BOARD_DESIGNS=y
+CONFIG_ARMADEUS_FPGA_BOARD_DESIGNS_WISHBONE_EXAMPLE=y
+CONFIG_ARMADEUS_FPGA_BOARD_DESIGNS_WISHBONE_EXAMPLE_BUTTON_DRIVER=m
+CONFIG_ARMADEUS_FPGA_BOARD_DESIGNS_WISHBONE_EXAMPLE_LED_DRIVER=m
+CONFIG_ARMADEUS_FPGA_BOARD_DESIGNS_WISHBONE_EXAMPLE_IRQ_MNGR_DRIVER=m
CONFIG_ARMADEUS_FPGA_BOARD_DESIGNS_TWIN_UARTS=y
CONFIG_ARMADEUS_FPGA_BOARD_DESIGNS_TWIN_UARTS_UARTS=m
CONFIG_ARMADEUS_FPGA_BOARD_DESIGNS_TWIN_UARTS_IRQ_MNGR=m
diff --git a/patches/buildroot/2011.05/170-mplayer-make_it_compile_on_apf51.patch b/patches/buildroot/2011.05/170-mplayer-make_it_compile_on_apf51.patch
new file mode 100644
index 0000000..7893453
--- /dev/null
+++ b/patches/buildroot/2011.05/170-mplayer-make_it_compile_on_apf51.patch
@@ -0,0 +1,17 @@
+Temporary fix until mplayer fixes the cortex-A8 optimized build.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/multimedia/mplayer/mplayer.mk
+===================================================================
+--- buildroot.orig/package/multimedia/mplayer/mplayer.mk 2012-01-13 14:57:49.000000000 +0100
++++ buildroot/package/multimedia/mplayer/mplayer.mk 2012-01-16 19:00:03.000000000 +0100
+@@ -91,7 +91,7 @@
+ endif
+
+ ifeq ($(call qstrip,$(BR2_GCC_TARGET_ARCH)),armv7-a)
+-MPLAYER_CONF_OPTS += --enable-neon
++MPLAYER_CONF_OPTS += --enable-armv6
+ endif
+
+ define MPLAYER_CONFIGURE_CMDS
diff --git a/target/linux/modules/fpga/dev_tools/loader/apf51-fpga-loader.c b/target/linux/modules/fpga/dev_tools/loader/apf51-fpga-loader.c
index 1b39b29..7008491 100644
--- a/target/linux/modules/fpga/dev_tools/loader/apf51-fpga-loader.c
+++ b/target/linux/modules/fpga/dev_tools/loader/apf51-fpga-loader.c
@@ -34,33 +34,39 @@
#define MXC_CS1RCR1_ADDR 0x20
#define MXC_CS1WCR1_ADDR 0x28
-#define CONFIG_SYS_FPGA_PWR (2*32 + 3) /*MX51_PAD_DI1_D0_CS__GPIO3_3*/
-#define CONFIG_SYS_FPGA_PRG (3*32 + 9) /*MX51_PAD_CSI2_D12__GPIO4_9*/
-#define CONFIG_SYS_FPGA_INIT (3*32 + 11) /*MX51_PAD_CSI2_D18__GPIO4_11*/
-#define CONFIG_SYS_FPGA_DONE (3*32 + 10) /*MX51_PAD_CSI2_D13__GPIO4_10*/
-#define CONFIG_SYS_FPGA_SUSPEND (2*32 + 6) /*MX51_PAD_DISPB2_SER_DIO__GPIO3_6*/
+#define CONFIG_SYS_FPGA_PWR (2*32 + 3) /*MX51_PAD_DI1_D0_CS__GPIO3_3 */
+#define CONFIG_SYS_FPGA_PRG (3*32 + 9) /*MX51_PAD_CSI2_D12__GPIO4_9 */
+#define CONFIG_SYS_FPGA_INIT (3*32 + 11) /*MX51_PAD_CSI2_D18__GPIO4_11 */
+#define CONFIG_SYS_FPGA_DONE (3*32 + 10) /*MX51_PAD_CSI2_D13__GPIO4_10 */
+#define CONFIG_SYS_FPGA_SUSPEND (2*32 + 6) /*MX51_PAD_DISPB2_SER_DIO__GPIO3_6 */
-
-u32 temp_clk; /* use to restore the emi_clk_sel after donwload */
+u32 temp_clk; /* use to restore the emi_clk_sel after donwload */
u32 temp_rcr1;
u32 temp_wcr1;
void __iomem *cs1_base;
-
/* Initialize GPIO port before download */
int apf51_fpga_pre(void)
{
#define EMI_CLK_SEL 1<<26
- temp_rcr1 = __raw_readl( MX51_IO_ADDRESS(MX51_WEIM_BASE_ADDR) + MXC_CS1RCR1_ADDR );
- __raw_writel( 0x01000010, MX51_IO_ADDRESS(MX51_WEIM_BASE_ADDR) + MXC_CS1RCR1_ADDR );
+ temp_rcr1 =
+ __raw_readl(MX51_IO_ADDRESS(MX51_WEIM_BASE_ADDR) +
+ MXC_CS1RCR1_ADDR);
+ __raw_writel(0x01000010,
+ MX51_IO_ADDRESS(MX51_WEIM_BASE_ADDR) + MXC_CS1RCR1_ADDR);
- temp_wcr1 = __raw_readl(MX51_IO_ADDRESS(MX51_WEIM_BASE_ADDR) + MXC_CS1WCR1_ADDR);
- __raw_writel( 0x01000008, MX51_IO_ADDRESS(MX51_WEIM_BASE_ADDR) + MXC_CS1WCR1_ADDR );
+ temp_wcr1 =
+ __raw_readl(MX51_IO_ADDRESS(MX51_WEIM_BASE_ADDR) +
+ MXC_CS1WCR1_ADDR);
+ __raw_writel(0x01000008,
+ MX51_IO_ADDRESS(MX51_WEIM_BASE_ADDR) + MXC_CS1WCR1_ADDR);
/* change emi_clk_sel to ensure blck smaller than 50MHz */
- temp_clk = __raw_readl( MX51_IO_ADDRESS(MX51_CCM_BASE_ADDR)+ MXC_CCM_CBCDR );
- __raw_writel( temp_clk | EMI_CLK_SEL, MX51_IO_ADDRESS(MX51_CCM_BASE_ADDR)+ MXC_CCM_CBCDR );
+ temp_clk =
+ __raw_readl(MX51_IO_ADDRESS(MX51_CCM_BASE_ADDR) + MXC_CCM_CBCDR);
+ __raw_writel(temp_clk | EMI_CLK_SEL,
+ MX51_IO_ADDRESS(MX51_CCM_BASE_ADDR) + MXC_CCM_CBCDR);
/* FPGA PROG */
gpio_direction_output(CONFIG_SYS_FPGA_PRG, 1);
@@ -131,19 +137,25 @@ int apf51_fpga_cs(int assert_cs)
return assert_cs;
}
-int apf51_fpga_wdata( unsigned char data )
+int apf51_fpga_wdata(unsigned char data)
{
static u32 temp;
static u32 index = 0;
- switch( index++ ){
- case 0: temp = data << 8; break;
- case 1: temp = temp + data; break;
- case 2: temp = temp + (data << 24); break;
- default:
- __raw_writel(temp + (data << 16), cs1_base);
- index = 0;
- break;
+ switch (index++) {
+ case 0:
+ temp = data << 8;
+ break;
+ case 1:
+ temp = temp + data;
+ break;
+ case 2:
+ temp = temp + (data << 24);
+ break;
+ default:
+ __raw_writel(temp + (data << 16), cs1_base);
+ index = 0;
+ break;
}
return data;
@@ -157,10 +169,13 @@ int apf51_fpga_busy(void)
int apf51_fpga_post(void)
{
/* restore emi_clk_sel */
- __raw_writel( temp_clk, MX51_IO_ADDRESS(MX51_CCM_BASE_ADDR)+ MXC_CCM_CBCDR );
+ __raw_writel(temp_clk,
+ MX51_IO_ADDRESS(MX51_CCM_BASE_ADDR) + MXC_CCM_CBCDR);
udelay(10);
- __raw_writel( temp_rcr1, MX51_IO_ADDRESS(MX51_WEIM_BASE_ADDR) + MXC_CS1RCR1_ADDR );
- __raw_writel( temp_wcr1, MX51_IO_ADDRESS(MX51_WEIM_BASE_ADDR) + MXC_CS1WCR1_ADDR );
+ __raw_writel(temp_rcr1,
+ MX51_IO_ADDRESS(MX51_WEIM_BASE_ADDR) + MXC_CS1RCR1_ADDR);
+ __raw_writel(temp_wcr1,
+ MX51_IO_ADDRESS(MX51_WEIM_BASE_ADDR) + MXC_CS1WCR1_ADDR);
iounmap(cs1_base);
@@ -169,10 +184,13 @@ int apf51_fpga_post(void)
int apf51_fpga_abort(void)
{
- __raw_writel( temp_clk, MX51_IO_ADDRESS(MX51_CCM_BASE_ADDR)+ MXC_CCM_CBCDR );
+ __raw_writel(temp_clk,
+ MX51_IO_ADDRESS(MX51_CCM_BASE_ADDR) + MXC_CCM_CBCDR);
udelay(10);
- __raw_writel( temp_rcr1, MX51_IO_ADDRESS(MX51_WEIM_BASE_ADDR) + MXC_CS1RCR1_ADDR );
- __raw_writel( temp_wcr1, MX51_IO_ADDRESS(MX51_WEIM_BASE_ADDR) + MXC_CS1WCR1_ADDR );
+ __raw_writel(temp_rcr1,
+ MX51_IO_ADDRESS(MX51_WEIM_BASE_ADDR) + MXC_CS1RCR1_ADDR);
+ __raw_writel(temp_wcr1,
+ MX51_IO_ADDRESS(MX51_WEIM_BASE_ADDR) + MXC_CS1WCR1_ADDR);
iounmap(cs1_base);
@@ -199,14 +217,14 @@ Xilinx_Spartan3_Slave_Parallel_fns fpga_fns = {
struct fpga_desc apf51_fpga_desc = {
.family = Xilinx_Spartan,
.iface = slave_parallel,
- .iface_fns = (void *) &fpga_fns
+ .iface_fns = (void *)&fpga_fns
};
static struct platform_device fpga_device = {
- .name = "fpgaloader",
- .id = 0,
+ .name = "fpgaloader",
+ .id = 0,
.dev = {
- .platform_data = &apf51_fpga_desc,
+ .platform_data = &apf51_fpga_desc,
},
};
@@ -222,4 +240,3 @@ static int __init apf51_fpga_initialize(void)
}
device_initcall(apf51_fpga_initialize);
-
diff --git a/target/test/packages/test_imxregs.sh b/target/test/packages/test_imxregs.sh
index 7ae0ad6..46bbf00 100755
--- a/target/test/packages/test_imxregs.sh
+++ b/target/test/packages/test_imxregs.sh
@@ -3,7 +3,7 @@
#
# Script to test a Buildroot package for Armadeus Software release
#
-# Copyright (C) 2008-2011 The Armadeus Project
+# Copyright (C) 2008-2012 The Armadeus 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
@@ -27,9 +27,8 @@ set_ids()
ID_REG="SIDR"
ID_VAL="0x00d4c01d"
elif [ "$1" == "APF51" ]; then
- # temporary:
- ID_REG="CCGR0"
- ID_VAL="0xffffffff"
+ ID_REG="PREV"
+ ID_VAL="0x000000f2"
fi
echo "$APF"
@@ -40,6 +39,7 @@ test_imxregs()
show_test_banner "imxregs"
is_package_installed $EXEC_NAME
+ execute_for_target set_ids
$EXEC_NAME $ID_REG
if [ "$?" == 0 ]; then
CHIP_ID=`$EXEC_NAME $ID_REG | grep $ID_REG | sed 's/^.*0x/0x/' | cut -d " " -f 1`
diff --git a/target/test/packages/test_portmap.sh b/target/test/packages/test_portmap.sh
index 5698e03..c51a177 100755
--- a/target/test/packages/test_portmap.sh
+++ b/target/test/packages/test_portmap.sh
@@ -3,7 +3,7 @@
#
# Script to test Armadeus Software release
#
-# Copyright (C) 2008 The Armadeus Project
+# Copyright (C) 2008-2012 The Armadeus 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
@@ -29,29 +29,21 @@ test_portmap()
echo "No Ethernet interface found"
exit_failed
fi
- # Create temp bench file
- echo "Creating mount point: test"
- mkdir -p test
- if [ "$?" != 0 ]; then
- echo "Failed to create mount point test"
- exit_failed
- fi
- echo " nfs connect"
- mount -t nfs $SERVER_IP:/tftpboot test
+ echo " NFS connect"
+ mount -t nfs $SERVER_IP:$SERVER_NFS_DIR /mnt/nfs
if [ "$?" != 0 ]; then
echo "Failed to connect to server"
exit_failed
fi
-
- echo " check content"
- ls test
+ echo " Check content"
+ ls /mnt/nfs
if [ "$?" != 0 ]; then
echo "Failed to access directory content"
umount test
exit_failed
fi
- umount test
+ umount /mnt/nfs
if [ "$?" != 0 ]; then
echo "Failed to disconnect from server"
exit_failed
diff --git a/target/test/test_dac.sh b/target/test/test_dac.sh
index 068f7b2..681a2f8 100755
--- a/target/test/test_dac.sh
+++ b/target/test/test_dac.sh
@@ -3,7 +3,7 @@
#
# Script to test Armadeus Software release
#
-# Copyright (C) 2008-2011 The Armadeus Project - ARMadeus Systems
+# Copyright (C) 2008-2012 The Armadeus Project - Armadeus systems
#
# 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
@@ -20,6 +20,8 @@ do_test()
setDAC AB 500
if [ "$?" == 0 ]; then
sleep 2
+ setDAC AB 250
+ sleep 2
setDAC AB 0
echo_test_ok
else
@@ -29,9 +31,15 @@ do_test()
modprobe mcp49x2
cd /sys/bus/spi/devices/spi0.1/device0
ls
+ echo 250 > out0_raw
+ echo 250 > out1_raw
+ sleep 2
echo 500 > out0_raw
echo 500 > out1_raw
sleep 2
+ echo 250 > out0_raw
+ echo 250 > out1_raw
+ sleep 2
echo 0 > out0_raw
echo 0 > out1_raw
echo_test_ok
diff --git a/target/test/test_env.sh b/target/test/test_env.sh
index 398d88f..a6b8081 100644
--- a/target/test/test_env.sh
+++ b/target/test/test_env.sh
@@ -1,9 +1,9 @@
#!/bin/sh
#
-# Script to test Armadeus Software release
+# Envt variables for scripts to test Armadeus Software release
#
-# Copyright (C) 2008 The Armadeus Project
+# Copyright (C) 2008-2012 The Armadeus 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
@@ -27,6 +27,7 @@ TEMP_FILE="rnd_data.bin"
TEMP_FILE_SIZE=6144 # kbytes
WRITE_BENCH="/tmp/test_mmc.sh"
SERVER_IP="192.168.0.2"
+SERVER_NFS_DIR=/local/export
mkdir -p $TEMP_DIR
diff --git a/target/test/test_usb_host.sh b/target/test/test_usb_host.sh
index 0ff3231..39d2079 100755
--- a/target/test/test_usb_host.sh
+++ b/target/test/test_usb_host.sh
@@ -3,7 +3,7 @@
#
# Script to test Armadeus Software release
#
-# Copyright (C) 2008-2011 The Armadeus Project - ARMadeus Systems
+# Copyright (C) 2008-2012 The Armadeus Project - Armadeus systems
#
# 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
@@ -24,6 +24,11 @@ load_usb_host_driver_apf9328()
if [ "$?" != 0 ]; then
echo "Unable to load USB Host modules !!"
fi
+ dmesg | grep "USB hub found"
+ if [ "$?" != 0 ]; then
+ echo "USB Host was not found !!"
+ exit_failed
+ fi
}
wait_key_insertion()
@@ -64,11 +69,6 @@ test_usb_host()
show_test_banner "USB Host"
# execute_for_target load_usb_host_driver_apf9328 echo
- dmesg | grep "USB hub found"
- if [ "$?" != 0 ]; then
- echo "USB Host was not found !!"
- exit_failed
- fi
wait_key_insertion "the UPPER"
check_usb_key
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2012-01-16 15:25: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 72213a456b849ceb6b2379216a2a739abc93c729 (commit)
via 4b795bb2680ae0aa9a4933d761eac2d9f4dc8163 (commit)
via 4113952fc2b787caca9db8f3e0261bafa247c69e (commit)
from eb1ee13698a40c44a78455240a77c61f1a779f12 (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 72213a456b849ceb6b2379216a2a739abc93c729
Merge: 4b795bb eb1ee13
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jan 16 16:23:34 2012 +0100
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 4b795bb2680ae0aa9a4933d761eac2d9f4dc8163
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jan 16 16:22:47 2012 +0100
[BUILDROOT] Updates apf27_webradio_defconfig apf51test_defconfig due to recent pygames changes
commit 4113952fc2b787caca9db8f3e0261bafa247c69e
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jan 13 17:22:35 2012 +0100
[LINUX] 2.6.38: prevents "svc: failed to register lockdv1 RPC service (errno 97)" message to be printed out in console when mounting NFS drive
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27_webradio_defconfig | 10 +++++-----
buildroot/configs/apf51test_defconfig | 9 +++++----
...ying_svc_message_when_mounting_NFS_drives.patch | 20 ++++++++++++++++++++
3 files changed, 30 insertions(+), 9 deletions(-)
create mode 100644 patches/linux/2.6.38/444-armadeus-sunrpc-silent_annoying_svc_message_when_mounting_NFS_drives.patch
diff --git a/buildroot/configs/apf27_webradio_defconfig b/buildroot/configs/apf27_webradio_defconfig
index 1a51d54..7f53a32 100644
--- a/buildroot/configs/apf27_webradio_defconfig
+++ b/buildroot/configs/apf27_webradio_defconfig
@@ -48,11 +48,11 @@ BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
BR2_PACKAGE_MPLAYER=y
BR2_PACKAGE_PYWEBRADIO=y
BR2_PACKAGE_STRACE=y
-BR2_PACKAGE_PYGAME=y
-BR2_PACKAGE_PYGAME_IMAGE_JPEG=y
-BR2_PACKAGE_PYGAME_FONT=y
-BR2_PACKAGE_PYGAME_MIXER=y
-BR2_PACKAGE_PYGAME_MIXER_MUSIC=y
+BR2_PACKAGE_PYTHON_PYGAME=y
+BR2_PACKAGE_PYTHON_PYGAME_IMAGE=y
+BR2_PACKAGE_PYTHON_PYGAME_FONT=y
+BR2_PACKAGE_PYTHON_PYGAME_MIXER=y
+BR2_PACKAGE_PYTHON_PYGAME_MIXER_MUSIC=y
BR2_PACKAGE_SDL_IMAGE_GIF=y
BR2_PACKAGE_SDL_NET=y
BR2_PACKAGE_I2C_TOOLS=y
diff --git a/buildroot/configs/apf51test_defconfig b/buildroot/configs/apf51test_defconfig
index cd18c4c..f7b1d2f 100644
--- a/buildroot/configs/apf51test_defconfig
+++ b/buildroot/configs/apf51test_defconfig
@@ -90,10 +90,11 @@ BR2_PACKAGE_DOOM_WAD=y
BR2_PACKAGE_FBGRAB=y
BR2_PACKAGE_FBTEST=y
BR2_PACKAGE_FBV=y
-BR2_PACKAGE_PYGAME=y
-BR2_PACKAGE_PYGAME_FONT=y
-BR2_PACKAGE_PYGAME_MIXER=y
-BR2_PACKAGE_PYGAME_MIXER_MUSIC=y
+BR2_PACKAGE_PYTHON_PYGAME=y
+BR2_PACKAGE_PYTHON_PYGAME_IMAGE=y
+BR2_PACKAGE_PYTHON_PYGAME_FONT=y
+BR2_PACKAGE_PYTHON_PYGAME_MIXER=y
+BR2_PACKAGE_PYTHON_PYGAME_MIXER_MUSIC=y
BR2_PACKAGE_SDL_IMAGE_GIF=y
BR2_PACKAGE_SDL_IMAGE_JPEG=y
BR2_PACKAGE_SDL_IMAGE_PNG=y
diff --git a/patches/linux/2.6.38/444-armadeus-sunrpc-silent_annoying_svc_message_when_mounting_NFS_drives.patch b/patches/linux/2.6.38/444-armadeus-sunrpc-silent_annoying_svc_message_when_mounting_NFS_drives.patch
new file mode 100644
index 0000000..3cbfcac
--- /dev/null
+++ b/patches/linux/2.6.38/444-armadeus-sunrpc-silent_annoying_svc_message_when_mounting_NFS_drives.patch
@@ -0,0 +1,20 @@
+Otherwise we get the annoying:
+"svc: failed to register lockdv1 RPC service (errno 97)" when mounting NFS
+drives.
+Make it appears only in kernel logs until we find a way to solve (?) it.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-2.6.38.8/net/sunrpc/svc.c
+===================================================================
+--- linux-2.6.38.8.orig/net/sunrpc/svc.c 2012-01-13 17:02:49.000000000 +0100
++++ linux-2.6.38.8/net/sunrpc/svc.c 2012-01-13 17:10:08.000000000 +0100
+@@ -844,7 +844,7 @@
+ }
+
+ if (error < 0)
+- printk(KERN_WARNING "svc: failed to register %sv%u RPC "
++ printk(KERN_DEBUG "svc: failed to register %sv%u RPC "
+ "service (errno %d).\n", progname, version, -error);
+ return error;
+ }
hooks/post-receive
--
armadeus
|
