Message ID | 1450626095-31948-2-git-send-email-hdegoede@redhat.com |
---|---|
State | Superseded |
Delegated to: | Hans de Goede |
Headers | show |
On Sun, Dec 20, 2015 at 04:41:32PM +0100, Hans de Goede wrote: > From: Michael van Slingerland <michael@deviousops.nl> > > Add a 'poweroff' command to boot commands, this only gets enabled if the > board Kconfig does a "select CMD_POWEROFF". > > Signed-off-by: Michael van Slingerland <michael@deviousops.nl> > [hdegoede@redhat.com: Make the cmd conditional on a CMD_POWEROFF Kconfig] > Signed-off-by: Hans de Goede <hdegoede@redhat.com> > --- > common/Kconfig | 3 +++ > common/cmd_boot.c | 8 ++++++++ > include/command.h | 3 +++ > 3 files changed, 14 insertions(+) > > diff --git a/common/Kconfig b/common/Kconfig > index ccf5475..9d446bf 100644 > --- a/common/Kconfig > +++ b/common/Kconfig > @@ -184,6 +184,9 @@ config CMD_XIMG > help > Extract a part of a multi-image. > > +config CMD_POWEROFF > + bool > + > endmenu > > menu "Environment commands" > diff --git a/common/cmd_boot.c b/common/cmd_boot.c > index 8f2e070..5a8f912 100644 > --- a/common/cmd_boot.c > +++ b/common/cmd_boot.c > @@ -61,3 +61,11 @@ U_BOOT_CMD( > "Perform RESET of the CPU", > "" > ); > + > +#ifdef CONFIG_CMD_POWEROFF > +U_BOOT_CMD( > + poweroff, 1, 0, do_poweroff, > + "Perform POWEROFF", " of the device" > + "" > +); > +#endif > diff --git a/include/command.h b/include/command.h > index 2ae9b6c..30bc327 100644 > --- a/include/command.h > +++ b/include/command.h > @@ -110,6 +110,9 @@ extern int common_diskboot(cmd_tbl_t *cmdtp, const char *intf, int argc, > char *const argv[]); > > extern int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); > +#ifdef CONFIG_CMD_POWEROFF > +extern int do_poweroff(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); > +#endif No need for ifdef/endif (yes, there's others in the file like that but that's something to fix sometime). Thanks!
diff --git a/common/Kconfig b/common/Kconfig index ccf5475..9d446bf 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -184,6 +184,9 @@ config CMD_XIMG help Extract a part of a multi-image. +config CMD_POWEROFF + bool + endmenu menu "Environment commands" diff --git a/common/cmd_boot.c b/common/cmd_boot.c index 8f2e070..5a8f912 100644 --- a/common/cmd_boot.c +++ b/common/cmd_boot.c @@ -61,3 +61,11 @@ U_BOOT_CMD( "Perform RESET of the CPU", "" ); + +#ifdef CONFIG_CMD_POWEROFF +U_BOOT_CMD( + poweroff, 1, 0, do_poweroff, + "Perform POWEROFF", + "" +); +#endif diff --git a/include/command.h b/include/command.h index 2ae9b6c..30bc327 100644 --- a/include/command.h +++ b/include/command.h @@ -110,6 +110,9 @@ extern int common_diskboot(cmd_tbl_t *cmdtp, const char *intf, int argc, char *const argv[]); extern int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); +#ifdef CONFIG_CMD_POWEROFF +extern int do_poweroff(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); +#endif /* * Error codes that commands return to cmd_process(). We use the standard 0