i2c: PRSDK-4123: Align AM65xx unit tests name & directory for system test

Signed-off-by: Hao Zhang <hzhang@ti.com>

diff --git a/i2c_component.mk b/i2c_component.mk
index d5df99e6b7e5e42d82ab8786138bea498d75b1d9..78cdf4cc973c0f6e74d14f4b4361161c5191edd2 100644 (file)
--- a/i2c_component.mk
+++ b/i2c_component.mk
@@ -113,7 +113,7 @@ drvi2c_FIRM_LIST = $(i2c_FIRM_LIST)
 # All the tests mentioned in list are built when test target is called
 # List below all examples for allowed values
 ############################
-i2c_EXAMPLE_LIST = drv_i2c_led_blink_test drv_i2c_eeprom_test_baremetal drv_i2c_eeprom_test_tirtos
+i2c_EXAMPLE_LIST = drv_i2c_led_blink_test I2C_Baremetal_Eeprom_TestApp I2C_Eeprom_TestApp
 drvi2c_EXAMPLE_LIST = $(i2c_EXAMPLE_LIST)
 
 #
@@ -338,42 +338,42 @@ drv_i2c_led_blink_test_$(SOC)_CORELIST = $(i2c_$(SOC)_CORELIST)
 export drv_i2c_led_blink_test_$(SOC)_CORELIST
 
 # I2C baremetal EEPROM test
-drv_i2c_eeprom_test_baremetal_COMP_LIST = drv_i2c_eeprom_test_baremetal
-drv_i2c_eeprom_test_baremetal_RELPATH = $(PDK_I2C_COMP_PATH)/test/eeprom_read
-drv_i2c_eeprom_test_baremetal_PATH = $(PDK_I2C_COMP_PATH)/test/eeprom_read
-drv_i2c_eeprom_test_baremetal_BOARD_DEPENDENCY = yes
-drv_i2c_eeprom_test_baremetal_CORE_DEPENDENCY = no
-drv_i2c_eeprom_test_baremetal_MAKEFILE = -f makefile IS_BAREMETAL=yes
-export drv_i2c_eeprom_test_baremetal_COMP_LIST
-export drv_i2c_eeprom_test_baremetal_BOARD_DEPENDENCY
-export drv_i2c_eeprom_test_baremetal_CORE_DEPENDENCY
-export drv_i2c_eeprom_test_baremetal_MAKEFILE
-drv_i2c_eeprom_test_baremetal_PKG_LIST = drv_i2c_eeprom_test_baremetal
-drv_i2c_eeprom_test_baremetal_INCLUDE = $(drv_i2c_eeprom_test_baremetal_PATH)
-drv_i2c_eeprom_test_baremetal_BOARDLIST = am65xx_evm am65xx_sim
-export drv_i2c_eeprom_test_baremetal_BOARDLIST
-drv_i2c_eeprom_test_baremetal_$(SOC)_CORELIST = $(i2c_$(SOC)_CORELIST)
-export drv_i2c_eeprom_test_baremetal_$(SOC)_CORELIST
+I2C_Baremetal_Eeprom_TestApp_COMP_LIST = I2C_Baremetal_Eeprom_TestApp
+I2C_Baremetal_Eeprom_TestApp_RELPATH = $(PDK_I2C_COMP_PATH)/test/eeprom_read
+I2C_Baremetal_Eeprom_TestApp_PATH = $(PDK_I2C_COMP_PATH)/test/eeprom_read
+I2C_Baremetal_Eeprom_TestApp_BOARD_DEPENDENCY = yes
+I2C_Baremetal_Eeprom_TestApp_CORE_DEPENDENCY = no
+I2C_Baremetal_Eeprom_TestApp_MAKEFILE = -f makefile IS_BAREMETAL=yes
+export I2C_Baremetal_Eeprom_TestApp_COMP_LIST
+export I2C_Baremetal_Eeprom_TestApp_BOARD_DEPENDENCY
+export I2C_Baremetal_Eeprom_TestApp_CORE_DEPENDENCY
+export I2C_Baremetal_Eeprom_TestApp_MAKEFILE
+I2C_Baremetal_Eeprom_TestApp_PKG_LIST = I2C_Baremetal_Eeprom_TestApp
+I2C_Baremetal_Eeprom_TestApp_INCLUDE = $(I2C_Baremetal_Eeprom_TestApp_PATH)
+I2C_Baremetal_Eeprom_TestApp_BOARDLIST = am65xx_evm am65xx_sim
+export I2C_Baremetal_Eeprom_TestApp_BOARDLIST
+I2C_Baremetal_Eeprom_TestApp_$(SOC)_CORELIST = $(i2c_$(SOC)_CORELIST)
+export I2C_Baremetal_Eeprom_TestApp_$(SOC)_CORELIST
 
 # I2C rtos EEPROM test
