Revert "TDA2ex and other core support needed for PDK"

This reverts commit 709d29dee783acaf88ca134b19d9a99f84587dbd.

diff --git a/packages/ti/sdo/edma3/drv/sample/makefile b/packages/ti/sdo/edma3/drv/sample/makefile
index ebd9f25a29c240ac0bfb70e6576e74d607a93055..e3794a00136db2b41464252dbef477d6222ab770 100755 (executable)
--- a/packages/ti/sdo/edma3/drv/sample/makefile
+++ b/packages/ti/sdo/edma3/drv/sample/makefile
@@ -24,7 +24,7 @@ endif
 # Example:
 #   SRCS_<core/SoC/platform-name> =
 #   CFLAGS_LOCAL_<core/SoC/platform-name> =
-ifeq ($(CORE),$(filter $(CORE), c66x c66xdsp_1 c66xdsp_2 c6xdsp c66xdsp))
+ifeq ($(CORE),$(filter $(CORE), c6xdsp c66xdsp))
 SRCS_c6472-evm = sample_c6472_cfg.c sample_c6472_int_reg.c
 SRCS_tci6486-evm = sample_tci6486_cfg.c sample_tci6486_int_reg.c
 SRCS_tci6608-sim = sample_tci6608_cfg.c sample_tci6608_int_reg.c
@@ -49,10 +49,8 @@ CFLAGS_LOCAL_ti814x-evm = -DBUILD_CENTAURUS_DSP
 SRCS_ti816x-evm = sample_ti816x_cfg.c sample_ti816x_int_reg.c
 CFLAGS_LOCAL_c6a811x-evm = -DBUILD_C6A811X_DSP
 SRCS_c6a811x-evm = sample_c6a811x_cfg.c sample_c6a811x_int_reg.c
-ifeq ($(SOC),$(filter $(SOC), tda2xx tda2ex))
-SRCS_COMMON += sample_tda2xx_cfg.c sample_tda2xx_int_reg.c
-CFLAGS_LOCAL_COMMON += -DBUILD_TDA2XX_DSP
-endif
+SRCS_tda2xx = sample_tda2xx_cfg.c sample_tda2xx_int_reg.c
+CFLAGS_LOCAL_tda2xx = -DBUILD_TDA2XX_DSP
 SRCS_tda3xx = sample_tda3xx_cfg.c sample_tda3xx_int_reg.c
 CFLAGS_LOCAL_tda3xx = -DBUILD_TDA3XX_DSP
 CFLAGS_LOCAL_tci6636k2h-evm = -DBUILD_K2H_DSP
@@ -62,9 +60,7 @@ CFLAGS_LOCAL_tci6630k2l-evm = -DBUILD_K2L_DSP
 CFLAGS_LOCAL_tci66ak2g02-evm = -DBUILD_K2G_DSP
 else
 SRCS_omapl138-evm = sample_omapl138_arm_cfg.c sample_omapl138_arm_int_reg.c
-ifeq ($(SOC),$(filter $(SOC), tda2xx tda2ex))
-SRCS_COMMON += sample_tda2xx_cfg.c sample_tda2xx_arm_int_reg.c
-endif
+SRCS_tda2xx = sample_tda2xx_cfg.c sample_tda2xx_arm_int_reg.c
 SRCS_tda3xx = sample_tda3xx_cfg.c sample_tda3xx_arm_int_reg.c
 SRCS_tci6636k2h-evm = sample_tci6636k2h_cfg.c sample_tci6636k2h_arm_int_reg.c
 SRCS_c66ak2e-evm = sample_c66ak2e_cfg.c sample_c66ak2e_arm_int_reg.c
@@ -106,17 +102,13 @@ SRCS_ti814x-evm = sample_ti814x_cfg.c sample_ti814x_arm_int_reg.c
 SRCS_c6a811x-evm = sample_c6a811x_cfg.c sample_c6a811x_arm_int_reg.c
 endif
 
-ifeq ($(CORE),$(filter $(CORE), ipu1_0 ipu1_1 ipu2_0 ipu2_1 m4 m4vpss))
-ifeq ($(SOC),$(filter $(SOC), tda2xx tda2ex))
-CFLAGS_LOCAL_COMMON += -DBUILD_TDA2XX_IPU
-endif
+ifeq ($(CORE),$(filter $(CORE), m4 m4vpss))
+CFLAGS_LOCAL_tda2xx = -DBUILD_TDA2XX_IPU
 CFLAGS_LOCAL_tda3xx = -DBUILD_TDA3XX_IPU
 endif
 
