aboutsummaryrefslogtreecommitdiffstats
path: root/docs/change-log-upcoming.rst
diff options
context:
space:
mode:
authorAlistair Delva <adelva@google.com>2021-02-15 12:43:29 -0800
committerAlistair Delva <adelva@google.com>2021-02-15 12:44:34 -0800
commitfaa476c0caaa598afa5a6109d17102db5fe35ec6 (patch)
tree37a21c69306801ee7cdda5167a30896c8740155b /docs/change-log-upcoming.rst
parentb00a71fc312c9781fa6f404dccfb55b062b2ccac (diff)
parent66306814586b1bf6bcb859aaad218ec3bb090e94 (diff)
downloadplatform_external_arm-trusted-firmware-faa476c0caaa598afa5a6109d17102db5fe35ec6.tar.gz
platform_external_arm-trusted-firmware-faa476c0caaa598afa5a6109d17102db5fe35ec6.tar.bz2
platform_external_arm-trusted-firmware-faa476c0caaa598afa5a6109d17102db5fe35ec6.zip
Merge branch 'aosp/upstream-master' into HEADandroid-s-preview-1
This keeps the bl31 interface change reverted which still has not been fixed in upstream U-Boot for rockchip devices. Test: CROSS_COMPILE=aarch64-linux-gnu- make PLAT=rk3399 \ DEBUG=0 ERROR_DEPRECATED=1 bl31 Signed-off-by: Alistair Delva <adelva@google.com> Change-Id: I7c3972a7b767715efb05593096d5d92dba14c609
Diffstat (limited to 'docs/change-log-upcoming.rst')
-rw-r--r--docs/change-log-upcoming.rst8
1 files changed, 6 insertions, 2 deletions
diff --git a/docs/change-log-upcoming.rst b/docs/change-log-upcoming.rst
index 14280cbf7..03806d910 100644
--- a/docs/change-log-upcoming.rst
+++ b/docs/change-log-upcoming.rst
@@ -7,7 +7,7 @@ of this file will be moved to the collective change-log.rst file at the time of
release code freeze.
-Upcoming Release Version 2.3
+Upcoming Release Version 2.4
----------------------------
**Trusted Firmware-A Contributors,
@@ -22,8 +22,12 @@ New Features
- Arm Architecture
- Example: "Add support for Branch Target Identification (BTI)"
+- BL-specific
+ - Example: "Enhanced BL2 bootloader flow to load secure partitions based
+ on firmware configuration data (fconf)."
+
- Build System
- - Add support for documentation build as a target in Makefile
+ - Example: "Modify FVP makefile for CPUs that support both AArch64/32"
- CPU Support
- Example: "cortex-a55: Workaround for erratum 1221012"