-drv_i2c_eeprom_test_tirtos_COMP_LIST = drv_i2c_eeprom_test_tirtos
-drv_i2c_eeprom_test_tirtos_RELPATH = $(PDK_I2C_COMP_PATH)/test/eeprom_read
-drv_i2c_eeprom_test_tirtos_PATH = $(PDK_I2C_COMP_PATH)/test/eeprom_read
-drv_i2c_eeprom_test_tirtos_BOARD_DEPENDENCY = yes
-drv_i2c_eeprom_test_tirtos_CORE_DEPENDENCY = no
-drv_i2c_eeprom_test_tirtos_MAKEFILE = -f makefile
-drv_i2c_eeprom_test_tirtos_XDC_CONFIGURO = yes
-export drv_i2c_eeprom_test_tirtos_COMP_LIST
-export drv_i2c_eeprom_test_tirtos_BOARD_DEPENDENCY
-export drv_i2c_eeprom_test_tirtos_CORE_DEPENDENCY
-export drv_i2c_eeprom_test_tirtos_XDC_CONFIGURO
-export drv_i2c_eeprom_test_tirtos_MAKEFILE
-drv_i2c_eeprom_test_tirtos_PKG_LIST = drv_i2c_eeprom_test_tirtos
-drv_i2c_eeprom_test_tirtos_INCLUDE = $(drv_i2c_eeprom_test_tirtos_PATH)
-drv_i2c_eeprom_test_tirtos_BOARDLIST = $(drvi2c_BOARDLIST)
-export drv_i2c_eeprom_test_tirtos_BOARDLIST
-drv_i2c_eeprom_test_tirtos_$(SOC)_CORELIST = $(i2c_$(SOC)_CORELIST)
-export drv_i2c_eeprom_test_tirtos_$(SOC)_CORELIST
+I2C_Eeprom_TestApp_COMP_LIST = I2C_Eeprom_TestApp
+I2C_Eeprom_TestApp_RELPATH = $(PDK_I2C_COMP_PATH)/test/eeprom_read
+I2C_Eeprom_TestApp_PATH = $(PDK_I2C_COMP_PATH)/test/eeprom_read
+I2C_Eeprom_TestApp_BOARD_DEPENDENCY = yes
+I2C_Eeprom_TestApp_CORE_DEPENDENCY = no
+I2C_Eeprom_TestApp_MAKEFILE = -f makefile
+I2C_Eeprom_TestApp_XDC_CONFIGURO = yes
+export I2C_Eeprom_TestApp_COMP_LIST
+export I2C_Eeprom_TestApp_BOARD_DEPENDENCY
+export I2C_Eeprom_TestApp_CORE_DEPENDENCY
+export I2C_Eeprom_TestApp_XDC_CONFIGURO
+export I2C_Eeprom_TestApp_MAKEFILE
+I2C_Eeprom_TestApp_PKG_LIST = I2C_Eeprom_TestApp
+I2C_Eeprom_TestApp_INCLUDE = $(I2C_Eeprom_TestApp_PATH)
+I2C_Eeprom_TestApp_BOARDLIST = $(drvi2c_BOARDLIST)
+export I2C_Eeprom_TestApp_BOARDLIST
+I2C_Eeprom_TestApp_$(SOC)_CORELIST = $(i2c_$(SOC)_CORELIST)
+export I2C_Eeprom_TestApp_$(SOC)_CORELIST
 
 export drvi2c_LIB_LIST
 export drvi2c_EXAMPLE_LIST

diff --git a/test/eeprom_read/makefile b/test/eeprom_read/makefile
index f85e5a472b16d51711e4dd19dc86d925f6d9ba5c..618aa1996aba691bd63e5857934d499ced83c82c 100644 (file)
--- a/test/eeprom_read/makefile
+++ b/test/eeprom_read/makefile
@@ -18,7 +18,16 @@ XDC_CFG_FILE_mpu1_0 = ./am65xx/i2cEepromTest_a53.cfg
 XDC_CFG_FILE_mcu1_0 = ./am65xx/i2cEepromTest_r5.cfg
 endif
 
-APP_NAME = drv_i2c_eeprom_app_$(BUILD_OS_TYPE)
+ifeq ($(BUILD_OS_TYPE), tirtos)
+I2C_OS_TESTPREFIX=
+else
+I2C_OS_TESTPREFIX=_Baremetal
+endif
+
+#Name of the directory created under packages/ti/binary/
+APP_NAME = I2C$(I2C_OS_TESTPREFIX)_Eeprom_TestApp
+# Name of the binary if different from the default (APP_NAME)_$(BOARD_$(CORE)_<build_profile>
+LOCAL_APP_NAME =  I2C$(I2C_OS_TESTPREFIX)_Eeprom_$(BOARD)_$(CORE)TestApp
 
 SRCDIR = . src
 INCDIR = . src
@@ -33,10 +42,7 @@ INCLUDE_EXTERNAL_INTERFACES = pdk $(EXTERNAL_INTERFACES)
 #COMP_LIST_COMMON  = i2c_profile uart board csl profiling
 COMP_LIST_COMMON  += i2c uart board csl 
 
-# am65xx build
-ifeq ($(BOARD),$(filter $(BOARD), am65xx_evm))
-CFLAGS_I2C_UT = -Dam65xx_evm
-endif
+CFLAGS_I2C_UT = 
 
 PACKAGE_SRCS_COMMON = .
 CFLAGS_LOCAL_COMMON = $(PDK_CFLAGS) $(CFLAGS_I2C_UT) $(CFLAGS_OS_DEFINES)