-ifeq ($(CORE),$(filter $(CORE), a15_0 a15host))
-ifeq ($(SOC),$(filter $(SOC), tda2xx tda2ex))
-CFLAGS_LOCAL_COMMON += -DBUILD_TDA2XX_MPU
-endif
+ifeq ($(CORE),a15host)
+CFLAGS_LOCAL_tda2xx = -DBUILD_TDA2XX_MPU
 CFLAGS_LOCAL_tci6636k2h-evm =  -DBUILD_K2H_MPU
 CFLAGS_LOCAL_tci6638k2k-evm =  -DBUILD_K2K_MPU
 CFLAGS_LOCAL_c66ak2e-evm =  -DBUILD_K2E_MPU
@@ -124,10 +116,8 @@ CFLAGS_LOCAL_tci6630k2l-evm =  -DBUILD_K2L_MPU
 CFLAGS_LOCAL_tci66ak2g02-evm =  -DBUILD_K2G_MPU
 endif
 
-ifeq ($(CORE),$(filter $(CORE), arp32_1 arp32_2 arp32_3 arp32_4 eve))
-ifeq ($(SOC),$(filter $(SOC), tda2xx tda2ex))
-CFLAGS_LOCAL_COMMON += -DBUILD_TDA2XX_EVE
-endif
+ifeq ($(CORE),eve)
+CFLAGS_LOCAL_tda2xx = -DBUILD_TDA2XX_EVE
 CFLAGS_LOCAL_tda3xx = -DBUILD_TDA3XX_EVE
 endif
 
@@ -137,9 +127,7 @@ SRCS_da830-evm = sample_da830_cfg.c sample_da830_int_reg.c
 
 CFLAGS_LOCAL_ti814x-evm += -DDMA_XBAR_AVAILABLE
 CFLAGS_LOCAL_c6a811x-evm += -DDMA_XBAR_AVAILABLE
-ifeq ($(SOC),$(filter $(SOC), tda2xx tda2ex))
-CFLAGS_LOCAL_COMMON += -DDMA_XBAR_AVAILABLE
-endif
+CFLAGS_LOCAL_tda2xx += -DDMA_XBAR_AVAILABLE
 CFLAGS_LOCAL_tda3xx += -DDMA_XBAR_AVAILABLE
 
 # Include common make files

diff --git a/packages/ti/sdo/edma3/rm/makefile b/packages/ti/sdo/edma3/rm/makefile
index 855a2c95a9429dd350e8da7b58be6a010a2dc58b..9c37f6ce39a2f975128b7b09a113795906aeed8b 100644 (file)
--- a/packages/ti/sdo/edma3/rm/makefile
+++ b/packages/ti/sdo/edma3/rm/makefile
@@ -29,10 +29,8 @@ endif
 ifeq ($(CORE),m3vpss)
 CFLAGS_LOCAL_c6a811x-evm = -DBUILD_C6A811X_M3VPSS
 endif
-ifeq ($(CORE),$(filter $(CORE), a15_0 a15host))
-ifeq ($(SOC),$(filter $(SOC), tda2xx tda2ex))
-CFLAGS_LOCAL_COMMON += -DBUILD_TDA2XX_MPU
-endif
+ifeq ($(CORE),a15host)
+CFLAGS_LOCAL_tda2xx = -DBUILD_TDA2XX_MPU
 endif
 
 # Core/SoC/platform specific source files and CFLAGS
@@ -60,9 +58,7 @@ SRCS_c6748-evm = edma3_c6748_cfg.c
 SRCS_da830-evm = edma3_da830_cfg.c
 SRCS_omap4-evm = edma3_omap4_cfg.c
 SRCS_ti814x = edma3_ti814x_cfg.c
-ifeq ($(SOC),$(filter $(SOC), tda2xx tda2ex))
-SRCS_COMMON += edma3_tda2xx_cfg.c
-endif
+SRCS_tda2xx = edma3_tda2xx_cfg.c
 SRCS_tda3xx = edma3_tda3xx_cfg.c
 SRCS_ti816x = edma3_ti816x_cfg.c
 SRCS_am335x = edma3_am335x_cfg.c

