Bumped up IBL version; fixed a string cmp in iblConfig

diff --git a/doc/README.txt b/doc/README.txt
index 1e276b5a77b572ec86d831faaafd0ddc674ce1b1..01ea9526bfcfe37960ff5bcf06488bbbacfff9c2 100644 (file)
--- a/doc/README.txt
+++ b/doc/README.txt
@@ -12,5 +12,5 @@ This directory contains the following documents:
                       Load the index.html file from this folder in a browser.
 4. evmc6678-instructions.txt: Document describing steps to use IBL on the c6678 EVM
 5. evmc6670-instructions.txt: Document describing steps to use IBL on the c6670 EVM
-
+6. evmc6657-instructions.txt: Document describing steps to use IBL on the c6657 EVM
 

diff --git a/release.sh b/release.sh
index 23ea6c8d89d3460c1af3acf84fad678d7428f153..74f7427514a60b48d3b1dea4b809ee873b9e2d30 100755 (executable)
--- a/release.sh
+++ b/release.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Generate the source release tarballs
-export IBL_VERSION="1_0_0_14"
+export IBL_VERSION="1_0_0_15"
 cd ../
 if [ -f ibl_src_$IBL_VERSION.tgz ]; then rm ibl_src_$IBL_VERSION.tgz; fi
 

diff --git a/src/ibl.h b/src/ibl.h
index 202c3686184ebad358f6b3d0eeb12189780a3b3d..f3a7c4208d05e53a3dee65feb8f618a4566b3c66 100644 (file)
--- a/src/ibl.h
+++ b/src/ibl.h
@@ -65,11 +65,11 @@
 
 /**
  * @brief
- *  The version number, 1.0.0.14
+ *  The version number, 1.0.0.15
  */
-#define ibl_VERSION  ibl_MAKE_VERSION(1,0,0,14)
+#define ibl_VERSION  ibl_MAKE_VERSION(1,0,0,15)
 /* Version string for UART write */
-#define ibl_VERSION_STR  "1.0.0.14"
+#define ibl_VERSION_STR  "1.0.0.15"
 
 /**
  * @defgroup iblBootModes  Defines the boot modes supported by the IBL

diff --git a/src/util/iblConfig/src/iblConfig.c b/src/util/iblConfig/src/iblConfig.c
index 0c666f4643b6697b27947d97555c2f0e79cdde67..c02368e4436d6872095b00110b0eded72eefb3be 100644 (file)
--- a/src/util/iblConfig/src/iblConfig.c
+++ b/src/util/iblConfig/src/iblConfig.c
@@ -242,7 +242,7 @@ int modifyIblConfig(FILE *fp, ibl_t *ibl)
                }
                else if (strcmp(key, BOOTFORMAT) == 0)
                {
-                       if (strcmp(data, "ELF") == 0)
+                       if (strcmp(data, "ibl_BOOT_FORMAT_ELF") == 0)
                                ibl->bootModes[ethBootIdx].u.ethBoot.bootFormat = ibl_BOOT_FORMAT_ELF;
                        else
                                ibl->bootModes[ethBootIdx].u.ethBoot.bootFormat = ibl_BOOT_FORMAT_BBLOB;