MCSDK 3.0: fix srioboot example build error

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 618b3fab32f835587cf57110dbf2d81e4173370a..2d9956d2e1fb2cdac26e40e14d8137fe20066e82 100755 (executable)
--- 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 c04ea87f6e248372c5efecb500862df0f2ec989b..7964314782ae58683bf0cd02a47b77284e1485eb 100755 (executable)
--- 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 99e86654559274672170ec0231c75ba20a73ffed..6e8b065979d42e00e621f5ef4766d4a35f30ae7c 100755 (executable)
--- 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 c1d4cf71a5581a9046c7573a7088ee64b65e8d3f..0a98f3789e069f07275c2eb0a1778f533060a163 100755 (executable)
--- 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 3fdb0ff226d383ba1839530ea0734992d84d92a9..5664534fc2cc50f1e3b79b631e90f4b995887c17 100755 (executable)
--- 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 171e01ce9b5acc7eaf550ea0f276ea004742c565..e2a344b1d3c7ce54078b62b7cfc2b098863b826e 100755 (executable)
--- 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 53cc50b7f30dc9552569ea088a3a19bf0ab943bf..314b90e92c22e02960b8a52590018a179e7397da 100755 (executable)
--- 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"