diff --git a/packages/ti/sdo/edma3/rm/sample/makefile b/packages/ti/sdo/edma3/rm/sample/makefile
index 4ae27baa90c0699d59d0e707e4b59d99e414a6ab..d28d8b3b4a5d5d69af8616fa303be52b729879cc 100755 (executable)
--- a/packages/ti/sdo/edma3/rm/sample/makefile
+++ b/packages/ti/sdo/edma3/rm/sample/makefile
@@ -24,7 +24,7 @@ endif
 # Example:
 #   SRCS_<core/SoC/platform-name> =
 #   CFLAGS_LOCAL_<core/SoC/platform-name> =
-ifeq ($(CORE),$(filter $(CORE), c66x c66xdsp_1 c66xdsp_2 c6xdsp c66xdsp))
+ifeq ($(CORE),$(filter $(CORE), c6xdsp c66xdsp))
 SRCS_c6472-evm = sample_c6472_cfg.c sample_c6472_int_reg.c
 SRCS_tci6486-evm = sample_tci6486_cfg.c sample_tci6486_int_reg.c
 SRCS_tci6608-sim = sample_tci6608_cfg.c sample_tci6608_int_reg.c
@@ -54,9 +54,7 @@ CFLAGS_LOCAL_tci6630k2l-evm = -DBUILD_K2L_DSP
 CFLAGS_LOCAL_tci66ak2g02-evm = -DBUILD_K2G_DSP
 else
 SRCS_omapl138-evm = sample_omapl138_arm_cfg.c sample_omapl138_arm_int_reg.c
-ifeq ($(SOC),$(filter $(SOC), tda2xx tda2ex))
-SRCS_COMMON += sample_tda2xx_cfg.c sample_tda2xx_arm_int_reg.c
-endif
+SRCS_tda2xx = sample_tda2xx_cfg.c sample_tda2xx_arm_int_reg.c
 SRCS_tda3xx = sample_tda3xx_cfg.c sample_tda3xx_arm_int_reg.c
 SRCS_tci6636k2h-evm = sample_tci6636k2h_cfg.c sample_tci6636k2h_arm_int_reg.c
 SRCS_c66ak2e-evm = sample_c66ak2e_cfg.c sample_c66ak2e_arm_int_reg.c
@@ -87,10 +85,8 @@ SRCS_ti816x-sim = sample_ti816x_m3vpss_cfg.c sample_ti816x_m3vpss_int_reg.c
 SRCS_ti814x-evm = sample_ti814x_m3video_cfg.c sample_ti814x_m3video_int_reg.c
 SRCS_c6a811x-evm = sample_c6a811x_cfg.c sample_c6a811x_arm_int_reg.c
 endif
-ifeq ($(CORE),$(filter $(CORE), a15_0 a15host))
-ifeq ($(SOC),$(filter $(SOC), tda2xx tda2ex))
-CFLAGS_LOCAL_COMMON += -DBUILD_TDA2XX_MPU
-endif
+ifeq ($(CORE),a15host)
+CFLAGS_LOCAL_tda2xx = -DBUILD_TDA2XX_MPU
 CFLAGS_LOCAL_tci6636k2h-evm =  -DBUILD_K2H_MPU
 CFLAGS_LOCAL_tci6638k2k-evm =  -DBUILD_K2K_MPU
 CFLAGS_LOCAL_c66ak2e-evm =  -DBUILD_K2E_MPU
@@ -102,9 +98,7 @@ SRCS_da830-evm = sample_da830_cfg.c sample_da830_int_reg.c
 
 CFLAGS_LOCAL_ti814x-evm += -DDMA_XBAR_AVAILABLE
 CFLAGS_LOCAL_c6a811x-evm += -DDMA_XBAR_AVAILABLE
-ifeq ($(SOC),$(filter $(SOC), tda2xx tda2ex))
-CFLAGS_LOCAL_COMMON += -DDMA_XBAR_AVAILABLE
-endif
+CFLAGS_LOCAL_tda2xx += -DDMA_XBAR_AVAILABLE
 CFLAGS_LOCAL_tda3xx += -DDMA_XBAR_AVAILABLE
 # Include common make files
 ifeq ($(MAKERULEDIR), )