PRSDK-7418: fatfs: Adding support for j7200 SOC and j7200_evm

Signed-off-by: Tinku Mannan <tmannan@ti.com>

diff --git a/packages/ti/fs/fatfs/build/makefile_indp.mk b/packages/ti/fs/fatfs/build/makefile_indp.mk
index 8098c399b3545ffc6c1fa9ef0f2ed9a53e33e061..bc83165b7e10a999fbb90a1dccc09c12a21906fc 100644 (file)
--- a/packages/ti/fs/fatfs/build/makefile_indp.mk
+++ b/packages/ti/fs/fatfs/build/makefile_indp.mk
@@ -39,7 +39,7 @@ MODULE_NAME = fatfs_indp
 #  need to be included for this component
 INCLUDE_EXTERNAL_INTERFACES = pdk
 
-ifneq ($(SOC),$(filter $(SOC), am65xx j721e))
+ifneq ($(SOC),$(filter $(SOC), am65xx j721e j7200))
 INCLUDE_EXTERNAL_INTERFACES += edma
 endif
 

diff --git a/packages/ti/fs/fatfs/build/makefile_profile_indp.mk b/packages/ti/fs/fatfs/build/makefile_profile_indp.mk
index 69a0d6b96230c686efd9df0b7e9fe6a42f6150b2..603d1a52cec04e9e46aa0a85f1282881a530e344 100644 (file)
--- a/packages/ti/fs/fatfs/build/makefile_profile_indp.mk
+++ b/packages/ti/fs/fatfs/build/makefile_profile_indp.mk
@@ -39,7 +39,7 @@ MODULE_NAME = fatfs_profile_indp
 #  need to be included for this component
 INCLUDE_EXTERNAL_INTERFACES = pdk
 
-ifneq ($(SOC),$(filter $(SOC), am65xx j721e))
+ifneq ($(SOC),$(filter $(SOC), am65xx j721e j7200))
 INCLUDE_EXTERNAL_INTERFACES += edma
 endif
 

diff --git a/packages/ti/fs/fatfs/example/console/makefile b/packages/ti/fs/fatfs/example/console/makefile
old mode 100755 (executable)
new mode 100644 (file)
index 3e3cfac..73ee11d
--- a/packages/ti/fs/fatfs/example/console/makefile
+++ b/packages/ti/fs/fatfs/example/console/makefile
@@ -32,7 +32,7 @@ endif
 
 endif
 
-ifeq ($(SOC),$(filter $(SOC), j721e))
+ifeq ($(SOC),$(filter $(SOC), j721e j7200))
 SRCDIR = ./src ../
 INCDIR = ./src
 # Common source files across all platforms and cores
@@ -48,7 +48,7 @@ INCLUDE_EXTERNAL_INTERFACES = bios xdc pdk
 # List all the components required by the application
 COMP_LIST_COMMON = csl osal_tirtos mmcsd gpio uart board fatfs_indp
 
-ifeq ($(SOC),$(filter $(SOC), am65xx j721e))
+ifeq ($(SOC),$(filter $(SOC), am65xx j721e j7200))
 COMP_LIST_COMMON += sciclient i2c
 endif
 

diff --git a/packages/ti/fs/fatfs/example/console/src/FATFS_log.c b/packages/ti/fs/fatfs/example/console/src/FATFS_log.c
index b1d4f60c8cdd2a7928ee33edaa717e47527c1985..f95750cf76f9a4f09ab4d17e792d003fd1b66c97 100644 (file)
--- a/packages/ti/fs/fatfs/example/console/src/FATFS_log.c
+++ b/packages/ti/fs/fatfs/example/console/src/FATFS_log.c
@@ -52,7 +52,7 @@
 /* TI-RTOS Header files */
 #include <ti/drv/uart/UART.h>
 #include <ti/drv/uart/UART_stdio.h>
-#if !defined(SOC_AM65XX) && !defined(SOC_J721E)
+#if !defined(SOC_AM65XX) && !defined(SOC_J721E) && !defined(SOC_J7200)
 #include <ti/csl/soc/am572x/src/cslr_control_core_pad_io.h>
 #endif
 
