1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
|
From cb5cf51008de5f321b9e4cb5fce1c34cd33b2200 Mon Sep 17 00:00:00 2001
From: Valentine Barshak <valentine.barshak@cogentembedded.com>
Date: Thu, 22 Nov 2018 00:17:56 +0300
Subject: [PATCH 22/23] arm: renesas: Enable RPC HF MTD support for all
Salvator-X boards
This enables RPC HyperFlash MTD support
for all R-Car Gen3 Salvator-X boards.
Signed-off-by: Valentine Barshak <valentine.barshak@cogentembedded.com>
---
arch/arm/dts/r8a7795-salvator-x-u-boot.dts | 4 ++++
arch/arm/dts/r8a7795-salvator-xs-2x2g-u-boot.dts | 4 ++++
arch/arm/dts/r8a7795-salvator-xs-4x2g-u-boot.dts | 4 ++++
arch/arm/dts/r8a7795-salvator-xs-u-boot.dts | 4 ++++
arch/arm/dts/r8a7796-salvator-x-u-boot.dts | 4 ++++
arch/arm/dts/r8a7796-salvator-xs-u-boot.dts | 4 ++++
arch/arm/dts/r8a77965-salvator-x-u-boot.dts | 4 ++++
arch/arm/dts/r8a77965-salvator-xs-u-boot.dts | 4 ++++
configs/r8a7795_salvator-x_defconfig | 5 +++++
configs/r8a7795_salvator-xs-2x2g_defconfig | 5 +++++
configs/r8a7795_salvator-xs-4x2g_defconfig | 5 +++++
configs/r8a7795_salvator-xs_defconfig | 5 +++++
configs/r8a77965_salvator-x_defconfig | 5 +++++
configs/r8a77965_salvator-xs_defconfig | 5 +++++
configs/r8a7796_salvator-x_defconfig | 5 +++++
configs/r8a7796_salvator-xs_defconfig | 5 +++++
include/configs/salvator-x.h | 11 +++++++++++
17 files changed, 83 insertions(+)
diff --git a/arch/arm/dts/r8a7795-salvator-x-u-boot.dts b/arch/arm/dts/r8a7795-salvator-x-u-boot.dts
index a22028b..08246c2 100644
--- a/arch/arm/dts/r8a7795-salvator-x-u-boot.dts
+++ b/arch/arm/dts/r8a7795-salvator-x-u-boot.dts
@@ -43,3 +43,7 @@
sd-uhs-sdr104;
max-frequency = <208000000>;
};
+
+&rpc {
+ status = "okay";
+};
diff --git a/arch/arm/dts/r8a7795-salvator-xs-2x2g-u-boot.dts b/arch/arm/dts/r8a7795-salvator-xs-2x2g-u-boot.dts
index 064c643..9383f36 100644
--- a/arch/arm/dts/r8a7795-salvator-xs-2x2g-u-boot.dts
+++ b/arch/arm/dts/r8a7795-salvator-xs-2x2g-u-boot.dts
@@ -44,3 +44,7 @@
sd-uhs-sdr104;
max-frequency = <208000000>;
};
+
+&rpc {
+ status = "okay";
+};
diff --git a/arch/arm/dts/r8a7795-salvator-xs-4x2g-u-boot.dts b/arch/arm/dts/r8a7795-salvator-xs-4x2g-u-boot.dts
index b2bb54c..6da588c 100644
--- a/arch/arm/dts/r8a7795-salvator-xs-4x2g-u-boot.dts
+++ b/arch/arm/dts/r8a7795-salvator-xs-4x2g-u-boot.dts
@@ -44,3 +44,7 @@
sd-uhs-sdr104;
max-frequency = <208000000>;
};
+
+&rpc {
+ status = "okay";
+};
diff --git a/arch/arm/dts/r8a7795-salvator-xs-u-boot.dts b/arch/arm/dts/r8a7795-salvator-xs-u-boot.dts
index bb0d3af..a983b24 100644
--- a/arch/arm/dts/r8a7795-salvator-xs-u-boot.dts
+++ b/arch/arm/dts/r8a7795-salvator-xs-u-boot.dts
@@ -43,3 +43,7 @@
sd-uhs-sdr104;
max-frequency = <208000000>;
};
+
+&rpc {
+ status = "okay";
+};
diff --git a/arch/arm/dts/r8a7796-salvator-x-u-boot.dts b/arch/arm/dts/r8a7796-salvator-x-u-boot.dts
index c730b90..f6d8ef3 100644
--- a/arch/arm/dts/r8a7796-salvator-x-u-boot.dts
+++ b/arch/arm/dts/r8a7796-salvator-x-u-boot.dts
@@ -43,3 +43,7 @@
sd-uhs-sdr104;
max-frequency = <208000000>;
};
+
+&rpc {
+ status = "okay";
+};
diff --git a/arch/arm/dts/r8a7796-salvator-xs-u-boot.dts b/arch/arm/dts/r8a7796-salvator-xs-u-boot.dts
index 707c5ce..c3839bb 100644
--- a/arch/arm/dts/r8a7796-salvator-xs-u-boot.dts
+++ b/arch/arm/dts/r8a7796-salvator-xs-u-boot.dts
@@ -43,3 +43,7 @@
sd-uhs-sdr104;
max-frequency = <208000000>;
};
+
+&rpc {
+ status = "okay";
+};
diff --git a/arch/arm/dts/r8a77965-salvator-x-u-boot.dts b/arch/arm/dts/r8a77965-salvator-x-u-boot.dts
index cfc0f74..b0b6e1f 100644
--- a/arch/arm/dts/r8a77965-salvator-x-u-boot.dts
+++ b/arch/arm/dts/r8a77965-salvator-x-u-boot.dts
@@ -46,3 +46,7 @@
max-frequency = <208000000>;
status = "okay";
};
+
+&rpc {
+ status = "okay";
+};
diff --git a/arch/arm/dts/r8a77965-salvator-xs-u-boot.dts b/arch/arm/dts/r8a77965-salvator-xs-u-boot.dts
index 7c38fc5..c0de7bf 100644
--- a/arch/arm/dts/r8a77965-salvator-xs-u-boot.dts
+++ b/arch/arm/dts/r8a77965-salvator-xs-u-boot.dts
@@ -46,3 +46,7 @@
max-frequency = <208000000>;
status = "okay";
};
+
+&rpc {
+ status = "okay";
+};
diff --git a/configs/r8a7795_salvator-x_defconfig b/configs/r8a7795_salvator-x_defconfig
index 92b1644..5629127 100644
--- a/configs/r8a7795_salvator-x_defconfig
+++ b/configs/r8a7795_salvator-x_defconfig
@@ -47,6 +47,11 @@ CONFIG_MMC_IO_VOLTAGE=y
CONFIG_MMC_UHS_SUPPORT=y
CONFIG_MMC_HS200_SUPPORT=y
CONFIG_RENESAS_SDHI=y
+CONFIG_MTD=y
+CONFIG_MTD_NOR_FLASH=y
+CONFIG_MTD_DEVICE=y
+CONFIG_CFI_FLASH=y
+CONFIG_RENESAS_RPC_HF=y
CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ90X1=y
CONFIG_DM_ETH=y
diff --git a/configs/r8a7795_salvator-xs-2x2g_defconfig b/configs/r8a7795_salvator-xs-2x2g_defconfig
index e8aabd8..e097e86 100644
--- a/configs/r8a7795_salvator-xs-2x2g_defconfig
+++ b/configs/r8a7795_salvator-xs-2x2g_defconfig
@@ -47,6 +47,11 @@ CONFIG_MMC_IO_VOLTAGE=y
CONFIG_MMC_UHS_SUPPORT=y
CONFIG_MMC_HS200_SUPPORT=y
CONFIG_RENESAS_SDHI=y
+CONFIG_MTD=y
+CONFIG_MTD_NOR_FLASH=y
+CONFIG_MTD_DEVICE=y
+CONFIG_CFI_FLASH=y
+CONFIG_RENESAS_RPC_HF=y
CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ90X1=y
CONFIG_DM_ETH=y
diff --git a/configs/r8a7795_salvator-xs-4x2g_defconfig b/configs/r8a7795_salvator-xs-4x2g_defconfig
index 589fa57..94bde7a 100644
--- a/configs/r8a7795_salvator-xs-4x2g_defconfig
+++ b/configs/r8a7795_salvator-xs-4x2g_defconfig
@@ -47,6 +47,11 @@ CONFIG_MMC_IO_VOLTAGE=y
CONFIG_MMC_UHS_SUPPORT=y
CONFIG_MMC_HS200_SUPPORT=y
CONFIG_RENESAS_SDHI=y
+CONFIG_MTD=y
+CONFIG_MTD_NOR_FLASH=y
+CONFIG_MTD_DEVICE=y
+CONFIG_CFI_FLASH=y
+CONFIG_RENESAS_RPC_HF=y
CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ90X1=y
CONFIG_DM_ETH=y
diff --git a/configs/r8a7795_salvator-xs_defconfig b/configs/r8a7795_salvator-xs_defconfig
index 0b1411c..86d58e9 100644
--- a/configs/r8a7795_salvator-xs_defconfig
+++ b/configs/r8a7795_salvator-xs_defconfig
@@ -47,6 +47,11 @@ CONFIG_MMC_IO_VOLTAGE=y
CONFIG_MMC_UHS_SUPPORT=y
CONFIG_MMC_HS200_SUPPORT=y
CONFIG_RENESAS_SDHI=y
+CONFIG_MTD=y
+CONFIG_MTD_NOR_FLASH=y
+CONFIG_MTD_DEVICE=y
+CONFIG_CFI_FLASH=y
+CONFIG_RENESAS_RPC_HF=y
CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ90X1=y
CONFIG_DM_ETH=y
diff --git a/configs/r8a77965_salvator-x_defconfig b/configs/r8a77965_salvator-x_defconfig
index 201a5c3..a0c86ed 100644
--- a/configs/r8a77965_salvator-x_defconfig
+++ b/configs/r8a77965_salvator-x_defconfig
@@ -48,6 +48,11 @@ CONFIG_MMC_IO_VOLTAGE=y
CONFIG_MMC_UHS_SUPPORT=y
CONFIG_MMC_HS200_SUPPORT=y
CONFIG_RENESAS_SDHI=y
+CONFIG_MTD=y
+CONFIG_MTD_NOR_FLASH=y
+CONFIG_MTD_DEVICE=y
+CONFIG_CFI_FLASH=y
+CONFIG_RENESAS_RPC_HF=y
CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ90X1=y
CONFIG_DM_ETH=y
diff --git a/configs/r8a77965_salvator-xs_defconfig b/configs/r8a77965_salvator-xs_defconfig
index dd494b6..4d2259c 100644
--- a/configs/r8a77965_salvator-xs_defconfig
+++ b/configs/r8a77965_salvator-xs_defconfig
@@ -46,6 +46,11 @@ CONFIG_MMC_IO_VOLTAGE=y
CONFIG_MMC_UHS_SUPPORT=y
CONFIG_MMC_HS200_SUPPORT=y
CONFIG_RENESAS_SDHI=y
+CONFIG_MTD=y
+CONFIG_MTD_NOR_FLASH=y
+CONFIG_MTD_DEVICE=y
+CONFIG_CFI_FLASH=y
+CONFIG_RENESAS_RPC_HF=y
CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ90X1=y
CONFIG_DM_ETH=y
diff --git a/configs/r8a7796_salvator-x_defconfig b/configs/r8a7796_salvator-x_defconfig
index 931e431..3993804 100644
--- a/configs/r8a7796_salvator-x_defconfig
+++ b/configs/r8a7796_salvator-x_defconfig
@@ -48,6 +48,11 @@ CONFIG_MMC_IO_VOLTAGE=y
CONFIG_MMC_UHS_SUPPORT=y
CONFIG_MMC_HS200_SUPPORT=y
CONFIG_RENESAS_SDHI=y
+CONFIG_MTD=y
+CONFIG_MTD_NOR_FLASH=y
+CONFIG_MTD_DEVICE=y
+CONFIG_CFI_FLASH=y
+CONFIG_RENESAS_RPC_HF=y
CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ90X1=y
CONFIG_DM_ETH=y
diff --git a/configs/r8a7796_salvator-xs_defconfig b/configs/r8a7796_salvator-xs_defconfig
index 9614951..a0102c0 100644
--- a/configs/r8a7796_salvator-xs_defconfig
+++ b/configs/r8a7796_salvator-xs_defconfig
@@ -48,6 +48,11 @@ CONFIG_MMC_IO_VOLTAGE=y
CONFIG_MMC_UHS_SUPPORT=y
CONFIG_MMC_HS200_SUPPORT=y
CONFIG_RENESAS_SDHI=y
+CONFIG_MTD=y
+CONFIG_MTD_NOR_FLASH=y
+CONFIG_MTD_DEVICE=y
+CONFIG_CFI_FLASH=y
+CONFIG_RENESAS_RPC_HF=y
CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ90X1=y
CONFIG_DM_ETH=y
diff --git a/include/configs/salvator-x.h b/include/configs/salvator-x.h
index 1bf2234..fd71102 100644
--- a/include/configs/salvator-x.h
+++ b/include/configs/salvator-x.h
@@ -23,4 +23,15 @@
#define CONFIG_SYS_MMC_ENV_DEV 1
#define CONFIG_SYS_MMC_ENV_PART 2
+#define CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS
+#define CONFIG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_MTD
+#define CONFIG_FLASH_SHOW_PROGRESS 45
+#define CONFIG_SYS_FLASH_BANKS_LIST { 0x08000000 }
+#define CONFIG_SYS_FLASH_CFI
+#define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT
+#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT 1
+#define CONFIG_SYS_MAX_FLASH_SECT 256
+#define CONFIG_SYS_WRITE_SWAPPED_DATA
+
#endif /* __SALVATOR_X_H */
--
2.7.4
|
