diff options
author | John Godbey | 2016-05-24 12:41:53 -0500 |
---|---|---|
committer | John Godbey | 2016-05-24 12:41:53 -0500 |
commit | 7649d93f7bdf1cb9f8b697d744b7df481153d4a4 (patch) | |
tree | 1e4990335f4d3e953d2f0ce049c6778a3dff444f | |
parent | 690fa671296ff9e5675ab5a9ef8f4e5abebdb785 (diff) | |
download | posix-smp-7649d93f7bdf1cb9f8b697d744b7df481153d4a4.tar.gz posix-smp-7649d93f7bdf1cb9f8b697d744b7df481153d4a4.tar.xz posix-smp-7649d93f7bdf1cb9f8b697d744b7df481153d4a4.zip |
DEVICE_K2H -> DEVICE_KEYSTONE
Signed-off-by: John Godbey <j-godbey@ti.com>
-rw-r--r-- | dhry_1.c | 4 | ||||
-rw-r--r-- | makefile | 44 |
2 files changed, 20 insertions, 28 deletions
@@ -607,7 +607,7 @@ extern clock_t clock(); | |||
607 | Types_FreqHz timerFreq; /* Timestamp frequency */ | 607 | Types_FreqHz timerFreq; /* Timestamp frequency */ |
608 | Timestamp_getFreq(&timerFreq); | 608 | Timestamp_getFreq(&timerFreq); |
609 | float_time /= timerFreq.lo; | 609 | float_time /= timerFreq.lo; |
610 | #if defined(DEVICE_K2H) | 610 | #if defined(DEVICE_KEYSTONE) |
611 | float factor = 8.0; /* correct frequency coming from getFreq */ | 611 | float factor = 8.0; /* correct frequency coming from getFreq */ |
612 | #elif defined(SOC_AM572x) | 612 | #elif defined(SOC_AM572x) |
613 | float factor = 0.3333; | 613 | float factor = 0.3333; |
@@ -780,7 +780,7 @@ void main(int32_t argc, char *argv[]) | |||
780 | #endif | 780 | #endif |
781 | #endif | 781 | #endif |
782 | ; | 782 | ; |
783 | #ifdef DEVICE_K2H | 783 | #ifdef DEVICE_KEYSTONE |
784 | BOARD_initPerfCounters(); | 784 | BOARD_initPerfCounters(); |
785 | #endif | 785 | #endif |
786 | Board_init(boardCfg); | 786 | Board_init(boardCfg); |
@@ -36,28 +36,20 @@ | |||
36 | 36 | ||
37 | #### Provide toolchain and dependency paths when building manually #### | 37 | #### Provide toolchain and dependency paths when building manually #### |
38 | #DEPOT = C:/ti | 38 | #DEPOT = C:/ti |
39 | DEPOT = C:/ti | ||
40 | 39 | ||
41 | #### BIOS-side dependencies #### | 40 | #### BIOS-side dependencies #### |
42 | #BIOS_INSTALL_PATH ?= $(DEPOT)\bios_n_nn_nn_nn | 41 | #BIOS_INSTALL_PATH ?= $(DEPOT)/bios_n_nn_nn_nn |
43 | #XDC_INSTALL_PATH ?= $(DEPOT)\xdctools_n_nn_nn_nn_core | 42 | #XDC_INSTALL_PATH ?= $(DEPOT)/xdctools_n_nn_nn_nn_core |
44 | BIOS_INSTALL_PATH ?= $(DEPOT)/bios_6_45_01_29 | 43 | #PDK_INSTALL_PATH ?= $(DEPOT)/pdk_platform_n_n_n/packages |
45 | XDC_INSTALL_PATH ?= $(DEPOT)/xdctools_3_32_00_06_core | ||
46 | #PDK_INSTALL_PATH ?= $(DEPOT)/pdk_am57xx_1_0_2/packages | ||
47 | PDK_INSTALL_PATH ?= $(DEPOT)/pdk_k2hk_4_0_1/packages | ||
48 | #PDK_INSTALL_PATH ?= $(DEPOT)/pdk_c665x_2_0_1/packages | ||
49 | #PDK_INSTALL_PATH ?= $(DEPOT)/pdk_am335x_1_0_2/packages | ||
50 | #PDK_INSTALL_PATH ?= $(DEPOT)/pdk_am437x_1_0_2/packages | ||
51 | #PDK_INSTALL_PATH ?= $(DEPOT)/pdk_c667x_2_0_1/packages | ||
52 | 44 | ||
53 | #### BIOS-side toolchains #### | 45 | #### BIOS-side toolchains #### |
54 | #TOOLCHAIN_PATH_A15 ?= $(DEPOT)\ccsv6\tools\compiler\gcc-arm-none-eabi-n_n-xxxxqn | 46 | #TOOLCHAIN_PATH_A15 ?= $(DEPOT)/ccsv6/tools/compiler/gcc-arm-none-eabi-n_n-xxxxqn |
55 | #TOOLCHAIN_PATH_M4 ?= $(DEPOT)\ccsv6\tools\compiler\ti-cgt-arm_n.n.n | 47 | #TOOLCHAIN_PATH_M4 ?= $(DEPOT)/ccsv6/tools/compiler/ti-cgt-arm_n.n.n |
56 | TOOLCHAIN_PATH_C66 = $(DEPOT)/ccsv6/tools/compiler/c6000_7.4.12 | 48 | #TOOLCHAIN_PATH_C66 ?= $(DEPOT)/ccsv6/tools/compiler/c6000_n.n.nn |
57 | TOOLCHAIN_PATH_M4 = C:/ti/ccsv6/tools/compiler/ti-cgt-arm_5.2.5 | 49 | #TOOLCHAIN_PATH_M4 ?= $(DEPOT)/ccsv6/tools/compiler/ti-cgt-arm_n.n.n |
58 | TOOLCHAIN_PATH_A15 = $(DEPOT)/ccsv6/tools/compiler/gcc-arm-none-eabi-4_8-2014q3 | 50 | #TOOLCHAIN_PATH_A15 ?= $(DEPOT)/ccsv6/tools/compiler/gcc-arm-none-eabi-n_n-20xxqn |
59 | TOOLCHAIN_PATH_A9 = $(DEPOT)/ccsv6/tools/compiler/gcc-arm-none-eabi-4_8-2014q3 | 51 | #TOOLCHAIN_PATH_A9 ?= $(DEPOT)/ccsv6/tools/compiler/gcc-arm-none-eabi-n_n-20xxqn |
60 | TOOLCHAIN_PATH_A8 = $(DEPOT)/ccsv6/tools/compiler/gcc-arm-none-eabi-4_8-2014q3 | 52 | #TOOLCHAIN_PATH_A8 ?= $(DEPOT)/ccsv6/tools/compiler/gcc-arm-none-eabi-n_n-20xxqn |
61 | 53 | ||
62 | srcs = dhry_1.c dhry_2.c | 54 | srcs = dhry_1.c dhry_2.c |
63 | objs = $(addprefix bin/$(SOC)/$(CORE)/$(PROFILE)/obj/,$(patsubst %.c,%.out,$(srcs))) | 55 | objs = $(addprefix bin/$(SOC)/$(CORE)/$(PROFILE)/obj/,$(patsubst %.c,%.out,$(srcs))) |
@@ -75,14 +67,14 @@ all: | |||
75 | # $(MAKE) PROFILE=debug SOCDEF=SOC_AM572x CORE=armv7 SOC=AM572x dhry.x | 67 | # $(MAKE) PROFILE=debug SOCDEF=SOC_AM572x CORE=armv7 SOC=AM572x dhry.x |
76 | # $(MAKE) PROFILE=debug SOCDEF=SOC_AM572x CORE=m4 SOC=AM572x dhry.x | 68 | # $(MAKE) PROFILE=debug SOCDEF=SOC_AM572x CORE=m4 SOC=AM572x dhry.x |
77 | # $(MAKE) PROFILE=debug SOCDEF=SOC_AM572x CORE=c66 SOC=AM572x dhry.x | 69 | # $(MAKE) PROFILE=debug SOCDEF=SOC_AM572x CORE=c66 SOC=AM572x dhry.x |
78 | # $(MAKE) PROFILE=debug SOCDEF=DEVICE_K2H CORE=armv7 SOC=k2e dhry.x | 70 | # $(MAKE) PROFILE=debug SOCDEF=DEVICE_KEYSTONE CORE=armv7 SOC=k2e dhry.x |
79 | # $(MAKE) PROFILE=debug SOCDEF=DEVICE_K2H CORE=c66 SOC=k2e dhry.x | 71 | # $(MAKE) PROFILE=debug SOCDEF=DEVICE_KEYSTONE CORE=c66 SOC=k2e dhry.x |
80 | # $(MAKE) PROFILE=debug SOCDEF=DEVICE_K2H CORE=armv7 SOC=k2l dhry.x | 72 | # $(MAKE) PROFILE=debug SOCDEF=DEVICE_KEYSTONE CORE=armv7 SOC=k2l dhry.x |
81 | # $(MAKE) PROFILE=debug SOCDEF=DEVICE_K2H CORE=c66 SOC=k2l dhry.x | 73 | # $(MAKE) PROFILE=debug SOCDEF=DEVICE_KEYSTONE CORE=c66 SOC=k2l dhry.x |
82 | # $(MAKE) PROFILE=debug SOCDEF=DEVICE_K2H CORE=armv7 SOC=k2g dhry.x | 74 | # $(MAKE) PROFILE=debug SOCDEF=DEVICE_KEYSTONE CORE=armv7 SOC=k2g dhry.x |
83 | # $(MAKE) PROFILE=debug SOCDEF=DEVICE_K2H CORE=c66 SOC=k2g dhry.x | 75 | # $(MAKE) PROFILE=debug SOCDEF=DEVICE_KEYSTONE CORE=c66 SOC=k2g dhry.x |
84 | $(MAKE) PROFILE=debug SOCDEF=DEVICE_K2H CORE=armv7 SOC=k2h dhry.x | 76 | # $(MAKE) PROFILE=debug SOCDEF=DEVICE_KEYSTONE CORE=armv7 SOC=k2h dhry.x |
85 | # $(MAKE) PROFILE=debug SOCDEF=DEVICE_K2H CORE=c66 SOC=k2h dhry.x | 77 | # $(MAKE) PROFILE=debug SOCDEF=DEVICE_KEYSTONE CORE=c66 SOC=k2h dhry.x |
86 | # $(MAKE) PROFILE=debug SOCDEF=SOC_C6657 CORE=c66 SOC=C6657 dhry.x | 78 | # $(MAKE) PROFILE=debug SOCDEF=SOC_C6657 CORE=c66 SOC=C6657 dhry.x |
87 | # $(MAKE) PROFILE=debug SOCDEF=SOC_C6678 CORE=c66 SOC=C6678 dhry.x | 79 | # $(MAKE) PROFILE=debug SOCDEF=SOC_C6678 CORE=c66 SOC=C6678 dhry.x |
88 | 80 | ||