sbl: added version header and modified startup print message with version/build details

Signed-off-by: Ivan Pang <i-pang@ti.com>

diff --git a/board/evmAM572x/sbl_main.c b/board/evmAM572x/sbl_main.c
index 0f745af2f6583b916de9d8b1da9f5dec9d2e3078..718a66dfbc0ee64f72a284f2e8015b1312cfb910 100644 (file)
--- a/board/evmAM572x/sbl_main.c
+++ b/board/evmAM572x/sbl_main.c
@@ -50,6 +50,7 @@
 
 #include "sbl_slave_core_boot.h"
 #include "sbl_avs_config.h"
+#include "sbl_ver.h"
 
 /**********************************************************************
  ************************** Macros ************************************
@@ -100,6 +101,7 @@ int main()
     SBL_SlaveCorePrcmEnable();
 
     UART_printf("**** PDK SBL ****\n");
+    UART_printf("%s (%s - %s)\n", SBL_VERSION_STR, __DATE__, __TIME__);
 
     UART_printf("Begin parsing user application\n");
 

diff --git a/board/evmK2E/sbl_main.c b/board/evmK2E/sbl_main.c
index b2894ebdb047b028e8a86ab99d2ecfae69651c7e..e04a2f679471d03317f77984b2e2fe2d21272c4f 100644 (file)
--- a/board/evmK2E/sbl_main.c
+++ b/board/evmK2E/sbl_main.c
@@ -35,6 +35,7 @@
 #include <ti/drv/uart/UART_stdio.h>
 #include "sbl_soc.h"
 #include "sbl_slave_core_boot.h"
+#include "sbl_ver.h"
 
 sblEntryPoint_t entry;
 typedef void (*EntryFunPtr_t)(void);
@@ -48,7 +49,7 @@ int main() {
     }
 
     UART_printf("\n**** PDK SBL ****\n");
-    UART_printf("Boot succesful!\n");
+    UART_printf("%s (%s - %s)\n", SBL_VERSION_STR, __DATE__, __TIME__);
 
     UART_printf("Begin parsing user application\n");
     SBL_ImageCopy(&entry);

diff --git a/board/evmK2G/sbl_main.c b/board/evmK2G/sbl_main.c
index 397b1c480ea3c8b3cd4677ff18464da7118518e6..88c488bf780f9e7723fb118645220ef7e8085d18 100644 (file)
--- a/board/evmK2G/sbl_main.c
+++ b/board/evmK2G/sbl_main.c
@@ -35,6 +35,7 @@
 #include <ti/drv/uart/UART_stdio.h>
 #include "sbl_soc.h"
 #include "sbl_slave_core_boot.h"
+#include "sbl_ver.h"
 
 #ifdef SECURE_BOOT
 #include "sbl_sec.h"
@@ -60,8 +61,7 @@ int main() {
     SBL_socInit();
 
     UART_printf("\n**** PDK SBL ****\n");
-
-    UART_printf("Boot succesful!\n");
+    UART_printf("%s (%s - %s)\n", SBL_VERSION_STR, __DATE__, __TIME__);
 
     UART_printf("Begin parsing user application\n");
     SBL_ImageCopy(&entry);

diff --git a/board/evmK2H/sbl_main.c b/board/evmK2H/sbl_main.c
index ace343ef922ea16f3e16302d5bed756277f38a0b..e837cbf51150b15260a9a501192d64dd1f66d20e 100644 (file)
--- a/board/evmK2H/sbl_main.c
+++ b/board/evmK2H/sbl_main.c
@@ -35,6 +35,7 @@
 #include <ti/drv/uart/UART_stdio.h>
 #include "sbl_soc.h"
 #include "sbl_slave_core_boot.h"
+#include "sbl_ver.h"
 
 sblEntryPoint_t entry;
 typedef void (*EntryFunPtr_t)(void);
@@ -48,7 +49,7 @@ int main() {
     }
 
     UART_printf("\n**** PDK SBL ****\n");
-    UART_printf("Boot succesful!\n");
+    UART_printf("%s (%s - %s)\n", SBL_VERSION_STR, __DATE__, __TIME__);
 
     SBL_enableARMCores();
 

diff --git a/board/evmK2K/sbl_main.c b/board/evmK2K/sbl_main.c
index 7beddfe7bfbc5f972cd6e40f5d85aa8d4ab3ec36..ea17875c82377769554f249fc27b31b490d1811b 100644 (file)
--- a/board/evmK2K/sbl_main.c
+++ b/board/evmK2K/sbl_main.c
@@ -35,6 +35,7 @@
 #include <ti/drv/uart/UART_stdio.h>
 #include "sbl_soc.h"
 #include "sbl_slave_core_boot.h"
+#include "sbl_ver.h"
 
 sblEntryPoint_t entry;
 typedef void (*EntryFunPtr_t)(void);
@@ -48,7 +49,7 @@ int main() {
     }
 
     UART_printf("\n**** PDK SBL ****\n");
-    UART_printf("Boot succesful!\n");
+    UART_printf("%s (%s - %s)\n", SBL_VERSION_STR, __DATE__, __TIME__);
 
     UART_printf("Begin parsing user application\n");
     SBL_ImageCopy(&entry);

diff --git a/board/evmK2L/sbl_main.c b/board/evmK2L/sbl_main.c
index a30aac4dac63fc6a5e47738df4d9f6326ba18f98..0e8dc79ebd8c68ced1b157c307c744153587d4fd 100644 (file)
--- a/board/evmK2L/sbl_main.c
+++ b/board/evmK2L/sbl_main.c
@@ -35,6 +35,7 @@
 #include <ti/drv/uart/UART_stdio.h>
 #include "sbl_soc.h"
 #include "sbl_slave_core_boot.h"
+#include "sbl_ver.h"
 
 sblEntryPoint_t entry;
 typedef void (*EntryFunPtr_t)(void);
@@ -48,7 +49,7 @@ int main() {
     }
 
     UART_printf("\n**** PDK SBL ****\n");
-    UART_printf("Boot succesful!\n");
+    UART_printf("%s (%s - %s)\n", SBL_VERSION_STR, __DATE__, __TIME__);
 
     UART_printf("Begin parsing user application\n");
     SBL_ImageCopy(&entry);

diff --git a/board/evmOMAPL137/sbl_main.c b/board/evmOMAPL137/sbl_main.c
index 6121f8a6608f3aa9de17a77e743f5886833ffe82..49278fabbe60be60b56d792573e7eca32507fe59 100644 (file)
--- a/board/evmOMAPL137/sbl_main.c
+++ b/board/evmOMAPL137/sbl_main.c
@@ -35,6 +35,7 @@
 #include <ti/drv/uart/UART_stdio.h>
 #include "sbl_soc.h"
 #include "sbl_slave_core_boot.h"
+#include "sbl_ver.h"
 
 sblEntryPoint_t entry;
 typedef void (*EntryFunPtr_t)(void);
@@ -48,7 +49,7 @@ int main() {
     }
 
     UART_printf("\n**** PDK SBL ****\n");
-    UART_printf("Boot succesful!\n");
+    UART_printf("%s (%s - %s)\n", SBL_VERSION_STR, __DATE__, __TIME__);
 
     UART_printf("Begin parsing user application\n");
     SBL_ImageCopy(&entry);

diff --git a/board/iceK2G/sbl_main.c b/board/iceK2G/sbl_main.c
index ce5e574055472a4d80d8e5e2cad69d059df8f8b5..9321da255373e8365e1ccee91f25dad8fd625d21 100644 (file)
--- a/board/iceK2G/sbl_main.c
+++ b/board/iceK2G/sbl_main.c
@@ -35,6 +35,7 @@
 #include <ti/drv/uart/UART_stdio.h>
 #include "sbl_soc.h"
 #include "sbl_slave_core_boot.h"
+#include "sbl_ver.h"
 
 sblEntryPoint_t entry;
 typedef void (*EntryFunPtr_t)(void);
@@ -44,7 +45,7 @@ int main() {
     SBL_socInit();
 
     UART_printf("\n**** PDK SBL ****\n");
-    UART_printf("Boot succesful!\n");
+    UART_printf("%s (%s - %s)\n", SBL_VERSION_STR, __DATE__, __TIME__);
 
     UART_printf("Begin parsing user application\n");
     SBL_ImageCopy(&entry);

diff --git a/board/idkAM571x/sbl_main.c b/board/idkAM571x/sbl_main.c
index 2af52a06e9786fc1286f6d54ab6a422962c17ab2..973415c1453c74a250992365793a436c2832f883 100644 (file)
--- a/board/idkAM571x/sbl_main.c
+++ b/board/idkAM571x/sbl_main.c
@@ -50,6 +50,7 @@
 
 #include "sbl_slave_core_boot.h"
 #include "sbl_avs_config.h"
+#include "sbl_ver.h"
 
 /**********************************************************************
 ************************** Macros ************************************
@@ -100,6 +101,7 @@ int main()
     SBL_SlaveCorePrcmEnable();
 
     UART_printf("**** PDK SBL ****\n");
+    UART_printf("%s (%s - %s)\n", SBL_VERSION_STR, __DATE__, __TIME__);
 
     UART_printf("Begin parsing user application\n");
 

diff --git a/board/idkAM572x/sbl_main.c b/board/idkAM572x/sbl_main.c
index 24526dcda84801bcacc2402b2bf62166080812e9..5738cf51f4c711eae5f261d21a330c65085274c9 100644 (file)
--- a/board/idkAM572x/sbl_main.c
+++ b/board/idkAM572x/sbl_main.c
@@ -50,6 +50,7 @@
 
 #include "sbl_slave_core_boot.h"
 #include "sbl_avs_config.h"
+#include "sbl_ver.h"
 
 /**********************************************************************
  ************************** Macros ************************************
@@ -100,6 +101,7 @@ int main()
     SBL_SlaveCorePrcmEnable();
 
     UART_printf("**** PDK SBL ****\n");
+    UART_printf("%s (%s - %s)\n", SBL_VERSION_STR, __DATE__, __TIME__);
 
     UART_printf("Begin parsing user application\n");
     /* Image Copy */

