[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-380-g3cbfe63
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-380-g3cbfe63
|
From: Sébastien S. <ss...@us...> - 2014-08-11 13:03:21
|
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 3cbfe63b03b05103b9460a6093fbac54962bb41d (commit)
via e226fb4de4d327192377995e8bf4b4b7af6432d2 (commit)
via b60db36f3dd1e60b3ad7f17edfc26f4dc8aeee21 (commit)
from 9a2417f75df0427a3701e6760c2b413b423f19d5 (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 3cbfe63b03b05103b9460a6093fbac54962bb41d
Author: Sébastien Szymanski <ss...@us...>
Date: Mon Aug 11 15:03:19 2014 +0200
[SCRIPTS] quiltify.sh: add a no build option
You can disable compiling linux or u-boot by adding no-build to the
command line:
<armadeus_bsp_dir>/scripts/quiltify.sh no-build
commit e226fb4de4d327192377995e8bf4b4b7af6432d2
Author: Sébastien Szymanski <ss...@us...>
Date: Mon Aug 11 15:01:19 2014 +0200
[LINUX] 3.16: apf6: dts: fix ethernet pin muxing.
commit b60db36f3dd1e60b3ad7f17edfc26f4dc8aeee21
Author: Sébastien Szymanski <ss...@us...>
Date: Mon Aug 11 14:59:43 2014 +0200
[U-BOOT] 2014.07: apf6: fix ethernet.
-----------------------------------------------------------------------
Summary of changes:
...rmadeus-add-apf6q-and-apf6dl-device-trees.patch | 43 ++++++++++----------
patches/u-boot/2014.07/503-add-apf6.patch | 22 ++++++++--
scripts/quiltify.sh | 8 ++-
3 files changed, 45 insertions(+), 28 deletions(-)
diff --git a/patches/linux/3.16/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch b/patches/linux/3.16/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
index e6f4a52..2ea3678 100644
--- a/patches/linux/3.16/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
+++ b/patches/linux/3.16/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
@@ -1,7 +1,7 @@
-Index: linux-3.15-rc8/arch/arm/boot/dts/imx6q-apf6dev.dts
+Index: linux-3.16/arch/arm/boot/dts/imx6q-apf6dev.dts
===================================================================
--- /dev/null
-+++ linux-3.15-rc8/arch/arm/boot/dts/imx6q-apf6dev.dts
++++ linux-3.16/arch/arm/boot/dts/imx6q-apf6dev.dts
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -31,11 +31,11 @@ Index: linux-3.15-rc8/arch/arm/boot/dts/imx6q-apf6dev.dts
+&sata {
+ status = "okay";
+};
-Index: linux-3.15-rc8/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+Index: linux-3.16/arch/arm/boot/dts/imx6qdl-apf6.dtsi
===================================================================
--- /dev/null
-+++ linux-3.15-rc8/arch/arm/boot/dts/imx6qdl-apf6.dtsi
-@@ -0,0 +1,131 @@
++++ linux-3.16/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+@@ -0,0 +1,132 @@
+/*
+ * Copyright 2014 Armadeus Systems
+ *
@@ -76,6 +76,7 @@ Index: linux-3.15-rc8/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_enet>;
+ phy-mode = "rgmii";
++ phy-reset-duration = <2>;
+ phy-reset-gpios = <&gpio1 24 GPIO_ACTIVE_HIGH>;
+ status = "okay";
+};
@@ -111,20 +112,20 @@ Index: linux-3.15-rc8/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+ MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0
+ MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0
+ MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD2__RGMII_TD2 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD3__RGMII_TD3 0x1b0b0
-+ MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b0b0
++ MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x1b030
++ MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x1b030
++ MX6QDL_PAD_RGMII_TD2__RGMII_TD2 0x1b030
++ MX6QDL_PAD_RGMII_TD3__RGMII_TD3 0x1b030
++ MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b030
+ MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0
-+ MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b0b0
-+ MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0
-+ MX6QDL_PAD_ENET_TX_EN__ENET_TX_EN 0x1b0b0
++ MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b030
++ MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x1b030
++ MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x1b030
++ MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1f030
++ MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1f030
++ MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b030
+ MX6QDL_PAD_ENET_RX_ER__GPIO1_IO24 0x80000000
++ MX6QDL_PAD_ENET_TX_EN__GPIO1_IO28 0x80000000
+ >;
+ };
+
@@ -167,10 +168,10 @@ Index: linux-3.15-rc8/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+ };
+ };
+};
-Index: linux-3.15-rc8/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+Index: linux-3.16/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
===================================================================
--- /dev/null
-+++ linux-3.15-rc8/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
++++ linux-3.16/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
@@ -0,0 +1,451 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -623,10 +624,10 @@ Index: linux-3.15-rc8/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ };
+ };
+};
-Index: linux-3.15-rc8/arch/arm/boot/dts/imx6dl-apf6dev.dts
+Index: linux-3.16/arch/arm/boot/dts/imx6dl-apf6dev.dts
===================================================================
--- /dev/null
-+++ linux-3.15-rc8/arch/arm/boot/dts/imx6dl-apf6dev.dts
++++ linux-3.16/arch/arm/boot/dts/imx6dl-apf6dev.dts
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2014 Armadeus Systems
diff --git a/patches/u-boot/2014.07/503-add-apf6.patch b/patches/u-boot/2014.07/503-add-apf6.patch
index b2349bf..8824404 100644
--- a/patches/u-boot/2014.07/503-add-apf6.patch
+++ b/patches/u-boot/2014.07/503-add-apf6.patch
@@ -27,7 +27,7 @@ Index: uboot-2014.07/board/armadeus/apf6/apf6.c
===================================================================
--- /dev/null
+++ uboot-2014.07/board/armadeus/apf6/apf6.c
-@@ -0,0 +1,307 @@
+@@ -0,0 +1,321 @@
+/*
+ * Copyright (C) 2013 Armadeus systems.
+ *
@@ -74,6 +74,9 @@ Index: uboot-2014.07/board/armadeus/apf6/apf6.c
+#define ENET_PAD_CTRL (PAD_CTL_PUS_100K_UP | \
+ PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS)
+
++#define ENET_PAD_CTRL2 (PAD_CTL_PUS_22K_UP | \
++ PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS)
++
+#define USDHC2_CD_GPIO IMX_GPIO_NR(1, 2)
+#define ETH_PHY_RESET IMX_GPIO_NR(1, 24)
+
@@ -118,11 +121,13 @@ Index: uboot-2014.07/board/armadeus/apf6/apf6.c
+ IOMUX_PADS(PAD_RGMII_RXC__RGMII_RXC | MUX_PAD_CTRL(ENET_PAD_CTRL)),
+ IOMUX_PADS(PAD_RGMII_RD0__RGMII_RD0 | MUX_PAD_CTRL(ENET_PAD_CTRL)),
+ IOMUX_PADS(PAD_RGMII_RD1__RGMII_RD1 | MUX_PAD_CTRL(ENET_PAD_CTRL)),
-+ IOMUX_PADS(PAD_RGMII_RD2__RGMII_RD2 | MUX_PAD_CTRL(ENET_PAD_CTRL)),
-+ IOMUX_PADS(PAD_RGMII_RD3__RGMII_RD3 | MUX_PAD_CTRL(ENET_PAD_CTRL)),
++ IOMUX_PADS(PAD_RGMII_RD2__RGMII_RD2 | MUX_PAD_CTRL(ENET_PAD_CTRL2)),
++ IOMUX_PADS(PAD_RGMII_RD3__RGMII_RD3 | MUX_PAD_CTRL(ENET_PAD_CTRL2)),
+ IOMUX_PADS(PAD_RGMII_RX_CTL__RGMII_RX_CTL | MUX_PAD_CTRL(ENET_PAD_CTRL)),
+ /* AR8035 PHY Reset */
+ IOMUX_PADS(PAD_ENET_RX_ER__GPIO1_IO24 | MUX_PAD_CTRL(NO_PAD_CTRL)),
++ /* AR8035 INT */
++ IOMUX_PADS(PAD_ENET_TX_EN__GPIO1_IO28 | MUX_PAD_CTRL(NO_PAD_CTRL)),
+};
+
+static void setup_iomux_uart(void)
@@ -136,7 +141,7 @@ Index: uboot-2014.07/board/armadeus/apf6/apf6.c
+
+ /* Reset AR8035 PHY */
+ gpio_direction_output(ETH_PHY_RESET, 0);
-+ udelay(500);
++ udelay(10000);
+ gpio_set_value(ETH_PHY_RESET, 1);
+}
+
@@ -197,6 +202,15 @@ Index: uboot-2014.07/board/armadeus/apf6/apf6.c
+{
+ unsigned short val;
+
++ /*
++ * Ar803x phy SmartEEE feature cause link status generates glitch,
++ * which cause ethernet link down/up issue, so disable SmartEEE
++ *
++ */
++ phy_write(phydev, MDIO_DEVAD_NONE, 0xd, 0x7);
++ phy_write(phydev, MDIO_DEVAD_NONE, 0xe, 0x805d);
++ phy_write(phydev, MDIO_DEVAD_NONE, 0xd, 0x4003);
++
+ /* To enable AR8035 ouput a 125MHz clk from CLK_25M */
+ phy_write(phydev, MDIO_DEVAD_NONE, 0xd, 0x7);
+ phy_write(phydev, MDIO_DEVAD_NONE, 0xe, 0x8016);
diff --git a/scripts/quiltify.sh b/scripts/quiltify.sh
index 5a5ee33..d949656 100755
--- a/scripts/quiltify.sh
+++ b/scripts/quiltify.sh
@@ -200,9 +200,11 @@ if [ "$QUILT_POST_PATCH_HOOK" != "" ]; then
fi
# Build it
-echo -e "\n--- Your "$QUILT_TARGET_NAME" is \"quiltified\" ! I will now compile it...\n"
-sleep 2
-make
+if [ "$1" != "no-build" ]; then
+ echo -e "\n--- Your "$QUILT_TARGET_NAME" is \"quiltified\" ! I will now compile it...\n"
+ sleep 2
+ make
+fi
echo -e "\n--- Your can now go to $QUILT_TARGET_DIR\nHappy hacking ! ;-)\n"
echo -e "__ Don't forget to do a \"$0 export\" after your modifications __\n"
hooks/post-receive
--
armadeus
|