Revert "Remove the exclusive-or language around DT or ACPI"

This reverts commit bec3ce5. This change has not been agreed to but was committed accidentally. Signed-off-by: Grant Likely <[email protected]>
ARM-software · Mar 17, 2021 · 6dae6fd · 6dae6fd
1 parent bec3ce5
commit 6dae6fd
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/source/chapter2-uefi.rst b/source/chapter2-uefi.rst
@@ -253,12 +253,18 @@ Configuration Tables
 A UEFI system that complies with this specification may provide additional
 tables via the EFI Configuration Table.
 
-Compliant systems are required to provide at least one of the following
+Compliant systems are required to provide one, but not both, of the following
 tables:
 
 - an Advanced Configuration and Power Interface [ACPI]_ table, or
 - a Devicetree [DTSPEC]_ system description
 
+EBBR systems must not provide both ACPI and Devicetree
+tables at the same time.
+Systems that support both interfaces must provide a configuration
+mechanism to select either ACPI or Devicetree,
+and must ensure only the selected interface is provided to the OS loader.
+
 Devicetree
 ^^^^^^^^^^