diff options
| author | Michal Simek <michal.simek@xilinx.com> | 2021-07-13 16:53:46 +0200 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2021-07-26 09:18:45 +0200 |
| commit | bfc05d7e2af334c5907c38a94eddb18b5e92faaf (patch) | |
| tree | 151967c3e2642d4a24a41bfa5d0f4a1201464caf /drivers/firmware | |
| parent | bc579291e2292c80e6018826fa5eefa453756b17 (diff) | |
| download | u-boot-bfc05d7e2af334c5907c38a94eddb18b5e92faaf.zip u-boot-bfc05d7e2af334c5907c38a94eddb18b5e92faaf.tar.gz u-boot-bfc05d7e2af334c5907c38a94eddb18b5e92faaf.tar.bz2 | |
psci: Do not define do_poweroff() if CONFIG_SYSRESET_CMD_POWEROFF is enabled
CONFIG_SYSRESET_CMD_POWEROFF defines do_poweroff() in sysreset-uclass.c
that's why don't define it twice when both CONFIG_SYSRESET_CMD_POWEROFF and
CONFIG_CMD_POWEROFF are enabled. CONFIG_SYSRESET_CMD_POWEROFF depends on
CONFIG_CMD_POWEROFF.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Diffstat (limited to 'drivers/firmware')
| -rw-r--r-- | drivers/firmware/psci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c index 89cb7d8..657e7eb 100644 --- a/drivers/firmware/psci.c +++ b/drivers/firmware/psci.c @@ -210,7 +210,7 @@ void psci_sys_poweroff(void) invoke_psci_fn(PSCI_0_2_FN_SYSTEM_OFF, 0, 0, 0); } -#ifdef CONFIG_CMD_POWEROFF +#if IS_ENABLED(CONFIG_CMD_POWEROFF) && !IS_ENABLED(CONFIG_SYSRESET_CMD_POWEROFF) int do_poweroff(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { do_psci_probe(); |