From: Michal Simek Date: Tue, 13 Jul 2021 14:53:46 +0000 (+0200) Subject: psci: Do not define do_poweroff() if CONFIG_SYSRESET_CMD_POWEROFF is enabled X-Git-Url: http://git.dujemihanovic.xyz/%22http:/www.sics.se/static/git-favicon.png?a=commitdiff_plain;h=bfc05d7e2af334c5907c38a94eddb18b5e92faaf;p=u-boot.git 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 --- diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c index 89cb7d88e5..657e7eb5ae 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();