From 4f36510eefda8281750d35be666ef37c084b8405 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Wed, 13 Jan 2016 11:32:52 +0100 Subject: [PATCH] Adding patches for Armada to change from mPCI to SATA, one slot (default) or both (disabled patch) --- .../slot0=mpci_1=sata.patch | 12 +++++++++++ .../slot0=sata_1=sata.patch.disabled | 20 +++++++++++++++++++ .../u-boot-armada-dev/slot0=mpci_1=sata.patch | 12 +++++++++++ .../slot0=sata_1=sata.patch.disabled | 20 +++++++++++++++++++ .../slot0=mpci_1=sata.patch | 12 +++++++++++ .../slot0=sata_1=sata.patch.disabled | 20 +++++++++++++++++++ 6 files changed, 96 insertions(+) create mode 100644 patch/u-boot/u-boot-armada-default/slot0=mpci_1=sata.patch create mode 100644 patch/u-boot/u-boot-armada-default/slot0=sata_1=sata.patch.disabled create mode 100644 patch/u-boot/u-boot-armada-dev/slot0=mpci_1=sata.patch create mode 100644 patch/u-boot/u-boot-armada-dev/slot0=sata_1=sata.patch.disabled create mode 100644 patch/u-boot/u-boot-armada-next/slot0=mpci_1=sata.patch create mode 100644 patch/u-boot/u-boot-armada-next/slot0=sata_1=sata.patch.disabled diff --git a/patch/u-boot/u-boot-armada-default/slot0=mpci_1=sata.patch b/patch/u-boot/u-boot-armada-default/slot0=mpci_1=sata.patch new file mode 100644 index 000000000..848ee1551 --- /dev/null +++ b/patch/u-boot/u-boot-armada-default/slot0=mpci_1=sata.patch @@ -0,0 +1,12 @@ +diff --git a/tools/marvell/bin_hdr/src_phy/a38x/mvHighSpeedTopologySpec-38x.c b/tools/marvell/bin_hdr/src_phy/a38x/mvHighSpeedTopologySpec-38x.c +index 3fb7465..70384a0 100755 +--- a/tools/marvell/bin_hdr/src_phy/a38x/mvHighSpeedTopologySpec-38x.c ++++ b/tools/marvell/bin_hdr/src_phy/a38x/mvHighSpeedTopologySpec-38x.c +@@ -89,7 +89,7 @@ SERDES_MAP CustomerBoardTopologyConfig[][MAX_SERDES_LANES] = + { /* ClarFog A1 board topology */ + { SATA0, __3Gbps, SERDES_DEFAULT_MODE, MV_FALSE, MV_FALSE }, + { SGMII1, __1_25Gbps, SERDES_DEFAULT_MODE, MV_FALSE, MV_FALSE }, +-#if 1 ++#if 0 + { PEX1, __5Gbps, PEX_ROOT_COMPLEX_x1, MV_FALSE, MV_FALSE }, + #else diff --git a/patch/u-boot/u-boot-armada-default/slot0=sata_1=sata.patch.disabled b/patch/u-boot/u-boot-armada-default/slot0=sata_1=sata.patch.disabled new file mode 100644 index 000000000..892ceb043 --- /dev/null +++ b/patch/u-boot/u-boot-armada-default/slot0=sata_1=sata.patch.disabled @@ -0,0 +1,20 @@ +diff --git a/tools/marvell/bin_hdr/src_phy/a38x/mvHighSpeedTopologySpec-38x.c b/tools/marvell/bin_hdr/src_phy/a38x/mvHighSpeedTopologySpec-38x.c +index 3fb7465..70384a0 100755 +--- a/tools/marvell/bin_hdr/src_phy/a38x/mvHighSpeedTopologySpec-38x.c ++++ b/tools/marvell/bin_hdr/src_phy/a38x/mvHighSpeedTopologySpec-38x.c +@@ -89,13 +89,13 @@ SERDES_MAP CustomerBoardTopologyConfig[][MAX_SERDES_LANES] = + { /* ClarFog A1 board topology */ + { SATA0, __3Gbps, SERDES_DEFAULT_MODE, MV_FALSE, MV_FALSE }, + { SGMII1, __1_25Gbps, SERDES_DEFAULT_MODE, MV_FALSE, MV_FALSE }, +-#if 1 ++#if 0 + { PEX1, __5Gbps, PEX_ROOT_COMPLEX_x1, MV_FALSE, MV_FALSE }, + #else + { SATA1, __3Gbps, SERDES_DEFAULT_MODE, MV_TRUE, MV_FALSE }, + #endif + { USB3_HOST1, __5Gbps, SERDES_DEFAULT_MODE, MV_FALSE, MV_FALSE }, +-#if 1 ++#if 0 + { PEX2, __5Gbps, PEX_ROOT_COMPLEX_x1, MV_FALSE, MV_FALSE }, + #else + { SATA2, __3Gbps, SERDES_DEFAULT_MODE, MV_TRUE, MV_FALSE }, diff --git a/patch/u-boot/u-boot-armada-dev/slot0=mpci_1=sata.patch b/patch/u-boot/u-boot-armada-dev/slot0=mpci_1=sata.patch new file mode 100644 index 000000000..848ee1551 --- /dev/null +++ b/patch/u-boot/u-boot-armada-dev/slot0=mpci_1=sata.patch @@ -0,0 +1,12 @@ +diff --git a/tools/marvell/bin_hdr/src_phy/a38x/mvHighSpeedTopologySpec-38x.c b/tools/marvell/bin_hdr/src_phy/a38x/mvHighSpeedTopologySpec-38x.c +index 3fb7465..70384a0 100755 +--- a/tools/marvell/bin_hdr/src_phy/a38x/mvHighSpeedTopologySpec-38x.c ++++ b/tools/marvell/bin_hdr/src_phy/a38x/mvHighSpeedTopologySpec-38x.c +@@ -89,7 +89,7 @@ SERDES_MAP CustomerBoardTopologyConfig[][MAX_SERDES_LANES] = + { /* ClarFog A1 board topology */ + { SATA0, __3Gbps, SERDES_DEFAULT_MODE, MV_FALSE, MV_FALSE }, + { SGMII1, __1_25Gbps, SERDES_DEFAULT_MODE, MV_FALSE, MV_FALSE }, +-#if 1 ++#if 0 + { PEX1, __5Gbps, PEX_ROOT_COMPLEX_x1, MV_FALSE, MV_FALSE }, + #else diff --git a/patch/u-boot/u-boot-armada-dev/slot0=sata_1=sata.patch.disabled b/patch/u-boot/u-boot-armada-dev/slot0=sata_1=sata.patch.disabled new file mode 100644 index 000000000..892ceb043 --- /dev/null +++ b/patch/u-boot/u-boot-armada-dev/slot0=sata_1=sata.patch.disabled @@ -0,0 +1,20 @@ +diff --git a/tools/marvell/bin_hdr/src_phy/a38x/mvHighSpeedTopologySpec-38x.c b/tools/marvell/bin_hdr/src_phy/a38x/mvHighSpeedTopologySpec-38x.c +index 3fb7465..70384a0 100755 +--- a/tools/marvell/bin_hdr/src_phy/a38x/mvHighSpeedTopologySpec-38x.c ++++ b/tools/marvell/bin_hdr/src_phy/a38x/mvHighSpeedTopologySpec-38x.c +@@ -89,13 +89,13 @@ SERDES_MAP CustomerBoardTopologyConfig[][MAX_SERDES_LANES] = + { /* ClarFog A1 board topology */ + { SATA0, __3Gbps, SERDES_DEFAULT_MODE, MV_FALSE, MV_FALSE }, + { SGMII1, __1_25Gbps, SERDES_DEFAULT_MODE, MV_FALSE, MV_FALSE }, +-#if 1 ++#if 0 + { PEX1, __5Gbps, PEX_ROOT_COMPLEX_x1, MV_FALSE, MV_FALSE }, + #else + { SATA1, __3Gbps, SERDES_DEFAULT_MODE, MV_TRUE, MV_FALSE }, + #endif + { USB3_HOST1, __5Gbps, SERDES_DEFAULT_MODE, MV_FALSE, MV_FALSE }, +-#if 1 ++#if 0 + { PEX2, __5Gbps, PEX_ROOT_COMPLEX_x1, MV_FALSE, MV_FALSE }, + #else + { SATA2, __3Gbps, SERDES_DEFAULT_MODE, MV_TRUE, MV_FALSE }, diff --git a/patch/u-boot/u-boot-armada-next/slot0=mpci_1=sata.patch b/patch/u-boot/u-boot-armada-next/slot0=mpci_1=sata.patch new file mode 100644 index 000000000..848ee1551 --- /dev/null +++ b/patch/u-boot/u-boot-armada-next/slot0=mpci_1=sata.patch @@ -0,0 +1,12 @@ +diff --git a/tools/marvell/bin_hdr/src_phy/a38x/mvHighSpeedTopologySpec-38x.c b/tools/marvell/bin_hdr/src_phy/a38x/mvHighSpeedTopologySpec-38x.c +index 3fb7465..70384a0 100755 +--- a/tools/marvell/bin_hdr/src_phy/a38x/mvHighSpeedTopologySpec-38x.c ++++ b/tools/marvell/bin_hdr/src_phy/a38x/mvHighSpeedTopologySpec-38x.c +@@ -89,7 +89,7 @@ SERDES_MAP CustomerBoardTopologyConfig[][MAX_SERDES_LANES] = + { /* ClarFog A1 board topology */ + { SATA0, __3Gbps, SERDES_DEFAULT_MODE, MV_FALSE, MV_FALSE }, + { SGMII1, __1_25Gbps, SERDES_DEFAULT_MODE, MV_FALSE, MV_FALSE }, +-#if 1 ++#if 0 + { PEX1, __5Gbps, PEX_ROOT_COMPLEX_x1, MV_FALSE, MV_FALSE }, + #else diff --git a/patch/u-boot/u-boot-armada-next/slot0=sata_1=sata.patch.disabled b/patch/u-boot/u-boot-armada-next/slot0=sata_1=sata.patch.disabled new file mode 100644 index 000000000..892ceb043 --- /dev/null +++ b/patch/u-boot/u-boot-armada-next/slot0=sata_1=sata.patch.disabled @@ -0,0 +1,20 @@ +diff --git a/tools/marvell/bin_hdr/src_phy/a38x/mvHighSpeedTopologySpec-38x.c b/tools/marvell/bin_hdr/src_phy/a38x/mvHighSpeedTopologySpec-38x.c +index 3fb7465..70384a0 100755 +--- a/tools/marvell/bin_hdr/src_phy/a38x/mvHighSpeedTopologySpec-38x.c ++++ b/tools/marvell/bin_hdr/src_phy/a38x/mvHighSpeedTopologySpec-38x.c +@@ -89,13 +89,13 @@ SERDES_MAP CustomerBoardTopologyConfig[][MAX_SERDES_LANES] = + { /* ClarFog A1 board topology */ + { SATA0, __3Gbps, SERDES_DEFAULT_MODE, MV_FALSE, MV_FALSE }, + { SGMII1, __1_25Gbps, SERDES_DEFAULT_MODE, MV_FALSE, MV_FALSE }, +-#if 1 ++#if 0 + { PEX1, __5Gbps, PEX_ROOT_COMPLEX_x1, MV_FALSE, MV_FALSE }, + #else + { SATA1, __3Gbps, SERDES_DEFAULT_MODE, MV_TRUE, MV_FALSE }, + #endif + { USB3_HOST1, __5Gbps, SERDES_DEFAULT_MODE, MV_FALSE, MV_FALSE }, +-#if 1 ++#if 0 + { PEX2, __5Gbps, PEX_ROOT_COMPLEX_x1, MV_FALSE, MV_FALSE }, + #else + { SATA2, __3Gbps, SERDES_DEFAULT_MODE, MV_TRUE, MV_FALSE },