diff --git a/board/lcdkC6748/sbl_main.c b/board/lcdkC6748/sbl_main.c
index fe42a27f71e7f4865d0c52f762768dc2a72206d9..f7699408c9d65f4c54cbc6f36ea1a25ca21da7c6 100644 (file)
--- a/board/lcdkC6748/sbl_main.c
+++ b/board/lcdkC6748/sbl_main.c
@@ -35,6 +35,7 @@
 #include <ti/drv/uart/UART_stdio.h>
 #include "sbl_soc.h"
 #include "sbl_slave_core_boot.h"
+#include "sbl_ver.h"
 
 sblEntryPoint_t entry;
 typedef void (*EntryFunPtr_t)(void);
@@ -50,7 +51,7 @@ int main() {
     }
 
     UART_printf("\n**** PDK SBL ****\n");
-    UART_printf("Boot succesful!\n");
+    UART_printf("%s (%s - %s)\n", SBL_VERSION_STR, __DATE__, __TIME__);
 
     UART_printf("Begin parsing user application\n");
     retval = SBL_ImageCopy(&entry);

diff --git a/board/lcdkOMAPL138/sbl_main.c b/board/lcdkOMAPL138/sbl_main.c
index a61b121eae42d503b9ef1e6cb9d0e2acd74f831a..9e203fad0f6015d2d10587929d515f2edbe0b6d5 100644 (file)
--- a/board/lcdkOMAPL138/sbl_main.c
+++ b/board/lcdkOMAPL138/sbl_main.c
@@ -35,6 +35,7 @@
 #include <ti/drv/uart/UART_stdio.h>
 #include "sbl_soc.h"
 #include "sbl_slave_core_boot.h"
