projects / keystone-rtos / mcsdk-tools.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5910b05)
post: removed Ethernet test until link ready; c66x build updated with correct files...
authorIvan Pang <i-pang@ti.com>
Wed, 1 Jun 2016 17:59:25 +0000 (12:59 -0500)
committerIvan Pang <i-pang@ti.com>
Wed, 1 Jun 2016 17:59:25 +0000 (12:59 -0500)
Signed-off-by: Ivan Pang <i-pang@ti.com>
post/evmc6657l/build/makefile [changed mode: 0755->0644] patch | blob | history
post/evmc6657l/build/src/subdir_rules.mk [changed mode: 0755->0644] patch | blob | history
post/include/target.h patch | blob | history
post/src/post.c patch | blob | history

diff --git a/post/evmc6657l/build/makefile b/post/evmc6657l/build/makefile
old mode 100755 (executable)
new mode 100644 (file)
index 720c10d..666d667
--- a/post/evmc6657l/build/makefile
+++ b/post/evmc6657l/build/makefile
@@ -3,27 +3,25 @@
 ################################################################################\r
 \r
 \r
-CG_TOOL_ROOT = $(C6X_GEN_INSTALL_PATH)
-\r
-ORDERED_OBJS += \
-"./src/c6678.obj" \
-"./src/cpdma.obj" \
-"./src/evmc665x_emac.obj" \
-"./src/evmc665x_sgmii.obj" \
-"./src/gmacsl.obj" \
-"./src/pa.obj" \
-"./src/post.obj" \
-"./src/psc.obj" \
-"./src/qm.obj" \
-"../post.cmd" \
-$(GEN_CMDS__FLAG) \
--l"ti.platform.evm6657l.lite.lib" \
--l"libc.a" \
+CG_TOOL_ROOT = $(C6X_GEN_INSTALL_PATH)\r
+\r
+ORDERED_OBJS += \\r
+"./src/cpdma.obj" \\r
+"./src/evmc665x_emac.obj" \\r
+"./src/evmc665x_sgmii.obj" \\r
+"./src/gmacsl.obj" \\r
+"./src/post.obj" \\r
+"./src/psc.obj" \\r
+"./src/qm.obj" \\r
+"../post.cmd" \\r
+$(GEN_CMDS__FLAG) \\r
+-l"ti.platform.evm6657l.lite.lib" \\r
+-l"libc.a" \\r
 \r
 -include ../makefile.init\r
 \r
-RM = rm
-RMDIR = rm -rf
+RM = rm\r
+RMDIR = rm -rf\r
 \r
 # All of the sources participating in the build are defined here\r
 -include sources.mk\r
@@ -125,11 +123,11 @@ endif
 -include ../makefile.defs\r
 \r
 # Add inputs and outputs from these tool invocations to the build variables \r
-EXE_OUTPUTS += \
-../bin/post_evm6657l.out \
+EXE_OUTPUTS += \\r
+../bin/post_evm6657l.out \\r
 \r
-EXE_OUTPUTS__QUOTED += \
-"../bin/post_evm6657l.out" \
+EXE_OUTPUTS__QUOTED += \\r
+"../bin/post_evm6657l.out" \\r
 \r
 \r
 # All Target\r
diff --git a/post/evmc6657l/build/src/subdir_rules.mk b/post/evmc6657l/build/src/subdir_rules.mk
old mode 100755 (executable)
new mode 100644 (file)
index cf83496..38f7f16
--- a/post/evmc6657l/build/src/subdir_rules.mk
+++ b/post/evmc6657l/build/src/subdir_rules.mk
@@ -2,14 +2,6 @@
 # Automatically-generated file. Do not edit!\r
 ################################################################################\r
 \r
-# Each subdirectory must supply rules for building sources it contributes\r
-src/c6678.obj: ../../../post/src/c6678.c $(GEN_OPTS) $(GEN_HDRS)\r
-       @echo 'Building file: $<'\r
-       @echo 'Invoking: C6000 Compiler'\r
-       "$(CG_TOOL_ROOT)/bin/cl6x" -mv6600 --abi=eabi -g --include_path="$(CG_TOOL_ROOT)/include" --include_path="../../../post/include" --include_path="$(PDK_INSTALL_PATH)/ti/platform" --include_path="$(PDK_INSTALL_PATH)/ti/csl" --include_path="$(PDK_INSTALL_PATH)" --define=_EVMC6657L_ --define=C6657 -DSOC_C6657 --display_error_number --diag_warning=225 --preproc_with_compile --preproc_dependency="src/c6678.pp" --obj_directory="src" $(GEN_OPTS__FLAG) "$<"\r
-       @echo 'Finished building: $<'\r
-       @echo ' '\r
-\r
 src/cpdma.obj: ../../../post/src/cpdma.c $(GEN_OPTS) $(GEN_HDRS)\r
        @echo 'Building file: $<'\r
        @echo 'Invoking: C6000 Compiler'\r
