4 files changed, 105 insertions, 14 deletions
diff --git a/Documentation/releases/coreboot-4.12-relnotes.md b/Documentation/releases/coreboot-4.12-relnotes.md
index 2f0bae52f4..aca3dd5cb3 100644
--- a/Documentation/releases/coreboot-4.12-relnotes.md
+++ b/Documentation/releases/coreboot-4.12-relnotes.md
@@ -1,20 +1,79 @@
 Upcoming release - coreboot 4.12
 ================================
 
-The 4.12 release is planned for April 2020
+coreboot 4.12 was released on May 12th, 2020.
 
-Update this document with changes that should be in the release
-notes.
-* Please use Markdown.
-* See the past few release notes for the general format.
-* The chip and board additions and removals will be updated right
-  before the release, so those do not need to be added.
+Since 4.11 there were 2692 new commits by over 190 developers and of
+these, 59 contributed for the first time, which is quite an amazing
+increase.
+
+Thank you to all developers who again helped made coreboot better
+than ever, and a big welcome to our new contributors!
+
+Maintainers
+-----------
+
+This release saw some activity on the MAINTAINERS file, showing more
+persons, teams and companies declare publicly that they intend to
+take care of mainboards and subsystems.
+
+To all new maintainers, thanks a lot!
+
+Documentation
+-------------
+
+Our documentation efforts in the code tree are picking up steam, with
+some 70 commits in that general area. Everything from typo fixes to
+documenting mainboard support or coreboot APIs.
+
+There's still room to improve, but the contributions are getting more
+and better.
+
+Hardware support
+----------------
+
+The removals due to the announced deprecations as well as the
+deduplication of boards into variants skew the stats a bit, so at
+a top level view this is a rare coreboot release in that it removes
+more boards (51) than it adds (49).
+
+After accounting for the variant moves the numbers in favor of more
+hardware supported than the previous version. Besides a whole lot
+of Chrome OS devices (again), this release features a whole bunch
+of retrofits for devices originally shipping with non-coreboot OEM
+firmware, but also support for devices that come with coreboot right
+out of the box.
+
+For that, a shout out to System76, Protectli, Libretrend and the
+Open Compute Project!
+
+Cleanup
+--------
+
+We simplified the header that comes at the top of every file:
+Instead of a lengthy reference to the license any given file
+is under, or even the license text itself, we opted for simple
+[SPDX](https://www.spdx.org) identifiers.
+
+Since people also handled copyright lines differently, we now opt for
+collecting authors in AUTHORS and let git history tell the whole story.
+
+While at it, the content-free "This file is part of this-and-that
+project" header was also dropped.
+
+Besides that, there has also been more work to sort out the headers
+we include across the tree to minimize the code impacting every
+compilation unit.
+
+Now that our board-variant mechanism matured, many boards that were
+individual models so far were converted into variants, making it
+easier to maintain families of devices.
 
 Deprecations
 ------------
 
 For the 4.12 release a few features on x86 became mandatory. These are
-relocatable ramstage, postcar stage and C_ENVIRONMENT_BOOTBLOCK.
+relocatable ramstage, postcar stage and C\_ENVIRONMENT\_BOOTBLOCK.
 
 ### Relocatable ramstage
 
@@ -53,9 +112,8 @@ regions.
 The following platforms did not implement those feature are dropped
 from master to allow the master branch to move on:
 - AMDFAM10
-- all FSP1.0 platforms: BROADWELL_DE, FSP_BAYTRAIL, RANGELEY
+- all FSP1.0 platforms: BROADWELL\_DE, FSP\_BAYTRAIL, RANGELEY
 - VIA VX900
-- TODO (AMD?)
 
 In particular on FSP1.0 it is impossible to implement POSTCAR stage.
 The reason is that FSP1.0 relocates the CAR region to the HOB before
@@ -67,7 +125,7 @@ there. This solution is deemed too hacky. Maybe a lesson can be
 learned from this: blobs should not interfere with the execution
 environment, as this makes proper integration much harder.
 
-### 4.11_branch
+### 4.11\_branch
 
 Given that some platforms supported by FSP1.0 are being produced and
 popular, the 4.11 release was made into a branch in which further
@@ -78,7 +136,9 @@ Significant changes
 
 ### SMMSTORE is now production ready
 
-See [smmstore](../drivers/smmstore.md) for the documentation on the API.
+See [smmstore](../drivers/smmstore.md) for the documentation on
+the API, but note that there will be an update to it featuring a
+much-improved but incompatible API.
 
 ### Unit testing infrastructure
 
@@ -89,4 +149,10 @@ tests. See
 [Unit testing coreboot](../technotes/2020-03-unit-testing-coreboot.md) for the
 design document.
 
-### Add significant changes here
+Final Notes
+-----------
+
+Your favorite new feature or supported board didn't make it to the
+release notes? They're maintained collaboratively in the coreboot
+tree, so when you land something noteworthy don't be shy, contribute
+to the upcoming release's document in Documentation/releases!
diff --git a/Documentation/releases/coreboot-4.13-relnotes.md b/Documentation/releases/coreboot-4.13-relnotes.md
new file mode 100644
index 0000000000..94e93bb75b
--- /dev/null
+++ b/Documentation/releases/coreboot-4.13-relnotes.md
@@ -0,0 +1,16 @@
+Upcoming release - coreboot 4.13
+================================
+
+The 4.13 release is planned for November 2020.
+
+Update this document with changes that should be in the release notes.
+
+* Please use Markdown.
+* See the past few release notes for the general format.
+* The chip and board additions and removals will be updated right
+  before the release, so those do not need to be added.
+
+Significant changes
+-------------------
+
+### Add significant changes here
diff --git a/Documentation/releases/index.md b/Documentation/releases/index.md
index 0a990f6d7b..0575e93f3b 100644
--- a/Documentation/releases/index.md
+++ b/Documentation/releases/index.md
@@ -12,6 +12,7 @@ Release notes for previous releases
 * [4.9 - December 2018](coreboot-4.9-relnotes.md)
 * [4.10 - July 2019](coreboot-4.10-relnotes.md)
 * [4.11 - November 2019](coreboot-4.11-relnotes.md)
+* [4.12 - May 2020](coreboot-4.12-relnotes.md)
 
 The checklist contains instructions to ensure that a release covers all
 important things and provides a reliable format for tarballs, branch
@@ -23,4 +24,4 @@ Upcoming release
 ----------------
 
 Please add to the release notes as changes are added:
-* [4.12 - April 2020](coreboot-4.12-relnotes.md)
+* [4.13 - November 2020](coreboot-4.13-relnotes.md)
diff --git a/Documentation/security/vboot/list_vboot.md b/Documentation/security/vboot/list_vboot.md
index 6b41597f18..845c0e7109 100644
--- a/Documentation/security/vboot/list_vboot.md
+++ b/Documentation/security/vboot/list_vboot.md
@@ -33,6 +33,8 @@
 - Ultima (Lenovo Yoga 11e G3)
 - Wizpig
 - Daisy (Samsung Chromebook (2012))
+- Deltan
+- Deltaur
 - DragonEgg
 - Drallion
 - Eve (Google Pixelbook)
@@ -56,8 +58,10 @@
 - Rainier
 - Akemi
 - Dratini
+- Duffy
 - Hatch
 - Jinlon
+- Kaisa
 - Kohaku
 - Kindred
 - Helios
@@ -67,6 +71,7 @@
 - Puff
 - Helios_Diskswap
 - Stryke
+- Sushi
 - Guado (ASUS Chromebox CN62)
 - Jecht
 - Rikku (Acer Chromebox CXI2)
@@ -135,6 +140,8 @@
 - Storm (OnHub Router TGR1900)
 - Stout (Lenovo Thinkpad X131e Chromebook)
 - Trogdor
+- Lazor
+- Bubs
 - Veyron_Jaq (Haier Chromebook 11)
 - Veyron_Jerry (Hisense Chromebook 11)
 - Veyron_Mighty (Haier Chromebook 11(edu))
@@ -199,6 +206,7 @@
 - ThinkPad X1
 - ThinkPad X230
 - ThinkPad X230t
+- ThinkPad X60 / X60s / X60t
 
 ## OpenCellular
 - Elgon (GBCv2)