summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSivaraj R2019-02-07 11:55:17 -0600
committerSivaraj R2019-02-07 11:55:17 -0600
commit2206534c227892a58c4fb4e54ca0c93fe3147f45 (patch)
treeb5229e94da2bc1db9465f13b991c01547253e63b
parentf045d233e1aa92c3c1e30f8ba2ee8119d4e5c04c (diff)
parent4f6217f758e97f49336157f3dbb6dffc2302971c (diff)
downloadsd-mmc-2206534c227892a58c4fb4e54ca0c93fe3147f45.tar.gz
sd-mmc-2206534c227892a58c4fb4e54ca0c93fe3147f45.tar.xz
sd-mmc-2206534c227892a58c4fb4e54ca0c93fe3147f45.zip
Merge pull request #119 in PROCESSOR-SDK/sd-mmc from review_j721e_sivaraj to master
* commit '4f6217f758e97f49336157f3dbb6dffc2302971c': PDK-3586: J7 to J721E
Diffstat
-rw-r--r--build/makefile.mk12
-rw-r--r--build/makefile_dma.mk10
-rw-r--r--build/makefile_dma_profile.mk8
-rw-r--r--build/makefile_indp.mk2
-rw-r--r--build/makefile_profile.mk8
-rw-r--r--build/makefile_profile_indp.mk2
-rw-r--r--mmcsd_component.mk24
-rw-r--r--package.xs282
-rw-r--r--soc/MMCSD_soc.h4
-rw-r--r--soc/j721e/MMCSD_soc.c (renamed from soc/j7/MMCSD_soc.c)0
-rw-r--r--src/src_files_common.mk2
-rw-r--r--test/MMCSD_Baremetal_DMA_TestApp/makefile4
-rw-r--r--test/MMCSD_Baremetal_DMA_TestProject/makefile4
-rw-r--r--test/MMCSD_Baremetal_EMMC_DMA_TestApp/makefile4
-rw-r--r--test/MMCSD_Baremetal_EMMC_DMA_TestProject/makefile4
-rw-r--r--test/MMCSD_Baremetal_EMMC_TestApp/makefile4
-rw-r--r--test/MMCSD_Baremetal_EMMC_TestProject/makefile4
-rw-r--r--test/MMCSD_Baremetal_TestApp/makefile4
-rw-r--r--test/MMCSD_Baremetal_TestProject/makefile4
-rw-r--r--test/MMCSD_DMA_TestApp/makefile12
-rw-r--r--test/MMCSD_DMA_TestProject/makefile12
-rw-r--r--test/MMCSD_EMMC_DMA_TestApp/makefile12
-rw-r--r--test/MMCSD_EMMC_DMA_TestProject/makefile12
-rw-r--r--test/MMCSD_EMMC_Regression_TestApp/makefile12
-rw-r--r--test/MMCSD_EMMC_TestApp/makefile12
-rw-r--r--test/MMCSD_EMMC_TestProject/makefile12
-rw-r--r--test/MMCSD_Regression_TestApp/makefile12
-rw-r--r--test/MMCSD_TestApp/makefile12
-rw-r--r--test/MMCSD_TestProject/makefile12
-rw-r--r--test/j721e/a72/mmcsdUnitTest_a72.cfg (renamed from test/j7/a72/mmcsdUnitTest_a72.cfg)0
-rw-r--r--test/j721e/r5f/mmcsdUnitTest_r5f.cfg (renamed from test/j7/r5f/mmcsdUnitTest_r5f.cfg)0
-rw-r--r--test/j721e/r5f/mpu.xs (renamed from test/j7/r5f/mpu.xs)0
-rw-r--r--test/src/MMCSD_log.h2
-rw-r--r--test/src/main.c28
-rw-r--r--test/src/main_emmc.c30
35 files changed, 283 insertions, 283 deletions
diff --git a/build/makefile.mk b/build/makefile.mk
index 6dc9f13..3e231b6 100644
--- a/build/makefile.mk
+++ b/build/makefile.mk
@@ -35,13 +35,13 @@ include $(PDK_MMCSD_COMP_PATH)/src/src_files_common.mk
35 35
36MODULE_NAME = mmcsd 36MODULE_NAME = mmcsd
37 37
38ifeq ($(SOC),$(filter $(SOC), dra72x dra75x dra78x k2g am437x am335x omapl137 omapl138 am65xx j7)) 38ifeq ($(SOC),$(filter $(SOC), dra72x dra75x dra78x k2g am437x am335x omapl137 omapl138 am65xx j721e))
39SOC_DIR=$(SOC) 39SOC_DIR=$(SOC)
40else ifeq ($(SOC),$(filter $(SOC), am571x am572x am574x)) 40else ifeq ($(SOC),$(filter $(SOC), am571x am572x am574x))
41SOC_DIR=am57xx 41SOC_DIR=am57xx
42endif 42endif
43 43
44ifeq ($(SOC),$(filter $(SOC), dra72x dra75x dra78x am571x am572x am574x k2g am437x am335x omapl137 omapl138 am65xx j7)) 44ifeq ($(SOC),$(filter $(SOC), dra72x dra75x dra78x am571x am572x am574x k2g am437x am335x omapl137 omapl138 am65xx j721e))
45SRCDIR += soc/$(SOC_DIR) 45SRCDIR += soc/$(SOC_DIR)
46INCDIR += soc 46INCDIR += soc
47SRCS_COMMON += MMCSD_soc.c 47SRCS_COMMON += MMCSD_soc.c
@@ -51,17 +51,17 @@ endif
51# need to be included for this component 51# need to be included for this component
52INCLUDE_EXTERNAL_INTERFACES = pdk 52INCLUDE_EXTERNAL_INTERFACES = pdk
53 53
54ifneq ($(SOC),$(filter $(SOC), am65xx j7)) 54ifneq ($(SOC),$(filter $(SOC), am65xx j721e))
55INCLUDE_EXTERNAL_INTERFACES += edma 55INCLUDE_EXTERNAL_INTERFACES += edma
56endif 56endif
57 57
58ifeq ($(SOC),$(filter $(SOC), dra72x dra75x dra78x am571x am572x am574x k2g am437x am335x omapl137 omapl138 am65xx j7)) 58ifeq ($(SOC),$(filter $(SOC), dra72x dra75x dra78x am571x am572x am574x k2g am437x am335x omapl137 omapl138 am65xx j721e))
59PACKAGE_SRCS_COMMON += soc/$(SOC_DIR) 59PACKAGE_SRCS_COMMON += soc/$(SOC_DIR)
60endif 60endif
61 61
62CFLAGS_LOCAL_COMMON = $(PDK_CFLAGS) 62CFLAGS_LOCAL_COMMON = $(PDK_CFLAGS)
63ifeq ($(BOARD), simJ7) 63ifeq ($(BOARD), j721e_sim)
64CFLAGS_LOCAL_COMMON += $(CFLAGS_GLOBAL_simJ7) 64CFLAGS_LOCAL_COMMON += $(CFLAGS_GLOBAL_j721e_sim)
65endif 65endif
66 66
67# Include common make files 67# Include common make files
diff --git a/build/makefile_dma.mk b/build/makefile_dma.mk
index 2b8cb76..9ff819e 100644
--- a/build/makefile_dma.mk
+++ b/build/makefile_dma.mk
@@ -35,13 +35,13 @@ include $(PDK_MMCSD_COMP_PATH)/src/src_files_common.mk
35 35
36MODULE_NAME = mmcsd_dma 36MODULE_NAME = mmcsd_dma
37 37
38ifeq ($(SOC),$(filter $(SOC), dra72x dra75x dra78x k2g am437x am335x am65xx j7)) 38ifeq ($(SOC),$(filter $(SOC), dra72x dra75x dra78x k2g am437x am335x am65xx j721e))
39SOC_DIR=$(SOC) 39SOC_DIR=$(SOC)
40else ifeq ($(SOC),$(filter $(SOC), am571x am572x am574x)) 40else ifeq ($(SOC),$(filter $(SOC), am571x am572x am574x))
41SOC_DIR=am57xx 41SOC_DIR=am57xx
42endif 42endif
43 43
44ifeq ($(SOC),$(filter $(SOC), dra72x dra75x dra78x am571x am572x am574x k2g am437x am335x am65xx j7)) 44ifeq ($(SOC),$(filter $(SOC), dra72x dra75x dra78x am571x am572x am574x k2g am437x am335x am65xx j721e))
45SRCDIR += soc/$(SOC_DIR) 45SRCDIR += soc/$(SOC_DIR)
46INCDIR += soc 46INCDIR += soc
47SRCS_COMMON += MMCSD_soc.c 47SRCS_COMMON += MMCSD_soc.c
@@ -51,16 +51,16 @@ endif
51# need to be included for this component 51# need to be included for this component
52INCLUDE_EXTERNAL_INTERFACES = pdk 52INCLUDE_EXTERNAL_INTERFACES = pdk
53 53
54ifneq ($(SOC),$(filter $(SOC), am65xx j7)) 54ifneq ($(SOC),$(filter $(SOC), am65xx j721e))
55INCLUDE_EXTERNAL_INTERFACES += edma 55INCLUDE_EXTERNAL_INTERFACES += edma
56endif 56endif
57 57
58ifeq ($(SOC),$(filter $(SOC), dra72x dra75x dra78x am571x am572x am574x k2g am437x am335x am65xx j7)) 58ifeq ($(SOC),$(filter $(SOC), dra72x dra75x dra78x am571x am572x am574x k2g am437x am335x am65xx j721e))
59PACKAGE_SRCS_COMMON += soc/$(SOC_DIR) 59PACKAGE_SRCS_COMMON += soc/$(SOC_DIR)
60endif 60endif
61 61
62 62
63ifeq ($(SOC),$(filter $(SOC), am65xx j7)) 63ifeq ($(SOC),$(filter $(SOC), am65xx j721e))
64CFLAGS_LOCAL_COMMON = $(PDK_CFLAGS) 64CFLAGS_LOCAL_COMMON = $(PDK_CFLAGS)
65else 65else
66CFLAGS_LOCAL_COMMON = $(PDK_CFLAGS) -DMMCSD_EDMA_ENABLED 66CFLAGS_LOCAL_COMMON = $(PDK_CFLAGS) -DMMCSD_EDMA_ENABLED
diff --git a/build/makefile_dma_profile.mk b/build/makefile_dma_profile.mk
index fb5ac13..3623227 100644
--- a/build/makefile_dma_profile.mk
+++ b/build/makefile_dma_profile.mk
@@ -35,13 +35,13 @@ include $(PDK_MMCSD_COMP_PATH)/src/src_files_common.mk
35 35
36MODULE_NAME = mmcsd_dma_profile 36MODULE_NAME = mmcsd_dma_profile
37 37
38ifeq ($(SOC),$(filter $(SOC), dra72x dra75x dra78x k2g am437x am335x am65xx j7)) 38ifeq ($(SOC),$(filter $(SOC), dra72x dra75x dra78x k2g am437x am335x am65xx j721e))
39SOC_DIR=$(SOC) 39SOC_DIR=$(SOC)
40else ifeq ($(SOC),$(filter $(SOC), am571x am572x am574x)) 40else ifeq ($(SOC),$(filter $(SOC), am571x am572x am574x))
41SOC_DIR=am57xx 41SOC_DIR=am57xx
42endif 42endif
43 43
44ifeq ($(SOC),$(filter $(SOC), dra72x dra75x dra78x am571x am572x am574x k2g am437x am335x am65xx j7)) 44ifeq ($(SOC),$(filter $(SOC), dra72x dra75x dra78x am571x am572x am574x k2g am437x am335x am65xx j721e))
45SRCDIR += soc/$(SOC_DIR) 45SRCDIR += soc/$(SOC_DIR)
46INCDIR += soc 46INCDIR += soc
47SRCS_COMMON += MMCSD_soc.c 47SRCS_COMMON += MMCSD_soc.c
@@ -51,11 +51,11 @@ endif
51# need to be included for this component 51# need to be included for this component
52INCLUDE_EXTERNAL_INTERFACES = pdk 52INCLUDE_EXTERNAL_INTERFACES = pdk
53 53
54ifneq ($(SOC),$(filter $(SOC), am65xx j7)) 54ifneq ($(SOC),$(filter $(SOC), am65xx j721e))
55INCLUDE_EXTERNAL_INTERFACES += edma 55INCLUDE_EXTERNAL_INTERFACES += edma
56endif 56endif
57 57
58ifeq ($(SOC),$(filter $(SOC), am571x am572x am574x dra72x dra75x dra78x k2g am437x am335x am65xx j7)) 58ifeq ($(SOC),$(filter $(SOC), am571x am572x am574x dra72x dra75x dra78x k2g am437x am335x am65xx j721e))
59PACKAGE_SRCS_COMMON += soc/$(SOC_DIR) 59PACKAGE_SRCS_COMMON += soc/$(SOC_DIR)
60endif 60endif
61 61
diff --git a/build/makefile_indp.mk b/build/makefile_indp.mk
index 2ab762a..1ebd917 100644
--- a/build/makefile_indp.mk
+++ b/build/makefile_indp.mk
@@ -39,7 +39,7 @@ MODULE_NAME = mmcsd_indp
39# need to be included for this component 39# need to be included for this component
40INCLUDE_EXTERNAL_INTERFACES = pdk 40INCLUDE_EXTERNAL_INTERFACES = pdk
41 41
42ifneq ($(SOC),$(filter $(SOC), am65xx j7)) 42ifneq ($(SOC),$(filter $(SOC), am65xx j721e))
43INCLUDE_EXTERNAL_INTERFACES += edma 43INCLUDE_EXTERNAL_INTERFACES += edma
44endif 44endif
45 45
diff --git a/build/makefile_profile.mk b/build/makefile_profile.mk
index 11a3a39..c4e17d6 100644
--- a/build/makefile_profile.mk
+++ b/build/makefile_profile.mk
@@ -35,13 +35,13 @@ include $(PDK_MMCSD_COMP_PATH)/src/src_files_common.mk
35 35
36MODULE_NAME = mmcsd_profile 36MODULE_NAME = mmcsd_profile
37 37
38ifeq ($(SOC),$(filter $(SOC), k2g dra72x dra75x dra78x am437x am335x omapl137 omapl138 am65xx j7)) 38ifeq ($(SOC),$(filter $(SOC), k2g dra72x dra75x dra78x am437x am335x omapl137 omapl138 am65xx j721e))
39SOC_DIR=$(SOC) 39SOC_DIR=$(SOC)
40else ifeq ($(SOC),$(filter $(SOC), am571x am572x am574x)) 40else ifeq ($(SOC),$(filter $(SOC), am571x am572x am574x))
41SOC_DIR=am57xx 41SOC_DIR=am57xx
42endif 42endif
43 43
44ifeq ($(SOC),$(filter $(SOC), dra72x dra75x dra78x am571x am572x am574x k2g am437x am335x omapl137 omapl138 am65xx j7)) 44ifeq ($(SOC),$(filter $(SOC), dra72x dra75x dra78x am571x am572x am574x k2g am437x am335x omapl137 omapl138 am65xx j721e))
45SRCDIR += soc/$(SOC_DIR) 45SRCDIR += soc/$(SOC_DIR)
46INCDIR += soc 46INCDIR += soc
47SRCS_COMMON += MMCSD_soc.c 47SRCS_COMMON += MMCSD_soc.c
@@ -51,11 +51,11 @@ endif
51# need to be included for this component 51# need to be included for this component
52INCLUDE_EXTERNAL_INTERFACES = pdk 52INCLUDE_EXTERNAL_INTERFACES = pdk
53 53
54ifneq ($(SOC),$(filter $(SOC), am65xx j7)) 54ifneq ($(SOC),$(filter $(SOC), am65xx j721e))
55INCLUDE_EXTERNAL_INTERFACES += edma 55INCLUDE_EXTERNAL_INTERFACES += edma
56endif 56endif
57 57
58ifeq ($(SOC),$(filter $(SOC), am571x am572x am574x dra72x dra75x dra78x k2g am437x am335x am65xx j7)) 58ifeq ($(SOC),$(filter $(SOC), am571x am572x am574x dra72x dra75x dra78x k2g am437x am335x am65xx j721e))
59PACKAGE_SRCS_COMMON += soc/$(SOC_DIR) 59PACKAGE_SRCS_COMMON += soc/$(SOC_DIR)
60endif 60endif
61 61
diff --git a/build/makefile_profile_indp.mk b/build/makefile_profile_indp.mk
index 82bb97f..68e7268 100644
--- a/build/makefile_profile_indp.mk
+++ b/build/makefile_profile_indp.mk
@@ -39,7 +39,7 @@ MODULE_NAME = mmcsd_profile_indp
39# need to be included for this component 39# need to be included for this component
40INCLUDE_EXTERNAL_INTERFACES = pdk 40INCLUDE_EXTERNAL_INTERFACES = pdk
41 41
42ifneq ($(SOC),$(filter $(SOC), am65xx j7)) 42ifneq ($(SOC),$(filter $(SOC), am65xx j721e))
43INCLUDE_EXTERNAL_INTERFACES += edma 43INCLUDE_EXTERNAL_INTERFACES += edma
44endif 44endif
45 45
diff --git a/mmcsd_component.mk b/mmcsd_component.mk
index 1e244b1..ee5815c 100644
--- a/mmcsd_component.mk
+++ b/mmcsd_component.mk
@@ -68,9 +68,9 @@ ifeq ($(mmcsd_component_make_include), )
68 68
69# note SOC="devind"is not supported for DMA as it is covered 69# note SOC="devind"is not supported for DMA as it is covered
70# under other list 70# under other list
71drvmmcsd_BOARDLIST = am65xx_evm am65xx_idk simJ7 71drvmmcsd_BOARDLIST = am65xx_evm am65xx_idk j721e_sim
72drvmmcsd_dma_SOCLIST = am574x am572x am571x k2g am437x am335x dra72x dra75x dra78x omapl137 omapl138 am65xx j7 72drvmmcsd_dma_SOCLIST = am574x am572x am571x k2g am437x am335x dra72x dra75x dra78x omapl137 omapl138 am65xx j721e
73drvmmcsd_SOCLIST = am574x am572x am571x k2g am437x am335x dra72x dra75x dra78x omapl137 omapl138 am65xx j7 73drvmmcsd_SOCLIST = am574x am572x am571x k2g am437x am335x dra72x dra75x dra78x omapl137 omapl138 am65xx j721e
74drvmmcsd_dra72x_CORELIST = c66x a15_0 ipu1_0 74drvmmcsd_dra72x_CORELIST = c66x a15_0 ipu1_0
75drvmmcsd_dra75x_CORELIST = c66x a15_0 ipu1_0 75drvmmcsd_dra75x_CORELIST = c66x a15_0 ipu1_0
76drvmmcsd_dra78x_CORELIST = c66x ipu1_0 76drvmmcsd_dra78x_CORELIST = c66x ipu1_0
@@ -83,7 +83,7 @@ drvmmcsd_am335x_CORELIST = a8host
83drvmmcsd_omapl137_CORELIST = arm9_0 c674x 83drvmmcsd_omapl137_CORELIST = arm9_0 c674x
84drvmmcsd_omapl138_CORELIST = arm9_0 c674x 84drvmmcsd_omapl138_CORELIST = arm9_0 c674x
85drvmmcsd_am65xx_CORELIST = mpu1_0 mcu1_0 85drvmmcsd_am65xx_CORELIST = mpu1_0 mcu1_0
86drvmmcsd_j7_CORELIST = mcu1_0 mpu1_0 86drvmmcsd_j721e_CORELIST = mcu1_0 mpu1_0
87############################ 87############################
88# mmcsd package 88# mmcsd package
89# List of components included under mmcsd lib 89# List of components included under mmcsd lib
@@ -266,7 +266,7 @@ export MMCSD_TestApp_CORE_DEPENDENCY
266export MMCSD_TestApp_XDC_CONFIGURO 266export MMCSD_TestApp_XDC_CONFIGURO
267MMCSD_TestApp_PKG_LIST = MMCSD_TestApp 267MMCSD_TestApp_PKG_LIST = MMCSD_TestApp
268MMCSD_TestApp_INCLUDE = $(MMCSD_TestApp_PATH) 268MMCSD_TestApp_INCLUDE = $(MMCSD_TestApp_PATH)
269MMCSD_TestApp_BOARDLIST = am65xx_idk am65xx_evm simJ7 269MMCSD_TestApp_BOARDLIST = am65xx_idk am65xx_evm j721e_sim
270export MMCSD_TestApp_BOARDLIST 270export MMCSD_TestApp_BOARDLIST
271MMCSD_TestApp_$(SOC)_CORELIST = $(drvmmcsd_$(SOC)_CORELIST) 271MMCSD_TestApp_$(SOC)_CORELIST = $(drvmmcsd_$(SOC)_CORELIST)
272export MMCSD_TestApp_$(SOC)_CORELIST 272export MMCSD_TestApp_$(SOC)_CORELIST
@@ -284,7 +284,7 @@ export MMCSD_EMMC_TestApp_CORE_DEPENDENCY
284export MMCSD_EMMC_TestApp_XDC_CONFIGURO 284export MMCSD_EMMC_TestApp_XDC_CONFIGURO
285MMCSD_EMMC_TestApp_PKG_LIST = MMCSD_EMMC_TestApp_COMP_LIST 285MMCSD_EMMC_TestApp_PKG_LIST = MMCSD_EMMC_TestApp_COMP_LIST
286MMCSD_EMMC_TestApp_INCLUDE = $(MMCSD_EMMC_TestApp_PATH) 286MMCSD_EMMC_TestApp_INCLUDE = $(MMCSD_EMMC_TestApp_PATH)
287MMCSD_EMMC_TestApp_BOARDLIST = am65xx_idk am65xx_evm simJ7 287MMCSD_EMMC_TestApp_BOARDLIST = am65xx_idk am65xx_evm j721e_sim
288export MMCSD_EMMC_TestApp_BOARDLIST 288export MMCSD_EMMC_TestApp_BOARDLIST
289MMCSD_EMMC_TestApp_$(SOC)_CORELIST = $(drvmmcsd_$(SOC)_CORELIST) 289MMCSD_EMMC_TestApp_$(SOC)_CORELIST = $(drvmmcsd_$(SOC)_CORELIST)
290export MMCSD_EMMC_TestApp_$(SOC)_CORELIST 290export MMCSD_EMMC_TestApp_$(SOC)_CORELIST
@@ -303,7 +303,7 @@ export MMCSD_EMMC_DMA_TestApp_CORE_DEPENDENCY
303export MMCSD_EMMC_DMA_TestApp_XDC_CONFIGURO 303export MMCSD_EMMC_DMA_TestApp_XDC_CONFIGURO
304MMCSD_EMMC_DMA_TestApp_PKG_LIST = MMCSD_EMMC_DMA_TestApp 304MMCSD_EMMC_DMA_TestApp_PKG_LIST = MMCSD_EMMC_DMA_TestApp
305MMCSD_EMMC_DMA_TestApp_INCLUDE = $(MMCSD_EMMC_DMA_TestApp_PATH) 305MMCSD_EMMC_DMA_TestApp_INCLUDE = $(MMCSD_EMMC_DMA_TestApp_PATH)
306MMCSD_EMMC_DMA_TestApp_BOARDLIST = am65xx_idk am65xx_evm simJ7 306MMCSD_EMMC_DMA_TestApp_BOARDLIST = am65xx_idk am65xx_evm j721e_sim
307export MMCSD_EMMC_DMA_TestApp_BOARDLIST 307export MMCSD_EMMC_DMA_TestApp_BOARDLIST
308MMCSD_EMMC_DMA_TestApp_$(SOC)_CORELIST = $(drvmmcsd_$(SOC)_CORELIST) 308MMCSD_EMMC_DMA_TestApp_$(SOC)_CORELIST = $(drvmmcsd_$(SOC)_CORELIST)
309export MMCSD_EMMC_DMA_TestApp_$(SOC)_CORELIST 309export MMCSD_EMMC_DMA_TestApp_$(SOC)_CORELIST
@@ -321,7 +321,7 @@ export MMCSD_Baremetal_TestApp_CORE_DEPENDENCY
321export MMCSD_Baremetal_TestApp_XDC_CONFIGURO 321export MMCSD_Baremetal_TestApp_XDC_CONFIGURO
322MMCSD_Baremetal_TestApp_PKG_LIST = MMCSD_Baremetal_TestApp 322MMCSD_Baremetal_TestApp_PKG_LIST = MMCSD_Baremetal_TestApp
323MMCSD_Baremetal_TestApp_INCLUDE = $(MMCSD_Baremetal_TestApp_PATH) 323MMCSD_Baremetal_TestApp_INCLUDE = $(MMCSD_Baremetal_TestApp_PATH)
324MMCSD_Baremetal_TestApp_BOARDLIST = am65xx_idk am65xx_evm simJ7 324MMCSD_Baremetal_TestApp_BOARDLIST = am65xx_idk am65xx_evm j721e_sim
325export MMCSD_Baremetal_TestApp_BOARDLIST 325export MMCSD_Baremetal_TestApp_BOARDLIST
326MMCSD_Baremetal_TestApp_$(SOC)_CORELIST = $(drvmmcsd_$(SOC)_CORELIST) 326MMCSD_Baremetal_TestApp_$(SOC)_CORELIST = $(drvmmcsd_$(SOC)_CORELIST)
327export MMCSD_Baremetal_TestApp_$(SOC)_CORELIST 327export MMCSD_Baremetal_TestApp_$(SOC)_CORELIST
@@ -339,7 +339,7 @@ export MMCSD_Baremetal_DMA_TestApp_CORE_DEPENDENCY
339export MMCSD_Baremetal_DMA_TestApp_XDC_CONFIGURO 339export MMCSD_Baremetal_DMA_TestApp_XDC_CONFIGURO
340MMCSD_Baremetal_DMA_TestApp_PKG_LIST = MMCSD_Baremetal_DMA_TestApp 340MMCSD_Baremetal_DMA_TestApp_PKG_LIST = MMCSD_Baremetal_DMA_TestApp
341MMCSD_Baremetal_DMA_TestApp_INCLUDE = $(MMCSD_Baremetal_DMA_TestApp_PATH) 341MMCSD_Baremetal_DMA_TestApp_INCLUDE = $(MMCSD_Baremetal_DMA_TestApp_PATH)
342MMCSD_Baremetal_DMA_TestApp_BOARDLIST = am65xx_idk am65xx_evm simJ7 342MMCSD_Baremetal_DMA_TestApp_BOARDLIST = am65xx_idk am65xx_evm j721e_sim
343export MMCSD_Baremetal_DMA_TestApp_BOARDLIST 343export MMCSD_Baremetal_DMA_TestApp_BOARDLIST
344MMCSD_Baremetal_DMA_TestApp_$(SOC)_CORELIST = $(drvmmcsd_$(SOC)_CORELIST) 344MMCSD_Baremetal_DMA_TestApp_$(SOC)_CORELIST = $(drvmmcsd_$(SOC)_CORELIST)
345export MMCSD_Baremetal_DMA_TestApp_$(SOC)_CORELIST 345export MMCSD_Baremetal_DMA_TestApp_$(SOC)_CORELIST
@@ -357,7 +357,7 @@ export MMCSD_DMA_TestApp_CORE_DEPENDENCY
357export MMCSD_DMA_TestApp_XDC_CONFIGURO 357export MMCSD_DMA_TestApp_XDC_CONFIGURO
358MMCSD_DMA_TestApp_PKG_LIST = MMCSD_DMA_TestApp 358MMCSD_DMA_TestApp_PKG_LIST = MMCSD_DMA_TestApp
359MMCSD_DMA_TestApp_INCLUDE = $(MMCSD_DMA_TestApp_PATH) 359MMCSD_DMA_TestApp_INCLUDE = $(MMCSD_DMA_TestApp_PATH)
360MMCSD_DMA_TestApp_BOARDLIST = am65xx_idk am65xx_evm simJ7 360MMCSD_DMA_TestApp_BOARDLIST = am65xx_idk am65xx_evm j721e_sim
361export MMCSD_DMA_TestApp_BOARDLIST 361export MMCSD_DMA_TestApp_BOARDLIST
362MMCSD_DMA_TestApp_$(SOC)_CORELIST = $(drvmmcsd_$(SOC)_CORELIST) 362MMCSD_DMA_TestApp_$(SOC)_CORELIST = $(drvmmcsd_$(SOC)_CORELIST)
363export MMCSD_DMA_TestApp_$(SOC)_CORELIST 363export MMCSD_DMA_TestApp_$(SOC)_CORELIST
@@ -376,7 +376,7 @@ export MMCSD_Baremetal_EMMC_TestApp_CORE_DEPENDENCY
376export MMCSD_Baremetal_EMMC_TestApp_XDC_CONFIGURO 376export MMCSD_Baremetal_EMMC_TestApp_XDC_CONFIGURO
377MMCSD_Baremetal_EMMC_TestApp_PKG_LIST = MMCSD_Baremetal_EMMC_TestApp 377MMCSD_Baremetal_EMMC_TestApp_PKG_LIST = MMCSD_Baremetal_EMMC_TestApp
378MMCSD_Baremetal_EMMC_TestApp_INCLUDE = $(MMCSD_Baremetal_EMMC_TestApp_PATH) 378MMCSD_Baremetal_EMMC_TestApp_INCLUDE = $(MMCSD_Baremetal_EMMC_TestApp_PATH)
379MMCSD_Baremetal_EMMC_TestApp_BOARDLIST = am65xx_idk am65xx_evm simJ7 379MMCSD_Baremetal_EMMC_TestApp_BOARDLIST = am65xx_idk am65xx_evm j721e_sim
380export MMCSD_Baremetal_EMMC_TestApp_BOARDLIST 380export MMCSD_Baremetal_EMMC_TestApp_BOARDLIST
381MMCSD_Baremetal_EMMC_TestApp_$(SOC)_CORELIST = $(drvmmcsd_$(SOC)_CORELIST) 381MMCSD_Baremetal_EMMC_TestApp_$(SOC)_CORELIST = $(drvmmcsd_$(SOC)_CORELIST)
382export MMCSD_Baremetal_EMMC_TestApp_$(SOC)_CORELIST 382export MMCSD_Baremetal_EMMC_TestApp_$(SOC)_CORELIST
@@ -397,7 +397,7 @@ export MMCSD_Baremetal_EMMC_DMA_TestApp_CORE_DEPENDENCY
397export MMCSD_Baremetal_EMMC_DMA_TestApp_XDC_CONFIGURO 397export MMCSD_Baremetal_EMMC_DMA_TestApp_XDC_CONFIGURO
398MMCSD_Baremetal_EMMC_DMA_TestApp_PKG_LIST = MMCSD_Baremetal_EMMC_DMA_TestApp 398MMCSD_Baremetal_EMMC_DMA_TestApp_PKG_LIST = MMCSD_Baremetal_EMMC_DMA_TestApp
399MMCSD_Baremetal_EMMC_DMA_TestApp_INCLUDE = $(MMCSD_Baremetal_EMMC_DMA_TestApp_PATH) 399MMCSD_Baremetal_EMMC_DMA_TestApp_INCLUDE = $(MMCSD_Baremetal_EMMC_DMA_TestApp_PATH)
400MMCSD_Baremetal_EMMC_DMA_TestApp_BOARDLIST = am65xx_idk am65xx_evm simJ7 400MMCSD_Baremetal_EMMC_DMA_TestApp_BOARDLIST = am65xx_idk am65xx_evm j721e_sim
401export MMCSD_Baremetal_EMMC_DMA_TestApp_BOARDLIST 401export MMCSD_Baremetal_EMMC_DMA_TestApp_BOARDLIST
402MMCSD_Baremetal_EMMC_DMA_TestApp_$(SOC)_CORELIST = $(drvmmcsd_$(SOC)_CORELIST) 402MMCSD_Baremetal_EMMC_DMA_TestApp_$(SOC)_CORELIST = $(drvmmcsd_$(SOC)_CORELIST)
403export MMCSD_Baremetal_EMMC_DMA_TestApp_$(SOC)_CORELIST 403export MMCSD_Baremetal_EMMC_DMA_TestApp_$(SOC)_CORELIST
diff --git a/package.xs b/package.xs
index 7ae773a..313e9ca 100644
--- a/package.xs
+++ b/package.xs
@@ -1,141 +1,141 @@
1/* 1/*
2 * ======== package.xs ======== 2 * ======== package.xs ========
3 * 3 *
4 */ 4 */
5 5
6 6
7/* 7/*
8 * ======== Package.getLibs ======== 8 * ======== Package.getLibs ========
9 * This function is called when a program's configuration files are 9 * This function is called when a program's configuration files are
10 * being generated and it returns the name of a library appropriate 10 * being generated and it returns the name of a library appropriate
11 * for the program's configuration. 11 * for the program's configuration.
12 */ 12 */
13 13
14function getLibs(prog) 14function getLibs(prog)
15{ 15{
16 var suffix = prog.build.target.suffix; 16 var suffix = prog.build.target.suffix;
17 var name = ""; 17 var name = "";
18 var socType = this.Settings.socType; 18 var socType = this.Settings.socType;
19 var useDma = this.Settings.useDma; 19 var useDma = this.Settings.useDma;
20 useDma = useDma.toLowerCase(); 20 useDma = useDma.toLowerCase();
21 var profilingTag = ""; 21 var profilingTag = "";
22 22
23 socType = socType.toLowerCase(); 23 socType = socType.toLowerCase();
24 /* Replace the last charecter in SoC am#### to am###x */ 24 /* Replace the last charecter in SoC am#### to am###x */
25 if (socType.substring(0, 2) == "am") 25 if (socType.substring(0, 2) == "am")
26 { 26 {
27 socType = socType.substring(0, socType.length - 1); 27 socType = socType.substring(0, socType.length - 1);
28 socType = socType.concat("x"); 28 socType = socType.concat("x");
29 } 29 }
30 30
31 if (this.Settings.enableProfiling == true) 31 if (this.Settings.enableProfiling == true)
32 { 32 {
33 profilingTag = ".profiling" 33 profilingTag = ".profiling"
34 } 34 }
35 name = this.$name + profilingTag + ".a" + suffix; 35 name = this.$name + profilingTag + ".a" + suffix;
36 36
37 /* Read LIBDIR variable */ 37 /* Read LIBDIR variable */
38 var lib = java.lang.System.getenv("LIBDIR"); 38 var lib = java.lang.System.getenv("LIBDIR");
39 39
40 /* If NULL, default to "lib" folder */ 40 /* If NULL, default to "lib" folder */
41 if (lib == null) 41 if (lib == null)
42 { 42 {
43 lib = "./lib"; 43 lib = "./lib";
44 } else { 44 } else {
45 print ("\tSystem environment LIBDIR variable defined : " + lib); 45 print ("\tSystem environment LIBDIR variable defined : " + lib);
46 } 46 }
47 47
48 var socTypes = [ 48 var socTypes = [
49 'am571x', 49 'am571x',
50 'am572x', 50 'am572x',
51 'am574x', 51 'am574x',
52 'dra72x', 52 'dra72x',
53 'dra75x', 53 'dra75x',
54 'dra78x', 54 'dra78x',
55 'am335x', 55 'am335x',
56 'am437x', 56 'am437x',
57 'k2g', 57 'k2g',
58 'omapl137', 58 'omapl137',
59 'omapl138', 59 'omapl138',
60 'am65xx', 60 'am65xx',
61 'j7', 61 'j721e',
62 ]; 62 ];
63 63
64 /* Get the SOC */ 64 /* Get the SOC */
65 for each (var soc in socTypes) 65 for each (var soc in socTypes)
66 { 66 {
67 if (socType.equals(soc)) 67 if (socType.equals(soc))
68 { 68 {
69 lib = lib + "/" + soc; 69 lib = lib + "/" + soc;
70 name = this.$name + profilingTag + ".a" + suffix; 70 name = this.$name + profilingTag + ".a" + suffix;
71 break; 71 break;
72 } 72 }
73 } 73 }
74 74
75 /* Get the DMA choice */ 75 /* Get the DMA choice */
76 if (useDma.equals("true")) 76 if (useDma.equals("true"))
77 { 77 {
78 name = this.$name + profilingTag + ".dma.a" + suffix; 78 name = this.$name + profilingTag + ".dma.a" + suffix;
79 } 79 }
80 80
81 /* Get target folder, if applicable */ 81 /* Get target folder, if applicable */
82 if ( java.lang.String(suffix).contains('66') ) 82 if ( java.lang.String(suffix).contains('66') )
83 lib = lib + "/c66"; 83 lib = lib + "/c66";
84 else if ( java.lang.String(suffix).contains('674') ) 84 else if ( java.lang.String(suffix).contains('674') )
85 lib = lib + "/c674"; 85 lib = lib + "/c674";
86 else if (java.lang.String(suffix).contains('a15') ) 86 else if (java.lang.String(suffix).contains('a15') )
87 lib = lib + "/a15"; 87 lib = lib + "/a15";
88 else if (java.lang.String(suffix).contains('m4') ) 88 else if (java.lang.String(suffix).contains('m4') )
89 lib = lib + "/m4"; 89 lib = lib + "/m4";
90 else if (java.lang.String(suffix).contains('a9') ) 90 else if (java.lang.String(suffix).contains('a9') )
91 lib = lib + "/a9"; 91 lib = lib + "/a9";
92 else if (java.lang.String(suffix).contains('e9') ) 92 else if (java.lang.String(suffix).contains('e9') )
93 lib = lib + "/arm9"; 93 lib = lib + "/arm9";
94 else if (java.lang.String(suffix).contains('a8') ) 94 else if (java.lang.String(suffix).contains('a8') )
95 lib = lib + "/a8"; 95 lib = lib + "/a8";
96 else if (java.lang.String(suffix).contains('a53')) 96 else if (java.lang.String(suffix).contains('a53'))
97 lib = lib + "/a53"; 97 lib = lib + "/a53";
98 else if (java.lang.String(suffix).contains('r5f')) 98 else if (java.lang.String(suffix).contains('r5f'))
99 lib = lib + "/r5f"; 99 lib = lib + "/r5f";
100 else 100 else
101 throw new Error("\tUnknown target for: " + this.packageBase + lib); 101 throw new Error("\tUnknown target for: " + this.packageBase + lib);
102 102
103 var libProfiles = ["debug", "release"]; 103 var libProfiles = ["debug", "release"];
104 /* get the configured library profile */ 104 /* get the configured library profile */
105 for each(var profile in libProfiles) 105 for each(var profile in libProfiles)
106 { 106 {
107 if (this.Settings.libProfile.equals(profile)) 107 if (this.Settings.libProfile.equals(profile))
108 { 108 {
109 lib = lib + "/" + profile; 109 lib = lib + "/" + profile;
110 break; 110 break;
111 } 111 }
112 } 112 }
113 113
114 /* Get library name with path */ 114 /* Get library name with path */
115 lib = lib + "/" + name; 115 lib = lib + "/" + name;
116 if (java.io.File(this.packageBase + lib).exists()) { 116 if (java.io.File(this.packageBase + lib).exists()) {
117 print ("\tLinking with library " + this.$name + ":" + lib); 117 print ("\tLinking with library " + this.$name + ":" + lib);
118 return lib; 118 return lib;
119 } 119 }
120 120
121 /* Could not find any library, throw exception */ 121 /* Could not find any library, throw exception */
122 throw new Error("\tLibrary not found: " + this.packageBase + lib); 122 throw new Error("\tLibrary not found: " + this.packageBase + lib);
123} 123}
124 124
125/* 125/*
126 * ======== package.init ======== 126 * ======== package.init ========
127 */ 127 */
128function init() { 128function init() {
129xdc.loadPackage("ti.osal"); 129xdc.loadPackage("ti.osal");
130xdc.loadPackage("ti.csl"); 130xdc.loadPackage("ti.csl");
131} 131}
132 132
133/* 133/*
134 * ======== package.close ======== 134 * ======== package.close ========
135 */ 135 */
136function close() 136function close()
137{ 137{
138 if (xdc.om.$name != 'cfg') { 138 if (xdc.om.$name != 'cfg') {
139 return; 139 return;
140 } 140 }
141} 141}
diff --git a/soc/MMCSD_soc.h b/soc/MMCSD_soc.h
index 4d3374f..37e1afb 100644
--- a/soc/MMCSD_soc.h
+++ b/soc/MMCSD_soc.h
@@ -62,7 +62,7 @@ extern "C" {
62#include <ti/drv/mmcsd/soc/MMCSD_v1.h> 62#include <ti/drv/mmcsd/soc/MMCSD_v1.h>
63#elif defined (SOC_OMAPL137) || defined(SOC_OMAPL138) 63#elif defined (SOC_OMAPL137) || defined(SOC_OMAPL138)
64#include <ti/drv/mmcsd/soc/MMCSD_v0.h> 64#include <ti/drv/mmcsd/soc/MMCSD_v0.h>
65#elif defined(SOC_AM65XX) || defined(SOC_J7) 65#elif defined(SOC_AM65XX) || defined(SOC_J721E)
66#include <ti/drv/mmcsd/soc/MMCSD_v2.h> 66#include <ti/drv/mmcsd/soc/MMCSD_v2.h>
67#endif 67#endif
68 68
@@ -79,7 +79,7 @@ extern "C" {
79 #define MMCSD_CNT CSL_MMCSD_CNT 79 #define MMCSD_CNT CSL_MMCSD_CNT
80#elif defined(SOC_OMAPL137) || defined(SOC_OMAPL138) 80#elif defined(SOC_OMAPL137) || defined(SOC_OMAPL138)
81 #define MMCSD_CNT CSL_MMCSD_CNT 81 #define MMCSD_CNT CSL_MMCSD_CNT
82#elif defined(SOC_AM65XX) || defined(SOC_J7) 82#elif defined(SOC_AM65XX) || defined(SOC_J721E)
83 #define MMCSD_CNT 2 83 #define MMCSD_CNT 2
84#endif 84#endif
85#ifdef __cplusplus 85#ifdef __cplusplus
diff --git a/soc/j7/MMCSD_soc.c b/soc/j721e/MMCSD_soc.c
index cf2a5a0..cf2a5a0 100644
--- a/soc/j7/MMCSD_soc.c
+++ b/soc/j721e/MMCSD_soc.c
diff --git a/src/src_files_common.mk b/src/src_files_common.mk
index c64dd8d..3ae2520 100644
--- a/src/src_files_common.mk
+++ b/src/src_files_common.mk
@@ -17,7 +17,7 @@ INCDIR = . src src/v0
17SRCS_COMMON += MMCSD_v0.c 17SRCS_COMMON += MMCSD_v0.c
18PACKAGE_SRCS_COMMON += src/v0 soc/MMCSD_v0.h 18PACKAGE_SRCS_COMMON += src/v0 soc/MMCSD_v0.h
19else 19else
20ifeq ($(SOC), $(filter $(SOC), am65xx j7)) 20ifeq ($(SOC), $(filter $(SOC), am65xx j721e))
21SRCDIR = . src src/v2 21SRCDIR = . src src/v2
22INCDIR = . src src/v2 22INCDIR = . src src/v2
23SRCS_COMMON += MMCSD_v2.c 23SRCS_COMMON += MMCSD_v2.c
diff --git a/test/MMCSD_Baremetal_DMA_TestApp/makefile b/test/MMCSD_Baremetal_DMA_TestApp/makefile
index cca3057..8af8bb3 100644
--- a/test/MMCSD_Baremetal_DMA_TestApp/makefile
+++ b/test/MMCSD_Baremetal_DMA_TestApp/makefile
@@ -14,7 +14,7 @@ LOCAL_APP_NAME = MMCSD_Baremetal_DMA_$(BOARD)_$(CORE)TestApp
14 14
15BUILD_OS_TYPE = baremetal 15BUILD_OS_TYPE = baremetal
16 16
17ifeq ($(SOC),$(filter $(SOC), am65xx j7)) 17ifeq ($(SOC),$(filter $(SOC), am65xx j721e))
18SRCDIR = ../src ../../ 18SRCDIR = ../src ../../
19INCDIR = ../src ../include ../../ 19INCDIR = ../src ../include ../../
20# Common source files across all platforms and cores 20# Common source files across all platforms and cores
@@ -34,7 +34,7 @@ COMP_LIST_a15_0 = csl_init
34COMP_LIST_mpu1_0 = csl_init 34COMP_LIST_mpu1_0 = csl_init
35COMP_LIST_mcu1_0 = csl_init 35COMP_LIST_mcu1_0 = csl_init
36 36
37ifeq ($(SOC),$(filter $(SOC), am65xx j7)) 37ifeq ($(SOC),$(filter $(SOC), am65xx j721e))
38COMP_LIST_COMMON += sciclient 38COMP_LIST_COMMON += sciclient
39endif 39endif
40 40
diff --git a/test/MMCSD_Baremetal_DMA_TestProject/makefile b/test/MMCSD_Baremetal_DMA_TestProject/makefile
index fa712ac..7aa39a7 100644
--- a/test/MMCSD_Baremetal_DMA_TestProject/makefile
+++ b/test/MMCSD_Baremetal_DMA_TestProject/makefile
@@ -14,7 +14,7 @@ LOCAL_APP_NAME = MMCSD_Baremetal_DMA_$(BOARD)_$(CORE)TestProject
14 14
15BUILD_OS_TYPE = baremetal 15BUILD_OS_TYPE = baremetal
16 16
17ifeq ($(SOC),$(filter $(SOC), am65xx j7)) 17ifeq ($(SOC),$(filter $(SOC), am65xx j721e))
18SRCDIR = ../src ../../ 18SRCDIR = ../src ../../
19INCDIR = ../src ../include ../../ 19INCDIR = ../src ../include ../../
20# Common source files across all platforms and cores 20# Common source files across all platforms and cores
@@ -34,7 +34,7 @@ COMP_LIST_a15_0 = csl_init
34COMP_LIST_mpu1_0 = csl_init 34COMP_LIST_mpu1_0 = csl_init
35COMP_LIST_mcu1_0 = csl_init 35COMP_LIST_mcu1_0 = csl_init
36 36
37ifeq ($(SOC),$(filter $(SOC), am65xx j7)) 37ifeq ($(SOC),$(filter $(SOC), am65xx j721e))
38COMP_LIST_COMMON += sciclient 38COMP_LIST_COMMON += sciclient
39endif 39endif
40 40
diff --git a/test/MMCSD_Baremetal_EMMC_DMA_TestApp/makefile b/test/MMCSD_Baremetal_EMMC_DMA_TestApp/makefile
index feb7da8..d40040f 100644
--- a/test/MMCSD_Baremetal_EMMC_DMA_TestApp/makefile
+++ b/test/MMCSD_Baremetal_EMMC_DMA_TestApp/makefile
@@ -14,7 +14,7 @@ LOCAL_APP_NAME = MMCSD_Baremetal_EMMC_DMA_$(BOARD)_$(CORE)TestApp
14 14
15BUILD_OS_TYPE = baremetal 15BUILD_OS_TYPE = baremetal
16 16
17ifeq ($(SOC),$(filter $(SOC), am65xx j7)) 17ifeq ($(SOC),$(filter $(SOC), am65xx j721e))
18SRCDIR = ../src ../../ 18SRCDIR = ../src ../../
19INCDIR = ../src ../include ../../ 19INCDIR = ../src ../include ../../
20# Common source files across all platforms and cores 20# Common source files across all platforms and cores
@@ -34,7 +34,7 @@ COMP_LIST_a15_0 = csl_init
34COMP_LIST_mpu1_0 = csl_init 34COMP_LIST_mpu1_0 = csl_init
35COMP_LIST_mcu1_0 = csl_init 35COMP_LIST_mcu1_0 = csl_init
36 36
37ifeq ($(SOC),$(filter $(SOC), am65xx j7)) 37ifeq ($(SOC),$(filter $(SOC), am65xx j721e))
38COMP_LIST_COMMON += sciclient 38COMP_LIST_COMMON += sciclient
39endif 39endif
40 40
diff --git a/test/MMCSD_Baremetal_EMMC_DMA_TestProject/makefile b/test/MMCSD_Baremetal_EMMC_DMA_TestProject/makefile
index 64cb0dd..4f965a0 100644
--- a/test/MMCSD_Baremetal_EMMC_DMA_TestProject/makefile
+++ b/test/MMCSD_Baremetal_EMMC_DMA_TestProject/makefile
@@ -14,7 +14,7 @@ LOCAL_APP_NAME = MMCSD_Baremetal_EMMC_DMA_$(BOARD)_$(CORE)TestProject
14 14
15BUILD_OS_TYPE = baremetal 15BUILD_OS_TYPE = baremetal
16 16
17ifeq ($(SOC),$(filter $(SOC), am65xx j7)) 17ifeq ($(SOC),$(filter $(SOC), am65xx j721e))
18SRCDIR = ../src ../../ 18SRCDIR = ../src ../../
19INCDIR = ../src ../include ../../ 19INCDIR = ../src ../include ../../
20# Common source files across all platforms and cores 20# Common source files across all platforms and cores
@@ -34,7 +34,7 @@ COMP_LIST_a15_0 = csl_init
34COMP_LIST_mpu1_0 = csl_init 34COMP_LIST_mpu1_0 = csl_init
35COMP_LIST_mcu1_0 = csl_init 35COMP_LIST_mcu1_0 = csl_init
36 36
37ifeq ($(SOC),$(filter $(SOC), am65xx j7)) 37ifeq ($(SOC),$(filter $(SOC), am65xx j721e))
38COMP_LIST_COMMON += sciclient 38COMP_LIST_COMMON += sciclient
39endif 39endif
40 40
diff --git a/test/MMCSD_Baremetal_EMMC_TestApp/makefile b/test/MMCSD_Baremetal_EMMC_TestApp/makefile
index 2868ff8..67ca865 100644
--- a/test/MMCSD_Baremetal_EMMC_TestApp/makefile
+++ b/test/MMCSD_Baremetal_EMMC_TestApp/makefile
@@ -14,7 +14,7 @@ LOCAL_APP_NAME = MMCSD_Baremetal_EMMC_$(BOARD)_$(CORE)TestApp
14 14
15BUILD_OS_TYPE = baremetal 15BUILD_OS_TYPE = baremetal
16 16
17ifeq ($(SOC),$(filter $(SOC), am65xx j7)) 17ifeq ($(SOC),$(filter $(SOC), am65xx j721e))
18SRCDIR = ../src ../../ 18SRCDIR = ../src ../../
19INCDIR = ../src ../include ../../ 19INCDIR = ../src ../include ../../
20# Common source files across all platforms and cores 20# Common source files across all platforms and cores
@@ -34,7 +34,7 @@ COMP_LIST_a15_0 = csl_init
34COMP_LIST_mpu1_0 = csl_init 34COMP_LIST_mpu1_0 = csl_init
35COMP_LIST_mcu1_0 = csl_init 35COMP_LIST_mcu1_0 = csl_init
36 36
37ifeq ($(SOC),$(filter $(SOC), am65xx j7)) 37ifeq ($(SOC),$(filter $(SOC), am65xx j721e))
38COMP_LIST_COMMON += sciclient 38COMP_LIST_COMMON += sciclient
39endif 39endif
40 40
diff --git a/test/MMCSD_Baremetal_EMMC_TestProject/makefile b/test/MMCSD_Baremetal_EMMC_TestProject/makefile
index 9d50d70..5ce880e 100644
--- a/test/MMCSD_Baremetal_EMMC_TestProject/makefile
+++ b/test/MMCSD_Baremetal_EMMC_TestProject/makefile
@@ -14,7 +14,7 @@ LOCAL_APP_NAME = MMCSD_Baremetal_EMMC_$(BOARD)_$(CORE)TestProject
14 14
15BUILD_OS_TYPE = baremetal 15BUILD_OS_TYPE = baremetal
16 16
17ifeq ($(SOC),$(filter $(SOC), am65xx j7)) 17ifeq ($(SOC),$(filter $(SOC), am65xx j721e))
18SRCDIR = ../src ../../ 18SRCDIR = ../src ../../
19INCDIR = ../src ../include ../../ 19INCDIR = ../src ../include ../../
20# Common source files across all platforms and cores 20# Common source files across all platforms and cores
@@ -34,7 +34,7 @@ COMP_LIST_a15_0 = csl_init
34COMP_LIST_mpu1_0 = csl_init 34COMP_LIST_mpu1_0 = csl_init
35COMP_LIST_mcu1_0 = csl_init 35COMP_LIST_mcu1_0 = csl_init
36 36
37ifeq ($(SOC),$(filter $(SOC), am65xx j7)) 37ifeq ($(SOC),$(filter $(SOC), am65xx j721e))
38COMP_LIST_COMMON += sciclient 38COMP_LIST_COMMON += sciclient
39endif 39endif
40 40
diff --git a/test/MMCSD_Baremetal_TestApp/makefile b/test/MMCSD_Baremetal_TestApp/makefile
index 817e920..6a893fd 100644
--- a/test/MMCSD_Baremetal_TestApp/makefile
+++ b/test/MMCSD_Baremetal_TestApp/makefile
@@ -14,7 +14,7 @@ LOCAL_APP_NAME = MMCSD_Baremetal_$(BOARD)_$(CORE)TestApp
14 14
15BUILD_OS_TYPE = baremetal 15BUILD_OS_TYPE = baremetal
16 16
17ifeq ($(SOC),$(filter $(SOC), am65xx j7)) 17ifeq ($(SOC),$(filter $(SOC), am65xx j721e))
18SRCDIR = ../src ../../ 18SRCDIR = ../src ../../
19INCDIR = ../src ../include ../../ 19INCDIR = ../src ../include ../../
20# Common source files across all platforms and cores 20# Common source files across all platforms and cores
@@ -34,7 +34,7 @@ COMP_LIST_a15_0 = csl_init
34COMP_LIST_mpu1_0 = csl_init 34COMP_LIST_mpu1_0 = csl_init
35COMP_LIST_mcu1_0 = csl_init 35COMP_LIST_mcu1_0 = csl_init
36 36
37ifeq ($(SOC),$(filter $(SOC), am65xx j7)) 37ifeq ($(SOC),$(filter $(SOC), am65xx j721e))
38COMP_LIST_COMMON += sciclient 38COMP_LIST_COMMON += sciclient
39endif 39endif
40 40
diff --git a/test/MMCSD_Baremetal_TestProject/makefile b/test/MMCSD_Baremetal_TestProject/makefile
index 789b09d..c9fdf27 100644
--- a/test/MMCSD_Baremetal_TestProject/makefile
+++ b/test/MMCSD_Baremetal_TestProject/makefile
@@ -14,7 +14,7 @@ LOCAL_APP_NAME = MMCSD_Baremetal_$(BOARD)_$(CORE)TestProject
14 14
15BUILD_OS_TYPE = baremetal 15BUILD_OS_TYPE = baremetal
16 16
17ifeq ($(SOC),$(filter $(SOC), am65xx j7)) 17ifeq ($(SOC),$(filter $(SOC), am65xx j721e))
18SRCDIR = ../src ../../ 18SRCDIR = ../src ../../
19INCDIR = ../src ../include ../../ 19INCDIR = ../src ../include ../../
20# Common source files across all platforms and cores 20# Common source files across all platforms and cores
@@ -34,7 +34,7 @@ COMP_LIST_a15_0 = csl_init
34COMP_LIST_mpu1_0 = csl_init 34COMP_LIST_mpu1_0 = csl_init
35COMP_LIST_mcu1_0 = csl_init 35COMP_LIST_mcu1_0 = csl_init
36 36
37ifeq ($(SOC),$(filter $(SOC), am65xx j7)) 37ifeq ($(SOC),$(filter $(SOC), am65xx j721e))
38COMP_LIST_COMMON += sciclient 38COMP_LIST_COMMON += sciclient
39endif 39endif
40 40
diff --git a/test/MMCSD_DMA_TestApp/makefile b/test/MMCSD_DMA_TestApp/makefile
index 8a98163..7aab8b4 100644
--- a/test/MMCSD_DMA_TestApp/makefile
+++ b/test/MMCSD_DMA_TestApp/makefile
@@ -32,7 +32,7 @@ endif
32 32
33endif 33endif
34 34
35ifeq ($(SOC),$(filter $(SOC), j7)) 35ifeq ($(SOC),$(filter $(SOC), j721e))
36SRCDIR = ../src ../../ 36SRCDIR = ../src ../../
37INCDIR = ../src ../include ../../ 37INCDIR = ../src ../include ../../
38# Common source files across all platforms and cores 38# Common source files across all platforms and cores
@@ -42,12 +42,12 @@ CFLAGS_MMCSD_UT += -DMMCSD_ADMA_ENABLED
42 42
43ifeq ($(CORE),$(filter $(CORE), mpu1_0)) 43ifeq ($(CORE),$(filter $(CORE), mpu1_0))
44# Enable XDC build for application by providing XDC CFG File per core 44# Enable XDC build for application by providing XDC CFG File per core
45XDC_CFG_FILE_$(CORE) = ../j7/a72/mmcsdUnitTest_a72.cfg 45XDC_CFG_FILE_$(CORE) = ../j721e/a72/mmcsdUnitTest_a72.cfg
46endif 46endif
47 47
48ifeq ($(CORE),$(filter $(CORE), mcu1_0)) 48ifeq ($(CORE),$(filter $(CORE), mcu1_0))
49# Enable XDC build for application by providing XDC CFG File per core 49# Enable XDC build for application by providing XDC CFG File per core
50XDC_CFG_FILE_$(CORE) = ../j7/r5f/mmcsdUnitTest_r5f.cfg 50XDC_CFG_FILE_$(CORE) = ../j721e/r5f/mmcsdUnitTest_r5f.cfg
51endif 51endif
52 52
53endif 53endif
@@ -59,7 +59,7 @@ INCLUDE_EXTERNAL_INTERFACES = bios xdc pdk
59# List all the components required by the application 59# List all the components required by the application
60COMP_LIST_COMMON = csl osal_tirtos uart board mmcsd 60COMP_LIST_COMMON = csl osal_tirtos uart board mmcsd
61 61
62ifeq ($(SOC),$(filter $(SOC), am65xx j7)) 62ifeq ($(SOC),$(filter $(SOC), am65xx j721e))
63COMP_LIST_COMMON += sciclient 63COMP_LIST_COMMON += sciclient
64endif 64endif
65 65
@@ -76,8 +76,8 @@ CFLAGS_MMCSD_UT += -DevmAM65xx
76endif 76endif
77 77
78# j7 build 78# j7 build
79ifeq ($(BOARD),$(filter $(BOARD), j7-evm)) 79ifeq ($(BOARD),$(filter $(BOARD), j721e-evm))
80CFLAGS_MMCSD_UT += -DsimJ7 80CFLAGS_MMCSD_UT += -Dj721e_sim
81endif 81endif
82 82
83PACKAGE_SRCS_COMMON = ../ 83PACKAGE_SRCS_COMMON = ../
diff --git a/test/MMCSD_DMA_TestProject/makefile b/test/MMCSD_DMA_TestProject/makefile
index a61c646..b439851 100644
--- a/test/MMCSD_DMA_TestProject/makefile
+++ b/test/MMCSD_DMA_TestProject/makefile
@@ -32,7 +32,7 @@ endif
32 32
33endif 33endif
34 34
35ifeq ($(SOC),$(filter $(SOC), j7)) 35ifeq ($(SOC),$(filter $(SOC), j721e))
36SRCDIR = ../src ../../ 36SRCDIR = ../src ../../
37INCDIR = ../src ../include ../../ 37INCDIR = ../src ../include ../../
38# Common source files across all platforms and cores 38# Common source files across all platforms and cores
@@ -42,12 +42,12 @@ CFLAGS_MMCSD_UT += -DMMCSD_ADMA_ENABLED
42 42
43ifeq ($(CORE),$(filter $(CORE), mpu1_0)) 43ifeq ($(CORE),$(filter $(CORE), mpu1_0))
44# Enable XDC build for application by providing XDC CFG File per core 44# Enable XDC build for application by providing XDC CFG File per core
45XDC_CFG_FILE_$(CORE) = ../j7/a72/mmcsdUnitTest_a72.cfg 45XDC_CFG_FILE_$(CORE) = ../j721e/a72/mmcsdUnitTest_a72.cfg
46endif 46endif
47 47
48ifeq ($(CORE),$(filter $(CORE), mcu1_0)) 48ifeq ($(CORE),$(filter $(CORE), mcu1_0))
49# Enable XDC build for application by providing XDC CFG File per core 49# Enable XDC build for application by providing XDC CFG File per core
50XDC_CFG_FILE_$(CORE) = ../j7/r5f/mmcsdUnitTest_r5f.cfg 50XDC_CFG_FILE_$(CORE) = ../j721e/r5f/mmcsdUnitTest_r5f.cfg
51endif 51endif
52 52
53endif 53endif
@@ -59,7 +59,7 @@ INCLUDE_EXTERNAL_INTERFACES = bios xdc pdk
59# List all the components required by the application 59# List all the components required by the application
60COMP_LIST_COMMON = csl osal_tirtos uart board mmcsd 60COMP_LIST_COMMON = csl osal_tirtos uart board mmcsd
61 61
62ifeq ($(SOC),$(filter $(SOC), am65xx j7)) 62ifeq ($(SOC),$(filter $(SOC), am65xx j721e))
63COMP_LIST_COMMON += sciclient 63COMP_LIST_COMMON += sciclient
64endif 64endif
65 65
@@ -76,8 +76,8 @@ CFLAGS_MMCSD_UT += -DevmAM65xx
76endif 76endif
77 77
78# EVM build 78# EVM build
79ifeq ($(BOARD),$(filter $(BOARD), j7-evm)) 79ifeq ($(BOARD),$(filter $(BOARD), j721e-evm))
80CFLAGS_MMCSD_UT += -DsimJ7 80CFLAGS_MMCSD_UT += -Dj721e_sim
81endif 81endif
82 82
83PACKAGE_SRCS_COMMON = ../ 83PACKAGE_SRCS_COMMON = ../
diff --git a/test/MMCSD_EMMC_DMA_TestApp/makefile b/test/MMCSD_EMMC_DMA_TestApp/makefile
index 150e106..3fdeff8 100644
--- a/test/MMCSD_EMMC_DMA_TestApp/makefile
+++ b/test/MMCSD_EMMC_DMA_TestApp/makefile
@@ -30,7 +30,7 @@ endif
30 30
31endif 31endif
32 32
33ifeq ($(SOC),$(filter $(SOC), j7)) 33ifeq ($(SOC),$(filter $(SOC), j721e))
34SRCDIR = ../src ../../ 34SRCDIR = ../src ../../
35INCDIR = ../src ../include ../../ 35INCDIR = ../src ../include ../../
36# Common source files across all platforms and cores 36# Common source files across all platforms and cores
@@ -38,12 +38,12 @@ SRCS_COMMON += main_emmc.c
38 38
39ifeq ($(CORE),$(filter $(CORE), mpu1_0)) 39ifeq ($(CORE),$(filter $(CORE), mpu1_0))
40# Enable XDC build for application by providing XDC CFG File per core 40# Enable XDC build for application by providing XDC CFG File per core
41XDC_CFG_FILE_$(CORE) = ../j7/a72/mmcsdUnitTest_a72.cfg 41XDC_CFG_FILE_$(CORE) = ../j721e/a72/mmcsdUnitTest_a72.cfg
42endif 42endif
43 43
44ifeq ($(CORE),$(filter $(CORE), mcu1_0)) 44ifeq ($(CORE),$(filter $(CORE), mcu1_0))
45# Enable XDC build for application by providing XDC CFG File per core 45# Enable XDC build for application by providing XDC CFG File per core
46XDC_CFG_FILE_$(CORE) = ../j7/r5f/mmcsdUnitTest_r5f.cfg 46XDC_CFG_FILE_$(CORE) = ../j721e/r5f/mmcsdUnitTest_r5f.cfg
47endif 47endif
48 48
49endif 49endif
@@ -55,7 +55,7 @@ INCLUDE_EXTERNAL_INTERFACES = bios xdc pdk
55# List all the components required by the application 55# List all the components required by the application
56COMP_LIST_COMMON = csl osal_tirtos uart board mmcsd 56COMP_LIST_COMMON = csl osal_tirtos uart board mmcsd
57 57
58ifeq ($(SOC),$(filter $(SOC), am65xx j7)) 58ifeq ($(SOC),$(filter $(SOC), am65xx j721e))
59COMP_LIST_COMMON += sciclient 59COMP_LIST_COMMON += sciclient
60endif 60endif
61 61
@@ -73,8 +73,8 @@ CFLAGS_MMCSD_UT += -DevmAM65xx
73endif 73endif
74 74
75# j7 build 75# j7 build
76ifeq ($(BOARD),$(filter $(BOARD), j7-evm)) 76ifeq ($(BOARD),$(filter $(BOARD), j721e-evm))
77CFLAGS_MMCSD_UT += -DsimJ7 77CFLAGS_MMCSD_UT += -Dj721e_sim
78endif 78endif
79 79
80PACKAGE_SRCS_COMMON = ../ 80PACKAGE_SRCS_COMMON = ../
diff --git a/test/MMCSD_EMMC_DMA_TestProject/makefile b/test/MMCSD_EMMC_DMA_TestProject/makefile
index 5527849..2f8eb13 100644
--- a/test/MMCSD_EMMC_DMA_TestProject/makefile
+++ b/test/MMCSD_EMMC_DMA_TestProject/makefile
@@ -30,7 +30,7 @@ endif
30 30
31endif 31endif
32 32
33ifeq ($(SOC),$(filter $(SOC), j7)) 33ifeq ($(SOC),$(filter $(SOC), j721e))
34SRCDIR = ../src ../../ 34SRCDIR = ../src ../../
35INCDIR = ../src ../include ../../ 35INCDIR = ../src ../include ../../
36# Common source files across all platforms and cores 36# Common source files across all platforms and cores
@@ -38,12 +38,12 @@ SRCS_COMMON += main_emmc.c
38 38
39ifeq ($(CORE),$(filter $(CORE), mpu1_0)) 39ifeq ($(CORE),$(filter $(CORE), mpu1_0))
40# Enable XDC build for application by providing XDC CFG File per core 40# Enable XDC build for application by providing XDC CFG File per core
41XDC_CFG_FILE_$(CORE) = ../j7/a72/mmcsdUnitTest_a72.cfg 41XDC_CFG_FILE_$(CORE) = ../j721e/a72/mmcsdUnitTest_a72.cfg
42endif 42endif
43 43
44ifeq ($(CORE),$(filter $(CORE), mcu1_0)) 44ifeq ($(CORE),$(filter $(CORE), mcu1_0))
45# Enable XDC build for application by providing XDC CFG File per core 45# Enable XDC build for application by providing XDC CFG File per core
46XDC_CFG_FILE_$(CORE) = ../j7/r5f/mmcsdUnitTest_r5f.cfg 46XDC_CFG_FILE_$(CORE) = ../j721e/r5f/mmcsdUnitTest_r5f.cfg
47endif 47endif
48 48
49endif 49endif
@@ -55,7 +55,7 @@ INCLUDE_EXTERNAL_INTERFACES = bios xdc pdk
55# List all the components required by the application 55# List all the components required by the application
56COMP_LIST_COMMON = csl osal_tirtos uart board mmcsd 56COMP_LIST_COMMON = csl osal_tirtos uart board mmcsd
57 57
58ifeq ($(SOC),$(filter $(SOC), am65xx j7)) 58ifeq ($(SOC),$(filter $(SOC), am65xx j721e))
59COMP_LIST_COMMON += sciclient 59COMP_LIST_COMMON += sciclient
60endif 60endif
61 61
@@ -73,8 +73,8 @@ CFLAGS_MMCSD_UT += -DevmAM65xx
73endif 73endif
74 74
75# EVM build 75# EVM build
76ifeq ($(BOARD),$(filter $(BOARD), j7-evm)) 76ifeq ($(BOARD),$(filter $(BOARD), j721e-evm))
77CFLAGS_MMCSD_UT += -DsimJ7 77CFLAGS_MMCSD_UT += -Dj721e_sim
78endif 78endif
79 79
80PACKAGE_SRCS_COMMON = ../ 80PACKAGE_SRCS_COMMON = ../
diff --git a/test/MMCSD_EMMC_Regression_TestApp/makefile b/test/MMCSD_EMMC_Regression_TestApp/makefile
index 7d86e33..735d7dd 100644
--- a/test/MMCSD_EMMC_Regression_TestApp/makefile
+++ b/test/MMCSD_EMMC_Regression_TestApp/makefile
@@ -30,7 +30,7 @@ endif
30 30
31endif 31endif
32 32
33ifeq ($(SOC),$(filter $(SOC), j7)) 33ifeq ($(SOC),$(filter $(SOC), j721e))
34SRCDIR = ../src ../../ 34SRCDIR = ../src ../../
35INCDIR = ../src ../include ../../ 35INCDIR = ../src ../include ../../
36# Common source files across all platforms and cores 36# Common source files across all platforms and cores
@@ -38,12 +38,12 @@ SRCS_COMMON += main_emmc.c
38 38
39ifeq ($(CORE),$(filter $(CORE), mpu1_0)) 39ifeq ($(CORE),$(filter $(CORE), mpu1_0))
40# Enable XDC build for application by providing XDC CFG File per core 40# Enable XDC build for application by providing XDC CFG File per core
41XDC_CFG_FILE_$(CORE) = ../j7/a72/mmcsdUnitTest_a72.cfg 41XDC_CFG_FILE_$(CORE) = ../j721e/a72/mmcsdUnitTest_a72.cfg
42endif 42endif
43 43
44ifeq ($(CORE),$(filter $(CORE), mcu1_0)) 44ifeq ($(CORE),$(filter $(CORE), mcu1_0))
45# Enable XDC build for application by providing XDC CFG File per core 45# Enable XDC build for application by providing XDC CFG File per core
46XDC_CFG_FILE_$(CORE) = ../j7/r5f/mmcsdUnitTest_r5f.cfg 46XDC_CFG_FILE_$(CORE) = ../j721e/r5f/mmcsdUnitTest_r5f.cfg
47endif 47endif
48 48
49endif 49endif
@@ -55,7 +55,7 @@ INCLUDE_EXTERNAL_INTERFACES = bios xdc pdk
55# List all the components required by the application 55# List all the components required by the application
56COMP_LIST_COMMON = csl osal_tirtos uart board mmcsd 56COMP_LIST_COMMON = csl osal_tirtos uart board mmcsd
57 57
58ifeq ($(SOC),$(filter $(SOC), am65xx j7)) 58ifeq ($(SOC),$(filter $(SOC), am65xx j721e))
59COMP_LIST_COMMON += sciclient 59COMP_LIST_COMMON += sciclient
60endif 60endif
61 61
@@ -73,8 +73,8 @@ CFLAGS_MMCSD_UT += -DevmAM65xx
73endif 73endif
74 74
75# j7 build 75# j7 build
76ifeq ($(BOARD),$(filter $(BOARD), j7-evm)) 76ifeq ($(BOARD),$(filter $(BOARD), j721e-evm))
77CFLAGS_MMCSD_UT += -DsimJ7 77CFLAGS_MMCSD_UT += -Dj721e_sim
78endif 78endif
79 79
80PACKAGE_SRCS_COMMON = ../ 80PACKAGE_SRCS_COMMON = ../
diff --git a/test/MMCSD_EMMC_TestApp/makefile b/test/MMCSD_EMMC_TestApp/makefile
index 6726306..1d233ec 100644
--- a/test/MMCSD_EMMC_TestApp/makefile
+++ b/test/MMCSD_EMMC_TestApp/makefile
@@ -30,7 +30,7 @@ endif
30 30
31endif 31endif
32 32
33ifeq ($(SOC),$(filter $(SOC), j7)) 33ifeq ($(SOC),$(filter $(SOC), j721e))
34SRCDIR = ../src ../../ 34SRCDIR = ../src ../../
35INCDIR = ../src ../include ../../ 35INCDIR = ../src ../include ../../
36# Common source files across all platforms and cores 36# Common source files across all platforms and cores
@@ -38,12 +38,12 @@ SRCS_COMMON += main_emmc.c
38 38
39ifeq ($(CORE),$(filter $(CORE), mpu1_0)) 39ifeq ($(CORE),$(filter $(CORE), mpu1_0))
40# Enable XDC build for application by providing XDC CFG File per core 40# Enable XDC build for application by providing XDC CFG File per core
41XDC_CFG_FILE_$(CORE) = ../j7/a72/mmcsdUnitTest_a72.cfg 41XDC_CFG_FILE_$(CORE) = ../j721e/a72/mmcsdUnitTest_a72.cfg
42endif 42endif
43 43
44ifeq ($(CORE),$(filter $(CORE), mcu1_0)) 44ifeq ($(CORE),$(filter $(CORE), mcu1_0))
45# Enable XDC build for application by providing XDC CFG File per core 45# Enable XDC build for application by providing XDC CFG File per core
46XDC_CFG_FILE_$(CORE) = ../j7/r5f/mmcsdUnitTest_r5f.cfg 46XDC_CFG_FILE_$(CORE) = ../j721e/r5f/mmcsdUnitTest_r5f.cfg
47endif 47endif
48 48
49endif 49endif
@@ -55,7 +55,7 @@ INCLUDE_EXTERNAL_INTERFACES = bios xdc pdk
55# List all the components required by the application 55# List all the components required by the application
56COMP_LIST_COMMON = csl osal_tirtos uart board mmcsd 56COMP_LIST_COMMON = csl osal_tirtos uart board mmcsd
57 57
58ifeq ($(SOC),$(filter $(SOC), am65xx j7)) 58ifeq ($(SOC),$(filter $(SOC), am65xx j721e))
59COMP_LIST_COMMON += sciclient 59COMP_LIST_COMMON += sciclient
60endif 60endif
61 61
@@ -71,8 +71,8 @@ CFLAGS_MMCSD_UT += -DevmAM65xx
71endif 71endif
72 72
73# j7 build 73# j7 build
74ifeq ($(BOARD),$(filter $(BOARD), j7-evm)) 74ifeq ($(BOARD),$(filter $(BOARD), j721e-evm))
75CFLAGS_MMCSD_UT += -DsimJ7 75CFLAGS_MMCSD_UT += -Dj721e_sim
76endif 76endif
77 77
78PACKAGE_SRCS_COMMON = ../ 78PACKAGE_SRCS_COMMON = ../
diff --git a/test/MMCSD_EMMC_TestProject/makefile b/test/MMCSD_EMMC_TestProject/makefile
index 40e219c..6df2bda 100644
--- a/test/MMCSD_EMMC_TestProject/makefile
+++ b/test/MMCSD_EMMC_TestProject/makefile
@@ -30,7 +30,7 @@ endif
30 30
31endif 31endif
32 32
33ifeq ($(SOC),$(filter $(SOC), j7)) 33ifeq ($(SOC),$(filter $(SOC), j721e))
34SRCDIR = ../src ../../ 34SRCDIR = ../src ../../
35INCDIR = ../src ../include ../../ 35INCDIR = ../src ../include ../../
36# Common source files across all platforms and cores 36# Common source files across all platforms and cores
@@ -38,12 +38,12 @@ SRCS_COMMON += main_emmc.c
38 38
39ifeq ($(CORE),$(filter $(CORE), mpu1_0)) 39ifeq ($(CORE),$(filter $(CORE), mpu1_0))
40# Enable XDC build for application by providing XDC CFG File per core 40# Enable XDC build for application by providing XDC CFG File per core
41XDC_CFG_FILE_$(CORE) = ../j7/a72/mmcsdUnitTest_a72.cfg 41XDC_CFG_FILE_$(CORE) = ../j721e/a72/mmcsdUnitTest_a72.cfg
42endif 42endif
43 43
44ifeq ($(CORE),$(filter $(CORE), mcu1_0)) 44ifeq ($(CORE),$(filter $(CORE), mcu1_0))
45# Enable XDC build for application by providing XDC CFG File per core 45# Enable XDC build for application by providing XDC CFG File per core
46XDC_CFG_FILE_$(CORE) = ../j7/r5f/mmcsdUnitTest_r5f.cfg 46XDC_CFG_FILE_$(CORE) = ../j721e/r5f/mmcsdUnitTest_r5f.cfg
47endif 47endif
48 48
49endif 49endif
@@ -55,7 +55,7 @@ INCLUDE_EXTERNAL_INTERFACES = bios xdc pdk
55# List all the components required by the application 55# List all the components required by the application
56COMP_LIST_COMMON = csl osal_tirtos uart board mmcsd 56COMP_LIST_COMMON = csl osal_tirtos uart board mmcsd
57 57
58ifeq ($(SOC),$(filter $(SOC), am65xx j7)) 58ifeq ($(SOC),$(filter $(SOC), am65xx j721e))
59COMP_LIST_COMMON += sciclient 59COMP_LIST_COMMON += sciclient
60endif 60endif
61 61
@@ -71,8 +71,8 @@ CFLAGS_MMCSD_UT += -DevmAM65xx
71endif 71endif
72 72
73# EVM build 73# EVM build
74ifeq ($(BOARD),$(filter $(BOARD), j7-evm)) 74ifeq ($(BOARD),$(filter $(BOARD), j721e-evm))
75CFLAGS_MMCSD_UT += -DsimJ7 75CFLAGS_MMCSD_UT += -Dj721e_sim
76endif 76endif
77 77
78 78
diff --git a/test/MMCSD_Regression_TestApp/makefile b/test/MMCSD_Regression_TestApp/makefile
index 751815a..8d366da 100644
--- a/test/MMCSD_Regression_TestApp/makefile
+++ b/test/MMCSD_Regression_TestApp/makefile
@@ -32,7 +32,7 @@ endif
32 32
33endif 33endif
34 34
35ifeq ($(SOC),$(filter $(SOC), j7)) 35ifeq ($(SOC),$(filter $(SOC), j721e))
36SRCDIR = ../src ../../ 36SRCDIR = ../src ../../
37INCDIR = ../src ../include ../../ 37INCDIR = ../src ../include ../../
38# Common source files across all platforms and cores 38# Common source files across all platforms and cores
@@ -42,12 +42,12 @@ CFLAGS_MMCSD_UT += -DMMCSD_ADMA_ENABLED -DMMCSD_REGRESSION_TEST -DMEASURE_TIME
42 42
43ifeq ($(CORE),$(filter $(CORE), mpu1_0)) 43ifeq ($(CORE),$(filter $(CORE), mpu1_0))
44# Enable XDC build for application by providing XDC CFG File per core 44# Enable XDC build for application by providing XDC CFG File per core
45XDC_CFG_FILE_$(CORE) = ../j7/a72/mmcsdUnitTest_a72.cfg 45XDC_CFG_FILE_$(CORE) = ../j721e/a72/mmcsdUnitTest_a72.cfg
46endif 46endif
47 47
48ifeq ($(CORE),$(filter $(CORE), mcu1_0)) 48ifeq ($(CORE),$(filter $(CORE), mcu1_0))
49# Enable XDC build for application by providing XDC CFG File per core 49# Enable XDC build for application by providing XDC CFG File per core
50XDC_CFG_FILE_$(CORE) = ../j7/r5f/mmcsdUnitTest_r5f.cfg 50XDC_CFG_FILE_$(CORE) = ../j721e/r5f/mmcsdUnitTest_r5f.cfg
51endif 51endif
52 52
53endif 53endif
@@ -59,7 +59,7 @@ INCLUDE_EXTERNAL_INTERFACES = bios xdc pdk
59# List all the components required by the application 59# List all the components required by the application
60COMP_LIST_COMMON = csl osal_tirtos uart board mmcsd fatfs_indp 60COMP_LIST_COMMON = csl osal_tirtos uart board mmcsd fatfs_indp
61 61
62ifeq ($(SOC),$(filter $(SOC), am65xx j7)) 62ifeq ($(SOC),$(filter $(SOC), am65xx j721e))
63COMP_LIST_COMMON += sciclient 63COMP_LIST_COMMON += sciclient
64endif 64endif
65 65
@@ -75,8 +75,8 @@ CFLAGS_MMCSD_UT += -DevmAM65xx
75endif 75endif
76 76
77# j7 build 77# j7 build
78ifeq ($(BOARD),$(filter $(BOARD), j7-evm)) 78ifeq ($(BOARD),$(filter $(BOARD), j721e-evm))
79CFLAGS_MMCSD_UT += -DsimJ7 79CFLAGS_MMCSD_UT += -Dj721e_sim
80endif 80endif
81 81
82PACKAGE_SRCS_COMMON = ../ 82PACKAGE_SRCS_COMMON = ../
diff --git a/test/MMCSD_TestApp/makefile b/test/MMCSD_TestApp/makefile
index bf4edaf..d4e151d 100644
--- a/test/MMCSD_TestApp/makefile
+++ b/test/MMCSD_TestApp/makefile
@@ -31,7 +31,7 @@ endif
31 31
32endif 32endif
33 33
34ifeq ($(SOC),$(filter $(SOC), j7)) 34ifeq ($(SOC),$(filter $(SOC), j721e))
35SRCDIR = ../src ../../ 35SRCDIR = ../src ../../
36INCDIR = ../src ../include ../../ 36INCDIR = ../src ../include ../../
37# Common source files across all platforms and cores 37# Common source files across all platforms and cores
@@ -39,12 +39,12 @@ SRCS_COMMON += main.c
39 39
40ifeq ($(CORE),$(filter $(CORE), mpu1_0)) 40ifeq ($(CORE),$(filter $(CORE), mpu1_0))
41# Enable XDC build for application by providing XDC CFG File per core 41# Enable XDC build for application by providing XDC CFG File per core
42XDC_CFG_FILE_$(CORE) = ../j7/a72/mmcsdUnitTest_a72.cfg 42XDC_CFG_FILE_$(CORE) = ../j721e/a72/mmcsdUnitTest_a72.cfg
43endif 43endif
44 44
45ifeq ($(CORE),$(filter $(CORE), mcu1_0)) 45ifeq ($(CORE),$(filter $(CORE), mcu1_0))
46# Enable XDC build for application by providing XDC CFG File per core 46# Enable XDC build for application by providing XDC CFG File per core
47XDC_CFG_FILE_$(CORE) = ../j7/r5f/mmcsdUnitTest_r5f.cfg 47XDC_CFG_FILE_$(CORE) = ../j721e/r5f/mmcsdUnitTest_r5f.cfg
48endif 48endif
49 49
50endif 50endif
@@ -56,7 +56,7 @@ INCLUDE_EXTERNAL_INTERFACES = bios xdc pdk
56# List all the components required by the application 56# List all the components required by the application
57COMP_LIST_COMMON = csl osal_tirtos uart board mmcsd 57COMP_LIST_COMMON = csl osal_tirtos uart board mmcsd
58 58
59ifeq ($(SOC),$(filter $(SOC), am65xx j7)) 59ifeq ($(SOC),$(filter $(SOC), am65xx j721e))
60COMP_LIST_COMMON += sciclient 60COMP_LIST_COMMON += sciclient
61endif 61endif
62 62
@@ -72,8 +72,8 @@ CFLAGS_MMCSD_UT += -DevmAM65xx
72endif 72endif
73 73
74# j7 build 74# j7 build
75ifeq ($(BOARD),$(filter $(BOARD), j7-evm)) 75ifeq ($(BOARD),$(filter $(BOARD), j721e-evm))
76CFLAGS_MMCSD_UT += -DsimJ7 76CFLAGS_MMCSD_UT += -Dj721e_sim
77endif 77endif
78 78
79PACKAGE_SRCS_COMMON = ../ 79PACKAGE_SRCS_COMMON = ../
diff --git a/test/MMCSD_TestProject/makefile b/test/MMCSD_TestProject/makefile
index d7ea025..ecedf06 100644
--- a/test/MMCSD_TestProject/makefile
+++ b/test/MMCSD_TestProject/makefile
@@ -31,7 +31,7 @@ endif
31 31
32endif 32endif
33 33
34ifeq ($(SOC),$(filter $(SOC), j7)) 34ifeq ($(SOC),$(filter $(SOC), j721e))
35SRCDIR = ../src ../../ 35SRCDIR = ../src ../../
36INCDIR = ../src ../include ../../ 36INCDIR = ../src ../include ../../
37# Common source files across all platforms and cores 37# Common source files across all platforms and cores
@@ -39,12 +39,12 @@ SRCS_COMMON += main.c
39 39
40ifeq ($(CORE),$(filter $(CORE), mpu1_0)) 40ifeq ($(CORE),$(filter $(CORE), mpu1_0))
41# Enable XDC build for application by providing XDC CFG File per core 41# Enable XDC build for application by providing XDC CFG File per core
42XDC_CFG_FILE_$(CORE) = ../j7/a72/mmcsdUnitTest_a72.cfg 42XDC_CFG_FILE_$(CORE) = ../j721e/a72/mmcsdUnitTest_a72.cfg
43endif 43endif
44 44
45ifeq ($(CORE),$(filter $(CORE), mcu1_0)) 45ifeq ($(CORE),$(filter $(CORE), mcu1_0))
46# Enable XDC build for application by providing XDC CFG File per core 46# Enable XDC build for application by providing XDC CFG File per core
47XDC_CFG_FILE_$(CORE) = ../j7/r5f/mmcsdUnitTest_r5f.cfg 47XDC_CFG_FILE_$(CORE) = ../j721e/r5f/mmcsdUnitTest_r5f.cfg
48endif 48endif
49 49
50endif 50endif
@@ -56,7 +56,7 @@ INCLUDE_EXTERNAL_INTERFACES = bios xdc pdk
56# List all the components required by the application 56# List all the components required by the application
57COMP_LIST_COMMON = csl osal_tirtos uart board mmcsd 57COMP_LIST_COMMON = csl osal_tirtos uart board mmcsd
58 58
59ifeq ($(SOC),$(filter $(SOC), am65xx j7)) 59ifeq ($(SOC),$(filter $(SOC), am65xx j721e))
60COMP_LIST_COMMON += sciclient 60COMP_LIST_COMMON += sciclient
61endif 61endif
62 62
@@ -72,8 +72,8 @@ CFLAGS_MMCSD_UT += -DevmAM65xx
72endif 72endif
73 73
74# EVM build 74# EVM build
75ifeq ($(BOARD),$(filter $(BOARD), j7-evm)) 75ifeq ($(BOARD),$(filter $(BOARD), j721e-evm))
76CFLAGS_MMCSD_UT += -DsimJ7 76CFLAGS_MMCSD_UT += -Dj721e_sim
77endif 77endif
78 78
79 79
diff --git a/test/j7/a72/mmcsdUnitTest_a72.cfg b/test/j721e/a72/mmcsdUnitTest_a72.cfg
index da45119..da45119 100644
--- a/test/j7/a72/mmcsdUnitTest_a72.cfg
+++ b/test/j721e/a72/mmcsdUnitTest_a72.cfg
diff --git a/test/j7/r5f/mmcsdUnitTest_r5f.cfg b/test/j721e/r5f/mmcsdUnitTest_r5f.cfg
index b476fc6..b476fc6 100644
--- a/test/j7/r5f/mmcsdUnitTest_r5f.cfg
+++ b/test/j721e/r5f/mmcsdUnitTest_r5f.cfg
diff --git a/test/j7/r5f/mpu.xs b/test/j721e/r5f/mpu.xs
index bd89bbe..bd89bbe 100644
--- a/test/j7/r5f/mpu.xs
+++ b/test/j721e/r5f/mpu.xs
diff --git a/test/src/MMCSD_log.h b/test/src/MMCSD_log.h
index bf95540..ddcf82a 100644
--- a/test/src/MMCSD_log.h
+++ b/test/src/MMCSD_log.h
@@ -51,7 +51,7 @@ extern "C" {
51/* UART Header files */ 51/* UART Header files */
52#include <ti/drv/uart/UART.h> 52#include <ti/drv/uart/UART.h>
53#include <ti/drv/uart/UART_stdio.h> 53#include <ti/drv/uart/UART_stdio.h>
54#if !defined(SOC_AM65XX) && !defined(SOC_J7) 54#if !defined(SOC_AM65XX) && !defined(SOC_J721E)
55#include <ti/csl/soc/am572x/src/cslr_control_core_pad_io.h> 55#include <ti/csl/soc/am572x/src/cslr_control_core_pad_io.h>
56#endif 56#endif
57 57
diff --git a/test/src/main.c b/test/src/main.c
index 987dc2e..90f3487 100644
--- a/test/src/main.c
+++ b/test/src/main.c
@@ -147,7 +147,7 @@ const FATFSConfigList FATFS_config = {
147#define MMCSD_DMA_ENABLED 1 147#define MMCSD_DMA_ENABLED 1
148#endif 148#endif
149 149
150#if !defined(SOC_AM65XX) && !defined(SOC_J7) 150#if !defined(SOC_AM65XX) && !defined(SOC_J721E)
151#define GPIO_ENABLED 151#define GPIO_ENABLED
152#endif 152#endif
153 153
@@ -168,7 +168,7 @@ const FATFSConfigList FATFS_config = {
168#endif 168#endif
169#include "profiling.h" 169#include "profiling.h"
170 170
171#if defined(SOC_AM65XX) || defined(SOC_J7) 171#if defined(SOC_AM65XX) || defined(SOC_J721E)
172#include <ti/csl/src/ip/intr_router/V0/csl_intr_router.h> 172#include <ti/csl/src/ip/intr_router/V0/csl_intr_router.h>
173#endif 173#endif
174/********************************************************************** 174/**********************************************************************
@@ -216,7 +216,7 @@ uint32_t mmcsd_test_sizes[MMCSD_TEST_NUM_SIZES]={(1024*10)};
216#define GPIO_PIN_MMC_SDCD_ACTIVE_STATE 0 216#define GPIO_PIN_MMC_SDCD_ACTIVE_STATE 0
217#endif 217#endif
218 218
219#if defined(iceK2G) || defined(SOC_AM65XX) || defined(SOC_J7) 219#if defined(iceK2G) || defined(SOC_AM65XX) || defined(SOC_J721E)
220#define MMCSD_INSTANCE_SDCARD 1 220#define MMCSD_INSTANCE_SDCARD 1
221#else 221#else
222 #define MMCSD_INSTANCE_SDCARD 0 222 #define MMCSD_INSTANCE_SDCARD 0
@@ -283,10 +283,10 @@ GPIO_v1_Config GPIO_v1_config = {
283#endif 283#endif
284 284
285 285
286#if defined(SOC_J7) 286#if defined(SOC_J721E)
287void MCMSD_configIntRouter(MMCSD_v2_HwAttrs *hwAttrsConfig) 287void MCMSD_configIntRouter(MMCSD_v2_HwAttrs *hwAttrsConfig)
288{ 288{
289#if defined(SOC_J7) && defined(__TI_ARM_V7R4__) 289#if defined(SOC_J721E) && defined(__TI_ARM_V7R4__)
290 CSL_IntrRouterCfg intrRouterCfg; 290 CSL_IntrRouterCfg intrRouterCfg;
291 uint32_t mmcsdIntRtrInIntNum,mmcsdIntRtrOutIntNum; 291 uint32_t mmcsdIntRtrInIntNum,mmcsdIntRtrOutIntNum;
292 292
@@ -299,7 +299,7 @@ void MCMSD_configIntRouter(MMCSD_v2_HwAttrs *hwAttrsConfig)
299 /* Route MMCSD int router output to MAIN2MCU int router output, MAIN2MCU int router output int number 299 /* Route MMCSD int router output to MAIN2MCU int router output, MAIN2MCU int router output int number
300 * is derived from the MCU GIC interrupt number configured in HwAttr in MMCSD_soc.*/ 300 * is derived from the MCU GIC interrupt number configured in HwAttr in MMCSD_soc.*/
301 mmcsdIntRtrInIntNum = hwAttrsConfig->eventId; 301 mmcsdIntRtrInIntNum = hwAttrsConfig->eventId;
302#if defined(SOC_J7) 302#if defined(SOC_J721E)
303 mmcsdIntRtrOutIntNum = hwAttrsConfig->intNum - CSL_MCU0_INTR_MAIN2MCU_LVL_INTRTR0_OUTL_0; 303 mmcsdIntRtrOutIntNum = hwAttrsConfig->intNum - CSL_MCU0_INTR_MAIN2MCU_LVL_INTRTR0_OUTL_0;
304#else 304#else
305 mmcsdIntRtrOutIntNum = hwAttrsConfig->intNum - CSL_MCU0_INTR_MAIN2MCU_LVL_INTR0_OUTL_0; 305 mmcsdIntRtrOutIntNum = hwAttrsConfig->intNum - CSL_MCU0_INTR_MAIN2MCU_LVL_INTR0_OUTL_0;
@@ -312,7 +312,7 @@ void MCMSD_configIntRouter(MMCSD_v2_HwAttrs *hwAttrsConfig)
312/* Structures and Enums */ 312/* Structures and Enums */
313/* ========================================================================== */ 313/* ========================================================================== */
314 314
315#if !defined(SOC_AM65XX) && !defined(SOC_J7) 315#if !defined(SOC_AM65XX) && !defined(SOC_J721E)
316typedef CSL_control_core_pad_ioRegs *CSL_padRegsOvly; 316typedef CSL_control_core_pad_ioRegs *CSL_padRegsOvly;
317#endif 317#endif
318 318
@@ -352,7 +352,7 @@ uint8_t rx[MMCSD_TEST_MAX_BUFSIZE] __attribute__((aligned(DATA_BUF_ALIGN))) __at
352#pragma DATA_ALIGN(rx, DATA_BUF_ALIGN) 352#pragma DATA_ALIGN(rx, DATA_BUF_ALIGN)
353#endif 353#endif
354 354
355#if (defined(SOC_AM65XX) || defined(SOC_J7)) && defined (__aarch64__) 355#if (defined(SOC_AM65XX) || defined(SOC_J721E)) && defined (__aarch64__)
356#ifndef BARE_METAL 356#ifndef BARE_METAL
357volatile int emuwait_mmu=1; 357volatile int emuwait_mmu=1;
358Void InitMmu() 358Void InitMmu()
@@ -565,7 +565,7 @@ typedef struct {
565 mmcsdTestBenchmarks_t *benchmarks; 565 mmcsdTestBenchmarks_t *benchmarks;
566} mmcsdTestSDProfile_t; 566} mmcsdTestSDProfile_t;
567 567
568#if defined(SOC_AM65XX) || defined(SOC_J7) 568#if defined(SOC_AM65XX) || defined(SOC_J721E)
569/* UHS Tests are disabled for AM65x PG 1.0 due to the silicon issue in 1.8 voltage switching */ 569/* UHS Tests are disabled for AM65x PG 1.0 due to the silicon issue in 1.8 voltage switching */
570#define MMCSD_UHS_TEST_DISABLED 570#define MMCSD_UHS_TEST_DISABLED
571#endif 571#endif
@@ -960,7 +960,7 @@ EDMA3_RM_Handle gEdmaHandle = NULL;
960 960
961#if defined (SOC_OMAPL137) || defined (SOC_OMAPL138) 961#if defined (SOC_OMAPL137) || defined (SOC_OMAPL138)
962MMCSD_v0_HwAttrs hwAttrsConfigDefault; 962MMCSD_v0_HwAttrs hwAttrsConfigDefault;
963#elif defined (SOC_AM65XX) || defined(SOC_J7) 963#elif defined (SOC_AM65XX) || defined(SOC_J721E)
964MMCSD_v2_HwAttrs hwAttrsConfigDefault; 964MMCSD_v2_HwAttrs hwAttrsConfigDefault;
965#else 965#else
966MMCSD_v1_HwAttrs hwAttrsConfigDefault; 966MMCSD_v1_HwAttrs hwAttrsConfigDefault;
@@ -983,7 +983,7 @@ void mmcsd_test(UArg arg0, UArg arg1)
983 983
984#if defined (SOC_OMAPL137) || defined (SOC_OMAPL138) 984#if defined (SOC_OMAPL137) || defined (SOC_OMAPL138)
985 MMCSD_v0_HwAttrs hwAttrsConfig; 985 MMCSD_v0_HwAttrs hwAttrsConfig;
986#elif defined (SOC_AM65XX) || defined(SOC_J7) 986#elif defined (SOC_AM65XX) || defined(SOC_J721E)
987 MMCSD_v2_HwAttrs hwAttrsConfig; 987 MMCSD_v2_HwAttrs hwAttrsConfig;
988#else 988#else
989 MMCSD_v1_HwAttrs hwAttrsConfig; 989 MMCSD_v1_HwAttrs hwAttrsConfig;
@@ -1087,7 +1087,7 @@ void mmcsd_test(UArg arg0, UArg arg1)
1087 1087
1088 hwAttrsConfig.enableInterrupt = testProfilePtr->intr; 1088 hwAttrsConfig.enableInterrupt = testProfilePtr->intr;
1089 hwAttrsConfig.supportedBusVoltages = testProfilePtr->busVoltage; 1089 hwAttrsConfig.supportedBusVoltages = testProfilePtr->busVoltage;
1090#if defined(SOC_AM65XX) || defined(SOC_J7) 1090#if defined(SOC_AM65XX) || defined(SOC_J721E)
1091 hwAttrsConfig.supportedModes = testProfilePtr->mode; 1091 hwAttrsConfig.supportedModes = testProfilePtr->mode;
1092 hwAttrsConfig.supportedBusWidth = testProfilePtr->busWidth; 1092 hwAttrsConfig.supportedBusWidth = testProfilePtr->busWidth;
1093#endif 1093#endif
@@ -1117,7 +1117,7 @@ void mmcsd_test(UArg arg0, UArg arg1)
1117#endif 1117#endif
1118 1118
1119 1119
1120#if defined(SOC_J7) 1120#if defined(SOC_J721E)
1121 /* Configure the main2mcu router for R5 */ 1121 /* Configure the main2mcu router for R5 */
1122 if(hwAttrsConfig.enableInterrupt==1) { 1122 if(hwAttrsConfig.enableInterrupt==1) {
1123 MCMSD_configIntRouter(&hwAttrsConfig); 1123 MCMSD_configIntRouter(&hwAttrsConfig);
@@ -1239,7 +1239,7 @@ int main(void)
1239 Board_initCfg boardCfg; 1239 Board_initCfg boardCfg;
1240 boardCfg = BOARD_INIT_PINMUX_CONFIG | BOARD_INIT_UART_STDIO | BOARD_INIT_MODULE_CLOCK; 1240 boardCfg = BOARD_INIT_PINMUX_CONFIG | BOARD_INIT_UART_STDIO | BOARD_INIT_MODULE_CLOCK;
1241 1241
1242#if (defined(SOC_AM65XX) || defined(SOC_J7)) && !defined(__aarch64__) 1242#if (defined(SOC_AM65XX) || defined(SOC_J721E)) && !defined(__aarch64__)
1243 /* Clear it until the issue is resolved */ 1243 /* Clear it until the issue is resolved */
1244 boardCfg &= ~(BOARD_INIT_MODULE_CLOCK); 1244 boardCfg &= ~(BOARD_INIT_MODULE_CLOCK);
1245#endif 1245#endif
diff --git a/test/src/main_emmc.c b/test/src/main_emmc.c
index 4cdb396..d054708 100644
--- a/test/src/main_emmc.c
+++ b/test/src/main_emmc.c
@@ -90,7 +90,7 @@
90#endif 90#endif
91 91
92 92
93#if !defined(SOC_AM65XX) && !defined(SOC_J7) 93#if !defined(SOC_AM65XX) && !defined(SOC_J721E)
94#define GPIO_ENABLED 1 94#define GPIO_ENABLED 1
95#endif 95#endif
96 96
@@ -101,7 +101,7 @@
101 101
102#include "profiling.h" 102#include "profiling.h"
103 103
104#if defined(SOC_AM65XX) || defined(SOC_J7) 104#if defined(SOC_AM65XX) || defined(SOC_J721E)
105#include <ti/csl/src/ip/intr_router/V0/csl_intr_router.h> 105#include <ti/csl/src/ip/intr_router/V0/csl_intr_router.h>
106#endif 106#endif
107/********************************************************************** 107/**********************************************************************
@@ -140,7 +140,7 @@ uint32_t mmcsd_test_sizes[MMCSD_TEST_NUM_SIZES]={(1024*256),(1024*512),(1024*102
140uint32_t mmcsd_test_sizes[MMCSD_TEST_NUM_SIZES]={(1024*10)}; 140uint32_t mmcsd_test_sizes[MMCSD_TEST_NUM_SIZES]={(1024*10)};
141#endif 141#endif
142 142
143#if defined (SOC_OMAPL137) || defined (SOC_AM65XX) || defined(SOC_J7) 143#if defined (SOC_OMAPL137) || defined (SOC_AM65XX) || defined(SOC_J721E)
144#define MMCSD_INSTANCE_EMMC (0U) 144#define MMCSD_INSTANCE_EMMC (0U)
145#else 145#else
146#define MMCSD_INSTANCE_EMMC (1U) 146#define MMCSD_INSTANCE_EMMC (1U)
@@ -207,10 +207,10 @@ GPIO_v1_Config GPIO_v1_config = {
207#endif 207#endif
208#endif 208#endif
209 209
210#if defined(SOC_J7) 210#if defined(SOC_J721E)
211void MCMSD_configIntRouter(MMCSD_v2_HwAttrs *hwAttrsConfig) 211void MCMSD_configIntRouter(MMCSD_v2_HwAttrs *hwAttrsConfig)
212{ 212{
213#if defined(SOC_J7) && defined(__TI_ARM_V7R4__) 213#if defined(SOC_J721E) && defined(__TI_ARM_V7R4__)
214 CSL_IntrRouterCfg intrRouterCfg; 214 CSL_IntrRouterCfg intrRouterCfg;
215 uint32_t mmcsdIntRtrInIntNum,mmcsdIntRtrOutIntNum; 215 uint32_t mmcsdIntRtrInIntNum,mmcsdIntRtrOutIntNum;
216 216
@@ -223,7 +223,7 @@ void MCMSD_configIntRouter(MMCSD_v2_HwAttrs *hwAttrsConfig)
223 /* Route MMCSD int router output to MAIN2MCU int router output, MAIN2MCU int router output int number 223 /* Route MMCSD int router output to MAIN2MCU int router output, MAIN2MCU int router output int number
224 * is derived from the MCU GIC interrupt number configured in HwAttr in MMCSD_soc.*/ 224 * is derived from the MCU GIC interrupt number configured in HwAttr in MMCSD_soc.*/
225 mmcsdIntRtrInIntNum = hwAttrsConfig->eventId; 225 mmcsdIntRtrInIntNum = hwAttrsConfig->eventId;
226#if defined(SOC_J7) 226#if defined(SOC_J721E)
227 mmcsdIntRtrOutIntNum = hwAttrsConfig->intNum - CSL_MCU0_INTR_MAIN2MCU_LVL_INTRTR0_OUTL_0; 227 mmcsdIntRtrOutIntNum = hwAttrsConfig->intNum - CSL_MCU0_INTR_MAIN2MCU_LVL_INTRTR0_OUTL_0;
228#else 228#else
229 mmcsdIntRtrOutIntNum = hwAttrsConfig->intNum - CSL_MCU0_INTR_MAIN2MCU_LVL_INTR0_OUTL_0; 229 mmcsdIntRtrOutIntNum = hwAttrsConfig->intNum - CSL_MCU0_INTR_MAIN2MCU_LVL_INTR0_OUTL_0;
@@ -237,7 +237,7 @@ void MCMSD_configIntRouter(MMCSD_v2_HwAttrs *hwAttrsConfig)
237/* Structures and Enums */ 237/* Structures and Enums */
238/* ========================================================================== */ 238/* ========================================================================== */
239 239
240#if !defined(SOC_AM65XX) && !defined(SOC_J7) 240#if !defined(SOC_AM65XX) && !defined(SOC_J721E)
241typedef CSL_control_core_pad_ioRegs *CSL_padRegsOvly; 241typedef CSL_control_core_pad_ioRegs *CSL_padRegsOvly;
242#endif 242#endif
243 243
@@ -248,7 +248,7 @@ typedef CSL_control_core_pad_ioRegs *CSL_padRegsOvly;
248static int32_t fillMmcPageData(uint8_t *buf, int32_t length, uint8_t flag,uint32_t *rampBase); 248static int32_t fillMmcPageData(uint8_t *buf, int32_t length, uint8_t flag,uint32_t *rampBase);
249 249
250 250
251#if !defined(SOC_AM65XX) && !defined(SOC_J7) 251#if !defined(SOC_AM65XX) && !defined(SOC_J721E)
252static void EmmcsReset(void); 252static void EmmcsReset(void);
253/* Delay function */ 253/* Delay function */
254#endif 254#endif
@@ -284,7 +284,7 @@ __attribute__((aligned(DATA_BUF_ALIGN))) // GCC way of aligning
284#pragma DATA_ALIGN(tx, DATA_BUF_ALIGN) 284#pragma DATA_ALIGN(tx, DATA_BUF_ALIGN)
285#pragma DATA_ALIGN(rx, DATA_BUF_ALIGN) 285#pragma DATA_ALIGN(rx, DATA_BUF_ALIGN)
286#endif 286#endif
287#if (defined(SOC_AM65XX) || defined(SOC_J7)) && defined (__aarch64__) 287#if (defined(SOC_AM65XX) || defined(SOC_J721E)) && defined (__aarch64__)
288#ifndef BARE_METAL 288#ifndef BARE_METAL
289volatile int emuwait_mmu=1; 289volatile int emuwait_mmu=1;
290Void InitMmu() 290Void InitMmu()
@@ -843,7 +843,7 @@ int32_t mmcsd_regression_seek_testID()
843 843
844#if defined (SOC_OMAPL137) 844#if defined (SOC_OMAPL137)
845MMCSD_v0_HwAttrs hwAttrsConfigDefault; 845MMCSD_v0_HwAttrs hwAttrsConfigDefault;
846#elif defined (SOC_AM65XX) || defined(SOC_J7) 846#elif defined (SOC_AM65XX) || defined(SOC_J721E)
847MMCSD_v2_HwAttrs hwAttrsConfigDefault; 847MMCSD_v2_HwAttrs hwAttrsConfigDefault;
848#else 848#else
849MMCSD_v1_HwAttrs hwAttrsConfigDefault; 849MMCSD_v1_HwAttrs hwAttrsConfigDefault;
@@ -865,7 +865,7 @@ void mmcsd_test(UArg arg0, UArg arg1)
865 uint32_t num_tests_passed=0,num_tests_run=0; 865 uint32_t num_tests_passed=0,num_tests_run=0;
866#if defined (SOC_OMAPL137) 866#if defined (SOC_OMAPL137)
867 MMCSD_v0_HwAttrs hwAttrsConfig; 867 MMCSD_v0_HwAttrs hwAttrsConfig;
868#elif defined (SOC_AM65XX) || defined(SOC_J7) 868#elif defined (SOC_AM65XX) || defined(SOC_J721E)
869 MMCSD_v2_HwAttrs hwAttrsConfig; 869 MMCSD_v2_HwAttrs hwAttrsConfig;
870#else 870#else
871 MMCSD_v1_HwAttrs hwAttrsConfig; 871 MMCSD_v1_HwAttrs hwAttrsConfig;
@@ -960,7 +960,7 @@ void mmcsd_test(UArg arg0, UArg arg1)
960 hwAttrsConfig.enableInterrupt = testProfilePtr->intr; 960 hwAttrsConfig.enableInterrupt = testProfilePtr->intr;
961 /* Set the Mode parameters */ 961 /* Set the Mode parameters */
962 hwAttrsConfig.supportedBusVoltages = testProfilePtr->busVoltage; 962 hwAttrsConfig.supportedBusVoltages = testProfilePtr->busVoltage;
963#if defined(SOC_AM65XX) || defined(SOC_J7) 963#if defined(SOC_AM65XX) || defined(SOC_J721E)
964 /* Set the Mode parameters */ 964 /* Set the Mode parameters */
965 hwAttrsConfig.supportedModes = testProfilePtr->mode; 965 hwAttrsConfig.supportedModes = testProfilePtr->mode;
966 /* Set the bus width */ 966 /* Set the bus width */
@@ -989,7 +989,7 @@ void mmcsd_test(UArg arg0, UArg arg1)
989#endif 989#endif
990 990
991 991
992#if defined(SOC_J7) 992#if defined(SOC_J721E)
993 /* Configure the main2mcu router for R5 */ 993 /* Configure the main2mcu router for R5 */
994 if(hwAttrsConfig.enableInterrupt==1) { 994 if(hwAttrsConfig.enableInterrupt==1) {
995 MCMSD_configIntRouter(&hwAttrsConfig); 995 MCMSD_configIntRouter(&hwAttrsConfig);
@@ -1015,7 +1015,7 @@ void mmcsd_test(UArg arg0, UArg arg1)
1015 return; 1015 return;
1016 } 1016 }
1017 1017
1018#if !defined(SOC_OMAPL137) && !defined(SOC_AM65XX) && !defined(SOC_J7) 1018#if !defined(SOC_OMAPL137) && !defined(SOC_AM65XX) && !defined(SOC_J721E)
1019 GPIO_init(); 1019 GPIO_init();
1020 1020
1021 EmmcsReset(); 1021 EmmcsReset();
@@ -1088,7 +1088,7 @@ int main(void)
1088 BOARD_INIT_MODULE_CLOCK | BOARD_INIT_UART_STDIO; 1088 BOARD_INIT_MODULE_CLOCK | BOARD_INIT_UART_STDIO;
1089 1089
1090 /* Until board issue is resolved */ 1090 /* Until board issue is resolved */
1091#if (defined(SOC_AM65XX) || defined(SOC_J7)) && !defined(__aarch64__) 1091#if (defined(SOC_AM65XX) || defined(SOC_J721E)) && !defined(__aarch64__)
1092 /* Clear it until the issue is resolved */ 1092 /* Clear it until the issue is resolved */
1093 boardCfg &= ~(BOARD_INIT_MODULE_CLOCK); 1093 boardCfg &= ~(BOARD_INIT_MODULE_CLOCK);
1094#endif 1094#endif
generated by cgit v1.2.3 (git 2.39.2)