diff options
| author | J. Aaron Gamble <jgamble@nvidia.com> | 2011-08-11 13:21:35 -0700 |
|---|---|---|
| committer | Varun Colbert <vcolbert@nvidia.com> | 2011-08-18 11:38:44 -0700 |
| commit | 26d858aa4ecfa3f25fee16af655b28d87d56469a (patch) | |
| tree | d7b6800129716680c4e70d944d0ae76a6c906fbf /security/tf_driver/s_version.h | |
| parent | 04bb6c2b2ee1bc07bf6b0248bb64f41509415fb7 (diff) | |
security: tf_driver: secureos tf_driver update
New version of tf_driver supplied by Trusted Logic
Change-Id: I57d28e467346e055d1c4c4f9ad75a49f670d646d
Reviewed-on: http://git-master/r/46803
Reviewed-by: Scott Williams <scwilliams@nvidia.com>
Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com>
Tested-by: John Gamble <jgamble@nvidia.com>
Diffstat (limited to 'security/tf_driver/s_version.h')
| -rw-r--r-- | security/tf_driver/s_version.h | 87 |
1 files changed, 39 insertions, 48 deletions
diff --git a/security/tf_driver/s_version.h b/security/tf_driver/s_version.h index f7368d797b4f..81cb62f2bc0e 100644 --- a/security/tf_driver/s_version.h +++ b/security/tf_driver/s_version.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2010 Trusted Logic S.A. + * Copyright (c) 2011 Trusted Logic S.A. * All Rights Reserved. * * This program is free software; you can redistribute it and/or @@ -23,13 +23,30 @@ /* * Usage: define S_VERSION_BUILD on the compiler's command line. * - * Then, you get: - * - S_VERSION_MAIN "X.Y" + * Then set: + * - S_VERSION_OS + * - S_VERSION_PLATFORM + * - S_VERSION_MAIN + * - S_VERSION_ENG is optional + * - S_VERSION_PATCH is optional * - S_VERSION_BUILD = 0 if S_VERSION_BUILD not defined or empty - * - S_VERSION_STRING = "TFO[O][P] X.Y.N " or "TFO[O][P] X.Y.N D " - * - S_VERSION_RESOURCE = X,Y,0,N */ +#define S_VERSION_OS "A" /* "A" for all Android */ +#define S_VERSION_PLATFORM "B" /* "B" for Tegra3 */ + +/* + * This version number must be updated for each new release + */ +#define S_VERSION_MAIN "01.01" + +/* +* If this is a patch or engineering version use the following +* defines to set the version number. Else set these values to 0. +*/ +#define S_VERSION_ENG 0 +#define S_VERSION_PATCH 0 + #ifdef S_VERSION_BUILD /* TRICK: detect if S_VERSION is defined but empty */ #if 0 == S_VERSION_BUILD-0 @@ -44,58 +61,32 @@ #define __STRINGIFY(X) #X #define __STRINGIFY2(X) __STRINGIFY(X) -#if !defined(NDEBUG) || defined(_DEBUG) -#define S_VERSION_VARIANT_DEBUG "D" -#else -#define S_VERSION_VARIANT_DEBUG " " -#endif - -#ifdef STANDARD -#define S_VERSION_VARIANT_STANDARD "S" +#if S_VERSION_ENG != 0 +#define _S_VERSION_ENG "e" __STRINGIFY2(S_VERSION_ENG) #else -#define S_VERSION_VARIANT_STANDARD " " +#define _S_VERSION_ENG "" #endif -#define S_VERSION_VARIANT S_VERSION_VARIANT_STANDARD S_VERSION_VARIANT_DEBUG " " - -/* - * This version number must be updated for each new release - */ -#define S_VERSION_MAIN "08.01" -#define S_VERSION_RESOURCE 8,1,0,S_VERSION_BUILD - -/* - * Products Versioning - */ -#if defined(WIN32) - -/* Win32 Simulator and all Win32 Side Components */ -#define PRODUCT_NAME "TFOWX" - -#elif defined(__ANDROID32__) - -#define PRODUCT_NAME "UNKWN" - -#elif defined(LINUX) - -#if defined(__ARM_EABI__) -/* arm architecture -> Cortex-A8 */ -#define PRODUCT_NAME "TFOLB" +#if S_VERSION_PATCH != 0 +#define _S_VERSION_PATCH "p" __STRINGIFY2(S_VERSION_PATCH) #else -/* ix86 architecture -> Linux Simulator and all Linux Side Components */ -#define PRODUCT_NAME "TFOLX" +#define _S_VERSION_PATCH "" #endif +#if !defined(NDEBUG) || defined(_DEBUG) +#define S_VERSION_VARIANT "D " #else - -/* Not OS specififc -> Cortex-A8 Secure Binary */ -#define PRODUCT_NAME "TFOXB" - +#define S_VERSION_VARIANT " " #endif #define S_VERSION_STRING \ - PRODUCT_NAME S_VERSION_MAIN "." \ - __STRINGIFY2(S_VERSION_BUILD) " " \ - S_VERSION_VARIANT + "TFN" \ + S_VERSION_OS \ + S_VERSION_PLATFORM \ + S_VERSION_MAIN \ + _S_VERSION_ENG \ + _S_VERSION_PATCH \ + "." __STRINGIFY2(S_VERSION_BUILD) " " \ + S_VERSION_VARIANT #endif /* __S_VERSION_H__ */ |