-
Notifications
You must be signed in to change notification settings - Fork 0
/
pdk_am335x_1_0_12_coco_board.patch
533 lines (501 loc) · 29.2 KB
/
pdk_am335x_1_0_12_coco_board.patch
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
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
--- ./pdk_am335x_1_0_12/packages/Rules.make 2019-02-26 09:37:53.642053000 +0100
+++ /mnt/c/ti/./pdk_am335x_1_0_12/packages/Rules.make 2019-02-25 14:17:08.144132500 +0100
@@ -42,7 +42,7 @@
SDK_INSTALL_PATH ?= C:/ti
export LIMIT_SOCS ?= am335x
-export LIMIT_BOARDS ?= evmAM335x icev2AM335x iceAMIC110 bbbAM335x skAM335x
+export LIMIT_BOARDS ?= evmAM335x icev2AM335x cocoAM335x cocoV2AM335x iceAMIC110 bbbAM335x skAM335x
export PDK_SOC ?= am335x
export PDK_VERSION ?= 1_0_12
--- ./pdk_am335x_1_0_12/packages/ti/board/board_cfg.h 2018-10-06 04:48:56.000000000 +0200
+++ /mnt/c/ti/./pdk_am335x_1_0_12/packages/ti/board/board_cfg.h 2019-02-25 14:18:41.552119900 +0100
@@ -44,6 +44,12 @@
#elif defined (icev2AM335x)
#include <ti/board/src/icev2AM335x/include/board_cfg.h>
+#elif defined (cocoAM335x)
+#include <ti/board/src/cocoAM335x/include/board_cfg.h>
+
+#elif defined (cocoV2AM335x)
+#include <ti/board/src/cocoV2AM335x/include/board_cfg.h>
+
#elif defined (iceAMIC110)
#include <ti/board/src/iceAMIC110/include/board_cfg.h>
--- ./pdk_am335x_1_0_12/packages/ti/board/board_component.mk 2018-10-06 04:48:56.000000000 +0200
+++ /mnt/c/ti/./pdk_am335x_1_0_12/packages/ti/board/board_component.mk 2019-02-25 14:19:59.344648900 +0100
@@ -66,7 +66,7 @@
#
ifeq ($(board_component_make_include), )
-board_lib_BOARDLIST = evmAM335x icev2AM335x iceAMIC110 skAM335x bbbAM335x evmAM437x idkAM437x skAM437x evmAM572x idkAM571x idkAM572x evmK2H evmK2K evmK2E evmK2L evmK2G iceK2G \
+board_lib_BOARDLIST = evmAM335x icev2AM335x cocoAM335x cocoV2AM335x iceAMIC110 skAM335x bbbAM335x evmAM437x idkAM437x skAM437x evmAM572x idkAM571x idkAM572x evmK2H evmK2K evmK2E evmK2L evmK2G iceK2G \
evmC6678 evmC6657 tda2xx-evm evmDRA75x tda2ex-evm evmDRA72x tda3xx-evm evmDRA78x evmOMAPL137 lcdkOMAPL138 idkAM574x am65xx_evm am65xx_idk simJ7
board_lib_tda2xx_CORELIST = a15_0 ipu1_0 c66x
board_lib_tda2ex_CORELIST = a15_0 ipu1_0 c66x
--- ./pdk_am335x_1_0_12/packages/ti/board/build/makefile.mk 2018-10-06 04:48:58.000000000 +0200
+++ /mnt/c/ti/./pdk_am335x_1_0_12/packages/ti/board/build/makefile.mk 2019-02-25 14:22:17.662499700 +0100
@@ -38,20 +38,20 @@
SRCDIR = . src
INCDIR = . src
-ifeq ($(BOARD),$(filter $(BOARD),evmAM335x icev2AM335x iceAMIC110 skAM335x bbbAM335x evmAM437x idkAM437x skAM437x evmAM572x idkAM571x idkAM572x evmK2H evmK2K evmK2E evmK2L evmK2G iceK2G evmC6678 evmC6657 evmOMAPL137 lcdkOMAPL138 idkAM574x am65xx_evm am65xx_idk))
+ifeq ($(BOARD),$(filter $(BOARD),evmAM335x icev2AM335x cocoAM335x cocoV2AM335x iceAMIC110 skAM335x bbbAM335x evmAM437x idkAM437x skAM437x evmAM572x idkAM571x idkAM572x evmK2H evmK2K evmK2E evmK2L evmK2G iceK2G evmC6678 evmC6657 evmOMAPL137 lcdkOMAPL138 idkAM574x am65xx_evm am65xx_idk))
# Common source files across all platforms and cores
SRCS_COMMON += board.c
endif
-ifeq ($(BOARD),$(filter $(BOARD),evmAM335x icev2AM335x iceAMIC110 skAM335x bbbAM335x evmAM437x idkAM437x skAM437x evmAM572x idkAM571x idkAM572x evmK2H evmK2K evmK2E evmK2L iceK2G evmC6678 evmC6657 evmOMAPL137 lcdkOMAPL138 idkAM574x evmDRA72x evmDRA75x evmDRA78x evmTDAxx simJ7))
+ifeq ($(BOARD),$(filter $(BOARD),evmAM335x icev2AM335x cocoAM335x cocoV2AM335x iceAMIC110 skAM335x bbbAM335x evmAM437x idkAM437x skAM437x evmAM572x idkAM571x idkAM572x evmK2H evmK2K evmK2E evmK2L iceK2G evmC6678 evmC6657 evmOMAPL137 lcdkOMAPL138 idkAM574x evmDRA72x evmDRA75x evmDRA78x evmTDAxx simJ7))
# Board stub function enabled for all the boards except evmK2G
SRCS_COMMON += boardStub.c
endif
-ifeq ($(BOARD),$(filter $(BOARD), evmAM335x icev2AM335x iceAMIC110 skAM335x bbbAM335x evmAM437x idkAM437x skAM437x))
+ifeq ($(BOARD),$(filter $(BOARD), evmAM335x icev2AM335x cocoAM335x cocoV2AM335x iceAMIC110 skAM335x bbbAM335x evmAM437x idkAM437x skAM437x))
include $(PDK_BOARD_COMP_PATH)/src/$(BOARD)/src_files_$(BOARD).mk
include $(PDK_BOARD_COMP_PATH)/src/src_files_starterware.mk
-ifeq ($(BOARD),$(filter $(BOARD), icev2AM335x evmAM437x))
+ifeq ($(BOARD),$(filter $(BOARD), icev2AM335x cocoAM335x cocoV2AM335x evmAM437x))
include $(PDK_BOARD_COMP_PATH)/src/flash/src_files_flash.mk
endif
endif
--- ./pdk_am335x_1_0_12/packages/ti/board/config.bld 2018-10-06 04:48:58.000000000 +0200
+++ /mnt/c/ti/./pdk_am335x_1_0_12/packages/ti/board/config.bld 2019-02-25 14:26:28.997695200 +0100
@@ -189,6 +189,38 @@
"$(PDK_INSTALL_PATH)/ti/board/src/flash/nor/nor.c",
"$(PDK_INSTALL_PATH)/ti/board/src/flash/nor/gpmc/nor_gpmc.c"]
}
+var cocoAM335x = {
+ name: "cocoAM335x",
+ ccOpts: "-DcocoAM335x -DSOC_AM335X -DAM335X_FAMILY_BUILD -Dam335x -DBUILDCFG_MOD_UART -DBUILDCFG_MOD_GPIO -DBUILDCFG_MOD_I2C -DBUILDCFG_MOD_MCSPI -DBUILDCFG_MOD_QSPI -DBUILDCFG_MOD_PRU_ETH -DBUILDCFG_MOD_MMCSD -DBUILDCFG_MOD_CPSW -DBUILDCFG_MOD_PWMSS -DBUILDCFG_MOD_DSS -DBUILDCFG_MOD_USB -DBUILDCFG_MOD_GPMC -DBUILDCFG_MOD_DCAN -DBUILDCFG_MOD_MCASP -DBUILDCFG_MOD_VPFE -DBUILDCFG_MOD_MDIO -DBUILDCFG_MOD_DMTIMER -DBUILDCFG_MOD_EDMA3CC -DBUILDCFG_MOD_EDMA3TC -DBUILDCFG_MOD_RTC -DBUILDCFG_MOD_WDT -DBUILDCFG_MOD_ADC -DBUILDCFG_MOD_LCDC -DBUILDCFG_MOD_PRU_ICSS",
+ targets: [A8LE],
+ incOpts: [ "-I$(PDK_INSTALL_PATH)/ti/starterware/include -I$(PDK_INSTALL_PATH)/ti/starterware/soc/am335x -I$(PDK_INSTALL_PATH)/ti/starterware/board -I$(PDK_INSTALL_PATH)/ti/starterware/board/am335x -I$(PDK_INSTALL_PATH)/ti/starterware/include/am335x -I$(PDK_INSTALL_PATH)/ti/starterware/device -I$(PDK_INSTALL_PATH)/ti/starterware/include/utils -I$(PDK_INSTALL_PATH)/ti/starterware/include/hw -I$(PDK_INSTALL_PATH)/ti/starterware/soc"],
+ stwFiles: ["$(PDK_INSTALL_PATH)/ti/starterware/board/am335x/am335x_coco_pinmux_data.c",
+ "$(PDK_INSTALL_PATH)/ti/starterware/soc/am335x/am335x_control.c",
+ "$(PDK_INSTALL_PATH)/ti/starterware/soc/am335x/am335x_chipdb.c",
+ "$(PDK_INSTALL_PATH)/ti/starterware/soc/am335x/am335x_prcm.c",
+ "$(PDK_INSTALL_PATH)/ti/starterware/soc/am335x/hw_am335x_chipdb.c",
+ "$(PDK_INSTALL_PATH)/ti/starterware/soc/am335x/hw_am335x_chipdb_baseaddr.c",
+ "$(PDK_INSTALL_PATH)/ti/starterware/soc/am335x/hw_am335x_chipdb_interrupt.c"],
+ flashFiles: ["$(PDK_INSTALL_PATH)/ti/board/src/flash/board_flash.c",
+ "$(PDK_INSTALL_PATH)/ti/board/src/flash/nor/nor.c",
+ "$(PDK_INSTALL_PATH)/ti/board/src/flash/nor/gpmc/nor_gpmc.c"]
+}
+var cocoV2AM335x = {
+ name: "cocoV2AM335x",
+ ccOpts: "-DcocoV2AM335x -DSOC_AM335X -DAM335X_FAMILY_BUILD -Dam335x -DBUILDCFG_MOD_UART -DBUILDCFG_MOD_GPIO -DBUILDCFG_MOD_I2C -DBUILDCFG_MOD_MCSPI -DBUILDCFG_MOD_QSPI -DBUILDCFG_MOD_PRU_ETH -DBUILDCFG_MOD_MMCSD -DBUILDCFG_MOD_CPSW -DBUILDCFG_MOD_PWMSS -DBUILDCFG_MOD_DSS -DBUILDCFG_MOD_USB -DBUILDCFG_MOD_GPMC -DBUILDCFG_MOD_DCAN -DBUILDCFG_MOD_MCASP -DBUILDCFG_MOD_VPFE -DBUILDCFG_MOD_MDIO -DBUILDCFG_MOD_DMTIMER -DBUILDCFG_MOD_EDMA3CC -DBUILDCFG_MOD_EDMA3TC -DBUILDCFG_MOD_RTC -DBUILDCFG_MOD_WDT -DBUILDCFG_MOD_ADC -DBUILDCFG_MOD_LCDC -DBUILDCFG_MOD_PRU_ICSS",
+ targets: [A8LE],
+ incOpts: [ "-I$(PDK_INSTALL_PATH)/ti/starterware/include -I$(PDK_INSTALL_PATH)/ti/starterware/soc/am335x -I$(PDK_INSTALL_PATH)/ti/starterware/board -I$(PDK_INSTALL_PATH)/ti/starterware/board/am335x -I$(PDK_INSTALL_PATH)/ti/starterware/include/am335x -I$(PDK_INSTALL_PATH)/ti/starterware/device -I$(PDK_INSTALL_PATH)/ti/starterware/include/utils -I$(PDK_INSTALL_PATH)/ti/starterware/include/hw -I$(PDK_INSTALL_PATH)/ti/starterware/soc"],
+ stwFiles: ["$(PDK_INSTALL_PATH)/ti/starterware/board/am335x/am335x_cocov2_pinmux_data.c",
+ "$(PDK_INSTALL_PATH)/ti/starterware/soc/am335x/am335x_control.c",
+ "$(PDK_INSTALL_PATH)/ti/starterware/soc/am335x/am335x_chipdb.c",
+ "$(PDK_INSTALL_PATH)/ti/starterware/soc/am335x/am335x_prcm.c",
+ "$(PDK_INSTALL_PATH)/ti/starterware/soc/am335x/hw_am335x_chipdb.c",
+ "$(PDK_INSTALL_PATH)/ti/starterware/soc/am335x/hw_am335x_chipdb_baseaddr.c",
+ "$(PDK_INSTALL_PATH)/ti/starterware/soc/am335x/hw_am335x_chipdb_interrupt.c"],
+ flashFiles: ["$(PDK_INSTALL_PATH)/ti/board/src/flash/board_flash.c",
+ "$(PDK_INSTALL_PATH)/ti/board/src/flash/nor/nor.c",
+ "$(PDK_INSTALL_PATH)/ti/board/src/flash/nor/gpmc/nor_gpmc.c"]
+}
var skAM335x = {
name: "skAM335x",
ccOpts: "-DskAM335x -DSOC_AM335X -DAM335X_FAMILY_BUILD -Dam335x -DBUILDCFG_MOD_UART -DBUILDCFG_MOD_GPIO -DBUILDCFG_MOD_I2C -DBUILDCFG_MOD_MCSPI -DBUILDCFG_MOD_QSPI -DBUILDCFG_MOD_PRU_ETH -DBUILDCFG_MOD_MMCSD -DBUILDCFG_MOD_CPSW -DBUILDCFG_MOD_PWMSS -DBUILDCFG_MOD_DSS -DBUILDCFG_MOD_USB -DBUILDCFG_MOD_GPMC -DBUILDCFG_MOD_DCAN -DBUILDCFG_MOD_MCASP -DBUILDCFG_MOD_VPFE -DBUILDCFG_MOD_MDIO -DBUILDCFG_MOD_DMTIMER -DBUILDCFG_MOD_EDMA3CC -DBUILDCFG_MOD_EDMA3TC -DBUILDCFG_MOD_RTC -DBUILDCFG_MOD_WDT -DBUILDCFG_MOD_ADC -DBUILDCFG_MOD_LCDC",
@@ -362,5 +394,5 @@
/* List all the build targets here. */
Build.targets = [ C66LE, C66BE, A15LE, M4LE, A9LE, A8LE, ARM9LE, C674LE A53LE ];
-var boards = [ evmAM335x, icev2AM335x, skAM335x, bbbAM335x, evmAM437x, idkAM437x, skAM437x, evmAM572x, idkAM571x, idkAM572x, evmK2H, evmK2K, evmK2E, evmK2L, evmK2G, evmC6678, evmC6657, evmOMAPL137 idkAM574x am65xx_evm am65xx_idk ];
+var boards = [ evmAM335x, icev2AM335x, cocoAM335x, cocoV2AM335x, skAM335x, bbbAM335x, evmAM437x, idkAM437x, skAM437x, evmAM572x, idkAM571x, idkAM572x, evmK2H, evmK2K, evmK2E, evmK2L, evmK2G, evmC6678, evmC6657, evmOMAPL137 idkAM574x am65xx_evm am65xx_idk ];
--- ./pdk_am335x_1_0_12/packages/ti/board/package.bld 2018-10-06 04:49:22.000000000 +0200
+++ /mnt/c/ti/./pdk_am335x_1_0_12/packages/ti/board/package.bld 2019-02-25 14:27:43.045517800 +0100
@@ -59,6 +59,8 @@
Pkg.otherFiles[Pkg.otherFiles.length++] = "src/idkAM571x/src_files_idkAM571x.mk";
Pkg.otherFiles[Pkg.otherFiles.length++] = "src/evmK2G/src_files_evmK2G.mk";
Pkg.otherFiles[Pkg.otherFiles.length++] = "src/icev2AM335x/src_files_icev2AM335x.mk";
+Pkg.otherFiles[Pkg.otherFiles.length++] = "src/cocoAM335x/src_files_cocoAM335x.mk";
+Pkg.otherFiles[Pkg.otherFiles.length++] = "src/cocoV2AM335x/src_files_cocoV2AM335x.mk";
Pkg.otherFiles[Pkg.otherFiles.length++] = "src/idkAM437x/src_files_idkAM437x.mk";
Pkg.otherFiles[Pkg.otherFiles.length++] = "src/evmAM571x/src_files_evmAM571x.mk";
Pkg.otherFiles[Pkg.otherFiles.length++] = "src/evmOMAPL137/src_files_evmOMAPL137.mk";
--- ./pdk_am335x_1_0_12/packages/ti/board/src/flash/nor/gpmc/nor_gpmc.h 2018-10-06 04:49:23.000000000 +0200
+++ /mnt/c/ti/./pdk_am335x_1_0_12/packages/ti/board/src/flash/nor/gpmc/nor_gpmc.h 2019-02-25 14:29:03.317555500 +0100
@@ -51,7 +51,7 @@
#include <ti/board/src/flash/nor/nor.h>
#include <ti/drv/gpmc/GPMC.h>
-#if defined (icev2AM335x)
+#if defined (icev2AM335x) || defined (cocoAM335x) || defined (cocoV2AM335x)
#include <ti/board/src/flash/nor/device/m29w160eb.h>
#include <ti/drv/gpmc/src/V1/GPMC_v1.h>
#endif
--- ./pdk_am335x_1_0_12/packages/ti/board/src/flash/nor/nor.c 2018-10-06 04:49:23.000000000 +0200
+++ /mnt/c/ti/./pdk_am335x_1_0_12/packages/ti/board/src/flash/nor/nor.c 2019-02-25 14:32:33.872738000 +0100
@@ -84,7 +84,7 @@
&Nor_ospiFxnTable
}
};
-#elif defined (icev2AM335x)
+#elif defined (icev2AM335x) || defined (cocoAM335x) || defined (cocoV2AM335x)
NOR_Config Nor_config[BOARD_FLASH_NOR_INTF_MAX] =
{
{
--- ./pdk_am335x_1_0_12/packages/ti/board/src/flash/src_files_flash.mk 2018-10-06 04:49:23.000000000 +0200
+++ /mnt/c/ti/./pdk_am335x_1_0_12/packages/ti/board/src/flash/src_files_flash.mk 2019-02-25 14:35:07.611418800 +0100
@@ -36,7 +36,7 @@
SRCDIR += src/flash src/flash/include
INCDIR += src/flash src/flash/include
-ifeq ($(BOARD),$(filter $(BOARD), icev2AM335x))
+ifeq ($(BOARD),$(filter $(BOARD), icev2AM335x cocoAM335x cocoV2AM335x))
SRCDIR += src/flash/nor src/flash/nor/device src/flash/nor/gpmc
INCDIR += src/flash/nor src/flash/nor/device src/flash/nor/gpmc
--- ./pdk_am335x_1_0_12/packages/ti/board/src/src_files_starterware.mk 2018-10-06 04:49:22.000000000 +0200
+++ /mnt/c/ti/./pdk_am335x_1_0_12/packages/ti/board/src/src_files_starterware.mk 2019-02-25 14:38:23.762711800 +0100
@@ -47,7 +47,7 @@
$(PDK_INSTALL_PATH)/ti/starterware/utils \
$(PDK_INSTALL_PATH)/ti/starterware/soc
-ifeq ($(BOARD),$(filter $(BOARD), evmAM335x icev2AM335x iceAMIC110 skAM335x bbbAM335x))
+ifeq ($(BOARD),$(filter $(BOARD), evmAM335x icev2AM335x cocoAM335x cocoV2AM335x iceAMIC110 skAM335x bbbAM335x))
SRCDIR += $(PDK_INSTALL_PATH)/ti/starterware/board/am335x \
$(PDK_INSTALL_PATH)/ti/starterware/soc/am335x \
$(PDK_INSTALL_PATH)/ti/starterware/include/am335x
@@ -73,6 +73,14 @@
SRCS_COMMON += am335x_icev2_pinmux_data.c
endif
+ ifeq ($(BOARD),$(filter $(BOARD), cocoAM335x))
+ SRCS_COMMON += am335x_coco_pinmux_data.c
+ endif
+
+ ifeq ($(BOARD),$(filter $(BOARD), cocoV2AM335x))
+ SRCS_COMMON += am335x_cocov2_pinmux_data.c
+ endif
+
ifeq ($(BOARD),$(filter $(BOARD), iceAMIC110))
SRCS_COMMON += am335x_amic11x_pinmux_data.c
endif
--- ./pdk_am335x_1_0_12/packages/ti/build/makerules/build_config.mk 2018-10-06 04:38:25.000000000 +0200
+++ /mnt/c/ti/./pdk_am335x_1_0_12/packages/ti/build/makerules/build_config.mk 2019-02-25 14:40:30.723533500 +0100
@@ -83,6 +83,8 @@
CFLAGS_GLOBAL_evmC6678 = -DSOC_C6678 -DevmC6678=evmC6678
CFLAGS_GLOBAL_evmAM335x = -DSOC_AM335x -DevmAM335x=evmAM335x
CFLAGS_GLOBAL_icev2AM335x = -DSOC_AM335x -Dicev2AM335x=icev2AM335x
+CFLAGS_GLOBAL_cocoAM335x = -DSOC_AM335x -DcocoAM335x=cocoAM335x
+CFLAGS_GLOBAL_cocoV2AM335x = -DSOC_AM335x -DcocoV2AM335x=cocoV2AM335x
CFLAGS_GLOBAL_iceAMIC110 = -DSOC_AM335x -DiceAMIC110=iceAMIC110
CFLAGS_GLOBAL_skAM335x = -DSOC_AM335x -DskAM335x=skAM335x
CFLAGS_GLOBAL_bbbAM335x = -DSOC_AM335x -DbbbAM335x=bbbAM335x
--- ./pdk_am335x_1_0_12/packages/ti/build/makerules/platform.mk 2018-10-06 04:38:25.000000000 +0200
+++ /mnt/c/ti/./pdk_am335x_1_0_12/packages/ti/build/makerules/platform.mk 2019-02-25 14:41:21.895945500 +0100
@@ -142,7 +142,7 @@
endif
# am335x
-ifeq ($(BOARD),$(filter $(BOARD), evmAM335x icev2AM335x iceAMIC110 skAM335x bbbAM335x))
+ifeq ($(BOARD),$(filter $(BOARD), evmAM335x icev2AM335x cocoAM335x cocoV2AM335x iceAMIC110 skAM335x bbbAM335x))
SOC = am335x
endif
--- ./pdk_am335x_1_0_12/packages/ti/build/Rules.make 2019-02-26 09:11:57.660967600 +0100
+++ /mnt/c/ti/./pdk_am335x_1_0_12/packages/ti/build/Rules.make 2019-02-25 14:42:21.357842000 +0100
@@ -50,7 +50,7 @@
# evmDRA72x, evmDRA75x, evmDRA78x,
# evmAM572x, idkAM571x, idkAM572x idkAM574x
# evmK2H, evmK2K, evmK2E, evmK2L, evmK2G, evmC6678, evmC6657,
-# evmAM335x, icev2AM335x, iceAMIC110, skAM335x, bbbAM335x,
+# evmAM335x, icev2AM335x, cocoAM335x, cocoV2AM335x, iceAMIC110, skAM335x, bbbAM335x,
# evmAM437x idkAM437x skAM437x evmOMAPL137 lcdkOMAPL138
# And also refer $(BOARD_LIST_J6_TDA) below
#
--- ./pdk_am335x_1_0_12/packages/ti/drv/gpio/test/led_blink/src/GPIO_board.h 2018-10-06 04:45:35.000000000 +0200
+++ /mnt/c/ti/./pdk_am335x_1_0_12/packages/ti/drv/gpio/test/led_blink/src/GPIO_board.h 2019-02-25 14:44:15.513056500 +0100
@@ -95,7 +95,7 @@
#if defined (evmAM572x) || defined (idkAM571x) || \
defined (skAM437x) || defined (evmAM437x) || \
- defined (icev2AM335x) || defined (skAM335x) || defined (bbbAM335x)
+ defined (icev2AM335x) || defined (skAM335x) || defined (bbbAM335x) || defined (cocoAM335x) || defined (cocoV2AM335x)
#define GPIO_BASE_ADDR GPIO_INTR_LED_BASE_ADDR
#define GPIO_LED_PIN GPIO_LED_PIN_NUM
#endif
--- ./pdk_am335x_1_0_12/packages/ti/drv/gpmc/gpmc_component.mk 2018-10-06 04:46:21.000000000 +0200
+++ /mnt/c/ti/./pdk_am335x_1_0_12/packages/ti/drv/gpmc/gpmc_component.mk 2019-02-25 14:45:08.993027000 +0100
@@ -42,7 +42,7 @@
ifeq ($(gpmc_component_make_include), )
# under other list
-drvgpmc_BOARDLIST = icev2AM335x evmAM437x
+drvgpmc_BOARDLIST = icev2AM335x cocoAM335x cocoV2AM335x evmAM437x
drvgpmc_SOCLIST = am437x am335x
drvgpmc_am437x_CORELIST = a9host
drvgpmc_am335x_CORELIST = a8host
--- ./pdk_am335x_1_0_12/packages/ti/drv/pruss/example/apps/sorte/master/makefile 2018-10-06 04:44:43.000000000 +0200
+++ /mnt/c/ti/./pdk_am335x_1_0_12/packages/ti/drv/pruss/example/apps/sorte/master/makefile 2019-02-25 14:46:25.232267400 +0100
@@ -18,6 +18,20 @@
EXT_LIB_$(CORE) = $(pruss_sorte_master_PATH)/bin/$(SOC)/a8host/REV1/sorte_master_PRU0.bin
endif
+ifeq ($(BOARD),$(filter $(BOARD), cocoAM335x))
+EXTERNAL_LNKCMD_FILE_LOCAL = ${PDK_INSTALL_PATH}/ti/build/pruss/lnk_a8_a9_a15_REV1.cmd
+# Enable XDC build for application by providing XDC CFG File per core
+XDC_CFG_FILE_$(CORE) = ../src/sorte_cocoam335x_app.cfg
+EXT_LIB_$(CORE) = $(pruss_sorte_master_PATH)/bin/$(SOC)/a8host/REV1/sorte_master_PRU0.bin
+endif
+
+ifeq ($(BOARD),$(filter $(BOARD), cocoV2AM335x))
+EXTERNAL_LNKCMD_FILE_LOCAL = ${PDK_INSTALL_PATH}/ti/build/pruss/lnk_a8_a9_a15_REV1.cmd
+# Enable XDC build for application by providing XDC CFG File per core
+XDC_CFG_FILE_$(CORE) = ../src/sorte_cocoV2am335x_app.cfg
+EXT_LIB_$(CORE) = $(pruss_sorte_master_PATH)/bin/$(SOC)/a8host/REV1/sorte_master_PRU0.bin
+endif
+
ifeq ($(BOARD),$(filter $(BOARD), idkAM437x))
EXTERNAL_LNKCMD_FILE_LOCAL = ${PDK_INSTALL_PATH}/ti/build/pruss/lnk_a8_a9_a15_REV1.cmd
# Enable XDC build for application by providing XDC CFG File per core
--- ./pdk_am335x_1_0_12/packages/ti/drv/pruss/example/apps/sorte/slave/makefile 2018-10-06 04:44:43.000000000 +0200
+++ /mnt/c/ti/./pdk_am335x_1_0_12/packages/ti/drv/pruss/example/apps/sorte/slave/makefile 2019-02-25 14:47:44.584349400 +0100
@@ -22,6 +22,22 @@
EXT_LIB_$(CORE) += $(pruss_sorte_slave_PATH)/bin/$(SOC)/a8host/REV1/sorte_slave_PRU1.bin
endif
+ifeq ($(BOARD),$(filter $(BOARD), cocoAM335x))
+EXTERNAL_LNKCMD_FILE_LOCAL = ${PDK_INSTALL_PATH}/ti/build/pruss/lnk_a8_a9_a15_REV1.cmd
+# Enable XDC build for application by providing XDC CFG File per core
+XDC_CFG_FILE_$(CORE) = ../src/sorte_cocoam335x_app.cfg
+EXT_LIB_$(CORE) = $(pruss_sorte_slave_PATH)/bin/$(SOC)/a8host/REV1/sorte_slave_PRU0.bin
+EXT_LIB_$(CORE) += $(pruss_sorte_slave_PATH)/bin/$(SOC)/a8host/REV1/sorte_slave_PRU1.bin
+endif
+
+ifeq ($(BOARD),$(filter $(BOARD), cocoV2AM335x))
+EXTERNAL_LNKCMD_FILE_LOCAL = ${PDK_INSTALL_PATH}/ti/build/pruss/lnk_a8_a9_a15_REV1.cmd
+# Enable XDC build for application by providing XDC CFG File per core
+XDC_CFG_FILE_$(CORE) = ../src/sorte_cocoV2am335x_app.cfg
+EXT_LIB_$(CORE) = $(pruss_sorte_slave_PATH)/bin/$(SOC)/a8host/REV1/sorte_slave_PRU0.bin
+EXT_LIB_$(CORE) += $(pruss_sorte_slave_PATH)/bin/$(SOC)/a8host/REV1/sorte_slave_PRU1.bin
+endif
+
ifeq ($(BOARD),$(filter $(BOARD), idkAM437x))
EXTERNAL_LNKCMD_FILE_LOCAL = ${PDK_INSTALL_PATH}/ti/build/pruss/lnk_a8_a9_a15_REV1.cmd
# Enable XDC build for application by providing XDC CFG File per core
--- ./pdk_am335x_1_0_12/packages/ti/drv/pruss/example/apps/sorte/src/main.c 2018-10-06 04:44:43.000000000 +0200
+++ /mnt/c/ti/./pdk_am335x_1_0_12/packages/ti/drv/pruss/example/apps/sorte/src/main.c 2019-02-25 14:50:25.421416700 +0100
@@ -74,7 +74,7 @@
#ifdef __LINUX_USER_SPACE
/* ICSS EMAC PHY address definitions */
#define BOARD_ICSS_EMAC_PORT0_PHY_ADDR (0U)
-#if defined(icev2AM335x)
+#if defined(icev2AM335x) || defined(cocoAM335x) || defined(cocoV2AM335x)
#define BOARD_ICSS_EMAC_PORT1_PHY_ADDR (3U)
#elif defined(idkAM437x) || defined(idkAM571x) || defined(idkAM572x) || defined(iceK2G) || defined(idkAM574x)
#define BOARD_ICSS_EMAC_PORT1_PHY_ADDR (1U)
@@ -95,7 +95,7 @@
#include <ti/drv/pruss/example/apps/sorte/src/ti_pruss_intc_mapping.h>
#include <ti/drv/pruss/example/apps/sorte/src/sorte_loc.h>
-#if defined(icev2AM335x) || defined(idkAM437x)
+#if defined(icev2AM335x) || defined(idkAM437x) || defined(cocoAM335x) || defined(cocoV2AM335x)
extern uint8_t pru_imem0_rev1_start;
extern uint8_t pru_imem0_rev1_end;
extern uint8_t pru_imem1_rev1_start;
@@ -107,7 +107,7 @@
extern uint8_t pru_imem1_rev2_end;
#endif
-#if defined(icev2AM335x)
+#if defined(icev2AM335x) || defined(cocoAM335x) || defined(cocoV2AM335x)
uint32_t pruIcssInstance = PRUICCSS_INSTANCE_ONE;
#elif defined(idkAM437x) || defined(idkAM571x) || defined(idkAM572x) || defined(iceK2G) || defined(idkAM574x)
uint32_t pruIcssInstance = PRUICCSS_INSTANCE_TWO;
@@ -486,7 +486,7 @@
int32_t ret;
PRUICSS_Config *pruIcssCfg;
Task_Params taskParams;
-#if defined(icev2AM335x) || defined(idkAM437x)
+#if defined(icev2AM335x) || defined(idkAM437x) || defined(cocoAM335x) || defined(cocoV2AM335x)
cfg = BOARD_INIT_PLL| BOARD_INIT_MODULE_CLOCK | BOARD_INIT_DDR | BOARD_INIT_ICSS_PINMUX | BOARD_INIT_UART_STDIO | BOARD_INIT_ICSS_ETH_PHY;
#else
cfg = BOARD_INIT_UART_STDIO | BOARD_INIT_PINMUX_CONFIG | BOARD_INIT_MODULE_CLOCK | BOARD_INIT_ICSS_ETH_PHY;
--- ./pdk_am335x_1_0_12/packages/ti/drv/pruss/pruss_component.mk 2018-10-06 04:44:43.000000000 +0200
+++ /mnt/c/ti/./pdk_am335x_1_0_12/packages/ti/drv/pruss/pruss_component.mk 2019-02-25 14:56:35.265360200 +0100
@@ -67,7 +67,7 @@
ifeq ($(pruss_component_make_include), )
# under other list
-drvpruss_BOARDLIST = icev2AM335x idkAM437x idkAM571x idkAM572x iceK2G idkAM574x
+drvpruss_BOARDLIST = icev2AM335x cocoAM335x cocoV2AM335x idkAM437x idkAM571x idkAM572x iceK2G idkAM574x
drvpruss_SOCLIST = am574x am572x am571x am437x am335x k2g am65xx
drvpruss_am574x_CORELIST = c66x a15_0 ipu1_0 pru_0 pru_1
drvpruss_am572x_CORELIST = c66x a15_0 ipu1_0 pru_0 pru_1
@@ -281,13 +281,15 @@
export pruss_app_sorte_slave_XDC_CONFIGURO
pruss_app_sorte_slave_PKG_LIST = pruss_app_sorte_slave
pruss_app_sorte_slave_INCLUDE = $(pruss_app_sorte_slave_PATH)
-pruss_app_sorte_slave_BOARDLIST = icev2AM335x idkAM437x idkAM571x idkAM572x iceK2G idkAM574x
+pruss_app_sorte_slave_BOARDLIST = icev2AM335x cocoAM335x cocoV2AM335x idkAM437x idkAM571x idkAM572x iceK2G idkAM574x
export pruss_app_sorte_slave_BOARDLIST
pruss_app_sorte_slave_SOCLIST = $(SOC)
export pruss_app_sorte_slave_SOCLIST
-ifeq ($(BOARD),$(filter $(BOARD), icev2AM335x))
+
+ifeq ($(BOARD),$(filter $(BOARD), icev2AM335x cocoAM335x cocoV2AM335x))
pruss_app_sorte_slave_$(SOC)_CORELIST = a8host
endif
+
ifeq ($(BOARD),$(filter $(BOARD), idkAM437x))
pruss_app_sorte_slave_$(SOC)_CORELIST = a9host
endif
@@ -321,12 +323,12 @@
export pruss_app_sorte_master_XDC_CONFIGURO
pruss_app_sorte_master_PKG_LIST = pruss_app_sorte_master
pruss_app_sorte_master_INCLUDE = $(pruss_app_sorte_master_PATH)
-pruss_app_sorte_master_BOARDLIST = icev2AM335x idkAM437x idkAM571x idkAM572x iceK2G idkaM574x
+pruss_app_sorte_master_BOARDLIST = icev2AM335x cocoAM335x cocoV2AM335x idkAM437x idkAM571x idkAM572x iceK2G idkaM574x
export pruss_app_sorte_master_BOARDLIST
pruss_app_sorte_master_SOCLIST = $(SOC)
export pruss_app_sorte_master_SOCLIST
-ifeq ($(BOARD),$(filter $(BOARD), icev2AM335x))
+ifeq ($(BOARD),$(filter $(BOARD), icev2AM335x cocoAM335x cocoV2AM335x))
pruss_app_sorte_master_$(SOC)_CORELIST = a8host
endif
--- ./pdk_am335x_1_0_12/packages/ti/starterware/board/am335x/am335x_pinmux.h 2018-10-06 04:29:04.000000000 +0200
+++ /mnt/c/ti/./pdk_am335x_1_0_12/packages/ti/starterware/board/am335x/am335x_pinmux.h 2019-02-25 15:00:17.676859100 +0100
@@ -320,6 +320,14 @@
extern pinmuxBoardCfg_t gIceV2PinmuxData[];
/** \brief Pinmux configuration data for the board. Auto-generated from
+ Pinmux tool. */
+extern pinmuxBoardCfg_t gCocoPinmuxData[];
+
+/** \brief Pinmux configuration data for the board. Auto-generated from
+ Pinmux tool. */
+extern pinmuxBoardCfg_t gCocoV2PinmuxData[];
+
+/** \brief Pinmux configuration data for the board. Auto-generated from
Pinmux tool for IceV2, but with AMIC11x naming. Intended for
manual deviation from IceV2, if applicable. */
extern pinmuxBoardCfg_t gAMIC11xPinmuxData[];
--- ./pdk_am335x_1_0_12/packages/ti/starterware/board/am335x/board_am335x.c 2018-10-06 04:29:04.000000000 +0200
+++ /mnt/c/ti/./pdk_am335x_1_0_12/packages/ti/starterware/board/am335x/board_am335x.c 2019-02-25 15:04:24.500093900 +0100
@@ -63,6 +63,8 @@
#include "am335x_beagleboneblack.h"
#include "am335x_icev1.h"
#include "am335x_icev2.h"
+#include "am335x_coco.h"
+#include "am335x_cocov2.h"
#include "am335x_amic110.h"
#include "am335x_custom.h"
@@ -184,6 +186,8 @@
&gBoardAm335xIceV2Data, /*BOARD_ICE ver 2*/
&gBoardAm335xAMIC110Data, /* AMIC110 */
&gBoardAm335xCustomData, /* BOARD_CUSTOM */
+ &gBoardAm335xCocoData, /* COCO BOARD */
+ &gBoardAm335xCocoV2Data, /* COCOV2 BOARD */
};
#else
static const boardData_t *gpBoardAm335xData [BOARD_MAX + 1U]= {
@@ -330,6 +334,20 @@
boardId = BOARD_ICEV2;
}
}
+ /* Check if the board is COCO */
+ else if (strncmp(BOARD_AM335X_COCO_BOARD_NAME,
+ (char *)gBoardDataEeprom.boardName,
+ BOARD_EEPROM_BOARD_NAME_SIZE) == 0U)
+ {
+ boardId = BOARD_COCO;
+ }
+ /* Check if the board is COCOV2 */
+ else if (strncmp(BOARD_AM335X_COCOV2_BOARD_NAME,
+ (char *)gBoardDataEeprom.boardName,
+ BOARD_EEPROM_BOARD_NAME_SIZE) == 0U)
+ {
+ boardId = BOARD_COCOV2;
+ }
/* Check if the board is AMIC110, if so use icev2 settings */
else if (strncmp(BOARD_AM335X_AMIC110_BOARD_NAME,
(char *)gBoardDataEeprom.boardName,
--- ./pdk_am335x_1_0_12/packages/ti/starterware/board/am335x/filelist.mk 2018-10-06 04:29:04.000000000 +0200
+++ /mnt/c/ti/./pdk_am335x_1_0_12/packages/ti/starterware/board/am335x/filelist.mk 2019-02-25 15:06:36.030668700 +0100
@@ -48,6 +48,8 @@
am335x_beagleboneblack.c \
am335x_icev1.c \
am335x_icev2.c \
+ am335x_coco.c \
+ am335x_cocov2.c \
am335x_amic110.c \
am335x_custom.c
endif
@@ -61,6 +63,8 @@
am335x_beagleboneblack_pinmux_data.c \
am335x_icev1_pinmux_data.c \
am335x_icev2_pinmux_data.c \
+ am335x_coco_pinmux_data.c \
+ am335x_cocov2_pinmux_data.c \
am335x_amic11x_pinmux_data.c
SRCS_COMMON += am335x_lcd4_dcard.c
endif
--- ./pdk_am335x_1_0_12/packages/ti/starterware/board/board.c 2018-10-06 04:29:04.000000000 +0200
+++ /mnt/c/ti/./pdk_am335x_1_0_12/packages/ti/starterware/board/board.c 2019-02-25 15:08:21.506264500 +0100
@@ -126,7 +126,9 @@
{BOARD_ICEV1, "ICE ver 1" },
{BOARD_ICEV2, "ICE Ver 2" },
{BOARD_AMIC110, "AMIC110" },
- {BOARD_CUSTOM, "Custom" }
+ {BOARD_CUSTOM, "Custom" },
+ {BOARD_COCO, "COCO" },
+ {BOARD_COCOV2, "COCO Ver 2" }
};
#else
static boardIdString_t gBoardIdStrTable[] =
--- ./pdk_am335x_1_0_12/packages/ti/starterware/include/board.h 2018-10-06 04:29:04.000000000 +0200
+++ /mnt/c/ti/./pdk_am335x_1_0_12/packages/ti/starterware/include/board.h 2019-02-25 15:13:36.431932400 +0100
@@ -116,9 +116,13 @@
/**< Industrial communications Engine Version 2 */
BOARD_AMIC110 = 0x9U,
/**< AMIC110 ICE board */
- BOARD_CUSTOM = 0x10U,
+ BOARD_CUSTOM = 0xAU,
/**< Any other custom board. */
- BOARD_MAX = BOARD_CUSTOM
+ BOARD_COCO = 0xBU,
+ /**< COCO board. */
+ BOARD_COCOV2 = 0xCU,
+ /**< COCO board Version 2. */
+ BOARD_MAX = BOARD_COCOV2
/**< Max board ID. */
} boardId_t;
#else
@@ -290,6 +294,36 @@
/**< Max board revision. */
} boardRevIceV2_t;
+/**
+ * \brief Coco board revisions ID.
+ */
+typedef enum boardRevCoco
+{
+ BOARD_REV_COCO_MIN,
+ /**< Should be the first value of this enumeration. */
+ BOARD_REV_COCO_UNKNOWN = BOARD_REV_COCO_MIN,
+ /**< Unknown/unsupported board revision. */
+ BOARD_REV_COCO_A1,
+ /**< Board revision A1. */
+ BOARD_REV_COCO_MAX = BOARD_REV_COCO_A1
+ /**< Max board revision. */
+} boardRevCoco_t;
+
+/**
+ * \brief Coco board V2 revisions ID.
+ */
+typedef enum boardRevCocoV2
+{
+ BOARD_REV_COCOV2_MIN,
+ /**< Should be the first value of this enumeration. */
+ BOARD_REV_COCOV2_UNKNOWN = BOARD_REV_COCOV2_MIN,
+ /**< Unknown/unsupported board revision. */
+ BOARD_REV_COCOV2_A1,
+ /**< Board revision A1. */
+ BOARD_REV_COCOV2_MAX = BOARD_REV_COCOV2_A1
+ /**< Max board revision. */
+} boardRevCocoV2_t;
+
/** This is added to avoid lcd_device.h dependency **/
typedef struct lcdDeviceBoardData lcdDeviceBoardData_t;
--- ./pdk_am335x_1_0_12/packages/ti/drv/uart/src/v1/UART_v1.c 2018-10-06 04:45:37.000000000 +0200
+++ /mnt/c/ti/./pdk_am335x_1_0_12/packages/ti/drv/uart/src/v1/UART_v1.c 2019-07-15 14:57:59.442168400 +0200
@@ -205,11 +205,15 @@
readIn = (int32_t)UARTCharGetNonBlocking(hwAttrs->baseAddr);
/* Receive chars until empty or done. */
- while ((size != (int32_t)(0)) && (readIn != (-((int32_t)1))))
+ while (size != (int32_t)(0))
{
/* If data mode is set to TEXT replace return with a newline. */
if (object->params.readDataMode == UART_DATA_TEXT)
{
+ if ((uint8_t)(readIn & 0xFF) == (uint8_t)0xFF)
+ {
+ break;
+ }
if ((uint8_t)readIn == ((uint8_t)('\r')))
{
/* Echo character if enabled. */