MCSDK 3.0: fix srioboot example build error

author: Hao Zhang 2013-02-08 14:11:05 -0600
committer: Hao Zhang 2013-02-08 14:11:05 -0600
commit: 5d06fe6175bdb5301c0e926e074b3b7574f0fb74 (patch)
tree: a2b098a2d027f07fd09571ff6b04a93553b501ce
parent: 4d0d74e2164b5385882f50cbeb213047f9ec76ce (diff)
download: mcsdk-tools-5d06fe6175bdb5301c0e926e074b3b7574f0fb74.tar.gz
mcsdk-tools-5d06fe6175bdb5301c0e926e074b3b7574f0fb74.tar.xz
mcsdk-tools-5d06fe6175bdb5301c0e926e074b3b7574f0fb74.zip
7 files changed, 7 insertions, 7 deletions
diff --git a/boot_loader/examples/pcie/pcieboot_ddrinit/src/pcieboot_ddrinit.c b/boot_loader/examples/pcie/pcieboot_ddrinit/src/pcieboot_ddrinit.c
index 618b3fa..2d9956d 100755
--- a/boot_loader/examples/pcie/pcieboot_ddrinit/src/pcieboot_ddrinit.c
+++ b/boot_loader/examples/pcie/pcieboot_ddrinit/src/pcieboot_ddrinit.c
@@ -59,7 +59,7 @@
 #define MAGIC_ADDR     0x8ffffc
 #endif
-#ifdef DEVICE_K2H
+#if (defined(DEVICE_K2H) || defined(DEVICE_K2K))
 #define MAGIC_ADDR     0x8ffffc
 #endif
diff --git a/boot_loader/examples/pcie/pcieboot_helloworld/src/pcieboot_helloworld.c b/boot_loader/examples/pcie/pcieboot_helloworld/src/pcieboot_helloworld.c
index c04ea87..7964314 100755
--- a/boot_loader/examples/pcie/pcieboot_helloworld/src/pcieboot_helloworld.c
+++ b/boot_loader/examples/pcie/pcieboot_helloworld/src/pcieboot_helloworld.c
@@ -64,7 +64,7 @@
 #define MAGIC_ADDR          0x8ffffc
 #endif
-#ifdef DEVICE_K2H
+#if (defined(DEVICE_K2H) || defined(DEVICE_K2K))
 #define MAGIC_ADDR          0x8ffffc
 #endif
diff --git a/boot_loader/examples/srio/srioboot_ddrinit/src/srioboot_ddrinit.c b/boot_loader/examples/srio/srioboot_ddrinit/src/srioboot_ddrinit.c
index 99e8665..6e8b065 100755
--- a/boot_loader/examples/srio/srioboot_ddrinit/src/srioboot_ddrinit.c
+++ b/boot_loader/examples/srio/srioboot_ddrinit/src/srioboot_ddrinit.c
@@ -59,7 +59,7 @@
 #define MAGIC_ADDR     0x8ffffc
 #endif
-#ifdef DEVICE_K2K
+#if (defined(DEVICE_K2H) || defined(DEVICE_K2K))
 #define MAGIC_ADDR     0x8ffffc
 #endif
diff --git a/boot_loader/examples/srio/srioboot_example/src/srioBootExample.c b/boot_loader/examples/srio/srioboot_example/src/srioBootExample.c
index c1d4cf7..0a98f37 100755
--- a/boot_loader/examples/srio/srioboot_example/src/srioBootExample.c
+++ b/boot_loader/examples/srio/srioboot_example/src/srioBootExample.c
@@ -52,7 +52,7 @@
 #define MAGIC_ADDR     0x8ffffc
 #endif
-#ifdef DEVICE_K2H
+#if (defined(DEVICE_K2H) || defined(DEVICE_K2K))
 #define MAGIC_ADDR     0x8ffffc
 #endif
diff --git a/boot_loader/examples/srio/srioboot_helloworld/src/srioboot_helloworld.c b/boot_loader/examples/srio/srioboot_helloworld/src/srioboot_helloworld.c
index 3fdb0ff..5664534 100755
--- a/boot_loader/examples/srio/srioboot_helloworld/src/srioboot_helloworld.c
+++ b/boot_loader/examples/srio/srioboot_helloworld/src/srioboot_helloworld.c
@@ -64,7 +64,7 @@
 #define MAGIC_ADDR          0x8ffffc
 #endif
