Merge tag 'efi-2021-10-rc3' of https://source.denx.de/u-boot/custodians/u-boot-efi

Pull request for efi-2021-10-rc3

Documentation:

* Rename Freescale to NXP
* Document structures used for the UEFI TCG2 protocol

UEFI:

* Device paths must use EfiBootServicesData

19 files changed, 5 insertions, 33 deletions

diff --git a/doc/board/index.rst b/doc/board/index.rst
index 9e90978891..33087074fa 100644
--- a/doc/board/index.rst
+++ b/doc/board/index.rst
@@ -14,11 +14,11 @@ Board-specific doc
    congatec/index
    coreboot/index
    emulation/index
-   freescale/index
    google/index
    intel/index
    kontron/index
    microchip/index
+   nxp/index
    openpiton/index
    qualcomm/index
    rockchip/index
diff --git a/doc/board/freescale/imx8mm_evk.rst b/doc/board/nxp/imx8mm_evk.rst
index 7fd3d72564..7fd3d72564 100644
--- a/doc/board/freescale/imx8mm_evk.rst
+++ b/doc/board/nxp/imx8mm_evk.rst
diff --git a/doc/board/freescale/imx8mn_evk.rst b/doc/board/nxp/imx8mn_evk.rst
index 9fbb947032..9fbb947032 100644
--- a/doc/board/freescale/imx8mn_evk.rst
+++ b/doc/board/nxp/imx8mn_evk.rst
diff --git a/doc/board/freescale/imx8mp_evk.rst b/doc/board/nxp/imx8mp_evk.rst
index 609a29f3eb..609a29f3eb 100644
--- a/doc/board/freescale/imx8mp_evk.rst
+++ b/doc/board/nxp/imx8mp_evk.rst
diff --git a/doc/board/freescale/imx8mq_evk.rst b/doc/board/nxp/imx8mq_evk.rst
index c269fdebe3..c269fdebe3 100644
--- a/doc/board/freescale/imx8mq_evk.rst
+++ b/doc/board/nxp/imx8mq_evk.rst
diff --git a/doc/board/freescale/imx8qxp_mek.rst b/doc/board/nxp/imx8qxp_mek.rst
index 215627cfa6..215627cfa6 100644
--- a/doc/board/freescale/imx8qxp_mek.rst
+++ b/doc/board/nxp/imx8qxp_mek.rst
diff --git a/doc/board/freescale/imxrt1020-evk.rst b/doc/board/nxp/imxrt1020-evk.rst
index 267f80c517..267f80c517 100644
--- a/doc/board/freescale/imxrt1020-evk.rst
+++ b/doc/board/nxp/imxrt1020-evk.rst
diff --git a/doc/board/freescale/imxrt1050-evk.rst b/doc/board/nxp/imxrt1050-evk.rst
index c1fb48f0cd..c1fb48f0cd 100644
--- a/doc/board/freescale/imxrt1050-evk.rst
+++ b/doc/board/nxp/imxrt1050-evk.rst
diff --git a/doc/board/freescale/index.rst b/doc/board/nxp/index.rst
index bddc6c6c2c..63956287c5 100644
--- a/doc/board/freescale/index.rst
+++ b/doc/board/nxp/index.rst
@@ -1,7 +1,7 @@
 .. SPDX-License-Identifier: GPL-2.0+
 
-Freescale
-=========
+NXP Semiconductors
+==================
 
 .. toctree::
    :maxdepth: 2
@@ -17,3 +17,4 @@ Freescale
    mx6sabresd
    mx6ul_14x14_evk
    mx6ullevk
+   psb
diff --git a/doc/board/freescale/mx6sabreauto.rst b/doc/board/nxp/mx6sabreauto.rst
index fe4cd9d214..fe4cd9d214 100644
--- a/doc/board/freescale/mx6sabreauto.rst
+++ b/doc/board/nxp/mx6sabreauto.rst
diff --git a/doc/board/freescale/mx6sabresd.rst b/doc/board/nxp/mx6sabresd.rst
index fe15ba7b79..fe15ba7b79 100644
--- a/doc/board/freescale/mx6sabresd.rst
+++ b/doc/board/nxp/mx6sabresd.rst
diff --git a/doc/board/freescale/mx6ul_14x14_evk.rst b/doc/board/nxp/mx6ul_14x14_evk.rst
index 8298bf8e1e..8298bf8e1e 100644
--- a/doc/board/freescale/mx6ul_14x14_evk.rst
+++ b/doc/board/nxp/mx6ul_14x14_evk.rst
diff --git a/doc/board/freescale/mx6ullevk.rst b/doc/board/nxp/mx6ullevk.rst
index a26248a1e3..a26248a1e3 100644
--- a/doc/board/freescale/mx6ullevk.rst
+++ b/doc/board/nxp/mx6ullevk.rst
diff --git a/doc/imx/misc/psb.rst b/doc/board/nxp/psb.rst
index 71ac09fac8..71ac09fac8 100644
--- a/doc/imx/misc/psb.rst
+++ b/doc/board/nxp/psb.rst
diff --git a/doc/board/st/index.rst b/doc/board/st/index.rst
index 8a06a954a2..9bba42f1da 100644
--- a/doc/board/st/index.rst
+++ b/doc/board/st/index.rst
@@ -6,5 +6,5 @@ STMicroelectronics
 .. toctree::
    :maxdepth: 2
 
-   st
+   st-dt
    stm32mp1
diff --git a/doc/board/st/st.rst b/doc/board/st/st-dt.rst
index 3dade1681f..3dade1681f 100644
--- a/doc/board/st/st.rst
+++ b/doc/board/st/st-dt.rst
diff --git a/doc/imx/index.rst b/doc/imx/index.rst
deleted file mode 100644
index b225b1d183..0000000000
--- a/doc/imx/index.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-.. SPDX-License-Identifier: GPL-2.0+
-
-NXP i.MX Machine-specific doc
-=============================
-
-.. toctree::
-   :maxdepth: 2
-
-   misc/index
diff --git a/doc/imx/misc/index.rst b/doc/imx/misc/index.rst
deleted file mode 100644
index 85fbdb6588..0000000000
--- a/doc/imx/misc/index.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-.. SPDX-License-Identifier: GPL-2.0+
-
-Miscellaneous
-=============
-
-.. toctree::
-   :maxdepth: 2
-
-   psb
diff --git a/doc/index.rst b/doc/index.rst
index 8066fcbfc0..02de1d4684 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -64,17 +64,6 @@ implementation.
 
    arch/index
 
-Machine-specific doc
---------------------
-
-These books provide programming details about machine-specific
-implementation.
-
-.. toctree::
-   :maxdepth: 2
-
-   imx/index
-
 Board-specific doc
 ------------------