+#include "sbl_ver.h"
 
 sblEntryPoint_t entry;
 typedef void (*EntryFunPtr_t)(void);
@@ -50,7 +51,7 @@ int main() {
     }
 
     UART_printf("\n**** PDK SBL ****\n");
-    UART_printf("Boot succesful!\n");
+    UART_printf("%s (%s - %s)\n", SBL_VERSION_STR, __DATE__, __TIME__);
 
     retval = SBL_ImageCopy(&entry);
     if(retval)

diff --git a/sbl_ver.h b/sbl_ver.h
new file mode 100644 (file)
index 0000000..33863d8
--- /dev/null
+++ b/sbl_ver.h
@@ -0,0 +1,49 @@
+/*\r
+ * Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com/\r
+ *\r
+ * Redistribution and use in source and binary forms, with or without\r
+ * modification, are permitted provided that the following conditions\r
+ * are met:\r
+ *\r
+ * Redistributions of source code must retain the above copyright\r
+ * notice, this list of conditions and the following disclaimer.\r
+ *\r
+ * Redistributions in binary form must reproduce the above copyright\r
+ * notice, this list of conditions and the following disclaimer in the\r
+ * documentation and/or other materials provided with the\r
+ * distribution.\r
+ *\r
+ * Neither the name of Texas Instruments Incorporated nor the names of\r
+ * its contributors may be used to endorse or promote products derived\r
+ * from this software without specific prior written permission.\r
+ *\r
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\r
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\r
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\r
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\r
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\r
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\r
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\r
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\r
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\r
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\r
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\r
+ *\r
+ */\r
+\r
+#ifndef SBL_VER_H\r
+#define SBL_VER_H\r
+\r
+/**\r
+ * @brief   This is the SBL Version. Versions numbers are encoded in the following\r
+ * format:\r
+ *  0xAABBCCDD -> Arch (AA); API Changes (BB); Major (CC); Minor (DD)\r
+ */\r
+#define SBL_VERSION_ID                     (0x01000700)\r
+\r
+/**\r
+ * @brief   This is the version string which describes the SBL Version\r
+ */\r
+#define SBL_VERSION_STR                    "SBL Revision: 01.00.07.00"\r
+\r
+#endif\r