@@ -88,7 +88,7 @@ void ConsoleUtilsInit(void)
  *  ======== Board_initUART ========
  */
 void Board_initUART(void) {
-#if !defined(SOC_AM65XX) && !defined(SOC_J721E)
+#if !defined(SOC_AM65XX) && !defined(SOC_J721E) && !defined(SOC_J7200)
           HW_WR_REG32((SOC_CORE_PAD_IO_REGISTERS_BASE + CSL_CONTROL_CORE_PAD_IO_PAD_UART1_RXD),
             (CSL_CONTROL_CORE_PAD_IO_PAD_UART1_RXD_UART1_RXD_INPUTENABLE_MASK |
                     CSL_CONTROL_CORE_PAD_IO_PAD_UART1_RXD_UART1_RXD_SLEWCONTROL_MASK |

diff --git a/packages/ti/fs/fatfs/example/console/src/FATFS_log.h b/packages/ti/fs/fatfs/example/console/src/FATFS_log.h
index ea3614d01565b1df424fbc53409462040d7dcf6a..7f98943a56314dc024dba4af51a9879ee09e092c 100644 (file)
--- a/packages/ti/fs/fatfs/example/console/src/FATFS_log.h
+++ b/packages/ti/fs/fatfs/example/console/src/FATFS_log.h
@@ -51,7 +51,7 @@ extern "C" {
 /* UART Header files */
 #include <ti/drv/uart/UART.h>
 #include <ti/drv/uart/UART_stdio.h>
-#if !defined(SOC_AM65XX) && !defined(SOC_J721E)
+#if !defined(SOC_AM65XX) && !defined(SOC_J721E) && !defined(SOC_J7200)
 #include <ti/csl/soc/am572x/src/cslr_control_core_pad_io.h>
 #endif
 

diff --git a/packages/ti/fs/fatfs/example/console/src/main_console.c b/packages/ti/fs/fatfs/example/console/src/main_console.c
index 042463d1e57299ea1548c0916b4ba57aaffc65c8..039b5317572d2c610ba67312839415ab0e4b9601 100644 (file)
--- a/packages/ti/fs/fatfs/example/console/src/main_console.c
+++ b/packages/ti/fs/fatfs/example/console/src/main_console.c
@@ -70,7 +70,7 @@
  * SDCD. Hence this feature , i.e using GPIO to check the SD card insert
  * is disabled. Same is the case with J7 and Simulator (J7). Here the demo
  * assumes that the SD card is inserted */
-#if !(defined(SOC_AM65XX) || defined(SOC_J721E) || defined(SIMULATOR))
+#if !(defined(SOC_AM65XX) || defined(SOC_J721E) || defined(SIMULATOR) || defined(SOC_J7200))
 #define FATFS_GPIO_ENABLED 1
 #endif
 
@@ -135,7 +135,7 @@ GPIO_CallbackFxn gpioCallbackFunctions[] = {
     NULL,
 };
 
-#if (defined(SOC_AM65XX)||defined(SOC_J721E))
+#if (defined(SOC_AM65XX)||defined(SOC_J721E)||defined (SOC_J7200))
 GPIO_v0_Config GPIO_v0_config = {
     gpioPinConfigs,
     gpioCallbackFunctions,
@@ -168,7 +168,7 @@ FATFS_DrvFxnTable FATFS_drvFxnTable = {
 /* FATFS configuration structure */
 FATFS_HwAttrs FATFS_initCfg[_VOLUMES] =
 {
-#if defined (SOC_AM65XX) || defined (SOC_J721E)
+#if defined (SOC_AM65XX) || defined (SOC_J721E) || defined (SOC_J7200)
     {  /* MMC1 is SD card  for AM65xx GP EVM */
         1U
     },
@@ -347,7 +347,7 @@ void fatfs_console(UArg arg0, UArg arg1)
 
 
 #ifndef BARE_METAL
-#if (defined(SOC_AM65XX) || defined(SOC_J721E)) && (defined(BUILD_MPU) || defined (__C7100__))
+#if (defined(SOC_AM65XX) || defined(SOC_J721E) || defined (SOC_J7200)) && (defined(BUILD_MPU) || defined (__C7100__))
 extern void Osal_initMmuDefault(void);
 void InitMmu(void)
 {
@@ -368,7 +368,7 @@ int main(void)
     Board_initCfg boardCfg;
     boardCfg = BOARD_INIT_PINMUX_CONFIG | BOARD_INIT_UART_STDIO | BOARD_INIT_MODULE_CLOCK;
 
-#if (defined(SOC_AM65XX)||defined(SOC_J721E)) &&  defined(__TI_ARM_V7R4__)
+#if (defined(SOC_AM65XX)||defined(SOC_J721E)||defined (SOC_J7200)) &&  defined(__TI_ARM_V7R4__)
     /* Clear it until the issue is resolved */
     boardCfg &= ~(BOARD_INIT_MODULE_CLOCK);
 #endif

diff --git a/packages/ti/fs/fatfs/fatfs_component.mk b/packages/ti/fs/fatfs/fatfs_component.mk
index 9d4915a73746b4bbf518d526615eb7b9ebeab59c..edd5605c7f4f4fe11c637351eca75b9499e75a89 100644 (file)
--- a/packages/ti/fs/fatfs/fatfs_component.mk
+++ b/packages/ti/fs/fatfs/fatfs_component.mk
@@ -67,8 +67,8 @@
 ifeq ($(fatfs_component_make_include), )
 
 # under other list
-drvfatfs_BOARDLIST       = am65xx_evm am65xx_idk j721e_sim j721e_evm
-drvfatfs_SOCLIST           = am574x am572x am571x am437x am335x dra72x dra75x dra78x k2g omapl137 omapl138 am65xx j721e
+drvfatfs_BOARDLIST       = am65xx_evm am65xx_idk j721e_sim j721e_evm j7200_evm
+drvfatfs_SOCLIST           = am574x am572x am571x am437x am335x dra72x dra75x dra78x k2g omapl137 omapl138 am65xx j721e j7200
 drvfatfs_am574x_CORELIST   = c66x a15_0 ipu1_0
 drvfatfs_am572x_CORELIST   = c66x a15_0 ipu1_0
 drvfatfs_am571x_CORELIST   = c66x a15_0 ipu1_0
@@ -82,6 +82,7 @@ drvfatfs_omapl137_CORELIST = arm9_0 c674x
 drvfatfs_omapl138_CORELIST = arm9_0 c674x
 drvfatfs_am65xx_CORELIST   = mpu1_0 mcu1_0
 drvfatfs_j721e_CORELIST   = $(DEFAULT_j721e_CORELIST)
+drvfatfs_j7200_CORELIST    = mpu1_0 mcu1_0 mcu1_1 mcu2_0 mcu2_1
 ############################
 # uart package
 # List of components included under uart lib