diff options
author | Sinthu Raja M | 2019-05-19 23:49:04 -0500 |
---|---|---|
committer | Mahesh Radhakrishnan | 2019-06-11 14:44:51 -0500 |
commit | 920d56c374a1308546f7632615c454f877361a42 (patch) | |
tree | 6c7458e17543aca96d69951d106567708e77412b | |
parent | 7ea83abc1f6ad5100e6fb0a3d6f46e5ee1ceb310 (diff) | |
download | sd-mmc-920d56c374a1308546f7632615c454f877361a42.tar.gz sd-mmc-920d56c374a1308546f7632615c454f877361a42.tar.xz sd-mmc-920d56c374a1308546f7632615c454f877361a42.zip |
PRSDK-4453 Addressing review comments
Remove redundant config file added for SMP example.
Update the existing config file to include SMP configurations.
Remove driver components from config file for A53 core.
-rw-r--r-- | test/am572x/armv7/bios/MMCSD_evmAM572x_DMA_SMP_armTestProject.txt | 3 | ||||
-rw-r--r-- | test/am572x/armv7/bios/MMCSD_evmAM572x_SMP_armTestProject.txt | 3 | ||||
-rw-r--r-- | test/am572x/armv7/bios/mmcsd_evm.cfg | 25 | ||||
-rw-r--r-- | test/am572x/armv7/bios/mmcsd_evm_smp.cfg | 254 | ||||
-rw-r--r-- | test/am572x/armv7/bios/mmcsddma_evm.cfg | 25 | ||||
-rw-r--r-- | test/am572x/armv7/bios/mmcsddma_evm_smp.cfg | 265 | ||||
-rw-r--r-- | test/am65xx/a53/mmcsdUnitTest_a53.cfg | 26 |
7 files changed, 46 insertions, 555 deletions
diff --git a/test/am572x/armv7/bios/MMCSD_evmAM572x_DMA_SMP_armTestProject.txt b/test/am572x/armv7/bios/MMCSD_evmAM572x_DMA_SMP_armTestProject.txt index 5722a83..f8b7b05 100644 --- a/test/am572x/armv7/bios/MMCSD_evmAM572x_DMA_SMP_armTestProject.txt +++ b/test/am572x/armv7/bios/MMCSD_evmAM572x_DMA_SMP_armTestProject.txt | |||
@@ -3,6 +3,7 @@ | |||
3 | -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/mmcsd/test/src/profiling.c" | 3 | -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/mmcsd/test/src/profiling.c" |
4 | -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/uart/soc/am572x/UART_soc.c" | 4 | -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/uart/soc/am572x/UART_soc.c" |
5 | -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/gpio/soc/am572x/GPIO_soc.c" | 5 | -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/gpio/soc/am572x/GPIO_soc.c" |
6 | -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/mmcsd/test/am572x/armv7/bios/mmcsddma_evm_smp.cfg" | 6 | -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/mmcsd/test/am572x/armv7/bios/mmcsddma_evm.cfg" |
7 | -ccs.setCompilerOptions "-c -mcpu=cortex-a15 -mtune=cortex-a15 -marm -mfloat-abi=hard -DDRA7xx -DMMCSD_EDMA_ENABLED -DMEASURE_TIME -DSOC_AM572x -DevmAM572x -g -gstrict-dwarf -gdwarf-3 -finstrument-functions -Wall -MMD -MP -I${PDK_INSTALL_PATH}/ti/drv/mmcsd " -rtsc.enableRtsc | 7 | -ccs.setCompilerOptions "-c -mcpu=cortex-a15 -mtune=cortex-a15 -marm -mfloat-abi=hard -DDRA7xx -DMMCSD_EDMA_ENABLED -DMEASURE_TIME -DSOC_AM572x -DevmAM572x -g -gstrict-dwarf -gdwarf-3 -finstrument-functions -Wall -MMD -MP -I${PDK_INSTALL_PATH}/ti/drv/mmcsd " -rtsc.enableRtsc |
8 | -ccs.setLinkerOptions " -lrdimon -lgcc -lm -lnosys -nostartfiles -static -Wl,--gc-sections " | 8 | -ccs.setLinkerOptions " -lrdimon -lgcc -lm -lnosys -nostartfiles -static -Wl,--gc-sections " |
9 | -rtsc.setConfiguroOptions "--cfgArgs {SMP:\"enable\"}" | ||
diff --git a/test/am572x/armv7/bios/MMCSD_evmAM572x_SMP_armTestProject.txt b/test/am572x/armv7/bios/MMCSD_evmAM572x_SMP_armTestProject.txt index fe24bf4..4605635 100644 --- a/test/am572x/armv7/bios/MMCSD_evmAM572x_SMP_armTestProject.txt +++ b/test/am572x/armv7/bios/MMCSD_evmAM572x_SMP_armTestProject.txt | |||
@@ -3,6 +3,7 @@ | |||
3 | -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/mmcsd/test/src/profiling.c" | 3 | -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/mmcsd/test/src/profiling.c" |
4 | -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/uart/soc/am572x/UART_soc.c" | 4 | -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/uart/soc/am572x/UART_soc.c" |
5 | -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/gpio/soc/am572x/GPIO_soc.c" | 5 | -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/gpio/soc/am572x/GPIO_soc.c" |
6 | -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/mmcsd/test/am572x/armv7/bios/mmcsd_evm_smp.cfg" | 6 | -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/mmcsd/test/am572x/armv7/bios/mmcsd_evm.cfg" |
7 | -ccs.setCompilerOptions "-c -mcpu=cortex-a15 -mtune=cortex-a15 -marm -mfloat-abi=hard -DDRA7xx -DMEASURE_TIME -DSOC_AM572x -DevmAM572x -g -gstrict-dwarf -gdwarf-3 -finstrument-functions -Wall -MMD -MP -I${PDK_INSTALL_PATH}/ti/drv/mmcsd " -rtsc.enableRtsc | 7 | -ccs.setCompilerOptions "-c -mcpu=cortex-a15 -mtune=cortex-a15 -marm -mfloat-abi=hard -DDRA7xx -DMEASURE_TIME -DSOC_AM572x -DevmAM572x -g -gstrict-dwarf -gdwarf-3 -finstrument-functions -Wall -MMD -MP -I${PDK_INSTALL_PATH}/ti/drv/mmcsd " -rtsc.enableRtsc |
8 | -ccs.setLinkerOptions " -lrdimon -lgcc -lm -lnosys -nostartfiles -static -Wl,--gc-sections " | 8 | -ccs.setLinkerOptions " -lrdimon -lgcc -lm -lnosys -nostartfiles -static -Wl,--gc-sections " |
9 | -rtsc.setConfiguroOptions "--cfgArgs {SMP:\"enable\"}" | ||
diff --git a/test/am572x/armv7/bios/mmcsd_evm.cfg b/test/am572x/armv7/bios/mmcsd_evm.cfg index 7b9a527..d68143c 100644 --- a/test/am572x/armv7/bios/mmcsd_evm.cfg +++ b/test/am572x/armv7/bios/mmcsd_evm.cfg | |||
@@ -6,7 +6,7 @@ | |||
6 | */ | 6 | */ |
7 | 7 | ||
8 | /* | 8 | /* |
9 | * Copyright (C) 2015 Texas Instruments Incorporated - http://www.ti.com/ | 9 | * Copyright (C) 2015-2019 Texas Instruments Incorporated - http://www.ti.com/ |
10 | * | 10 | * |
11 | * Redistribution and use in source and binary forms, with or without | 11 | * Redistribution and use in source and binary forms, with or without |
12 | * modification, are permitted provided that the following conditions | 12 | * modification, are permitted provided that the following conditions |
@@ -139,6 +139,20 @@ if (Program.build.target.$name.match(/gnu/)) { | |||
139 | /* ================ BIOS configuration ================ */ | 139 | /* ================ BIOS configuration ================ */ |
140 | 140 | ||
141 | var BIOS = xdc.useModule('ti.sysbios.BIOS'); | 141 | var BIOS = xdc.useModule('ti.sysbios.BIOS'); |
142 | |||
143 | var smpCfg; | ||
144 | /* Enable SMP mode */ | ||
145 | if (Program.build.cfgArgs != null) | ||
146 | { | ||
147 | smpCfg = Program.build.cfgArgs.SMP; | ||
148 | if(smpCfg == 'enable') | ||
149 | { | ||
150 | xdc.print("Enabling BIOS SMP mode"); | ||
151 | BIOS.smpEnabled = true; | ||
152 | var Cache = xdc.module("ti.sysbios.hal.Cache"); | ||
153 | } | ||
154 | } | ||
155 | |||
142 | /* | 156 | /* |
143 | * Build a custom SYS/BIOS library from sources. | 157 | * Build a custom SYS/BIOS library from sources. |
144 | */ | 158 | */ |
@@ -207,11 +221,14 @@ Board.Settings.boardName = "evmAM572x"; | |||
207 | 221 | ||
208 | /* ================ Cache and MMU configuration ================ */ | 222 | /* ================ Cache and MMU configuration ================ */ |
209 | 223 | ||
210 | var Cache1 = xdc.useModule('ti.sysbios.family.arm.a15.Cache'); | ||
211 | var Mmu = xdc.useModule('ti.sysbios.family.arm.a15.Mmu'); | 224 | var Mmu = xdc.useModule('ti.sysbios.family.arm.a15.Mmu'); |
212 | 225 | ||
213 | /* Enable the cache */ | 226 | /* Enable the cache */ |
214 | Cache1.enableCache = true; | 227 | if(smpCfg == null || smpCfg == '') |
228 | { | ||
229 | var Cache = xdc.useModule('ti.sysbios.family.arm.a15.Cache'); | ||
230 | Cache.enableCache = true; | ||
231 | } | ||
215 | 232 | ||
216 | /* Enable the MMU (Required for L1 data caching) */ | 233 | /* Enable the MMU (Required for L1 data caching) */ |
217 | Mmu.enableMMU = true; | 234 | Mmu.enableMMU = true; |
diff --git a/test/am572x/armv7/bios/mmcsd_evm_smp.cfg b/test/am572x/armv7/bios/mmcsd_evm_smp.cfg deleted file mode 100644 index 127311a..0000000 --- a/test/am572x/armv7/bios/mmcsd_evm_smp.cfg +++ /dev/null | |||
@@ -1,254 +0,0 @@ | |||
1 | /** | ||
2 | * \file mmcsd_evm_smp.cfg | ||
3 | * | ||
4 | * \brief Sysbios config file for mmcsd test project on AM572X GP EVM | ||
5 | * with SMP enabled. | ||
6 | * | ||
7 | */ | ||
8 | |||
9 | /* | ||
10 | * Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com/ | ||
11 | * | ||
12 | * Redistribution and use in source and binary forms, with or without | ||
13 | * modification, are permitted provided that the following conditions | ||
14 | * are met: | ||
15 | * | ||
16 | * Redistributions of source code must retain the above copyright | ||
17 | * notice, this list of conditions and the following disclaimer. | ||
18 | * | ||
19 | * Redistributions in binary form must reproduce the above copyright | ||
20 | * notice, this list of conditions and the following disclaimer in the | ||
21 | * documentation and/or other materials provided with the | ||
22 | * distribution. | ||
23 | * | ||
24 | * Neither the name of Texas Instruments Incorporated nor the names of | ||
25 | * its contributors may be used to endorse or promote products derived | ||
26 | * from this software without specific prior written permission. | ||
27 | * | ||
28 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
29 | * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
30 | * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||
31 | * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
32 | * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
33 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
34 | * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
35 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
36 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
37 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
38 | * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
39 | * | ||
40 | */ | ||
41 | /* ================ General configuration ================ */ | ||
42 | var Defaults = xdc.useModule('xdc.runtime.Defaults'); | ||
43 | var Diags = xdc.useModule('xdc.runtime.Diags'); | ||
44 | var Error = xdc.useModule('xdc.runtime.Error'); | ||
45 | var Log = xdc.useModule('xdc.runtime.Log'); | ||
46 | var LoggerBuf = xdc.useModule('xdc.runtime.LoggerBuf'); | ||
47 | var Main = xdc.useModule('xdc.runtime.Main'); | ||
48 | var Memory = xdc.useModule('xdc.runtime.Memory') | ||
49 | var SysMin = xdc.useModule('xdc.runtime.SysMin'); | ||
50 | var System = xdc.useModule('xdc.runtime.System'); | ||
51 | var Text = xdc.useModule('xdc.runtime.Text'); | ||
52 | var Clock = xdc.useModule('ti.sysbios.knl.Clock'); | ||
53 | var Swi = xdc.useModule('ti.sysbios.knl.Swi'); | ||
54 | var Task = xdc.useModule('ti.sysbios.knl.Task'); | ||
55 | var Semaphore = xdc.useModule('ti.sysbios.knl.Semaphore'); | ||
56 | var Hwi = xdc.useModule('ti.sysbios.hal.Hwi'); | ||
57 | var ti_sysbios_family_arm_gic_Hwi = xdc.useModule('ti.sysbios.family.arm.gic.Hwi'); | ||
58 | var IntXbar = xdc.useModule('ti.sysbios.family.shared.vayu.IntXbar'); | ||
59 | |||
60 | /* | ||
61 | * Program.argSize sets the size of the .args section. | ||
62 | * The examples don't use command line args so argSize is set to 0. | ||
63 | */ | ||
64 | Program.argSize = 0x0; | ||
65 | |||
66 | |||
67 | /* System stack size (used by ISRs and Swis) */ | ||
68 | Program.stack = 0x20000; | ||
69 | |||
70 | /* | ||
71 | * Uncomment this line to globally disable Asserts. | ||
72 | * All modules inherit the default from the 'Defaults' module. You | ||
73 | * can override these defaults on a per-module basis using Module.common$. | ||
74 | * Disabling Asserts will save code space and improve runtime performance. | ||
75 | Defaults.common$.diags_ASSERT = Diags.ALWAYS_OFF; | ||
76 | */ | ||
77 | |||
78 | /* | ||
79 | * Uncomment this line to keep module names from being loaded on the target. | ||
80 | * The module name strings are placed in the .const section. Setting this | ||
81 | * parameter to false will save space in the .const section. Error and | ||
82 | * Assert messages will contain an "unknown module" prefix instead | ||
83 | * of the actual module name. | ||
84 | Defaults.common$.namedModule = false; | ||
85 | */ | ||
86 | |||
87 | /* | ||
88 | * Minimize exit handler array in System. The System module includes | ||
89 | * an array of functions that are registered with System_atexit() to be | ||
90 | * called by System_exit(). | ||
91 | */ | ||
92 | System.maxAtexitHandlers = 4; | ||
93 | System.extendedFormats += "%f"; | ||
94 | /* | ||
95 | * Uncomment this line to disable the Error print function. | ||
96 | * We lose error information when this is disabled since the errors are | ||
97 | * not printed. Disabling the raiseHook will save some code space if | ||
98 | * your app is not using System_printf() since the Error_print() function | ||
99 | * calls System_printf(). | ||
100 | Error.raiseHook = null; | ||
101 | */ | ||
102 | |||
103 | /* | ||
104 | * Uncomment this line to keep Error, Assert, and Log strings from being | ||
105 | * loaded on the target. These strings are placed in the .const section. | ||
106 | * Setting this parameter to false will save space in the .const section. | ||
107 | * Error, Assert and Log message will print raw ids and args instead of | ||
108 | * a formatted message. | ||
109 | Text.isLoaded = false; | ||
110 | */ | ||
111 | |||
112 | /* | ||
113 | * Uncomment this line to disable the output of characters by SysMin | ||
114 | * when the program exits. SysMin writes characters to a circular buffer. | ||
115 | * This buffer can be viewed using the SysMin Output view in ROV. | ||
116 | SysMin.flushAtExit = false; | ||
117 | */ | ||
118 | |||
119 | /* Circular buffer size for System_printf() */ | ||
120 | SysMin.bufSize = 0x200; | ||
121 | System.SupportProxy = SysMin; | ||
122 | |||
123 | /* | ||
124 | * Create and install logger for the whole system | ||
125 | */ | ||
126 | var loggerBufParams = new LoggerBuf.Params(); | ||
127 | loggerBufParams.numEntries = 16; | ||
128 | var logger0 = LoggerBuf.create(loggerBufParams); | ||
129 | Defaults.common$.logger = logger0; | ||
130 | Main.common$.diags_INFO = Diags.ALWAYS_ON; | ||
131 | |||
132 | if (Program.build.target.$name.match(/gnu/)) { | ||
133 | if (Program.build.target.$name.match(/A8F/) || | ||
134 | Program.build.target.$name.match(/A9F/) || | ||
135 | Program.build.target.$name.match(/A15F/)) { | ||
136 | var SemiHost = xdc.useModule('ti.sysbios.rts.gnu.SemiHostSupport'); | ||
137 | } | ||
138 | } | ||
139 | |||
140 | /* ================ BIOS configuration ================ */ | ||
141 | |||
142 | var BIOS = xdc.useModule('ti.sysbios.BIOS'); | ||
143 | /* | ||
144 | * Build a custom SYS/BIOS library from sources. | ||
145 | */ | ||
146 | BIOS.libType = BIOS.LibType_Custom; | ||
147 | |||
148 | /* | ||
149 | * The BIOS module will create the default heap for the system. | ||
150 | * Specify the size of this default heap. | ||
151 | */ | ||
152 | BIOS.heapSize = 0x1000; | ||
153 | |||
154 | /* Enable SMP in BIOS */ | ||
155 | BIOS.smpEnabled = true; | ||
156 | |||
157 | /* ================ Task configuration ================ */ | ||
158 | |||
159 | /* Define and add one Task Hook Set */ | ||
160 | Task.addHookSet({ | ||
161 | registerFxn: '&TaskRegisterId', | ||
162 | switchFxn: '&mySwitch', | ||
163 | }); | ||
164 | |||
165 | |||
166 | /* No runtime stack checking is performed */ | ||
167 | Task.checkStackFlag = false; | ||
168 | |||
169 | |||
170 | /* Reduce the number of task priorities */ | ||
171 | Task.numPriorities = 4; | ||
172 | |||
173 | /* ================ Driver configuration ================ */ | ||
174 | var socType = "am572x"; | ||
175 | /*use CSL package*/ | ||
176 | var Csl = xdc.loadPackage('ti.csl'); | ||
177 | Csl.Settings.deviceType = socType; | ||
178 | |||
179 | /* Load the OSAL package */ | ||
180 | var osType = "tirtos" | ||
181 | var Osal = xdc.useModule('ti.osal.Settings'); | ||
182 | Osal.osType = osType; | ||
183 | Osal.socType = socType; | ||
184 | |||
185 | /* Load Profiling package */ | ||
186 | var Utils = xdc.loadPackage('ti.utils.profiling'); | ||
187 | |||
188 | /* Load the MMCSD package */ | ||
189 | var Mmcsd = xdc.loadPackage('ti.drv.mmcsd'); | ||
190 | Mmcsd.Settings.enableProfiling = true; | ||
191 | var Fatfs = xdc.loadPackage('ti.fs.fatfs'); | ||
192 | |||
193 | /* Load the GPIO package */ | ||
194 | var GPIO = xdc.loadPackage('ti.drv.gpio'); | ||
195 | |||
196 | /* Load the UART package */ | ||
197 | var UART = xdc.loadPackage('ti.drv.uart'); | ||
198 | |||
199 | /* Load the I2C package */ | ||
200 | var I2C = xdc.loadPackage('ti.drv.i2c'); | ||
201 | I2C.Settings.socType = socType; | ||
202 | |||
203 | /* Load the PM package */ | ||
204 | var pm = xdc.loadPackage('ti.drv.pm'); | ||
205 | pm.Settings.socType="am572x"; | ||
206 | |||
207 | /* Load the Board package and set the board name */ | ||
208 | var Board = xdc.loadPackage('ti.board'); | ||
209 | Board.Settings.boardName = "evmAM572x"; | ||
210 | |||
211 | /* ================ Cache and MMU configuration ================ */ | ||
212 | |||
213 | var Cache1 = xdc.useModule('ti.sysbios.hal.Cache'); | ||
214 | var Mmu = xdc.useModule('ti.sysbios.family.arm.a15.Mmu'); | ||
215 | |||
216 | /* Enable the MMU (Required for L1 data caching) */ | ||
217 | Mmu.enableMMU = true; | ||
218 | |||
219 | /* Map MMC1 regs in MMU */ | ||
220 | var peripheralAttrs = new Mmu.DescriptorAttrs(); | ||
221 | Mmu.initDescAttrsMeta(peripheralAttrs); | ||
222 | peripheralAttrs.type = Mmu.DescriptorType_BLOCK; // BLOCK descriptor | ||
223 | peripheralAttrs.noExecute = true; // not executable | ||
224 | peripheralAttrs.accPerm = 0; // read/write at PL1 | ||
225 | peripheralAttrs.attrIndx = 1; // MAIR0 Byte1 describes | ||
226 | // memory attributes for | ||
227 | // each BLOCK MMU entry | ||
228 | var peripheralBaseAddr = 0x4ae00000; | ||
229 | // Configure the corresponding MMU page descriptor accordingly | ||
230 | Mmu.setSecondLevelDescMeta(peripheralBaseAddr, | ||
231 | peripheralBaseAddr, | ||
232 | peripheralAttrs); | ||
233 | |||
234 | var attrs = new Mmu.DescriptorAttrs(); | ||
235 | Mmu.initDescAttrsMeta(attrs); | ||
236 | attrs.type = Mmu.DescriptorType_BLOCK; | ||
237 | attrs.noExecute = true; | ||
238 | attrs.accPerm = 0; | ||
239 | attrs.attrIndx = 1; | ||
240 | |||
241 | /* Set IO Delay configuration areas as non-cache */ | ||
242 | Mmu.setSecondLevelDescMeta(0x4844a000, 0x4844a000, attrs); | ||
243 | Mmu.setSecondLevelDescMeta(0x4ae07d00, 0x4ae07d00, attrs); | ||
244 | |||
245 | /* Make PBAIS register in the controller module accessible */ | ||
246 | Mmu.setSecondLevelDescMeta(0x4a002da0, 0x4a002da0, attrs); | ||
247 | |||
248 | |||
249 | /* ================ Memory sections configuration ================ */ | ||
250 | Program.sectMap["BOARD_IO_DELAY_DATA"] = "OCMC_RAM1"; | ||
251 | Program.sectMap["BOARD_IO_DELAY_CODE"] = "OCMC_RAM1"; | ||
252 | Program.sectMap[".bss:.tx_buf"] = "EXT_RAM"; | ||
253 | Program.sectMap[".bss:.rx_buf"] = "EXT_RAM"; | ||
254 | |||
diff --git a/test/am572x/armv7/bios/mmcsddma_evm.cfg b/test/am572x/armv7/bios/mmcsddma_evm.cfg index 4dcd1ca..2a4b71b 100644 --- a/test/am572x/armv7/bios/mmcsddma_evm.cfg +++ b/test/am572x/armv7/bios/mmcsddma_evm.cfg | |||
@@ -6,7 +6,7 @@ | |||
6 | */ | 6 | */ |
7 | 7 | ||
8 | /* | 8 | /* |
9 | * Copyright (C) 2015 Texas Instruments Incorporated - http://www.ti.com/ | 9 | * Copyright (C) 2015-2019 Texas Instruments Incorporated - http://www.ti.com/ |
10 | * | 10 | * |
11 | * Redistribution and use in source and binary forms, with or without | 11 | * Redistribution and use in source and binary forms, with or without |
12 | * modification, are permitted provided that the following conditions | 12 | * modification, are permitted provided that the following conditions |
@@ -139,6 +139,20 @@ if (Program.build.target.$name.match(/gnu/)) { | |||
139 | /* ================ BIOS configuration ================ */ | 139 | /* ================ BIOS configuration ================ */ |
140 | 140 | ||
141 | var BIOS = xdc.useModule('ti.sysbios.BIOS'); | 141 | var BIOS = xdc.useModule('ti.sysbios.BIOS'); |
142 | |||
143 | var smpCfg; | ||
144 | /* Enable SMP mode */ | ||
145 | if (Program.build.cfgArgs != null) | ||
146 | { | ||
147 | smpCfg = Program.build.cfgArgs.SMP; | ||
148 | if(smpCfg == 'enable') | ||
149 | { | ||
150 | xdc.print("Enabling BIOS SMP mode"); | ||
151 | BIOS.smpEnabled = true; | ||
152 | var Cache = xdc.module("ti.sysbios.hal.Cache"); | ||
153 | } | ||
154 | } | ||
155 | |||
142 | /* | 156 | /* |
143 | * Build a custom SYS/BIOS library from sources. | 157 | * Build a custom SYS/BIOS library from sources. |
144 | */ | 158 | */ |
@@ -214,11 +228,14 @@ Board.Settings.boardName = "evmAM572x"; | |||
214 | 228 | ||
215 | /* ================ Cache and MMU configuration ================ */ | 229 | /* ================ Cache and MMU configuration ================ */ |
216 | 230 | ||
217 | var Cache1 = xdc.useModule('ti.sysbios.family.arm.a15.Cache'); | ||
218 | var Mmu = xdc.useModule('ti.sysbios.family.arm.a15.Mmu'); | 231 | var Mmu = xdc.useModule('ti.sysbios.family.arm.a15.Mmu'); |
219 | 232 | ||
220 | /* Enable the cache */ | 233 | /* Enable the cache */ |
221 | Cache1.enableCache = true; | 234 | if(smpCfg == null || smpCfg == '') |
235 | { | ||
236 | var Cache = xdc.useModule('ti.sysbios.family.arm.a15.Cache'); | ||
237 | Cache.enableCache = true; | ||
238 | } | ||
222 | 239 | ||
223 | /* Enable the MMU (Required for L1 data caching) */ | 240 | /* Enable the MMU (Required for L1 data caching) */ |
224 | Mmu.enableMMU = true; | 241 | Mmu.enableMMU = true; |
diff --git a/test/am572x/armv7/bios/mmcsddma_evm_smp.cfg b/test/am572x/armv7/bios/mmcsddma_evm_smp.cfg deleted file mode 100644 index 44e9498..0000000 --- a/test/am572x/armv7/bios/mmcsddma_evm_smp.cfg +++ /dev/null | |||
@@ -1,265 +0,0 @@ | |||
1 | /** | ||
2 | * \file mmcsddma_evm_smp.cfg | ||
3 | * | ||
4 | * \brief Sysbios config file for mmcsd dma test project on AM572X GP EVM | ||
5 | * with SMP enabled. | ||
6 | * | ||
7 | */ | ||
8 | |||
9 | /* | ||
10 | * Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com/ | ||
11 | * | ||
12 | * Redistribution and use in source and binary forms, with or without | ||
13 | * modification, are permitted provided that the following conditions | ||
14 | * are met: | ||
15 | * | ||
16 | * Redistributions of source code must retain the above copyright | ||
17 | * notice, this list of conditions and the following disclaimer. | ||
18 | * | ||
19 | * Redistributions in binary form must reproduce the above copyright | ||
20 | * notice, this list of conditions and the following disclaimer in the | ||
21 | * documentation and/or other materials provided with the | ||
22 | * distribution. | ||
23 | * | ||
24 | * Neither the name of Texas Instruments Incorporated nor the names of | ||
25 | * its contributors may be used to endorse or promote products derived | ||
26 | * from this software without specific prior written permission. | ||
27 | * | ||
28 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
29 | * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
30 | * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||
31 | * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
32 | * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
33 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
34 | * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
35 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
36 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
37 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
38 | * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
39 | * | ||
40 | */ | ||
41 | /* ================ General configuration ================ */ | ||
42 | var Defaults = xdc.useModule('xdc.runtime.Defaults'); | ||
43 | var Diags = xdc.useModule('xdc.runtime.Diags'); | ||
44 | var Error = xdc.useModule('xdc.runtime.Error'); | ||
45 | var Log = xdc.useModule('xdc.runtime.Log'); | ||
46 | var LoggerBuf = xdc.useModule('xdc.runtime.LoggerBuf'); | ||
47 | var Main = xdc.useModule('xdc.runtime.Main'); | ||
48 | var Memory = xdc.useModule('xdc.runtime.Memory') | ||
49 | var SysMin = xdc.useModule('xdc.runtime.SysMin'); | ||
50 | var System = xdc.useModule('xdc.runtime.System'); | ||
51 | var Text = xdc.useModule('xdc.runtime.Text'); | ||
52 | var Clock = xdc.useModule('ti.sysbios.knl.Clock'); | ||
53 | var Swi = xdc.useModule('ti.sysbios.knl.Swi'); | ||
54 | var Task = xdc.useModule('ti.sysbios.knl.Task'); | ||
55 | var Semaphore = xdc.useModule('ti.sysbios.knl.Semaphore'); | ||
56 | var Hwi = xdc.useModule('ti.sysbios.hal.Hwi'); | ||
57 | var ti_sysbios_family_arm_gic_Hwi = xdc.useModule('ti.sysbios.family.arm.gic.Hwi'); | ||
58 | var IntXbar = xdc.useModule('ti.sysbios.family.shared.vayu.IntXbar'); | ||
59 | |||
60 | /* | ||
61 | * Program.argSize sets the size of the .args section. | ||
62 | * The examples don't use command line args so argSize is set to 0. | ||
63 | */ | ||
64 | Program.argSize = 0x0; | ||
65 | |||
66 | |||
67 | /* System stack size (used by ISRs and Swis) */ | ||
68 | Program.stack = 0x20000; | ||
69 | |||
70 | /* | ||
71 | * Uncomment this line to globally disable Asserts. | ||
72 | * All modules inherit the default from the 'Defaults' module. You | ||
73 | * can override these defaults on a per-module basis using Module.common$. | ||
74 | * Disabling Asserts will save code space and improve runtime performance. | ||
75 | Defaults.common$.diags_ASSERT = Diags.ALWAYS_OFF; | ||
76 | */ | ||
77 | |||
78 | /* | ||
79 | * Uncomment this line to keep module names from being loaded on the target. | ||
80 | * The module name strings are placed in the .const section. Setting this | ||
81 | * parameter to false will save space in the .const section. Error and | ||
82 | * Assert messages will contain an "unknown module" prefix instead | ||
83 | * of the actual module name. | ||
84 | Defaults.common$.namedModule = false; | ||
85 | */ | ||
86 | |||
87 | /* | ||
88 | * Minimize exit handler array in System. The System module includes | ||
89 | * an array of functions that are registered with System_atexit() to be | ||
90 | * called by System_exit(). | ||
91 | */ | ||
92 | System.maxAtexitHandlers = 4; | ||
93 | |||
94 | /* | ||
95 | * Uncomment this line to disable the Error print function. | ||
96 | * We lose error information when this is disabled since the errors are | ||
97 | * not printed. Disabling the raiseHook will save some code space if | ||
98 | * your app is not using System_printf() since the Error_print() function | ||
99 | * calls System_printf(). | ||
100 | Error.raiseHook = null; | ||
101 | */ | ||
102 | |||
103 | /* | ||
104 | * Uncomment this line to keep Error, Assert, and Log strings from being | ||
105 | * loaded on the target. These strings are placed in the .const section. | ||
106 | * Setting this parameter to false will save space in the .const section. | ||
107 | * Error, Assert and Log message will print raw ids and args instead of | ||
108 | * a formatted message. | ||
109 | Text.isLoaded = false; | ||
110 | */ | ||
111 | |||
112 | /* | ||
113 | * Uncomment this line to disable the output of characters by SysMin | ||
114 | * when the program exits. SysMin writes characters to a circular buffer. | ||
115 | * This buffer can be viewed using the SysMin Output view in ROV. | ||
116 | SysMin.flushAtExit = false; | ||
117 | */ | ||
118 | |||
119 | /* Circular buffer size for System_printf() */ | ||
120 | SysMin.bufSize = 0x200; | ||
121 | System.SupportProxy = SysMin; | ||
122 | System.extendedFormats += "%f"; | ||
123 | /* | ||
124 | * Create and install logger for the whole system | ||
125 | */ | ||
126 | var loggerBufParams = new LoggerBuf.Params(); | ||
127 | loggerBufParams.numEntries = 16; | ||
128 | var logger0 = LoggerBuf.create(loggerBufParams); | ||
129 | Defaults.common$.logger = logger0; | ||
130 | Main.common$.diags_INFO = Diags.ALWAYS_ON; | ||
131 | |||
132 | if (Program.build.target.$name.match(/gnu/)) { | ||
133 | if (Program.build.target.$name.match(/A8F/) || | ||
134 | Program.build.target.$name.match(/A9F/) || | ||
135 | Program.build.target.$name.match(/A15F/)) { | ||
136 | var SemiHost = xdc.useModule('ti.sysbios.rts.gnu.SemiHostSupport'); | ||
137 | } | ||
138 | } | ||
139 | |||
140 | /* ================ BIOS configuration ================ */ | ||
141 | |||
142 | var BIOS = xdc.useModule('ti.sysbios.BIOS'); | ||
143 | /* | ||
144 | * Build a custom SYS/BIOS library from sources. | ||
145 | */ | ||
146 | BIOS.libType = BIOS.LibType_Custom; | ||
147 | |||
148 | /* | ||
149 | * The BIOS module will create the default heap for the system. | ||
150 | * Specify the size of this default heap. | ||
151 | */ | ||
152 | BIOS.heapSize = 0x1000; | ||
153 | |||
154 | /* Enable SMP in BIOS */ | ||
155 | BIOS.smpEnabled = true; | ||
156 | |||
157 | /* ================ Task configuration ================ */ | ||
158 | |||
159 | /* Define and add one Task Hook Set */ | ||
160 | Task.addHookSet({ | ||
161 | registerFxn: '&TaskRegisterId', | ||
162 | switchFxn: '&mySwitch', | ||
163 | }); | ||
164 | |||
165 | /* No runtime stack checking is performed */ | ||
166 | Task.checkStackFlag = false; | ||
167 | |||
168 | |||
169 | /* Reduce the number of task priorities */ | ||
170 | Task.numPriorities = 4; | ||
171 | |||
172 | /* ================ Driver configuration ================ */ | ||
173 | |||
174 | var Edma = xdc.loadPackage ("ti.sdo.edma3.drv.sample"); | ||
175 | var drv = xdc.loadPackage ("ti.sdo.edma3.drv"); | ||
176 | var rm = xdc.loadPackage ("ti.sdo.edma3.rm"); | ||
177 | |||
178 | var socType = "am572x"; | ||
179 | /*use CSL package*/ | ||
180 | var Csl = xdc.loadPackage('ti.csl'); | ||
181 | Csl.Settings.deviceType = socType; | ||
182 | |||
183 | /* Load the OSAL package */ | ||
184 | var osType = "tirtos" | ||
185 | var Osal = xdc.useModule('ti.osal.Settings'); | ||
186 | Osal.osType = osType; | ||
187 | Osal.socType = socType; | ||
188 | /* Load Profiling package */ | ||
189 | var Utils = xdc.loadPackage('ti.utils.profiling'); | ||
190 | |||
191 | /* Load the MMCSD package */ | ||
192 | var Mmcsd = xdc.loadPackage('ti.drv.mmcsd'); | ||
193 | Mmcsd.Settings.enableProfiling = true; | ||
194 | Mmcsd.Settings.useDma = "true"; | ||
195 | Mmcsd.Settings.socType = socType; | ||
196 | |||
197 | var Fatfs = xdc.loadPackage('ti.fs.fatfs'); | ||
198 | |||
199 | /* Load the GPIO package */ | ||
200 | var GPIO = xdc.loadPackage('ti.drv.gpio'); | ||
201 | |||
202 | /* Load the UART package */ | ||
203 | var UART = xdc.loadPackage('ti.drv.uart'); | ||
204 | |||
205 | /* Load the I2C package */ | ||
206 | var I2C = xdc.loadPackage('ti.drv.i2c'); | ||
207 | I2C.Settings.socType = socType; | ||
208 | |||
209 | /* Load the PM package */ | ||
210 | var pm = xdc.loadPackage('ti.drv.pm'); | ||
211 | pm.Settings.socType="am572x"; | ||
212 | |||
213 | /* Load the Board package and set the board name */ | ||
214 | var Board = xdc.loadPackage('ti.board'); | ||
215 | Board.Settings.boardName = "evmAM572x"; | ||
216 | |||
217 | /* ================ Cache and MMU configuration ================ */ | ||
218 | |||
219 | var Cache = xdc.useModule('ti.sysbios.hal.Cache'); | ||
220 | var Mmu = xdc.useModule('ti.sysbios.family.arm.a15.Mmu'); | ||
221 | |||
222 | /* Enable the MMU (Required for L1 data caching) */ | ||
223 | Mmu.enableMMU = true; | ||
224 | |||
225 | /* Map MMC1 regs in MMU */ | ||
226 | var peripheralAttrs = new Mmu.DescriptorAttrs(); | ||
227 | Mmu.initDescAttrsMeta(peripheralAttrs); | ||
228 | peripheralAttrs.type = Mmu.DescriptorType_BLOCK; // BLOCK descriptor | ||
229 | peripheralAttrs.noExecute = true; // not executable | ||
230 | peripheralAttrs.accPerm = 0; // read/write at PL1 | ||
231 | peripheralAttrs.attrIndx = 1; // MAIR0 Byte1 describes | ||
232 | // memory attributes for | ||
233 | // each BLOCK MMU entry | ||
234 | var peripheralBaseAddr = 0x4ae00000; | ||
235 | // Configure the corresponding MMU page descriptor accordingly | ||
236 | Mmu.setSecondLevelDescMeta(peripheralBaseAddr, | ||
237 | peripheralBaseAddr, | ||
238 | peripheralAttrs); | ||
239 | |||
240 | // Configure the corresponding MMU page descriptor accordingly | ||
241 | Mmu.setSecondLevelDescMeta(0x43300000, | ||
242 | 0x43300000, | ||
243 | peripheralAttrs); | ||
244 | |||
245 | var attrs = new Mmu.DescriptorAttrs(); | ||
246 | Mmu.initDescAttrsMeta(attrs); | ||
247 | attrs.type = Mmu.DescriptorType_BLOCK; | ||
248 | attrs.noExecute = true; | ||
249 | attrs.accPerm = 0; | ||
250 | attrs.attrIndx = 1; | ||
251 | |||
252 | /* Set IO Delay configuration areas as non-cache */ | ||
253 | Mmu.setSecondLevelDescMeta(0x4844a000, 0x4844a000, attrs); | ||
254 | Mmu.setSecondLevelDescMeta(0x4ae07d00, 0x4ae07d00, attrs); | ||
255 | |||
256 | /* Make PBAIS register in the controller module accessible */ | ||
257 | Mmu.setSecondLevelDescMeta(0x4a002da0, 0x4a002da0, attrs); | ||
258 | |||
259 | |||
260 | /* ================ Memory sections configuration ================ */ | ||
261 | Program.sectMap["BOARD_IO_DELAY_DATA"] = "OCMC_RAM1"; | ||
262 | Program.sectMap["BOARD_IO_DELAY_CODE"] = "OCMC_RAM1"; | ||
263 | Program.sectMap[".bss:.tx_buf"] = "EXT_RAM"; | ||
264 | Program.sectMap[".bss:.rx_buf"] = "EXT_RAM"; | ||
265 | |||
diff --git a/test/am65xx/a53/mmcsdUnitTest_a53.cfg b/test/am65xx/a53/mmcsdUnitTest_a53.cfg index 4ba1ba8..1979bf4 100644 --- a/test/am65xx/a53/mmcsdUnitTest_a53.cfg +++ b/test/am65xx/a53/mmcsdUnitTest_a53.cfg | |||
@@ -212,29 +212,3 @@ Program.sectMap[".ti_sysbios_family_arm_v8a_Mmu_tableArray"] = "MSMC_SRAM"; | |||
212 | //Program.sectMap[".c_int00"] = "MSMC_SRAM"; | 212 | //Program.sectMap[".c_int00"] = "MSMC_SRAM"; |
213 | Program.sectMap[".bss:.tx_buf"] = "DDR_0"; | 213 | Program.sectMap[".bss:.tx_buf"] = "DDR_0"; |
214 | Program.sectMap[".bss:.rx_buf"] = "DDR_0"; | 214 | Program.sectMap[".bss:.rx_buf"] = "DDR_0"; |
215 | |||
216 | /* ================ Driver configuration ================ */ | ||
217 | var Csl = xdc.loadPackage('ti.csl'); | ||
218 | var deviceType = "am65xx"; | ||
219 | var boardName = "am65xx_evm"; | ||
220 | Csl.Settings.deviceType = deviceType; | ||
221 | |||
222 | var socType = "am65xx"; | ||
223 | /* Load the OSAL package */ | ||
224 | var osType = "tirtos" | ||
225 | var Osal = xdc.useModule('ti.osal.Settings'); | ||
226 | Osal.osType = osType; | ||
227 | |||
228 | /* Load the UDMA package */ | ||
229 | /* UDMA */ | ||
230 | var Udma = xdc.loadPackage('ti.drv.udma'); | ||
231 | Udma.Settings.socType = socType; | ||
232 | Udma.Settings.libProfile = "release"; | ||
233 | |||
234 | /* Load the MMCSD package */ | ||
235 | var mmcsd = xdc.loadPackage('ti.drv.mmcsd'); | ||
236 | mmcsd.Settings.socType = socType; | ||
237 | |||
238 | /* Load the UART package */ | ||
239 | var UART = xdc.loadPackage('ti.drv.uart'); | ||
240 | UART.Settings.socType = socType; \ No newline at end of file | ||