]> rtime.felk.cvut.cz Git - pes-rpp/rpp-lib.git/commitdiff
Fix clock values for RM48, fix makefile and sci broken by the last merge
authorMichal Horn <hornmich@fel.cvut.cz>
Mon, 3 Nov 2014 16:27:50 +0000 (17:27 +0100)
committerMichal Horn <hornmich@fel.cvut.cz>
Thu, 20 Nov 2014 09:50:36 +0000 (10:50 +0100)
Debug/GNUmakefile
apps/rpp-test-suite/Debug/GNUmakefile
rpp/include/sys/port.h
rpp/include/sys/ti_drv_sci.h
rpp/src/sys/sys_startup.c

index 4ea2f31bb2a7ac43e4cce548a330b76fe96907c9..b2d5b23d422d7bb0c57a3925c8d89cb26934187c 100644 (file)
@@ -11,7 +11,7 @@ include ../common.mk
 CC=$(ARM_COMPILER_DIR)/bin/armcl
 AR=$(ARM_COMPILER_DIR)/bin/armar
 
-rpp_lib_CFLAGS = -mv7R4 --code_state=32 --float_support=VFPv3D16 --abi=eabi -g -O0 --gcc       \
+rpp_lib_CFLAGS = -mv7R4 --code_state=32 --float_support=VFPv3D16 --abi=eabi -me -g -O0 --gcc   \
                -I$(ARM_COMPILER_DIR)/include $(rpp_lib_INCLUDES:%=-I../%)              \
                --diag_warning=225 --display_error_number --diag_wrap=off               \
                --gen_func_subsections=on --enum_type=packed
index 2149d812a0130b376dbbeda4e37f3babe2b2c948..c15f5bbce5ccbbce694d5f591768a4e259c3348c 100644 (file)
@@ -11,7 +11,7 @@ ARM_COMPILER_DIR ?= $(dir $(CCS_UTILS_DIR))/tools/compiler/arm_5.1.1
 CC=$(ARM_COMPILER_DIR)/bin/armcl
 LD=$(CC)
 
-rpp-test-suite_CFLAGS = -mv7R4 --code_state=32 --float_support=VFPv3D16 --abi=eabi -g -O0 --gcc        \
+rpp-test-suite_CFLAGS = -mv7R4 --code_state=32 --float_support=VFPv3D16 --abi=eabi -me -g -O0 --gcc    \
                -I$(ARM_COMPILER_DIR)/include $(rpp_lib_INCLUDES:%=-I../../../%) -I../include   \
                --diag_warning=225 --display_error_number --diag_wrap=off               \
                --gen_func_subsections=on --enum_type=packed
@@ -25,7 +25,7 @@ LDFLAGS = $(rpp-test-suite_CFLAGS) -z -m"${@:%.obj=%.map}"  \
            --reread_libs --warn_sections    \
           --display_error_number --rom_model                            \
                  --search_path=$(ARM_COMPILER_DIR)/lib                                                 \
-          --library="rtsv7R4_T_be_v3D16_eabi.lib"                       \
+          --library="rtsv7R4_T_le_v3D16_eabi.lib"                       \
           --generate_dead_funcs_list=$(@:%.out=%.deadfuncs.xml)         \
           --stack_size=0x800
 
index 9e7c7fc372b7ced8f86e4d7c6a6d58932ff1e79e..fb330bbe763830709d8f48cc0c68100c22cc4b78 100644 (file)
@@ -14,7 +14,7 @@
 /**
  * MCU endianity. Define the constant as 1 for little endian.
  */
-#define __LITTLE_ENDIAN__       0
+#define __LITTLE_ENDIAN__       1
 /*
  * Clock configuration.
  *
  * PLL1 configuration.
  */
 #define RPP_PLL1_REF_CLK_DIV    6                              /**< PLL1 Frequency clock divider. */
-#define RPP_PLL1_CLK_MUL        120                            /**< PLL1 Frequency multiplier. */
+#define RPP_PLL1_CLK_MUL        165                            /**< PLL1 Frequency multiplier. */
 #define RPP_PLL1_CLK_OUT_DIV    2                              /**< PLL1 output frequency internal divider. */
 #define RPP_PLL1_CLK_DIV        1                              /**< PLL1 final clock divider. */