-#ifdef DEVICE_K2H
+#if (defined(DEVICE_K2H) || defined(DEVICE_K2K))
 #define MAGIC_ADDR          0x8ffffc
 #endif
diff --git a/post/evmk2h/bin/post_romparse.bat b/post/evmk2h/bin/post_romparse.bat
index 171e01c..e2a344b 100755
--- a/post/evmk2h/bin/post_romparse.bat
+++ b/post/evmk2h/bin/post_romparse.bat
@@ -1,4 +1,4 @@
-set C6000_CG_DIR="C:\ti\ccsv5\tools\compiler\c6000_7.3.4"
+set C6000_CG_DIR="C:\ti\ccsv5\tools\compiler\c6000_7.4.1"
 set TARGET=k2h
 set ENDIAN=little
 set IBL_ROOT_DIR="..\..\..\boot_loader\ibl"
diff --git a/post/evmk2h/bin/post_romparse.sh b/post/evmk2h/bin/post_romparse.sh
index 53cc50b..314b90e 100755
--- a/post/evmk2h/bin/post_romparse.sh
+++ b/post/evmk2h/bin/post_romparse.sh
@@ -1,4 +1,4 @@
-export CGT_INSTALL_DIR=~/ti/ccsv5/tools/compiler/c6000_7.3.4
+export CGT_INSTALL_DIR=~/ti/ccsv5/tools/compiler/c6000_7.4.1
 export TARGET=k2h
 export ENDIAN=little
 export IBL_ROOT_DIR="../../../boot_loader/ibl"
author	Hao Zhang	2013-02-08 14:11:05 -0600
committer	Hao Zhang	2013-02-08 14:11:05 -0600
commit	5d06fe6175bdb5301c0e926e074b3b7574f0fb74 (patch)
tree	a2b098a2d027f07fd09571ff6b04a93553b501ce
parent	4d0d74e2164b5385882f50cbeb213047f9ec76ce (diff)
download	mcsdk-tools-5d06fe6175bdb5301c0e926e074b3b7574f0fb74.tar.gz mcsdk-tools-5d06fe6175bdb5301c0e926e074b3b7574f0fb74.tar.xz mcsdk-tools-5d06fe6175bdb5301c0e926e074b3b7574f0fb74.zip

diff --git a/boot_loader/examples/pcie/pcieboot_ddrinit/src/pcieboot_ddrinit.c b/boot_loader/examples/pcie/pcieboot_ddrinit/src/pcieboot_ddrinit.c index 618b3fa..2d9956d 100755 --- a/boot_loader/examples/pcie/pcieboot_ddrinit/src/pcieboot_ddrinit.c +++ b/boot_loader/examples/pcie/pcieboot_ddrinit/src/pcieboot_ddrinit.c
@@ -59,7 +59,7 @@
59	#define MAGIC_ADDR 0x8ffffc	59	#define MAGIC_ADDR 0x8ffffc
60	#endif	60	#endif
61		61
62	#ifdef DEVICE_K2H	62	#if (defined(DEVICE_K2H) \|\| defined(DEVICE_K2K))
63	#define MAGIC_ADDR 0x8ffffc	63	#define MAGIC_ADDR 0x8ffffc
64	#endif	64	#endif
65		65


diff --git a/boot_loader/examples/pcie/pcieboot_helloworld/src/pcieboot_helloworld.c b/boot_loader/examples/pcie/pcieboot_helloworld/src/pcieboot_helloworld.c index c04ea87..7964314 100755 --- a/boot_loader/examples/pcie/pcieboot_helloworld/src/pcieboot_helloworld.c +++ b/boot_loader/examples/pcie/pcieboot_helloworld/src/pcieboot_helloworld.c
@@ -64,7 +64,7 @@
64	#define MAGIC_ADDR 0x8ffffc	64	#define MAGIC_ADDR 0x8ffffc
65	#endif	65	#endif
66		66
67	#ifdef DEVICE_K2H	67	#if (defined(DEVICE_K2H) \|\| defined(DEVICE_K2K))
68	#define MAGIC_ADDR 0x8ffffc	68	#define MAGIC_ADDR 0x8ffffc
69	#endif	69	#endif
70		70


