[PATCH v2 5/5] Revert "ARM: meson: Add support for fastboot_set_reboot_flag()"
Mattijs Korpershoek
mkorpershoek at baylibre.com
Fri Jul 30 14:28:12 CEST 2021
With the introduction of a generic reboot flag implemented in commit
a362ce214f ("fastboot: Implement generic fastboot_set_reboot_flag"), we
no longer need the custom PSCI implementation to handle the reboot reason.
This reverts commit 9a34dedfae0ebb031a45324c2fed8c39b2c6fcf2.
Signed-off-by: Mattijs Korpershoek <mkorpershoek at baylibre.com>
Acked-by: Neil Armstrong <narmstrong at baylibre.com>
---
arch/arm/mach-meson/board-common.c | 34 ------------------------------
1 file changed, 34 deletions(-)
diff --git a/arch/arm/mach-meson/board-common.c b/arch/arm/mach-meson/board-common.c
index 1690b6b1e6..7ceba7cede 100644
--- a/arch/arm/mach-meson/board-common.c
+++ b/arch/arm/mach-meson/board-common.c
@@ -22,10 +22,7 @@
#include <efi_loader.h>
#include <u-boot/crc.h>
-#if CONFIG_IS_ENABLED(FASTBOOT)
#include <asm/psci.h>
-#include <fastboot.h>
-#endif
DECLARE_GLOBAL_DATA_PTR;
@@ -152,38 +149,7 @@ int board_late_init(void)
return meson_board_late_init();
}
-#if CONFIG_IS_ENABLED(FASTBOOT)
-static unsigned int reboot_reason = REBOOT_REASON_NORMAL;
-
-int fastboot_set_reboot_flag(enum fastboot_reboot_reason reason)
-{
- if (reason != FASTBOOT_REBOOT_REASON_BOOTLOADER)
- return -ENOTSUPP;
-
- reboot_reason = REBOOT_REASON_BOOTLOADER;
-
- printf("Using reboot reason: 0x%x\n", reboot_reason);
-
- return 0;
-}
-
-void reset_cpu(void)
-{
- struct pt_regs regs;
-
- regs.regs[0] = ARM_PSCI_0_2_FN_SYSTEM_RESET;
- regs.regs[1] = reboot_reason;
-
- printf("Rebooting with reason: 0x%lx\n", regs.regs[1]);
-
- smc_call(®s);
-
- while (1)
- ;
-}
-#else
void reset_cpu(void)
{
psci_system_reset();
}
-#endif
--
2.30.2
More information about the U-Boot
mailing list