-#define RPP_PLL1_FREQ           160000000              /**< Desired frequency of PLL1 in Hz. Make sure this value is the result
+#define RPP_PLL1_FREQ           220000000              /**< Desired frequency of PLL1 in Hz. Make sure this value is the result
                                                      RPP_OSC_FR / RPP_PLL1_REF_CLK_DIV * RPP_PLL1_CLK_MUL / RPP_PLL1_CLK_OUT_DIV / RPP_PLL1_CLK_DIV
                                                      because it is used in the code as a reference clock value.
                                                  */
  * PLL2 configuration.
  */
 #define RPP_PLL2_REF_CLK_DIV    6                              /**< PLL2 Frequency clock divider. */
-#define RPP_PLL2_CLK_MUL        120                            /**< PLL2 Frequency multiplier. */
+#define RPP_PLL2_CLK_MUL        165                            /**< PLL2 Frequency multiplier. */
 #define RPP_PLL2_CLK_OUT_DIV    2                              /**< PLL2 output frequency internal divider. */
 #define RPP_PLL2_CLK_DIV        1                              /**< PLL2 final clock divider. */
-#define RPP_PLL2_FREQ           160000000              /**< Desired frequency of PLL2 in Hz. Make sure this value is the result
+#define RPP_PLL2_FREQ           220000000              /**< Desired frequency of PLL2 in Hz. Make sure this value is the result
                                                      RPP_OSC_FR / RPP_PLL1_REF_CLK_DIV * RPP_PLL1_CLK_MUL / RPP_PLL1_CLK_OUT_DIV / RPP_PLL1_CLK_DIV
                                                      because it is used in the code as a reference clock value.
                                                  */
  */
 #define RPP_GHVSRC_CLK_SOURCE  SYS_PLL1                /**< Clock source for GCLK, HCLK and VCLK peripherals */
 #define RPP_VCLK1_CLK_DIV              2                               /**< Clock divider for VCLK1 */
-#define RPP_VCLK1_FREQ                 80000000                /**< Desired frequency of the VCLK1 in Hz. Make sure this value is the result
+#define RPP_VCLK1_FREQ                 110000000               /**< Desired frequency of the VCLK1 in Hz. Make sure this value is the result
                                                      RPP_GHVSRC_CLK_SOURCE / RPP_VCLK1_CLK_DIV
                                                      because it is used in the code as a reference clock value.
                                                  */
 #define RPP_VCLK2_CLK_DIV              2                               /**< Clock divider for VCLK2 */
-#define RPP_VCLK2_FREQ                 80000000                /**< Desired frequency of the VCLK2 in Hz. Make sure this value is the result
+#define RPP_VCLK2_FREQ                 110000000               /**< Desired frequency of the VCLK2 in Hz. Make sure this value is the result
                                                      RPP_GHVSRC_CLK_SOURCE / RPP_VCLK2_CLK_DIV
                                                      because it is used in the code as a reference clock value.
                                                  */
 #define RPP_VCLK3_CLK_DIV              2                               /**< Clock divider for VCLK3 */
-#define RPP_VCLK3_FREQ                 80000000                /**< Desired frequency of the VCLK3 in Hz. Make sure this value is the result
+#define RPP_VCLK3_FREQ                 110000000               /**< Desired frequency of the VCLK3 in Hz. Make sure this value is the result
                                                      RPP_GHVSRC_CLK_SOURCE / RPP_VCLK3_CLK_DIV
                                                      because it is used in the code as a reference clock value.
                                                  */
 #define RPP_RCLK_CLK_SRC               SYS_VCLK                /**< Clock source for RTI */
 #define RPP_RCLK_CLK_DIV               1                               /**< Clock divider for RTI. Value between 0-3. RTI1DIV=2^RPP_RCLK_CLK_DIV  */
