[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-21-g25002f1

[Nicolas <th...@us...>]

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