@@ -38,13 +30,6 @@ src/gmacsl.obj: ../../../post/src/gmacsl.c $(GEN_OPTS) $(GEN_HDRS)
        @echo 'Finished building: $<'\r
        @echo ' '\r
 \r
-src/pa.obj: ../../../post/src/pa.c $(GEN_OPTS) $(GEN_HDRS)\r
-       @echo 'Building file: $<'\r
-       @echo 'Invoking: C6000 Compiler'\r
-       "$(CG_TOOL_ROOT)/bin/cl6x" -mv6600 --abi=eabi -g --include_path="$(CG_TOOL_ROOT)/include" --include_path="../../../post/include" --include_path="$(PDK_INSTALL_PATH)/ti/platform" --include_path="$(PDK_INSTALL_PATH)/ti/csl" --include_path="$(PDK_INSTALL_PATH)" --define=_EVMC6657L_ --define=C6657 -DSOC_C6657 --display_error_number --diag_warning=225 --preproc_with_compile --preproc_dependency="src/pa.pp" --obj_directory="src" $(GEN_OPTS__FLAG) "$<"\r
-       @echo 'Finished building: $<'\r
-       @echo ' '\r
-\r
 src/post.obj: ../../../post/src/post.c $(GEN_OPTS) $(GEN_HDRS)\r
        @echo 'Building file: $<'\r
        @echo 'Invoking: C6000 Compiler'\r
diff --git a/post/include/target.h b/post/include/target.h
index 55d8c7ddeacf810f772425a60fad7561c3e3bab3..2201762963e7a912155cf8d69fe13d2cf53b4a0c 100644 (file)
--- a/post/include/target.h
+++ b/post/include/target.h
@@ -240,7 +240,7 @@ int32_t chipPllExternalMult (uint16_t pllNum, uint16_t mult);
 #define DEVICE_CPSW_NUM_PORTS       3                    /* 3 switch ports */
 #if defined(SOC_K2L)
 #define DEVICE_CPSW_BASE (0x26200000)
-#elif defined(SOC_K2K) || (SOC_K2H)
+#elif defined(SOC_K2K) || defined(SOC_K2H) || defined(_EVMC6678L_)
 #define DEVICE_CPSW_BASE            (0x02090800)
 #elif defined(SOC_K2E)
 #define DEVICE_CPSW_BASE                       0x24200000
@@ -294,9 +294,14 @@ void     targetInitQs (void);
 #define DEVICE_PA_CDMA_TX_CHAN_CFG_BASE  DEVICE_NETCP_CFG_BASE+0x187000
 #define DEVICE_PA_CDMA_RX_CHAN_CFG_BASE  DEVICE_NETCP_CFG_BASE+0x188000
 #define DEVICE_PA_CDMA_RX_FLOW_CFG_BASE  DEVICE_NETCP_CFG_BASE+0x189000
+#elif defined(_EVMC6678L_)
+#define DEVICE_PA_CDMA_GLOBAL_CFG_BASE   0x02004000
+#define DEVICE_PA_CDMA_TX_CHAN_CFG_BASE  0x02004400
+#define DEVICE_PA_CDMA_RX_CHAN_CFG_BASE  0x02004800
+#define DEVICE_PA_CDMA_RX_FLOW_CFG_BASE  0x02005000
 #endif
 
-#if defined(SOC_K2K) || defined(SOC_K2H)
+#if defined(SOC_K2K) || defined(SOC_K2H) || defined(_EVMC6678L_)
 #define DEVICE_PA_CDMA_RX_NUM_CHANNELS   24
 #define DEVICE_PA_CDMA_RX_NUM_FLOWS      32
 #define DEVICE_PA_CDMA_TX_NUM_CHANNELS   9
