[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-710-gc03616a
Brought to you by:
sszy
|
From: Fabien M <fa...@us...> - 2015-04-23 10:25: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 c03616ae26871af65fa55c184cec0a19062e5b57 (commit)
from 3705a10f15fbc879cc74a0f43e908b0ac9bd4dac (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 c03616ae26871af65fa55c184cec0a19062e5b57
Author: Fabien Marteau <fab...@ar...>
Date: Thu Apr 23 12:23:16 2015 +0200
[U-BOOT][APF6] change PCIe clock frequency to 125Mhz when loading fpga in uboot
-----------------------------------------------------------------------
Summary of changes:
patches/u-boot/2014.07/503-add-apf6.patch | 39 +++++++++++++++-------------
1 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/patches/u-boot/2014.07/503-add-apf6.patch b/patches/u-boot/2014.07/503-add-apf6.patch
index 9965d7e..221543c 100644
--- a/patches/u-boot/2014.07/503-add-apf6.patch
+++ b/patches/u-boot/2014.07/503-add-apf6.patch
@@ -1,8 +1,8 @@
Index: uboot-2014.07/boards.cfg
===================================================================
---- uboot-2014.07.orig/boards.cfg
-+++ uboot-2014.07/boards.cfg
-@@ -318,6 +318,7 @@ Active arm armv7 mx6
+--- uboot-2014.07.orig/boards.cfg 2015-04-23 11:58:50.400311770 +0200
++++ uboot-2014.07/boards.cfg 2015-04-23 11:58:50.396311770 +0200
+@@ -318,6 +318,7 @@
Active arm armv7 mx6 - wandboard wandboard_dl wandboard:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,MX6DL,DDR_MB=1024 Fabio Estevam <fab...@fr...>
Active arm armv7 mx6 - wandboard wandboard_quad wandboard:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,MX6Q,DDR_MB=2048 Fabio Estevam <fab...@fr...>
Active arm armv7 mx6 - wandboard wandboard_solo wandboard:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s.cfg,MX6S,DDR_MB=512 Fabio Estevam <fab...@fr...>
@@ -12,8 +12,8 @@ Index: uboot-2014.07/boards.cfg
Active arm armv7 mx6 boundary nitrogen6x nitrogen6dl nitrogen6x:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,MX6DL,DDR_MB=1024 Eric Nelson <eri...@bo...>
Index: uboot-2014.07/board/armadeus/apf6/Makefile
===================================================================
---- /dev/null
-+++ uboot-2014.07/board/armadeus/apf6/Makefile
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ uboot-2014.07/board/armadeus/apf6/Makefile 2015-04-23 11:58:50.396311770 +0200
@@ -0,0 +1,8 @@
+#
+# Copyright (C) 2014, ARMadeus Systems <su...@ar...>
@@ -25,8 +25,8 @@ Index: uboot-2014.07/board/armadeus/apf6/Makefile
+obj-$(CONFIG_SPL_BUILD) += apf6_spl.o
Index: uboot-2014.07/board/armadeus/apf6/apf6.c
===================================================================
---- /dev/null
-+++ uboot-2014.07/board/armadeus/apf6/apf6.c
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ uboot-2014.07/board/armadeus/apf6/apf6.c 2015-04-23 12:14:59.000000000 +0200
@@ -0,0 +1,386 @@
+/*
+ * Copyright (C) 2013 Armadeus systems.
@@ -416,8 +416,8 @@ Index: uboot-2014.07/board/armadeus/apf6/apf6.c
+}
Index: uboot-2014.07/board/armadeus/apf6/apf6.cfg
===================================================================
---- /dev/null
-+++ uboot-2014.07/board/armadeus/apf6/apf6.cfg
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ uboot-2014.07/board/armadeus/apf6/apf6.cfg 2015-04-23 11:58:50.396311770 +0200
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2014 ARMadeus Systems <su...@ar...>
@@ -442,8 +442,8 @@ Index: uboot-2014.07/board/armadeus/apf6/apf6.cfg
+#include "clocks.cfg"
Index: uboot-2014.07/board/armadeus/apf6/apf6_spl.c
===================================================================
---- /dev/null
-+++ uboot-2014.07/board/armadeus/apf6/apf6_spl.c
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ uboot-2014.07/board/armadeus/apf6/apf6_spl.c 2015-04-23 11:58:50.396311770 +0200
@@ -0,0 +1,251 @@
+/*
+ * Copyright (C) 2014 ARMadeus systems <su...@ar...>
@@ -698,8 +698,8 @@ Index: uboot-2014.07/board/armadeus/apf6/apf6_spl.c
+}
Index: uboot-2014.07/board/armadeus/apf6/clocks.cfg
===================================================================
---- /dev/null
-+++ uboot-2014.07/board/armadeus/apf6/clocks.cfg
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ uboot-2014.07/board/armadeus/apf6/clocks.cfg 2015-04-23 11:58:50.396311770 +0200
@@ -0,0 +1,25 @@
+/* set the default clock gate to save power */
+DATA 4, CCM_CCGR0, 0x00C03F3F
@@ -728,9 +728,9 @@ Index: uboot-2014.07/board/armadeus/apf6/clocks.cfg
+DATA 4, CCM_CCOSR, 0x000000fb
Index: uboot-2014.07/board/armadeus/apf6/fpga.c
===================================================================
---- /dev/null
-+++ uboot-2014.07/board/armadeus/apf6/fpga.c
-@@ -0,0 +1,173 @@
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ uboot-2014.07/board/armadeus/apf6/fpga.c 2015-04-23 12:16:12.804280971 +0200
+@@ -0,0 +1,176 @@
+/*
+ * (C) Copyright 2002-2014
+ * Nicolas Colombain <nic...@ar...>
@@ -810,6 +810,9 @@ Index: uboot-2014.07/board/armadeus/apf6/fpga.c
+
+int fpga_config_fn(int assert, int flush, int cookie)
+{
++ /* Change PCIe frequency to 125Mhz */
++ *((u64 *)0x20c8160) = ((*((u64 *)0x20c8160))&0xFFFFFE0L)|0xa;
++
+ gpio_set_value(FPGA_NCONFIG, assert);
+ return assert;
+}
@@ -906,8 +909,8 @@ Index: uboot-2014.07/board/armadeus/apf6/fpga.c
+#endif /* CONFIG_FPGA */
Index: uboot-2014.07/board/armadeus/apf6/fpga.h
===================================================================
---- /dev/null
-+++ uboot-2014.07/board/armadeus/apf6/fpga.h
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ uboot-2014.07/board/armadeus/apf6/fpga.h 2015-04-23 11:58:50.396311770 +0200
@@ -0,0 +1,34 @@
+/*
+ * (C) Copyright 2002-2010
hooks/post-receive
--
armadeus
|