Merge remote-tracking branch 'u-boot/master' into test

[karo-tx-uboot.git] / common / cmd_irq.c

diff --git a/common/cmd_irq.c b/common/cmd_irq.c
index a21aedea40cc5e64ff494b89952a7d746e51c21c..02da450f6731ee1994f27bd6a30e9030373dd9b5 100644 (file)
--- a/common/cmd_irq.c
+++ b/common/cmd_irq.c
@@ -1,43 +1,25 @@
 /*
  * Copyright 2008 Freescale Semiconductor, Inc.
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
 #include <config.h>
 #include <command.h>
 
-int do_interrupts(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+static int do_interrupts(cmd_tbl_t *cmdtp, int flag, int argc,
+                        char * const argv[])
 {
 
-       if (argc != 2) {
-               cmd_usage(cmdtp);
-               return 1;
-       }
+       if (argc != 2)
+               return CMD_RET_USAGE;
 
        /* on */
-       if (strncmp(argv[1], "on", 2) == 0) {
+       if (strncmp(argv[1], "on", 2) == 0)
                enable_interrupts();
-       } else {
+       else
                disable_interrupts();
-       }
 
        return 0;
 }
@@ -45,6 +27,14 @@ int do_interrupts(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 U_BOOT_CMD(
        interrupts, 5, 0, do_interrupts,
        "enable or disable interrupts",
-       "[on, off]\n"
-       "    - enable or disable interrupts\n"
+       "[on, off]"
+);
+
+/* Implemented in $(CPU)/interrupts.c */
+int do_irqinfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
+
+U_BOOT_CMD(
+       irqinfo,    1,    1,     do_irqinfo,
+       "print information about IRQs",
+       ""
 );