diff options
| author | Stewart Smith <stewart@linux.vnet.ibm.com> | 2014-11-19 12:15:07 +1100 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2014-11-19 12:19:30 +1100 |
| commit | 0b18bd2ae2db1e6fd15e859b00b23bb39886f528 (patch) | |
| tree | b6e2c141d55c2d274b152fadea92871a3f08e803 /include | |
| parent | 0265f805be05f224fbcf3913fb4c604fa04da7e0 (diff) | |
| download | skiboot-0b18bd2ae2db1e6fd15e859b00b23bb39886f528.zip skiboot-0b18bd2ae2db1e6fd15e859b00b23bb39886f528.tar.gz skiboot-0b18bd2ae2db1e6fd15e859b00b23bb39886f528.tar.bz2 | |
Implement skiboot versioning
We grab a version from git tags (or SKIBOOT_VERSION environment variable),
optionally tack on EXTRA_VERSION (if from git) as well as add things to the
git version number if we're ahead of the most recent tag or the tree is dirty.
Also fix-up makefiles so that we don't have to rebuild version.c every time
you run make.
fsp attn area needed updating as we can have >40 character version strings.
We also export the version string via device tree rather than just the gitid.
For buildroot builds, setting SKIBOOT_VERSION environment variable to the
tag you grab will do the correct thing.
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/fsp-attn.h | 6 | ||||
| -rw-r--r-- | include/skiboot.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/fsp-attn.h b/include/fsp-attn.h index 947c49f..1eaa5bb 100644 --- a/include/fsp-attn.h +++ b/include/fsp-attn.h @@ -59,14 +59,14 @@ struct sp_attn_area { #define TI_MSG_LEN 940 /* Maximum sapphire version length (approx) */ -#define GITID_LEN 40 +#define VERSION_LEN 80 /* Upto 10 frames each of length 40 bytes + header = 430 bytes */ #define BT_FRAME_LEN 430 /* File info length : Use the rest of the memory for file details */ -#define FILE_INFO_LEN (TI_MSG_LEN - GITID_LEN - BT_FRAME_LEN) +#define FILE_INFO_LEN (TI_MSG_LEN - VERSION_LEN - BT_FRAME_LEN) struct user_data { - char gitid[GITID_LEN]; + char version[VERSION_LEN]; char bt_buf[BT_FRAME_LEN]; char file_info[FILE_INFO_LEN]; } __packed; diff --git a/include/skiboot.h b/include/skiboot.h index 1a1f96f..b65475b 100644 --- a/include/skiboot.h +++ b/include/skiboot.h @@ -175,8 +175,8 @@ extern void parse_hdat(bool is_opal, uint32_t master_cpu); /* Root of device tree. */ extern struct dt_node *dt_root; -/* Generated git id. */ -extern const char gitid[]; +/* Full skiboot version number (possibly includes gitid). */ +extern const char version[]; /* Fast reboot support */ extern void fast_reset(void); |