Merge octopus:/home/git/projects/u-boot-v2
This commit is contained in:
commit
a09b455fce
|
@ -1,3 +1,25 @@
|
||||||
|
/*
|
||||||
|
* crc.c - Calculate a crc32 checksum of a memory area
|
||||||
|
*
|
||||||
|
* Copyright (c) 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
|
||||||
|
*
|
||||||
|
* 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 version 2
|
||||||
|
* as published by the Free Software Foundation.
|
||||||
|
*
|
||||||
|
* 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
|
||||||
|
*/
|
||||||
|
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <command.h>
|
#include <command.h>
|
||||||
#include <fs.h>
|
#include <fs.h>
|
||||||
|
|
|
@ -1,4 +1,6 @@
|
||||||
/*
|
/*
|
||||||
|
* erase, protect, unprotect - FLASH support
|
||||||
|
*
|
||||||
* (C) Copyright 2000
|
* (C) Copyright 2000
|
||||||
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
|
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
|
||||||
*
|
*
|
||||||
|
@ -21,9 +23,6 @@
|
||||||
* MA 02111-1307 USA
|
* MA 02111-1307 USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
|
||||||
* FLASH support
|
|
||||||
*/
|
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <command.h>
|
#include <command.h>
|
||||||
#include <cfi_flash.h>
|
#include <cfi_flash.h>
|
||||||
|
|
|
@ -1,4 +1,6 @@
|
||||||
/*
|
/*
|
||||||
|
* go- execute some code anywhere (misc boot support)
|
||||||
|
*
|
||||||
* (C) Copyright 2000-2003
|
* (C) Copyright 2000-2003
|
||||||
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
|
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
|
||||||
*
|
*
|
||||||
|
@ -21,10 +23,6 @@
|
||||||
* MA 02111-1307 USA
|
* MA 02111-1307 USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
|
||||||
* Misc boot support
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <command.h>
|
#include <command.h>
|
||||||
|
|
||||||
|
|
|
@ -19,6 +19,7 @@
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <command.h>
|
#include <command.h>
|
||||||
#include <fs.h>
|
#include <fs.h>
|
||||||
|
|
|
@ -1,4 +1,6 @@
|
||||||
/*
|
/*
|
||||||
|
* mtest - Perform a memory test
|
||||||
|
*
|
||||||
* (C) Copyright 2000
|
* (C) Copyright 2000
|
||||||
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
|
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
|
||||||
*
|
*
|
||||||
|
|
|
@ -1,4 +1,6 @@
|
||||||
/*
|
/*
|
||||||
|
* tftp, rarpboot, dhcp, nfs, cdp - Boot support
|
||||||
|
*
|
||||||
* (C) Copyright 2000
|
* (C) Copyright 2000
|
||||||
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
|
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
|
||||||
*
|
*
|
||||||
|
@ -21,9 +23,6 @@
|
||||||
* MA 02111-1307 USA
|
* MA 02111-1307 USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
|
||||||
* Boot support
|
|
||||||
*/
|
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <command.h>
|
#include <command.h>
|
||||||
#include <environment.h>
|
#include <environment.h>
|
||||||
|
@ -132,7 +131,7 @@ static int do_dhcp (cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||||
}
|
}
|
||||||
|
|
||||||
U_BOOT_CMD_START(dhcp)
|
U_BOOT_CMD_START(dhcp)
|
||||||
.maxargs = 3,
|
.maxargs = 1,
|
||||||
.cmd = do_dhcp,
|
.cmd = do_dhcp,
|
||||||
.usage = "invoke dhcp client to obtain ip/boot params",
|
.usage = "invoke dhcp client to obtain ip/boot params",
|
||||||
U_BOOT_CMD_END
|
U_BOOT_CMD_END
|
||||||
|
@ -201,7 +200,7 @@ netboot_common (proto_t proto, cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||||
return rcode;
|
return rcode;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if (CONFIG_COMMANDS & CFG_CMD_CDP)
|
#ifdef CONFIG_NET_CDP
|
||||||
|
|
||||||
static void cdp_update_env(void)
|
static void cdp_update_env(void)
|
||||||
{
|
{
|
||||||
|
@ -245,4 +244,4 @@ U_BOOT_CMD_START(cdp)
|
||||||
U_BOOT_CMD_HELP("[loadAddress] [host ip addr:bootfilename]\n")
|
U_BOOT_CMD_HELP("[loadAddress] [host ip addr:bootfilename]\n")
|
||||||
U_BOOT_CMD_END
|
U_BOOT_CMD_END
|
||||||
|
|
||||||
#endif /* CFG_CMD_CDP */
|
#endif /* CONFIG_NET_CDP */
|
||||||
|
|
|
@ -30,7 +30,7 @@ static int do_pwd (cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||||
}
|
}
|
||||||
|
|
||||||
U_BOOT_CMD_START(pwd)
|
U_BOOT_CMD_START(pwd)
|
||||||
.maxargs = 2,
|
.maxargs = 1,
|
||||||
.cmd = do_pwd,
|
.cmd = do_pwd,
|
||||||
.usage = "print working directory",
|
.usage = "print working directory",
|
||||||
U_BOOT_CMD_END
|
U_BOOT_CMD_END
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* ls.c - list files and directories
|
* timeout - wait for timeout
|
||||||
*
|
*
|
||||||
* Copyright (c) 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
|
* Copyright (c) 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
|
||||||
*
|
*
|
||||||
|
|
Loading…
Reference in New Issue