diff --git a/packages/ti/board/diag/board_diag_component.mk b/packages/ti/board/diag/board_diag_component.mk
board_diag_j721e_CORELIST = mpu1_0 mcu1_0
board_diag_j7200_CORELIST = mpu1_0 mcu1_0
board_diag_tpr12_CORELIST = mcu1_0
+board_diag_awr294x_CORELIST = mcu1_0
+board_diag_am64x_CORELIST = mpu1_0 mcu1_0
############################
# Board diagnostic package
# ARCH is used for diag binary folder name to align with existing platforms
board_diag_LOCAL_BINPATH =
-ifeq ($(SOC),$(filter $(SOC), tpr12))
-board_diag_APPIMAGEGEN_CTRL = no
-else
board_diag_APPIMAGEGEN_CTRL = yes
-endif
# Board Diagnostic
board_diag_COMP_LIST = board_diag
export board_diag_adc_MAKEFILE
board_diag_adc_PKG_LIST = board_diag_adc
board_diag_adc_INCLUDE = $(board_diag_adc_PATH)
-board_diag_adc_BOARDLIST = j721e_evm j7200_evm
+board_diag_adc_BOARDLIST = j721e_evm j7200_evm am64x_evm
board_diag_adc_$(SOC)_CORELIST = $(board_diag_$(SOC)_CORELIST)
export board_diag_adc_$(SOC)_CORELIST
export board_diag_adc_SBL_APPIMAGEGEN = $(board_diag_APPIMAGEGEN_CTRL)
export board_diag_automationHeader_MAKEFILE
board_diag_automationHeader_PKG_LIST = board_diag_automationHeader
board_diag_automationHeader_INCLUDE = $(board_diag_automationHeader_PATH)
-board_diag_automationHeader_BOARDLIST = j721e_evm j7200_evm
+board_diag_automationHeader_BOARDLIST = j721e_evm j7200_evm am64x_evm
board_diag_automationHeader_$(SOC)_CORELIST = $(board_diag_$(SOC)_CORELIST)
export board_diag_automationHeader_$(SOC)_CORELIST
export board_diag_automationHeader_SBL_APPIMAGEGEN = $(board_diag_APPIMAGEGEN_CTRL)
export board_diag_bootSwitch_CORE_DEPENDENCY = yes
board_diag_bootSwitch_PKG_LIST = board_diag_bootSwitch
board_diag_bootSwitch_INCLUDE = $(board_diag_bootSwitch_PATH)
-board_diag_bootSwitch_BOARDLIST = j721e_evm am65xx_evm am65xx_idk j7200_evm
+board_diag_bootSwitch_BOARDLIST = j721e_evm am65xx_evm am65xx_idk j7200_evm am64x_evm
export board_diag_bootSwitch_$(SOC)_CORELIST = $(board_diag_$(SOC)_CORELIST)
export board_diag_bootSwitch_SBL_APPIMAGEGEN = $(board_diag_APPIMAGEGEN_CTRL)
board_diag_EXAMPLE_LIST += board_diag_bootSwitch
export board_diag_button_CORE_DEPENDENCY = yes
board_diag_button_PKG_LIST = board_diag_button
board_diag_button_INCLUDE = $(board_diag_button_PATH)
-board_diag_button_BOARDLIST = am65xx_evm am65xx_idk tpr12_evm
+board_diag_button_BOARDLIST = am65xx_evm am65xx_idk tpr12_evm am64x_evm awr294x_evm
export board_diag_button_$(SOC)_CORELIST = $(board_diag_$(SOC)_CORELIST)
export board_diag_button_SBL_APPIMAGEGEN = $(board_diag_APPIMAGEGEN_CTRL)
board_diag_EXAMPLE_LIST += board_diag_button
export board_diag_cpsw_MAKEFILE
board_diag_cpsw_PKG_LIST = board_diag_cpsw
board_diag_cpsw_INCLUDE = $(board_diag_cpsw_PATH)
-board_diag_cpsw_BOARDLIST = j721e_evm
-board_diag_cpsw_$(SOC)_CORELIST = mcu2_0
+board_diag_cpsw_BOARDLIST = tpr12_evm awr294x_evm
+board_diag_cpsw_$(SOC)_CORELIST = $(board_diag_$(SOC)_CORELIST)
export board_diag_cpsw_$(SOC)_CORELIST
export board_diag_cpsw_SBL_APPIMAGEGEN = $(board_diag_APPIMAGEGEN_CTRL)
-
-# Add CPSW example only if the CPSW component path exists
-ifneq ($(wildcard $(PDK_CPSW_COMP_PATH)),)
board_diag_EXAMPLE_LIST += board_diag_cpsw
-endif
# csirx
board_diag_csirx_COMP_LIST = board_diag_csirx
board_diag_csirx_RELPATH = ti/board/diag/csirx/build
board_diag_csirx_PATH = $(PDK_BOARD_DIAG_COMP_PATH)/csirx/build
board_diag_csirx_CUSTOM_BINPATH = $(board_diag_LOCAL_BINPATH)
-board_diag_csirx_MAKEFILE = -f makefile
+board_diag_csirx_MAKEFILE = -f makefile IS_BAREMETAL=yes
board_diag_csirx_BOARD_DEPENDENCY = yes
board_diag_csirx_CORE_DEPENDENCY = yes
+board_diag_csirx_XDC_CONFIGURO = no
export board_diag_csirx_COMP_LIST
export board_diag_csirx_BOARD_DEPENDENCY
export board_diag_csirx_CORE_DEPENDENCY
export board_diag_csirx_MAKEFILE
+export board_diag_csirx_XDC_CONFIGURO
board_diag_csirx_PKG_LIST = board_diag_csirx
board_diag_csirx_INCLUDE = $(board_diag_csirx_PATH)
-board_diag_csirx_BOARDLIST = j721e_evm
+board_diag_csirx_BOARDLIST = j721e_evm tpr12_evm
+ifeq ($(SOC),$(filter $(SOC), tpr12))
+board_diag_csirx_$(SOC)_CORELIST = mcu1_0 c66xdsp_1
+else
board_diag_csirx_$(SOC)_CORELIST = mcu2_0
+endif
export board_diag_csirx_$(SOC)_CORELIST
export board_diag_csirx_SBL_APPIMAGEGEN = $(board_diag_APPIMAGEGEN_CTRL)
+# csirx
+board_diag_csirx_tirtos_COMP_LIST = board_diag_csirx_tirtos
+board_diag_csirx_tirtos_RELPATH = ti/board/diag/csirx/build
+board_diag_csirx_tirtos_PATH = $(PDK_BOARD_DIAG_COMP_PATH)/csirx/build
+board_diag_csirx_tirtos_CUSTOM_BINPATH = $(board_diag_LOCAL_BINPATH)
+board_diag_csirx_tirtos_MAKEFILE = -f makefile IS_BAREMETAL=no
+board_diag_csirx_tirtos_BOARD_DEPENDENCY = yes
+board_diag_csirx_tirtos_CORE_DEPENDENCY = yes
+board_diag_csirx_tirtos_XDC_CONFIGURO = yes
+export board_diag_csirx_tirtos_COMP_LIST
+export board_diag_csirx_tirtos_BOARD_DEPENDENCY
+export board_diag_csirx_tirtos_CORE_DEPENDENCY
+export board_diag_csirx_tirtos_MAKEFILE
+export board_diag_csirx_tirtos_XDC_CONFIGURO
+board_diag_csirx_tirtos_PKG_LIST = board_diag_csirx_tirtos
+board_diag_csirx_tirtos_INCLUDE = $(board_diag_csirx_tirtos_PATH)
+board_diag_csirx_tirtos_BOARDLIST = tpr12_evm
+board_diag_csirx_tirtos_$(SOC)_CORELIST = mcu1_0 c66xdsp_1
+export board_diag_csirx_tirtos_$(SOC)_CORELIST
+export board_diag_csirx_tirtos_SBL_APPIMAGEGEN = $(board_diag_APPIMAGEGEN_CTRL)
+
# Add CSIRX diagnostic test only if the CSIRX component path exists
ifneq ($(wildcard $(PDK_CSIRX_COMP_PATH)),)
-board_diag_EXAMPLE_LIST += board_diag_csirx
+board_diag_EXAMPLE_LIST += board_diag_csirx board_diag_csirx_tirtos
endif
export board_diag_currentMonitor_MAKEFILE
board_diag_currentMonitor_PKG_LIST = board_diag_currentMonitor
board_diag_currentMonitor_INCLUDE = $(board_diag_currentMonitor_PATH)
-board_diag_currentMonitor_BOARDLIST = j721e_evm am65xx_evm am65xx_idk j7200_evm tpr12_evm
+board_diag_currentMonitor_BOARDLIST = j721e_evm am65xx_evm am65xx_idk j7200_evm tpr12_evm am64x_evm am64x_svb awr294x_evm
board_diag_currentMonitor_$(SOC)_CORELIST = $(board_diag_$(SOC)_CORELIST)
export board_diag_currentMonitor_$(SOC)_CORELIST
export board_diag_currentMonitor_SBL_APPIMAGEGEN = $(board_diag_APPIMAGEGEN_CTRL)
export board_diag_dsi_SBL_APPIMAGEGEN = $(board_diag_APPIMAGEGEN_CTRL)
board_diag_EXAMPLE_LIST += board_diag_dsi
+# DSITX
+board_diag_dsitx_COMP_LIST = board_diag_dsitx
+board_diag_dsitx_RELPATH = ti/board/diag/dsitx/build
+board_diag_dsitx_PATH = $(PDK_BOARD_DIAG_COMP_PATH)/dsitx/build
+board_diag_dsitx_CUSTOM_BINPATH = $(board_diag_LOCAL_BINPATH)
+board_diag_dsitx_MAKEFILE = -f makefile
+board_diag_dsitx_BOARD_DEPENDENCY = yes
+board_diag_dsitx_CORE_DEPENDENCY = yes
+export board_diag_dsitx_COMP_LIST
+export board_diag_dsitx_BOARD_DEPENDENCY
+export board_diag_dsitx_CORE_DEPENDENCY
+export board_diag_dsitx_MAKEFILE
+board_diag_dsitx_PKG_LIST = board_diag_dsitx
+board_diag_dsitx_INCLUDE = $(board_diag_dsitx_PATH)
+board_diag_dsitx_BOARDLIST = j721e_evm
+board_diag_dsitx_$(SOC)_CORELIST = mcu2_0
+export board_diag_dsitx_$(SOC)_CORELIST
+export board_diag_dsitx_SBL_APPIMAGEGEN = $(board_diag_APPIMAGEGEN_CTRL)
+board_diag_EXAMPLE_LIST += board_diag_dsitx
+
# EEPROM
board_diag_eeprom_COMP_LIST = board_diag_eeprom
board_diag_eeprom_RELPATH = ti/board/diag/eeprom/build
export board_diag_eeprom_MAKEFILE
board_diag_eeprom_PKG_LIST = board_diag_eeprom
board_diag_eeprom_INCLUDE = $(board_diag_eeprom_PATH)
-board_diag_eeprom_BOARDLIST = j721e_evm am65xx_evm am65xx_idk j7200_evm tpr12_evm
+board_diag_eeprom_BOARDLIST = j721e_evm am65xx_evm am65xx_idk j7200_evm tpr12_evm am64x_evm am64x_svb awr294x_evm
board_diag_eeprom_$(SOC)_CORELIST = $(board_diag_$(SOC)_CORELIST)
export board_diag_eeprom_$(SOC)_CORELIST
export board_diag_eeprom_SBL_APPIMAGEGEN = $(board_diag_APPIMAGEGEN_CTRL)
board_diag_emac_$(SOC)_CORELIST = $(board_diag_$(SOC)_CORELIST)
export board_diag_emac_$(SOC)_CORELIST
export board_diag_emac_SBL_APPIMAGEGEN = $(board_diag_APPIMAGEGEN_CTRL)
-board_diag_EXAMPLE_LIST += board_diag_emac
+#board_diag_EXAMPLE_LIST += board_diag_emac
# EMMC
board_diag_emmc_COMP_LIST = board_diag_emmc
export board_diag_emmc_MAKEFILE
board_diag_emmc_PKG_LIST = board_diag_emmc
board_diag_emmc_INCLUDE = $(board_diag_emmc_PATH)
-board_diag_emmc_BOARDLIST = j721e_evm am65xx_evm am65xx_idk j7200_evm
+board_diag_emmc_BOARDLIST = j721e_evm am65xx_evm am65xx_idk j7200_evm am64x_evm am64x_svb
board_diag_emmc_$(SOC)_CORELIST = $(board_diag_$(SOC)_CORELIST)
export board_diag_emmc_$(SOC)_CORELIST
export board_diag_emmc_SBL_APPIMAGEGEN = $(board_diag_APPIMAGEGEN_CTRL)
export board_diag_expHeader_MAKEFILE
board_diag_expHeader_PKG_LIST = board_diag_expHeader
board_diag_expHeader_INCLUDE = $(board_diag_expHeader_PATH)
-board_diag_expHeader_BOARDLIST = j721e_evm j7200_evm tpr12_evm
+board_diag_expHeader_BOARDLIST = j721e_evm j7200_evm tpr12_evm am64x_evm
board_diag_expHeader_$(SOC)_CORELIST = $(board_diag_$(SOC)_CORELIST)
export board_diag_expHeader_$(SOC)_CORELIST
export board_diag_expHeader_SBL_APPIMAGEGEN = $(board_diag_APPIMAGEGEN_CTRL)
export board_diag_fpdLib_MAKEFILE
board_diag_fpdLib_PKG_LIST = board_diag_fpdLib
board_diag_fpdLib_INCLUDE = $(board_diag_fpdLib_PATH)
-board_diag_fpdLib_BOARDLIST = j721e_evm
+board_diag_fpdLib_BOARDLIST = j721e_evm j7200_evm
board_diag_fpdLib_$(SOC)_CORELIST = $(board_diag_$(SOC)_CORELIST)
export board_diag_fpdLib_$(SOC)_CORELIST
export board_diag_fpdLib_SBL_APPIMAGEGEN = $(board_diag_APPIMAGEGEN_CTRL)
export board_diag_framework_MAKEFILE
board_diag_framework_PKG_LIST = board_diag_framework
board_diag_framework_INCLUDE = $(board_diag_framework_PATH)
-board_diag_framework_BOARDLIST = j721e_evm am65xx_evm am65xx_idk j7200_evm
+board_diag_framework_BOARDLIST = j721e_evm am65xx_evm am65xx_idk j7200_evm am64x_evm
board_diag_framework_$(SOC)_CORELIST = $(board_diag_$(SOC)_CORELIST)
export board_diag_framework_$(SOC)_CORELIST
export board_diag_framework_SBL_APPIMAGEGEN = $(board_diag_APPIMAGEGEN_CTRL)
board_diag_EXAMPLE_LIST += board_diag_framework
+# GPMC
+board_diag_gpmc_COMP_LIST = board_diag_gpmc
+board_diag_gpmc_RELPATH = ti/board/diag/gpmc/build
+board_diag_gpmc_PATH = $(PDK_BOARD_DIAG_COMP_PATH)/gpmc/build
+board_diag_gpmc_CUSTOM_BINPATH = $(board_diag_LOCAL_BINPATH)
+board_diag_gpmc_MAKEFILE = -f makefile
+board_diag_gpmc_BOARD_DEPENDENCY = yes
+board_diag_gpmc_CORE_DEPENDENCY = yes
+export board_diag_gpmc_COMP_LIST
+export board_diag_gpmc_BOARD_DEPENDENCY
+export board_diag_gpmc_CORE_DEPENDENCY
+export board_diag_gpmc_MAKEFILE
+board_diag_gpmc_PKG_LIST = board_diag_gpmc
+board_diag_gpmc_INCLUDE = $(board_diag_gpmc_PATH)
+board_diag_gpmc_BOARDLIST = am64x_svb am640x_svb
+board_diag_gpmc_$(SOC)_CORELIST = $(board_diag_$(SOC)_CORELIST)
+export board_diag_gpmc_$(SOC)_CORELIST
+export board_diag_gpmc_SBL_APPIMAGEGEN = $(board_diag_APPIMAGEGEN_CTRL)
+board_diag_EXAMPLE_LIST += board_diag_gpmc
+
# HDMI
board_diag_hdmi_COMP_LIST = board_diag_hdmi
board_diag_hdmi_RELPATH = ti/board/diag/hdmi/build
export board_diag_hyperbus_SBL_APPIMAGEGEN = $(board_diag_APPIMAGEGEN_CTRL)
board_diag_EXAMPLE_LIST += board_diag_hyperbus
-# icssg_emac
-export board_diag_icssgEmac_COMP_LIST = board_diag_icssgEmac
-board_diag_icssgEmac_RELPATH = ti/board/diag/icssg_emac/build
-board_diag_icssgEmac_PATH = $(PDK_BOARD_DIAG_COMP_PATH)/icssg_emac/build
-board_diag_icssgEmac_CUSTOM_BINPATH = $(board_diag_LOCAL_BINPATH)
-export board_diag_icssgEmac_MAKEFILE = -f makefile
-export board_diag_icssgEmac_BOARD_DEPENDENCY = yes
-export board_diag_icssgEmac_CORE_DEPENDENCY = yes
-board_diag_icssgEmac_PKG_LIST = board_diag_icssgEmac
-board_diag_icssgEmac_INCLUDE = $(board_diag_icssgEmac_PATH)
-board_diag_icssgEmac_BOARDLIST = am65xx_evm am65xx_idk
-export board_diag_icssgEmac_$(SOC)_CORELIST = $(board_diag_$(SOC)_CORELIST)
-export board_diag_icssgEmac_SBL_APPIMAGEGEN = $(board_diag_APPIMAGEGEN_CTRL)
-board_diag_EXAMPLE_LIST += board_diag_icssgEmac
+# enet_icssg
+export board_diag_enetIcssg_COMP_LIST = board_diag_enetIcssg
+board_diag_enetIcssg_RELPATH = ti/board/diag/enet_icssg/build
+board_diag_enetIcssg_PATH = $(PDK_BOARD_DIAG_COMP_PATH)/enet_icssg/build
+board_diag_enetIcssg_CUSTOM_BINPATH = $(board_diag_LOCAL_BINPATH)
+export board_diag_enetIcssg_MAKEFILE = -f makefile
+export board_diag_enetIcssg_BOARD_DEPENDENCY = yes
+export board_diag_enetIcssg_CORE_DEPENDENCY = yes
+board_diag_enetIcssg_PKG_LIST = board_diag_enetIcssg
+board_diag_enetIcssg_INCLUDE = $(board_diag_enetIcssg_PATH)
+board_diag_enetIcssg_BOARDLIST = am65xx_evm am65xx_idk
+export board_diag_enetIcssg_$(SOC)_CORELIST = mcu1_0
+export board_diag_enetIcssg_SBL_APPIMAGEGEN = $(board_diag_APPIMAGEGEN_CTRL)
+# Need to disable this as EMAC-LLD is also disbaled
+#board_diag_EXAMPLE_LIST += board_diag_enetIcssg
# icssg_led
export board_diag_icssgLed_COMP_LIST = board_diag_icssgLed
board_diag_icssgLed_BOARDLIST = am65xx_idk
export board_diag_icssgLed_$(SOC)_CORELIST = $(board_diag_$(SOC)_CORELIST)
export board_diag_icssgLed_SBL_APPIMAGEGEN = $(board_diag_APPIMAGEGEN_CTRL)
-board_diag_EXAMPLE_LIST += board_diag_icssgLed
+#board_diag_EXAMPLE_LIST += board_diag_icssgLed
# lcd
export board_diag_lcd_COMP_LIST = board_diag_lcd
export board_diag_led_MAKEFILE
board_diag_led_PKG_LIST = board_diag_led
board_diag_led_INCLUDE = $(board_diag_led_PATH)
-board_diag_led_BOARDLIST = j721e_evm am65xx_evm am65xx_idk tpr12_evm j7200_evm
+board_diag_led_BOARDLIST = j721e_evm am65xx_evm am65xx_idk tpr12_evm j7200_evm am64x_evm awr294x_evm
board_diag_led_$(SOC)_CORELIST = $(board_diag_$(SOC)_CORELIST)
export board_diag_led_$(SOC)_CORELIST
export board_diag_led_SBL_APPIMAGEGEN = $(board_diag_APPIMAGEGEN_CTRL)
export board_diag_ledIndustrial_CORE_DEPENDENCY = yes
board_diag_ledIndustrial_PKG_LIST = board_diag_ledIndustrial
board_diag_ledIndustrial_INCLUDE = $(board_diag_ledIndustrial_PATH)
-board_diag_ledIndustrial_BOARDLIST = am65xx_evm am65xx_idk
+board_diag_ledIndustrial_BOARDLIST = am65xx_evm am65xx_idk am64x_evm
export board_diag_ledIndustrial_$(SOC)_CORELIST = $(board_diag_$(SOC)_CORELIST)
export board_diag_ledIndustrial_SBL_APPIMAGEGEN = $(board_diag_APPIMAGEGEN_CTRL)
board_diag_EXAMPLE_LIST += board_diag_ledIndustrial
export board_diag_mcan_MAKEFILE
board_diag_mcan_PKG_LIST = board_diag_mcan
board_diag_mcan_INCLUDE = $(board_diag_mcan_PATH)
-board_diag_mcan_BOARDLIST = j721e_evm am65xx_idk j7200_evm
+board_diag_mcan_BOARDLIST = j721e_evm am65xx_idk j7200_evm am64x_evm tpr12_evm am64x_svb awr294x_evm
board_diag_mcan_$(SOC)_CORELIST = $(board_diag_$(SOC)_CORELIST)
export board_diag_mcan_$(SOC)_CORELIST
export board_diag_mcan_SBL_APPIMAGEGEN = $(board_diag_APPIMAGEGEN_CTRL)
export board_diag_mem_MAKEFILE
board_diag_mem_PKG_LIST = board_diag_mem
board_diag_mem_INCLUDE = $(board_diag_mem_PATH)
-board_diag_mem_BOARDLIST = j721e_evm am65xx_evm am65xx_idk j7200_evm
+board_diag_mem_BOARDLIST = j721e_evm am65xx_evm am65xx_idk j7200_evm am64x_evm am64x_svb
board_diag_mem_$(SOC)_CORELIST = $(board_diag_$(SOC)_CORELIST)
export board_diag_mem_$(SOC)_CORELIST
export board_diag_mem_SBL_APPIMAGEGEN = $(board_diag_APPIMAGEGEN_CTRL)
export board_diag_mmcsd_MAKEFILE
board_diag_mmcsd_PKG_LIST = board_diag_mmcsd
board_diag_mmcsd_INCLUDE = $(board_diag_mmcsd_PATH)
-board_diag_mmcsd_BOARDLIST = j721e_evm am65xx_evm am65xx_idk j7200_evm
+board_diag_mmcsd_BOARDLIST = j721e_evm am65xx_evm am65xx_idk j7200_evm am64x_evm am64x_svb
board_diag_mmcsd_$(SOC)_CORELIST = $(board_diag_$(SOC)_CORELIST)
export board_diag_mmcsd_$(SOC)_CORELIST
export board_diag_mmcsd_SBL_APPIMAGEGEN = $(board_diag_APPIMAGEGEN_CTRL)
export board_diag_norflash_MAKEFILE
board_diag_norflash_PKG_LIST = board_diag_norflash
board_diag_norflash_INCLUDE = $(board_diag_norflash_PATH)
-board_diag_norflash_BOARDLIST = j721e_evm am65xx_evm am65xx_idk j7200_evm tpr12_evm
+board_diag_norflash_BOARDLIST = j721e_evm am65xx_evm am65xx_idk j7200_evm tpr12_evm am64x_svb awr294x_evm
board_diag_norflash_$(SOC)_CORELIST = $(board_diag_$(SOC)_CORELIST)
export board_diag_norflash_$(SOC)_CORELIST
export board_diag_norflash_SBL_APPIMAGEGEN = $(board_diag_APPIMAGEGEN_CTRL)
board_diag_EXAMPLE_LIST += board_diag_norflash
+# OLED DISPLAY
+board_diag_oledDisplay_COMP_LIST = board_diag_oledDisplay
+board_diag_oledDisplay_RELPATH = ti/board/diag/oled_display/build
+board_diag_oledDisplay_PATH = $(PDK_BOARD_DIAG_COMP_PATH)/oled_display/build
+board_diag_oledDisplay_CUSTOM_BINPATH = $(board_diag_LOCAL_BINPATH)
+board_diag_oledDisplay_MAKEFILE = -f makefile
+board_diag_oledDisplay_BOARD_DEPENDENCY = yes
+board_diag_oledDisplay_CORE_DEPENDENCY = yes
+export board_diag_oledDisplay_COMP_LIST
+export board_diag_oledDisplay_BOARD_DEPENDENCY
+export board_diag_oledDisplay_CORE_DEPENDENCY
+export board_diag_oledDisplay_MAKEFILE
+board_diag_oledDisplay_PKG_LIST = board_diag_oledDisplay
+board_diag_oledDisplay_INCLUDE = $(board_diag_oledDisplay_PATH)
+board_diag_oledDisplay_BOARDLIST = am64x_evm
+board_diag_oledDisplay_$(SOC)_CORELIST = $(board_diag_$(SOC)_CORELIST)
+export board_diag_oledDisplay_$(SOC)_CORELIST
+export board_diag_oledDisplay_SBL_APPIMAGEGEN = $(board_diag_APPIMAGEGEN_CTRL)
+board_diag_EXAMPLE_LIST += board_diag_oledDisplay
+
# OSPI
board_diag_ospi_COMP_LIST = board_diag_ospi
board_diag_ospi_RELPATH = ti/board/diag/ospi/build
export board_diag_ospi_MAKEFILE
board_diag_ospi_PKG_LIST = board_diag_ospi
board_diag_ospi_INCLUDE = $(board_diag_ospi_PATH)
-board_diag_ospi_BOARDLIST = j721e_evm am65xx_evm am65xx_idk j7200_evm
+board_diag_ospi_BOARDLIST = j721e_evm am65xx_evm am65xx_idk j7200_evm am64x_evm am64x_svb
board_diag_ospi_$(SOC)_CORELIST = $(board_diag_$(SOC)_CORELIST)
export board_diag_ospi_$(SOC)_CORELIST
export board_diag_ospi_SBL_APPIMAGEGEN = $(board_diag_APPIMAGEGEN_CTRL)
export board_diag_pmic_MAKEFILE
board_diag_pmic_PKG_LIST = board_diag_pmic
board_diag_pmic_INCLUDE = $(board_diag_pmic_PATH)
-board_diag_pmic_BOARDLIST = j721e_evm j7200_evm tpr12_evm
+board_diag_pmic_BOARDLIST = j721e_evm j7200_evm tpr12_evm awr294x_evm
board_diag_pmic_$(SOC)_CORELIST = $(board_diag_$(SOC)_CORELIST)
export board_diag_pmic_$(SOC)_CORELIST
export board_diag_pmic_SBL_APPIMAGEGEN = $(board_diag_APPIMAGEGEN_CTRL)
export board_diag_rs485Uart_SBL_APPIMAGEGEN = yes
board_diag_EXAMPLE_LIST += board_diag_rs485Uart
+# SPI EEPROM
+board_diag_spiEeprom_COMP_LIST = board_diag_spiEeprom
+board_diag_spiEeprom_RELPATH = ti/board/diag/spi_eeprom/build
+board_diag_spiEeprom_PATH = $(PDK_BOARD_DIAG_COMP_PATH)/spi_eeprom/build
+board_diag_spiEeprom_CUSTOM_BINPATH = $(board_diag_LOCAL_BINPATH)
+board_diag_spiEeprom_MAKEFILE = -f makefile
+board_diag_spiEeprom_BOARD_DEPENDENCY = yes
+board_diag_spiEeprom_CORE_DEPENDENCY = yes
+export board_diag_spiEeprom_COMP_LIST
+export board_diag_spiEeprom_BOARD_DEPENDENCY
+export board_diag_spiEeprom_CORE_DEPENDENCY
+export board_diag_spiEeprom_MAKEFILE
+board_diag_spiEeprom_PKG_LIST = board_diag_spiEeprom
+board_diag_spiEeprom_INCLUDE = $(board_diag_spiEeprom_PATH)
+board_diag_spiEeprom_BOARDLIST = am64x_evm
+board_diag_spiEeprom_$(SOC)_CORELIST = $(board_diag_$(SOC)_CORELIST)
+export board_diag_spiEeprom_$(SOC)_CORELIST
+export board_diag_spiEeprom_SBL_APPIMAGEGEN = $(board_diag_APPIMAGEGEN_CTRL)
+board_diag_EXAMPLE_LIST += board_diag_spiEeprom
+
# TEMPERATURE
board_diag_temperature_COMP_LIST = board_diag_temperature
board_diag_temperature_RELPATH = ti/board/diag/temperature/build
export board_diag_temperature_MAKEFILE
board_diag_temperature_PKG_LIST = board_diag_temperature
board_diag_temperature_INCLUDE = $(board_diag_temperature_PATH)
-board_diag_temperature_BOARDLIST = j721e_evm am65xx_evm am65xx_idk j7200_evm tpr12_evm
+board_diag_temperature_BOARDLIST = j721e_evm am65xx_evm am65xx_idk j7200_evm tpr12_evm am64x_evm am64x_svb awr294x_evm
board_diag_temperature_$(SOC)_CORELIST = $(board_diag_$(SOC)_CORELIST)
export board_diag_temperature_$(SOC)_CORELIST
export board_diag_temperature_SBL_APPIMAGEGEN = $(board_diag_APPIMAGEGEN_CTRL)
export board_diag_uart_MAKEFILE
board_diag_uart_PKG_LIST = board_diag_uart
board_diag_uart_INCLUDE = $(board_diag_uart_PATH)
-board_diag_uart_BOARDLIST = j721e_evm am65xx_evm am65xx_idk j7200_evm tpr12_evm
-ifeq ($(SOC),$(filter $(SOC), tpr12))
+board_diag_uart_BOARDLIST = j721e_evm am65xx_evm am65xx_idk j7200_evm tpr12_evm am64x_evm awr294x_evm
+ifeq ($(SOC),$(filter $(SOC), tpr12 awr294x))
board_diag_uart_$(SOC)_CORELIST = mcu1_0 c66xdsp_1
else
board_diag_uart_$(SOC)_CORELIST = $(board_diag_$(SOC)_CORELIST)