@@ -306,7 +311,7 @@ void     targetInitQs (void);
 #define DEVICE_PA_CDMA_TX_NUM_CHANNELS   21
 #endif
 //Corrected Over
-#if defined(SOC_K2K) || defined(SOC_K2H)
+#if defined(SOC_K2K) || defined(SOC_K2H) || defined(_EVMC6678L_)
 #define DEVICE_QM_FREE_Q                910
 #define DEVICE_QM_LNK_BUF_Q             911
 #define DEVICE_QM_RCV_Q                 912
@@ -326,7 +331,7 @@ void     targetInitQs (void);
 
 
 #define DEVICE_PA
-#if defined(SOC_K2K) || defined(SOC_K2H)
+#if defined(SOC_K2K) || defined(SOC_K2H) || defined(_EVMC6678L_)
 #define DEVICE_PA_BASE                  0x02000000
 #define DEVICE_PA_NUM_PDSPS             6
 #elif defined(SOC_K2L)
@@ -343,7 +348,7 @@ void     targetInitQs (void);
 
 
 #define TARGET_SGMII_EXTERNAL_SERDES
-#if defined(SOC_K2K) || defined(SOC_K2H)
+#if defined(SOC_K2K) || defined(SOC_K2H) || defined(_EVMC6678L_)
 #define TARGET_SGMII_TYPE_2             /* Use second sgmii setup sequence */
 #define TARGET_SGMII_BASE_ADDRESSES    { 0x02090100, 0x02090200 }
 #define TARGET_SGMII_SERDES_BASE        0x2620340
@@ -368,7 +373,7 @@ void targetSgmiiSerdesConfig (int32_t port, void *cfg);
 #define chipKickClosedSerdes(x)         ;       /* never lock the registers */
 #define TARGET_SERDES_LOCK_DELAY        (1600*1000)
 
-#if defined(SOC_K2H) || defined(SOC_K2K)
+#if defined(SOC_K2H) || defined(SOC_K2K) || defined(_EVMC6678L_)
 #define DEVICE_EMACSL_BASE(x)           (0x02090900 + (x)*0x040)
 #elif defined(SOC_K2L)
 #define DEVICE_EMACSL_BASE(x)           (0x26220000 + (x)*0x040)
@@ -383,7 +388,7 @@ int32_t targetMacRcv (void *ptr_device, uint8_t *buffer);
 
 #define DEVICE_SS
 
-#if defined(SOC_K2H) || defined(SOC_K2K)
+#if defined(SOC_K2H) || defined(SOC_K2K) || defined(_EVMC6678L_)
 #define DEVICE_PSTREAM_CFG_REG_ADDR                 0x2000604
 #elif defined(SOC_K2L)
 #define DEVICE_PSTREAM_CFG_REG_ADDR                 0x26000604
diff --git a/post/src/post.c b/post/src/post.c
index f90473873ad465fc18b2e2b45061d4ef4304ab74..b7fed28fd572e9f538bdeb6775e4e11e3d8d0180 100644 (file)
--- a/post/src/post.c
+++ b/post/src/post.c
@@ -56,8 +56,8 @@
   #include <ti/csl/cslr_cpsgmii.h>
   #include <ti/csl/csl_mdioAux.h>
 #else
-  #include <ti/csl/csl_sgmii.h>
-  #include <ti/csl/cslr_sgmii.h>
+  #include <ti/csl/csl_cpsgmii.h>
+  #include <ti/csl/cslr_cpsgmii.h>
 #endif
 
 #include <ti/csl/csl_mdio.h>
@@ -393,6 +393,7 @@ int32_t cpswLpbkMode = CPSW_LOOPBACK_INTERNAL;
 #endif
 int32_t cpswEvm6678 = 0;
 
+#if 0
 #if !(defined(_EVMC6657L_))
 /** ============================================================================
  *   @n@b Init_SGMII
@@ -910,6 +911,7 @@ post_test_emac_loopback
 #endif
     return POST_TEST_RESULT_PASSED;
 }
+#endif
 
 void
 post_hex_to_string
Project to include GIT repos for RTOS components including user mode CSL & NetCP LLDs (CPPI/QMSS/PA/RM), PDK components (NWAL/PKTLIB) and Transport Net Lib components (NetAPI/HPLIB) - Various tools enabled for legacy K2/K1 SOCs. This includes bootloader, flashwriter, post, program-evm etc. for other SOCs support available in SBL.