diff --git a/boot_loader/examples/srio/srioboot_ddrinit/src/srioboot_ddrinit.c b/boot_loader/examples/srio/srioboot_ddrinit/src/srioboot_ddrinit.c index 99e8665..6e8b065 100755 --- a/boot_loader/examples/srio/srioboot_ddrinit/src/srioboot_ddrinit.c +++ b/boot_loader/examples/srio/srioboot_ddrinit/src/srioboot_ddrinit.c
@@ -59,7 +59,7 @@
59	#define MAGIC_ADDR 0x8ffffc	59	#define MAGIC_ADDR 0x8ffffc
60	#endif	60	#endif
61		61
62	#ifdef DEVICE_K2K	62	#if (defined(DEVICE_K2H) \|\| defined(DEVICE_K2K))
63	#define MAGIC_ADDR 0x8ffffc	63	#define MAGIC_ADDR 0x8ffffc
64	#endif	64	#endif
65		65


diff --git a/boot_loader/examples/srio/srioboot_example/src/srioBootExample.c b/boot_loader/examples/srio/srioboot_example/src/srioBootExample.c index c1d4cf7..0a98f37 100755 --- a/boot_loader/examples/srio/srioboot_example/src/srioBootExample.c +++ b/boot_loader/examples/srio/srioboot_example/src/srioBootExample.c
@@ -52,7 +52,7 @@
52	#define MAGIC_ADDR 0x8ffffc	52	#define MAGIC_ADDR 0x8ffffc
53	#endif	53	#endif
54		54
55	#ifdef DEVICE_K2H	55	#if (defined(DEVICE_K2H) \|\| defined(DEVICE_K2K))
56	#define MAGIC_ADDR 0x8ffffc	56	#define MAGIC_ADDR 0x8ffffc
57	#endif	57	#endif
58		58


diff --git a/boot_loader/examples/srio/srioboot_helloworld/src/srioboot_helloworld.c b/boot_loader/examples/srio/srioboot_helloworld/src/srioboot_helloworld.c index 3fdb0ff..5664534 100755 --- a/boot_loader/examples/srio/srioboot_helloworld/src/srioboot_helloworld.c +++ b/boot_loader/examples/srio/srioboot_helloworld/src/srioboot_helloworld.c
@@ -64,7 +64,7 @@
64	#define MAGIC_ADDR 0x8ffffc	64	#define MAGIC_ADDR 0x8ffffc
65	#endif	65	#endif
66		66
67	#ifdef DEVICE_K2H	67	#if (defined(DEVICE_K2H) \|\| defined(DEVICE_K2K))
68	#define MAGIC_ADDR 0x8ffffc	68	#define MAGIC_ADDR 0x8ffffc
69	#endif	69	#endif
70		70


diff --git a/post/evmk2h/bin/post_romparse.bat b/post/evmk2h/bin/post_romparse.bat index 171e01c..e2a344b 100755 --- a/post/evmk2h/bin/post_romparse.bat +++ b/post/evmk2h/bin/post_romparse.bat
@@ -1,4 +1,4 @@
1	set C6000_CG_DIR="C:\ti\ccsv5\tools\compiler\c6000_7.3.4"	1	set C6000_CG_DIR="C:\ti\ccsv5\tools\compiler\c6000_7.4.1"
2	set TARGET=k2h	2	set TARGET=k2h
3	set ENDIAN=little	3	set ENDIAN=little
4	set IBL_ROOT_DIR="..\..\..\boot_loader\ibl"	4	set IBL_ROOT_DIR="..\..\..\boot_loader\ibl"


diff --git a/post/evmk2h/bin/post_romparse.sh b/post/evmk2h/bin/post_romparse.sh index 53cc50b..314b90e 100755 --- a/post/evmk2h/bin/post_romparse.sh +++ b/post/evmk2h/bin/post_romparse.sh
@@ -1,4 +1,4 @@
1	export CGT_INSTALL_DIR=~/ti/ccsv5/tools/compiler/c6000_7.3.4	1	export CGT_INSTALL_DIR=~/ti/ccsv5/tools/compiler/c6000_7.4.1
2	export TARGET=k2h	2	export TARGET=k2h
3	export ENDIAN=little	3	export ENDIAN=little
4	export IBL_ROOT_DIR="../../../boot_loader/ibl"	4	export IBL_ROOT_DIR="../../../boot_loader/ibl"