summaryrefslogtreecommitdiff
path: root/include/asm-generic
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2022-08-31 19:32:31 -0400
committerTom Rini <[email protected]>2022-08-31 19:32:31 -0400
commit4e10c1227aa879af809b3073bf917289f23e17d7 (patch)
tree682c915d732c07d017a00278ae76fdea6f00b003 /include/asm-generic
parent1573b6a86993fcf80d4badc866a46b78df7e6bda (diff)
parentf4b540e25c5c63fd55a80c78a22b2f69ecb848f8 (diff)
Merge branch '2022-08-31-assorted-fixes'
- Assorted bugfixes including re-working the i2c command CVE and fixing some TI reference platforms with different EEPROMs.
Diffstat (limited to 'include/asm-generic')
-rw-r--r--include/asm-generic/global_data.h12
1 files changed, 8 insertions, 4 deletions
diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h
index 805a6fd6797..2a747d91e16 100644
--- a/include/asm-generic/global_data.h
+++ b/include/asm-generic/global_data.h
@@ -115,10 +115,14 @@ struct global_data {
/**
* @precon_buf_idx: pre-console buffer index
*
- * @precon_buf_idx indicates the current position of the buffer used to
- * collect output before the console becomes available
- */
- unsigned long precon_buf_idx;
+ * @precon_buf_idx indicates the current position of the
+ * buffer used to collect output before the console becomes
+ * available. When negative, the pre-console buffer is
+ * temporarily disabled (used when the pre-console buffer is
+ * being written out, to prevent adding its contents to
+ * itself).
+ */
+ long precon_buf_idx;
#endif
/**
* @env_addr: address of environment structure