[U-Boot] [PATCH] Fix for MPC8360 ATM Quad OC3 External Phys

* Changed the CS4 and CS5 addresses on Local Bus for matching the PMC0 and PMC1 addresses.
Signed-off-by: Stefan Popa Stefan.Popa@freescale.com
---
include/configs/MPC8360EMDS.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/configs/MPC8360EMDS.h b/include/configs/MPC8360EMDS.h
index 87a137b..6b3d71e 100644
--- a/include/configs/MPC8360EMDS.h
+++ b/include/configs/MPC8360EMDS.h
@@ -294,13 +294,13 @@
/*
* CS4 on Local Bus, to PIB
*/
-#define CONFIG_SYS_BR4_PRELIM 0xf8010801 /* CS4 base address at 0xf8010000 */
+#define CONFIG_SYS_BR4_PRELIM 0xf8008801 /* CS4 base address at 0xf8008000 */
#define CONFIG_SYS_OR4_PRELIM 0xffffe9f7 /* size 32KB, port size 8bit, GPCM */
/*
* CS5 on Local Bus, to PIB
*/
-#define CONFIG_SYS_BR5_PRELIM 0xf8008801 /* CS5 base address at 0xf8008000 */
+#define CONFIG_SYS_BR5_PRELIM 0xf8010801 /* CS5 base address at 0xf8010000 */
#define CONFIG_SYS_OR5_PRELIM 0xffffe9f7 /* size 32KB, port size 8bit, GPCM */
/*

On Fri, 26 Nov 2010 01:35:23 -0700 "Popa Stefan-R89990" R89990@freescale.com wrote:
- Changed the CS4 and CS5 addresses on Local Bus for matching the PMC0
and PMC1 addresses.
Signed-off-by: Stefan Popa Stefan.Popa@freescale.com
doesn't apply:
[u-boot master]$ git am -s -3 369 Applying: Fix for MPC8360 ATM Quad OC3 External Phys fatal: patch fragment without header at line 19: @@ -294,13 +294,13 @@ Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Fix for MPC8360 ATM Quad OC3 External Phys When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort".
applied manually, please make sure your next patch doesn't get mangled next time - try emailing it to yourself, and if that doesn't work, well, email me directly since I'm aware of a couple of issues with freescale smtp servers.
Kim
participants (2)
-
Kim Phillips
-
Popa Stefan-R89990