On Wed, 10 Sep 2025 16:13:42 +0100
Debbie Horsfall <debbie.horsf...@arm.com> wrote:
Hi Debbie,
> Select SYSRESET on Vexpress64 to enable system reset to support other
> features, such as capsule-on-disk. Select SYSRESET_PSCI if PSCI is
> inferred from the firmware (via ARM_PSCI_FW).
> Select ARM_SMCCC for Vexpress64 boards which in turn selects
> ARM_PSCI_FW.
>
> The sysreset uclass unconditionally implements a reset_cpu() function.
> Remove the empty reset_cpu() in vexpress64 board code.
Thanks for the cleanup, looks good. Tested on AEM-RevC FVP and Juno.
> Signed-off-by: Debbie Horsfall <debbie.horsf...@arm.com>
Reviewed-by: Andre Przywara <andre.przyw...@arm.com>
Cheers,
Andre
> ---
> arch/arm/Kconfig | 2 ++
> board/armltd/vexpress64/Kconfig | 2 ++
> board/armltd/vexpress64/vexpress64.c | 5 -----
> 3 files changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index 40368abc297..d51a7619cdb 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -1417,6 +1417,8 @@ config ARCH_VEXPRESS64
> select MTD_NOR_FLASH if MTD
> select FLASH_CFI_DRIVER if MTD
> select ENV_IS_IN_FLASH if MTD
> + select SYSRESET
> + select SYSRESET_PSCI if ARM_PSCI_FW
> imply DISTRO_DEFAULTS
>
> config TARGET_CORSTONE1000
> diff --git a/board/armltd/vexpress64/Kconfig b/board/armltd/vexpress64/Kconfig
> index f413c51ac43..5b10074e03f 100644
> --- a/board/armltd/vexpress64/Kconfig
> +++ b/board/armltd/vexpress64/Kconfig
> @@ -22,6 +22,7 @@ config VEXPRESS64_BASE_MODEL
> select LINUX_KERNEL_IMAGE_HEADER
> select POSITION_INDEPENDENT
> imply DM_RNG
> + select ARM_SMCCC
>
> choice
> prompt "VExpress64 board variant"
> @@ -47,6 +48,7 @@ config TARGET_VEXPRESS64_JUNO
> select USB_EHCI_GENERIC if USB
> select USB_OHCI_HCD if USB
> select USB_OHCI_GENERIC if USB
> + select ARM_SMCCC
> imply OF_HAS_PRIOR_STAGE
>
> endchoice
> diff --git a/board/armltd/vexpress64/vexpress64.c
> b/board/armltd/vexpress64/vexpress64.c
> index 0b75c1358f0..e8f1c2fe9fe 100644
> --- a/board/armltd/vexpress64/vexpress64.c
> +++ b/board/armltd/vexpress64/vexpress64.c
> @@ -206,11 +206,6 @@ int board_fdt_blob_setup(void **fdtp)
> #endif
> #endif
>
> -/* Actual reset is done via PSCI. */
> -void reset_cpu(void)
> -{
> -}
> -
> /*
> * Board specific ethernet initialization routine.
> */
