[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-40-g0c68c37
Brought to you by:
sszy
|
From: jorasse <jo...@us...> - 2012-02-09 22:02:50
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 0c68c37e56ee71da3d42fcf48023116c2cf0f212 (commit)
from 0bac4f2f36e16d0bcf852c389a149acb302253a0 (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 0c68c37e56ee71da3d42fcf48023116c2cf0f212
Author: Eric Jarrige <eri...@ar...>
Date: Thu Feb 9 23:01:58 2012 +0100
[UBOOT] apf28: fix hidden characters in comments
-----------------------------------------------------------------------
Summary of changes:
patches/u-boot/2011.12/502-add-apf28.patch | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/patches/u-boot/2011.12/502-add-apf28.patch b/patches/u-boot/2011.12/502-add-apf28.patch
index 01c583f..1847f90 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 @@
+
+ if (otpctrl & OCOTP_CTRL_ERROR)
+ {
-+ printf("OCOTP error: CTRLÂ register value: 0x%x\n", otpctrl);
++ printf("OCOTP error: CTRL register value: 0x%x\n", otpctrl);
+ return -1;
+ }
+
@@ -298,7 +298,7 @@
+
+ if (otpctrl & OCOTP_CTRL_ERROR)
+ {
-+ printf("OCOTP in error: CTRLÂ register value: 0x%x\n", otpctrl);
++ printf("OCOTP in error: CTRL register value: 0x%x\n", otpctrl);
+ return val;
+ }
+
@@ -369,7 +369,7 @@
+ } else err = -1;
+
+
-+ /*Â restore HBUS, CLKSEQ and VDDIO */
++ /* restore HBUS, CLKSEQ and VDDIO */
+ writel(vddio, &power_regs->hw_power_vddioctrl);
+ writel(hbus, &clkctrl_regs->hw_clkctrl_hbus);
+ writel(clkseq, &clkctrl_regs->hw_clkctrl_clkseq);
@@ -556,7 +556,7 @@
+++ u-boot-2011.12/board/armadeus/apf28/mx28_bcb.c 2012-02-08 23:00:37.501763289 +0100
@@ -0,0 +1,548 @@
+/*
-+ * i.MX28 NANDÂ Boot Control Blocks generator
++ * i.MX28 NAND Boot Control Blocks generator
+ *
+ * Copyright (C) 2012 Eric Jarrige <eri...@ar...>
+ *
@@ -592,7 +592,7 @@
+#include <asm/arch/imx-regs.h>
+
+/*
-+ * BCB layout Read from OCOTPÂ fuses.
++ * BCB layout Read from OCOTP fuses.
+ */
+static uint32_t stride_pages;
+static uint32_t stride_count;
@@ -1064,7 +1064,7 @@
+ goto err2;
+ }
+
-+ printf("NANDÂ BCBÂ tables updated\n");
++ printf("NAND BCB tables updated\n");
+ ret = 0;
+
+err2:
hooks/post-receive
--
armadeus
|