| Patrick Williams | ac13d5f | 2023-11-24 18:59:46 -0600 | [diff] [blame] | 1 | From 43881e2e9dd165a65791927b1455f4b6c8727f4c Mon Sep 17 00:00:00 2001 |
| 2 | Message-Id: <43881e2e9dd165a65791927b1455f4b6c8727f4c.1696397516.git.diego.sueiro@arm.com> |
| 3 | In-Reply-To: <98035c418c3df58817ab678037599303842ee931.1696397516.git.diego.sueiro@arm.com> |
| 4 | References: <98035c418c3df58817ab678037599303842ee931.1696397516.git.diego.sueiro@arm.com> |
| 5 | From: Diego Sueiro <diego.sueiro@arm.com> |
| 6 | Date: Wed, 4 Oct 2023 06:31:50 +0100 |
| 7 | Subject: [PATCH 2/2] vexpress64: Select PSCI RESET by default |
| 8 | |
| 9 | Set SYSRESET and SYSRESET_PSCI config for vexpress64 by |
| 10 | by default. This means that the reset_cpu function in |
| 11 | vexpress64.c is no longer needed because it is called in |
| 12 | sysreset-uclass.c instead. |
| 13 | |
| 14 | Upstream-Status: Pending |
| 15 | Signed-off-by: Diego Sueiro <diego.sueiro@arm.com> |
| 16 | --- |
| 17 | board/armltd/vexpress64/Kconfig | 2 ++ |
| 18 | board/armltd/vexpress64/vexpress64.c | 5 ----- |
| 19 | 2 files changed, 2 insertions(+), 5 deletions(-) |
| 20 | |
| 21 | diff --git a/board/armltd/vexpress64/Kconfig b/board/armltd/vexpress64/Kconfig |
| 22 | index 0d161740fb..0c2e5f8759 100644 |
| 23 | --- a/board/armltd/vexpress64/Kconfig |
| 24 | +++ b/board/armltd/vexpress64/Kconfig |
| 25 | @@ -31,6 +31,8 @@ config TARGET_VEXPRESS64_BASE_FVP |
| 26 | bool "Support Versatile Express ARMv8a FVP BASE model" |
| 27 | select VEXPRESS64_BASE_MODEL |
| 28 | imply OF_HAS_PRIOR_STAGE |
| 29 | + select SYSRESET |
| 30 | + select SYSRESET_PSCI |
| 31 | |
| 32 | config TARGET_VEXPRESS64_BASER_FVP |
| 33 | bool "Support Versatile Express ARMv8r64 FVP BASE model" |
| 34 | diff --git a/board/armltd/vexpress64/vexpress64.c b/board/armltd/vexpress64/vexpress64.c |
| 35 | index ee65a59683..f73de56464 100644 |
| 36 | --- a/board/armltd/vexpress64/vexpress64.c |
| 37 | +++ b/board/armltd/vexpress64/vexpress64.c |
| 38 | @@ -207,11 +207,6 @@ void *board_fdt_blob_setup(int *err) |
| 39 | } |
| 40 | #endif |
| 41 | |
| 42 | -/* Actual reset is done via PSCI. */ |
| 43 | -void reset_cpu(void) |
| 44 | -{ |
| 45 | -} |
| 46 | - |
| 47 | /* |
| 48 | * Board specific ethernet initialization routine. |
| 49 | */ |
| 50 | -- |
| 51 | 2.39.1 |
| 52 | |