OSDN Git Service

hw/arm/boot: Prevent setting both psci_conduit and secure_board_setup
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 27 Jan 2022 15:46:35 +0000 (15:46 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 8 Feb 2022 10:56:28 +0000 (10:56 +0000)
commitdc888dd43bea83b1ccc3d0554d5044179554a5f1
tree4be07f0728f217d678f87ca4c911a7623bb2c8b2
parent61b82973e746ff750fbbafe10fa6e3c416b01321
hw/arm/boot: Prevent setting both psci_conduit and secure_board_setup

Now that we have dealt with the one special case (highbank) that needed
to set both psci_conduit and secure_board_setup, we don't need to
allow that combination any more. It doesn't make sense in general,
so use an assertion to ensure we don't add new boards that do it
by accident without thinking through the consequences.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Niek Linnenbank <nieklinnenbank@gmail.com>
Tested-by: Cédric Le Goater <clg@kaod.org>
Tested-by: Niek Linnenbank <nieklinnenbank@gmail.com>
Message-id: 20220127154639.2090164-13-peter.maydell@linaro.org
hw/arm/boot.c