From: Mattijs Korpershoek <mkorpershoek@baylibre.com>
To: Neil Armstrong <narmstrong@baylibre.com>
Cc: u-boot-amlogic@groups.io, u-boot@lists.denx.de,
Mattijs Korpershoek <mkorpershoek@baylibre.com>
Subject: [PATCH v2 5/5] Revert "ARM: meson: Add support for fastboot_set_reboot_flag()"
Date: Fri, 30 Jul 2021 14:28:12 +0200 [thread overview]
Message-ID: <20210730122812.3011529-6-mkorpershoek@baylibre.com> (raw)
In-Reply-To: <20210730122812.3011529-1-mkorpershoek@baylibre.com>
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@baylibre.com>
Acked-by: Neil Armstrong <narmstrong@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
next prev parent reply other threads:[~2021-07-30 12:28 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-30 12:28 [PATCH v2 0/5] meson64_android: use BCB for reboot reason Mattijs Korpershoek
2021-07-30 12:28 ` [PATCH v2 1/5] configs: meson64_android: use BCB for reboot to bootloader Mattijs Korpershoek
2021-07-30 12:28 ` [PATCH v2 2/5] configs: meson64_android: implement recovery boot via BCB Mattijs Korpershoek
2021-07-30 12:28 ` [PATCH v2 3/5] configs: meson64_android: reboot to fastbootd from bootloader Mattijs Korpershoek
2021-07-30 12:28 ` [PATCH v2 4/5] configs: sei610/sei510: set CONFIG_CMD_BCB=y Mattijs Korpershoek
2021-07-30 12:28 ` Mattijs Korpershoek [this message]
2021-07-30 12:54 ` [PATCH v2 0/5] meson64_android: use BCB for reboot reason Neil Armstrong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210730122812.3011529-6-mkorpershoek@baylibre.com \
--to=mkorpershoek@baylibre.com \
--cc=narmstrong@baylibre.com \
--cc=u-boot-amlogic@groups.io \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.