-#define RPP_RCLK_FREQ                  80000000                /**< Desired RTI clock in Hz. Make sure this value is the result
+#define RPP_RCLK_FREQ                  110000000               /**< Desired RTI clock in Hz. Make sure this value is the result
                                                      RPP_RCLK_CLK_SRC / RPP_RCLK_CLK_DIV
                                                      because it is used in the code as a reference clock value.
                                                  */
 #define RPP_VCLKA1_CLK_SRC             SYS_VCLK                /**< Clock source for VCLKA1 */
-#define RPP_VCLKA1_FREQ                        80000000                /**< Desired VCLKA1 clock in Hz. Make sure this value is the result
+#define RPP_VCLKA1_FREQ                        110000000               /**< Desired VCLKA1 clock in Hz. Make sure this value is the result
                                                      RPP_VCLKA1_CLK_SRC
                                                      because it is used in the code as a reference clock value.
                                                  */
 #define RPP_VCLKA2_CLK_SRC             SYS_VCLK                /**< Clock source for VCLKA2 */
-#define RPP_VCLKA2_FREQ                        80000000                /**< Desired VCLKA2 clock in Hz. Make sure this value is the result
+#define RPP_VCLKA2_FREQ                        110000000               /**< Desired VCLKA2 clock in Hz. Make sure this value is the result
                                                      RPP_VCLKA2_CLK_SRC
                                                      because it is used in the code as a reference clock value.
                                                  */
 #define RPP_VCLKA3_CLK_SRC             SYS_VCLK                /**< Clock source for VCLKA3 */
 #define RPP_VCLKA3_DIV_OUT_DIS 0                               /**< Disable the VCLKA3 divider output */
 #define RPP_VCLKA3_CLK_DIV             2                               /**< Clock divider for the VCLKA3 source */
-#define RPP_VCLKA3_FREQ                        80000000                /**< Desired VCLKA3 clock in Hz. Make sure this value is the result
+#define RPP_VCLKA3_FREQ                        110000000               /**< Desired VCLKA3 clock in Hz. Make sure this value is the result
                                                      RPP_VCLKA3_CLK_SRC / RPP_VCLKA3_CLK_DIV if the divider is used, else RPP_VCLKA3_CLK_SRC
                                                      because it is used in the code as a reference clock value.
                                                  */
 #define RPP_VCLKA4_CLK_SRC             SYS_VCLK                /**< Clock source for VCLKA4 */
 #define RPP_VCLKA4_DIV_OUT_DIS 0                               /**< Disable the VCLKA4 divider output */
 #define RPP_VCLKA4_CLK_DIV             2                               /**< Clock divider for the VCLKA4 source */
-#define RPP_VCLKA4_FREQ                        80000000                /**< Desired VCLKA4 clock in Hz. Make sure this value is the result
+#define RPP_VCLKA4_FREQ                        110000000               /**< Desired VCLKA4 clock in Hz. Make sure this value is the result
                                                      RPP_VCLKA4_CLK_SRC / RPP_VCLKA4_CLK_DIV if the divider is used, else RPP_VCLKA4_CLK_SRC
                                                      because it is used in the code as a reference clock value.
                                                  */
index 09b49d912e4487099362286d0532c1a38e679dbe..d6fcaa699cdec53b4c15aafed8a18b397c218f18 100644 (file)
@@ -150,7 +150,7 @@ typedef volatile struct sciBase
  * Alias for the sci register.
  * This is used to easily switch between SCI and SCI/LIN.
  */
-#define serialLine sciREG
+#define serialLine scilinREG
 
 
 /* SCI Interface Functions */
index 27359842d2ed308e50d659782ae9da5fe9445796..1204f68e12fe635af26fc574f92105a269e91322 100644 (file)
@@ -450,8 +450,6 @@ void _c_int00()
              | 0x00002000    /*   HTU1 Dual Port PBIST  */
              | 0x00080000    /*   HTU2 Dual Port PBIST  */
              | 0x00004000    /*   RTP Dual Port PBIST  */
-             | 0x00000000    /*   FTU Dual Port PBIST for TMS570x / Reserved for RMx */
-             | 0x00008000    /*   FRAY Dual Port PBIST for TMS570x / Reserved for RMx */
              , PBIST_March13N_DP);
 
     /* Test the CPU ECC mechanism for RAM accesses.