X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=common%2Fcmd_boot.c;h=8f2e0701b540387b01906d26b622d3a239580b2d;hb=b9cb64825b5e6efeb715abd8b48d9b12f98973e9;hp=9ccc8c798dd3767c0971c247f1c1a3c8491650ad;hpb=54841ab50c20d6fa6c9cc3eb826989da3a22d934;p=oweals%2Fu-boot.git diff --git a/common/cmd_boot.c b/common/cmd_boot.c index 9ccc8c798d..8f2e0701b5 100644 --- a/common/cmd_boot.c +++ b/common/cmd_boot.c @@ -2,23 +2,7 @@ * (C) Copyright 2000-2003 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * 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+ */ /* @@ -28,22 +12,23 @@ #include #include +#ifdef CONFIG_CMD_GO + /* Allow ports to override the default behavior */ __attribute__((weak)) -unsigned long do_go_exec (ulong (*entry)(int, char * const []), int argc, char * const argv[]) +unsigned long do_go_exec(ulong (*entry)(int, char * const []), int argc, + char * const argv[]) { return entry (argc, argv); } -int do_go (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +static int do_go(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { ulong addr, rc; int rcode = 0; - if (argc < 2) { - cmd_usage(cmdtp); - return 1; - } + if (argc < 2) + return CMD_RET_USAGE; addr = simple_strtoul(argv[1], NULL, 16); @@ -69,7 +54,7 @@ U_BOOT_CMD( " passing 'arg' as arguments" ); -extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); +#endif U_BOOT_CMD( reset, 1, 0, do_reset,