View | Details | Raw Unified | Return to bug 255037
Collapse All | Expand All

(-)sysutils/u-boot-clearfog-gt8k/Makefile (+15 lines)
Added Link Here
1
# $FreeBSD$
2
3
MASTERDIR=	${.CURDIR}/../u-boot-master
4
5
OPTIONS_DEFINE=	PCIE3X
6
OPTIONS_DEFAULT=
7
8
PCIE3X_DESC=	Change U-Boot DTB make all 3 slots PCIe (not SATA/USB)
9
PCIE3X_EXTRA_PATCHES+=	${.CURDIR}/files/extra-patch-gt8k-3xpci.diff
10
11
MODEL=		clearfog_gt_8k
12
BOARD_CONFIG=	clearfog_gt_8k_defconfig
13
FAMILY=		armada8040
14
15
.include "${MASTERDIR}/Makefile"
(-)sysutils/u-boot-clearfog-gt8k/files/extra-patch-gt8k-3xpci.diff (+125 lines)
Added Link Here
1
--- arch/arm/dts/armada-8040-clearfog-gt-8k.dts.orig	2020-10-05 15:15:32.000000000 +0000
2
+++ arch/arm/dts/armada-8040-clearfog-gt-8k.dts	2021-04-10 16:04:09.421325000 +0000
3
@@ -104,15 +104,25 @@
4
 		marvell,function = <0>;
5
 	};
6
 
7
-	cpm_xhci_vbus_pins: cpm-xhci-vbus-pins {
8
-		marvell,pins = < 47 >;
9
+	cpm_pcie1_reset_pins: cpm-pcie1-reset-pins {
10
+		marvell,pins = < 33 >;
11
 		marvell,function = <0>;
12
 	};
13
 
14
+	cpm_pcie2_reset_pins: cpm-pcie2-reset-pins {
15
+		marvell,pins = < 34 >;
16
+		marvell,function = <0>;
17
+	};
18
+
19
 	cps_1g_phy_reset: cps-1g-phy-reset {
20
 		marvell,pins = < 43 >;
21
 		marvell,function = <0>;
22
 	};
23
+
24
+	cpm_xhci_vbus_pins: cpm-xhci-vbus-pins {
25
+		marvell,pins = < 47 >;
26
+		marvell,function = <0>;
27
+	};
28
 };
29
 
30
 /* uSD slot */
31
@@ -131,6 +141,15 @@
32
 	status = "okay";
33
 };
34
 
35
+/* USB */
36
+&cpm_pcie1 {
37
+	num-lanes = <1>;
38
+	pinctrl-names = "default";
39
+	pinctrl-0 = <&cpm_pcie2_reset_pins>;
40
+	marvell,reset-gpio = <&cpm_gpio1 2 GPIO_ACTIVE_LOW>;
41
+	status = "okay";
42
+};
43
+
44
 &cpm_i2c0 {
45
 	pinctrl-names = "default";
46
 	pinctrl-0 = <&cpm_i2c0_pins>;
47
@@ -145,8 +164,9 @@
48
 	clock-frequency = <100000>;
49
 };
50
 
51
+/* ??? */
52
 &cpm_sata0 {
53
-	status = "okay";
54
+	status = "disabled";
55
 };
56
 
57
 &cpm_comphy {
58
@@ -172,7 +192,7 @@
59
 		phy-type = <PHY_TYPE_UNCONNECTED>;
60
 	};
61
 	phy4 {
62
-		phy-type = <PHY_TYPE_USB3_HOST1>;
63
+		phy-type = <PHY_TYPE_PEX1>;
64
 	};
65
 	phy5 {
66
 		phy-type = <PHY_TYPE_UNCONNECTED>;
67
@@ -190,19 +210,6 @@
68
         phy-mode = "sfi";
69
 };
70
 
71
-&cps_sata0 {
72
-	status = "okay";
73
-};
74
-
75
-&cps_usb3_0 {
76
-	vbus-supply = <&reg_usb3h0_vbus>;
77
-	status = "okay";
78
-};
79
-
80
-&cps_utmi0 {
81
-	status = "okay";
82
-};
83
-
84
 &cps_pinctl {
85
 	/*
86
 	 * MPP Bus:
87
@@ -272,8 +279,7 @@
88
 	 * Lane 5: SGMII2 - Connected to Topaz switch
89
 	 */
90
 	phy0 {
91
-		phy-type = <PHY_TYPE_SATA1>;
92
-		phy-invert = <PHY_POLARITY_RXD_INVERT>;
93
+		phy-type = <PHY_TYPE_PEX0>;
94
 	};
95
 	phy1 {
96
 		phy-type = <PHY_TYPE_UNCONNECTED>;
97
@@ -292,6 +298,28 @@
98
 		phy-type = <PHY_TYPE_SGMII2>;
99
 		phy-speed = <PHY_SPEED_3_125G>;
100
 	};
101
+};
102
+
103
+&cps_sata0 {
104
+	status = "disabled";
105
+};
106
+
107
+/* SATA */
108
+&cps_pcie0 {
109
+	num-lanes = <1>;
110
+	pinctrl-names = "default";
111
+	pinctrl-0 = <&cpm_pcie1_reset_pins>;
112
+	marvell,reset-gpio = <&cpm_gpio1 1 GPIO_ACTIVE_LOW>;
113
+	status = "okay";
114
+};
115
+
116
+&cps_usb3_0 {
117
+	vbus-supply = <&reg_usb3h0_vbus>;
118
+	status = "okay";
119
+};
120
+
121
+&cps_utmi0 {
122
+	status = "okay";
123
 };
124
 
125
 &cps_mdio {
(-)sysutils/u-boot-clearfog-gt8k/pkg-descr (+10 lines)
Added Link Here
1
U-Boot loader for the SolidRun ClearFog GT 8K.
2
3
u-boot.bin should not be written out to any storage
4
for any device directly.
5
It is used as input for atf-marvell-gt8k.
6
7
If you set the 3x mPCIe option you will also have to
8
patch the base system dts file.
9
10
WWW: https://www.denx.de/wiki/U-Boot
(-)sysutils/u-boot-master/Makefile (+4 lines)
Lines 104-109 UBOOT_METADATA_ARMADA38X_METHOD= raw Link Here
104
UBOOT_METADATA_ARMADA38X_RAW_OFFSET=	1
104
UBOOT_METADATA_ARMADA38X_RAW_OFFSET=	1
105
UBOOT_METADATA_ARMADA38X_RAW_BS=	512
105
UBOOT_METADATA_ARMADA38X_RAW_BS=	512
106
106
107
# Override for ARMADA8040 family
108
UBOOT_PLIST_ARMADA8040=	u-boot.bin
109
UBOOT_ARCH_ARMADA8040=	aarch64
110
107
# Override for QEMU family
111
# Override for QEMU family
108
UBOOT_PLIST_QEMU=	u-boot.bin
112
UBOOT_PLIST_QEMU=	u-boot.bin
109
113

Return to bug 255037