diff options
| author | Tom Rini <trini@konsulko.com> | 2021-09-03 17:40:28 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-09-03 17:42:15 +0300 |
| commit | 00179319714fd2076cf81f49de357ee699672f31 (patch) | |
| tree | 995c59d4b9b004e506b6e644b866c73f71b502ff /board/armltd | |
| parent | b35be5ed42c8453ac95432b6fbc0d42b1e91c758 (diff) | |
| download | u-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 'board/armltd')
| -rw-r--r-- | board/armltd/vexpress64/Kconfig | 5 | ||||
| -rw-r--r-- | board/armltd/vexpress64/MAINTAINERS | 5 | ||||
| -rw-r--r-- | board/armltd/vexpress64/vexpress64.c | 22 |
3 files changed, 2 insertions, 30 deletions
diff --git a/board/armltd/vexpress64/Kconfig b/board/armltd/vexpress64/Kconfig index 1f0c7ad969..1d13f542e6 100644 --- a/board/armltd/vexpress64/Kconfig +++ b/board/armltd/vexpress64/Kconfig @@ -1,5 +1,4 @@ -if TARGET_VEXPRESS64_BASE_FVP || TARGET_VEXPRESS64_JUNO || \ - TARGET_VEXPRESS64_BASER_FVP +if TARGET_VEXPRESS64_BASE_FVP || TARGET_VEXPRESS64_JUNO config SYS_BOARD default "vexpress64" @@ -8,7 +7,7 @@ config SYS_VENDOR default "armltd" config SYS_CONFIG_NAME - default "vexpress_aemv8" + default "vexpress_aemv8a" config JUNO_DTB_PART string "NOR flash partition holding DTB" diff --git a/board/armltd/vexpress64/MAINTAINERS b/board/armltd/vexpress64/MAINTAINERS index 875401ae1b..0ba044d7ff 100644 --- a/board/armltd/vexpress64/MAINTAINERS +++ b/board/armltd/vexpress64/MAINTAINERS @@ -14,8 +14,3 @@ JUNO DEVELOPMENT PLATFORM BOARD M: Linus Walleij <linus.walleij@linaro.org> S: Maintained F: configs/vexpress_aemv8a_juno_defconfig - -VEXPRESS64 BASER_FVP -M: Peter Hoyes <Peter.Hoyes@arm.com> -S: Maintained -F: configs/vexpress_aemv8r_defconfig diff --git a/board/armltd/vexpress64/vexpress64.c b/board/armltd/vexpress64/vexpress64.c index eb4951d07c..2e4260286b 100644 --- a/board/armltd/vexpress64/vexpress64.c +++ b/board/armltd/vexpress64/vexpress64.c @@ -18,7 +18,6 @@ #include <dm/platform_data/serial_pl01x.h> #include "pcie.h" #include <asm/armv8/mmu.h> -#include <asm/armv8/mpu.h> DECLARE_GLOBAL_DATA_PTR; @@ -55,27 +54,6 @@ static struct mm_region vexpress64_mem_map[] = { struct mm_region *mem_map = vexpress64_mem_map; -static struct mpu_region vexpress64_aemv8r_mem_map[] = { - { - .start = 0x0UL, - .end = 0x7fffffffUL, - .attrs = PRLAR_ATTRIDX(MT_NORMAL) - }, { - .start = 0x80000000UL, - .end = 0xffffffffUL, - .attrs = PRLAR_ATTRIDX(MT_DEVICE_NGNRNE) - }, { - .start = 0x100000000UL, - .end = 0xffffffffffUL, - .attrs = PRLAR_ATTRIDX(MT_NORMAL) - }, { - /* List terminator */ - 0, - } -}; - -struct mpu_region *mpu_mem_map = vexpress64_aemv8r_mem_map; - /* This function gets replaced by platforms supporting PCIe. * The replacement function, eg. on Juno, initialises the PCIe bus. */ |