[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-413-gfb44565
Brought to you by:
sszy
|
From: Fabien M <fa...@us...> - 2014-09-15 13:32:49
|
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 fb445655c6897b904a79ec452494f3625d6fba69 (commit)
from 6e38553abd135052410c2b0371d462b5151f87d5 (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 fb445655c6897b904a79ec452494f3625d6fba69
Author: Fabien Marteau <fab...@ar...>
Date: Mon Sep 15 15:31:32 2014 +0200
[U-BOOT] SPL-Boot apf6 on eMMC
-----------------------------------------------------------------------
Summary of changes:
patches/u-boot/2014.07/503-add-apf6.patch | 32 ++++++++++++++--------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/patches/u-boot/2014.07/503-add-apf6.patch b/patches/u-boot/2014.07/503-add-apf6.patch
index 8824404..4cac376 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 2014-09-15 15:29:00.526533554 +0200
++++ uboot-2014.07/boards.cfg 2014-09-15 15:29:00.534533691 +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 2014-09-15 15:29:00.538533761 +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 2014-09-15 15:29:36.671153456 +0200
@@ -0,0 +1,321 @@
+/*
+ * Copyright (C) 2013 Armadeus systems.
@@ -146,8 +146,8 @@ Index: uboot-2014.07/board/armadeus/apf6/apf6.c
+}
+
+static struct fsl_esdhc_cfg usdhc_cfg[2] = {
-+ {USDHC2_BASE_ADDR},
+ {USDHC3_BASE_ADDR},
++ {USDHC2_BASE_ADDR},
+};
+
+int board_mmc_getcd(struct mmc *mmc)
@@ -174,12 +174,12 @@ Index: uboot-2014.07/board/armadeus/apf6/apf6.c
+
+ for (index = 0; index < CONFIG_SYS_FSL_USDHC_NUM; ++index) {
+ switch (index) {
-+ case 1:
++ case 0:
+ SETUP_IOMUX_PADS(usdhc3_pads);
+ usdhc_cfg[index].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK);
+ usdhc_cfg[index].max_bus_width = 8;
+ break;
-+ case 0:
++ case 1:
+ SETUP_IOMUX_PADS(usdhc2_pads);
+ usdhc_cfg[index].sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK);
+ usdhc_cfg[index].max_bus_width = 4;
@@ -351,8 +351,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 2014-09-15 15:29:00.538533761 +0200
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2014 ARMadeus Systems <su...@ar...>
@@ -377,8 +377,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 2014-09-15 15:29:00.538533761 +0200
@@ -0,0 +1,251 @@
+/*
+ * Copyright (C) 2014 ARMadeus systems <su...@ar...>
@@ -633,8 +633,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 2014-09-15 15:29:00.538533761 +0200
@@ -0,0 +1,25 @@
+/* set the default clock gate to save power */
+DATA 4, CCM_CCGR0, 0x00C03F3F
hooks/post-receive
--
armadeus
|