[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-74-gc660b96

[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  c660b96005f7e2454b21c7f7519a037385a02e80 (commit)
      from  d0cbf4c657ddf54f86704178a6311c8e31efd8d4 (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 c660b96005f7e2454b21c7f7519a037385a02e80
Author: Nicolas Colombain <nic...@ar...>
Date:   Thu Apr 21 14:33:24 2011 +0200

    [U-BOOT] APF51 split fix high voltage nand sd patch

-----------------------------------------------------------------------

Summary of changes:
 ...boot-2010.03-411-Fix-high-voltage-nand-sd.patch |   65 --------------------
 1 files changed, 0 insertions(+), 65 deletions(-)

diff --git a/buildroot/target/u-boot/u-boot-2010.03-411-Fix-high-voltage-nand-sd.patch b/buildroot/target/u-boot/u-boot-2010.03-411-Fix-high-voltage-nand-sd.patch
index 1a62b78..ea7c676 100644
--- a/buildroot/target/u-boot/u-boot-2010.03-411-Fix-high-voltage-nand-sd.patch
+++ b/buildroot/target/u-boot/u-boot-2010.03-411-Fix-high-voltage-nand-sd.patch
@@ -1,68 +1,3 @@
-diff -purN u-boot-2010.03.ori/board/armadeus/apf51/apf51.c u-boot-2010.03/board/armadeus/apf51/apf51.c
---- u-boot-2010.03.ori/board/armadeus/apf51/apf51.c	2011-01-25 22:43:23.000000000 +0100
-+++ u-boot-2010.03/board/armadeus/apf51/apf51.c	2011-02-04 00:21:21.000000000 +0100
-@@ -513,22 +513,61 @@ void setup_nfc(void)
- 	/*
- 	 * 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 | 		\
-+				 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 | 	\
-+				 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_request_iomux(MX51_PIN_NANDF_RE_B, IOMUX_CONFIG_ALT0);
-+        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_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_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_request_iomux(MX51_PIN_NANDF_D1, IOMUX_CONFIG_ALT0);
-+        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_request_iomux(MX51_PIN_NANDF_D3, IOMUX_CONFIG_ALT0);
-+        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_request_iomux(MX51_PIN_NANDF_D5, IOMUX_CONFIG_ALT0);
-+        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_request_iomux(MX51_PIN_NANDF_D7, IOMUX_CONFIG_ALT0);
-+        mxc_iomux_set_pad(MX51_PIN_NANDF_D7, NAND_PAD100K_CFG);
- 
- 	writel(0, NFC_IPC);
- 	NFC_SET_FW(1);
 diff -purN u-boot-2010.03.ori/include/asm-arm/arch-mx51/asm-offsets.h u-boot-2010.03/include/asm-arm/arch-mx51/asm-offsets.h
 --- u-boot-2010.03.ori/include/asm-arm/arch-mx51/asm-offsets.h	2011-01-25 22:43:22.000000000 +0100
 +++ u-boot-2010.03/include/asm-arm/arch-mx51/asm-offsets.h	2011-02-03 23:08:33.000000000 +0100


hooks/post-receive
-- 
armadeus