diff --git a/ti-processor-sdk-rtos-j7200-evm-07_03_00_07/pdk_j7200_07_03_00_29/packages/ti/board/src/j7200_evm/J7200_pinmux_data_cpsw.c b/ti-processor-sdk-rtos-j7200-evm-07_03_00_07/pdk_j7200_07_03_00_29/packages/ti/board/src/j7200_evm/J7200_pinmux_data_cpsw.c index e6ca54d60..c8382ea5a 100755 --- a/ti-processor-sdk-rtos-j7200-evm-07_03_00_07/pdk_j7200_07_03_00_29/packages/ti/board/src/j7200_evm/J7200_pinmux_data_cpsw.c +++ b/ti-processor-sdk-rtos-j7200-evm-07_03_00_07/pdk_j7200_07_03_00_29/packages/ti/board/src/j7200_evm/J7200_pinmux_data_cpsw.c @@ -237,16 +237,16 @@ static pinmuxModuleCfg_t gSystemPinCfg[] = }; -static pinmuxPerCfg_t gUart3PinCfg[] = +static pinmuxPerCfg_t gUart0PinCfg[] = { /* MyUART3 -> UART3_RXD -> Y18 */ { - PIN_MCAN2_TX, PIN_MODE(11) | \ + PIN_UART0_RXD, PIN_MODE(0) | \ ((PIN_PULL_DISABLE | PIN_INPUT_ENABLE) & (~PIN_PULL_DIRECTION)) }, /* MyUART3 -> UART3_TXD -> Y19 */ { - PIN_MCAN2_RX, PIN_MODE(11) | \ + PIN_UART0_TXD, PIN_MODE(0) | \ ((PIN_PULL_DISABLE) & (~PIN_PULL_DIRECTION & ~PIN_INPUT_ENABLE)) }, {PINMUX_END} @@ -254,7 +254,7 @@ static pinmuxPerCfg_t gUart3PinCfg[] = static pinmuxModuleCfg_t gUartPinCfg[] = { - {3, TRUE, gUart3PinCfg}, + {0, TRUE, gUart0PinCfg}, {PINMUX_END} }; diff --git a/ti-processor-sdk-rtos-j7200-evm-07_03_00_07/pdk_j7200_07_03_00_29/packages/ti/drv/enet/examples/utils/V1/enet_appboardutils_j721e_evm.c b/ti-processor-sdk-rtos-j7200-evm-07_03_00_07/pdk_j7200_07_03_00_29/packages/ti/drv/enet/examples/utils/V1/enet_appboardutils_j721e_evm.c index 387b4670f..0193b2172 100644 --- a/ti-processor-sdk-rtos-j7200-evm-07_03_00_07/pdk_j7200_07_03_00_29/packages/ti/drv/enet/examples/utils/V1/enet_appboardutils_j721e_evm.c +++ b/ti-processor-sdk-rtos-j7200-evm-07_03_00_07/pdk_j7200_07_03_00_29/packages/ti/drv/enet/examples/utils/V1/enet_appboardutils_j721e_evm.c @@ -214,7 +214,7 @@ void EnetBoard_initEthFw(void) uint32_t clkModuleId[] = { TISCI_DEV_DDR0, TISCI_DEV_TIMER12, TISCI_DEV_TIMER13, - TISCI_DEV_UART2, }; + TISCI_DEV_UART0, }; appFlags = 0U; moduleCnt = ENET_ARRAYSIZE(clkModuleId); @@ -241,11 +241,14 @@ void EnetBoard_initEthFw(void) EnetBoard_boardInit(&boardCfg); +/* the MUX between J7200 SOM UART1 to CPB UART1 are hardware config */ +#if 0 #if defined(ENETAPPUTILS_UART_ALLOWED) && defined (SOC_J7200) && defined(BUILD_MCU2_0) /* Set SOM's MUX2 for UART3 route */ status = Board_control(BOARD_CTRL_CMD_SET_SOM_UART_MUX, NULL); EnetAppUtils_assert(status == BOARD_SOK); #endif +#endif #if !defined(ENETAPPUTILS_BYPASS_I2C) && defined(BUILD_MCU2_0) /* Configure SGMII/QSGMII expansion board diff --git a/ti-processor-sdk-rtos-j7200-evm-07_03_00_07/pdk_j7200_07_03_00_29/packages/ti/drv/enet/examples/utils/include/enet_apputils.h b/ti-processor-sdk-rtos-j7200-evm-07_03_00_07/pdk_j7200_07_03_00_29/packages/ti/drv/enet/examples/utils/include/enet_apputils.h index acab1f085..c6184c27d 100644 --- a/ti-processor-sdk-rtos-j7200-evm-07_03_00_07/pdk_j7200_07_03_00_29/packages/ti/drv/enet/examples/utils/include/enet_apputils.h +++ b/ti-processor-sdk-rtos-j7200-evm-07_03_00_07/pdk_j7200_07_03_00_29/packages/ti/drv/enet/examples/utils/include/enet_apputils.h @@ -109,7 +109,7 @@ extern "C" { #define ENET_CTRL_RGMII_ID_NODELAY (1U) #if defined(SOC_J7200) -#define ENET_UTILS_MCU2_0_UART_INSTANCE (3U) +#define ENET_UTILS_MCU2_0_UART_INSTANCE (0U) #else #define ENET_UTILS_MCU2_0_UART_INSTANCE (2U) #endif diff --git a/ti-processor-sdk-rtos-j7200-evm-07_03_00_07/pdk_j7200_07_03_00_29/packages/ti/drv/enet/examples/utils/makefile b/ti-processor-sdk-rtos-j7200-evm-07_03_00_07/pdk_j7200_07_03_00_29/packages/ti/drv/enet/examples/utils/makefile index 40ccfc9bd..1d528562a 100644 --- a/ti-processor-sdk-rtos-j7200-evm-07_03_00_07/pdk_j7200_07_03_00_29/packages/ti/drv/enet/examples/utils/makefile +++ b/ti-processor-sdk-rtos-j7200-evm-07_03_00_07/pdk_j7200_07_03_00_29/packages/ti/drv/enet/examples/utils/makefile @@ -37,7 +37,7 @@ else ifeq ($(SOC),$(filter $(SOC), j721e)) ENET_CFLAGS += -DENETAPPUTILS_BYPASS_QSGMII endif - ifneq ($(SOC),$(filter $(SOC), j7200)) + ifeq ($(SOC),$(filter $(SOC), j7200)) ENET_CFLAGS += -DENETAPPUTILS_UART_ALLOWED endif else