summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2021-09-03 17:40:28 +0300
committerTom Rini <trini@konsulko.com>2021-09-03 17:42:15 +0300
commit00179319714fd2076cf81f49de357ee699672f31 (patch)
tree995c59d4b9b004e506b6e644b866c73f71b502ff /doc
parentb35be5ed42c8453ac95432b6fbc0d42b1e91c758 (diff)
downloadu-boot-00179319714fd2076cf81f49de357ee699672f31.tar.xz
Revert most of the series for adding vexpress_aemv8r support
Per a request from Andre Przywara and agreed with by Peter Hoyes, the vexpress aemv8r support wasn't quite ready to be merged, but the discussion had moved off list. We should keep the first patch in the series for now, but revert the rest. This reverts the following commits: e0bd6f31ce41 doc: Add documentation for the Arm vexpress board configs 30e5a449e8c7 arm: Use armv8_switch_to_el1 env to switch to EL1 b53bbca63bf4 vexpress64: Add BASER_FVP vexpress board variant 2f5b7b74903f armv8: Add ARMv8 MPU configuration logic 37a757e227cc armv8: Ensure EL1&0 VMSA is enabled Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/README.semihosting2
-rw-r--r--doc/arch/arm64.rst3
-rw-r--r--doc/board/armltd/index.rst9
-rw-r--r--doc/board/armltd/vexpress64.rst57
-rw-r--r--doc/board/index.rst1
5 files changed, 2 insertions, 70 deletions
diff --git a/doc/README.semihosting b/doc/README.semihosting
index f382d0131e..c019999bed 100644
--- a/doc/README.semihosting
+++ b/doc/README.semihosting
@@ -25,7 +25,7 @@ or turning on CONFIG_BASE_FVP for the more full featured model.
Rather than create a new armv8 board similar to armltd/vexpress64, add
semihosting calls to the existing one, enabled with CONFIG_SEMIHOSTING
and CONFIG_BASE_FVP both set. Also reuse the existing board config file
-vexpress_aemv8.h but differentiate the two models by the presence or
+vexpress_aemv8a.h but differentiate the two models by the presence or
absence of CONFIG_BASE_FVP. This change is tested and works on both the
Foundation and Base fastmodel simulators.
diff --git a/doc/arch/arm64.rst b/doc/arch/arm64.rst
index f20eb8f1b2..80498f6f6b 100644
--- a/doc/arch/arm64.rst
+++ b/doc/arch/arm64.rst
@@ -18,8 +18,7 @@ Notes
classical firmware (like initial hardware setup, CPU errata workarounds
or SMP bringup). U-Boot can be entered in EL2 when its main purpose is
that of a boot loader. It can drop to lower exception levels before
- entering the OS. For ARMv8-R it is recommened to enter at S-EL2, as for this
- architecture there is no S-EL3.
+ entering the OS.
2. U-Boot for arm64 is compiled with AArch64-gcc. AArch64-gcc
use rela relocation format, a tool(tools/relocate-rela) by Scott Wood
diff --git a/doc/board/armltd/index.rst b/doc/board/armltd/index.rst
deleted file mode 100644
index b6786c114f..0000000000
--- a/doc/board/armltd/index.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-.. SPDX-License-Identifier: GPL-2.0+
-
-Arm Ltd
-=============
-
-.. toctree::
- :maxdepth: 2
-
- vexpress64.rst
diff --git a/doc/board/armltd/vexpress64.rst b/doc/board/armltd/vexpress64.rst
deleted file mode 100644
index 37ef564110..0000000000
--- a/doc/board/armltd/vexpress64.rst
+++ /dev/null
@@ -1,57 +0,0 @@
-.. SPDX-License-Identifier: GPL-2.0+
-
-Arm Versatile Express
-=====================
-
-The vexpress_* board configuration supports the following platforms:
-
- * FVP_Base_RevC-2xAEMvA
- * FVP_BaseR_AEMv8R
- * Juno development board
-
-Fixed Virtual Platforms
------------------------
-
-The Fixed Virtual Platforms (FVP) are complete simulations of an Arm system,
-including processor, memory and peripherals. They are set out in a "programmer's
-view", which gives a comprehensive model on which to build and test software.
-
-The supported FVPs are available free of charge and can be downloaded from the
-Arm developer site [1]_ (user registration might be required).
-
-Supported features:
-
- * GICv3
- * Generic timer
- * PL011 UART
- * SMC91111 network interface
-
-The default configuration assumes that U-Boot is boostrapped from the start of
-the DRAM (address 0x80000000 for AEMvA; 0x00000000 for AEMv8R) using a suitable
-bootloader. Alternatively, U-Boot can be launched directly by mapping the binary
-to the same address (using the FVP's --data argument).
-
-The FVPs can be debugged using Arm Development Studio [2]_.
-
-FVP_BaseR
-^^^^^^^^^
-
-On Armv8r64 platforms (such as the FVP_BaseR), U-Boot runs at S-EL2, so
-CONFIG_ARMV8_SWITCH_TO_EL1 is defined so that the next stage boots at S-EL1. If
-S-EL2 is desired instead, the *armv8_switch_to_el1* environment variable is
-available. This can be set to *n* to override the config flag and boot the next
-stage at S-EL2 instead.
-
-Juno
-----
-
-The Juno development board is an open, vendor-neutral Armv8-A development
-platform that supports an out-of-the-box Linux software package. A range of
-plug-in expansion options enables hardware and software applications to be
-developed and debugged.
-
-References
-----------
-
-.. [1] https://developer.arm.com/tools-and-software/simulation-models/fixed-virtual-platforms
-.. [2] https://developer.arm.com/tools-and-software/embedded/arm-development-studio
diff --git a/doc/board/index.rst b/doc/board/index.rst
index 827f0866bd..8588e453d5 100644
--- a/doc/board/index.rst
+++ b/doc/board/index.rst
@@ -10,7 +10,6 @@ Board-specific doc
advantech/index
AndesTech/index
amlogic/index
- armltd/index
atmel/index
congatec/index
coreboot/index