projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
command: Remove the cmd_tbl_t typedef
[oweals/u-boot.git]
/
cmd
/
nand.c
diff --git
a/cmd/nand.c
b/cmd/nand.c
index 899d504533752a581f3b8c4f417c2bef35a41b2d..92d039af8f52c6bf9ceb61bffbc58d713e52c1e8 100644
(file)
--- a/
cmd/nand.c
+++ b/
cmd/nand.c
@@
-20,20
+20,25
@@
*/
#include <common.h>
*/
#include <common.h>
+#include <bootstage.h>
+#include <image.h>
+#include <asm/cache.h>
#include <linux/mtd/mtd.h>
#include <command.h>
#include <console.h>
#include <linux/mtd/mtd.h>
#include <command.h>
#include <console.h>
+#include <env.h>
#include <watchdog.h>
#include <malloc.h>
#include <asm/byteorder.h>
#include <jffs2/jffs2.h>
#include <nand.h>
#include <watchdog.h>
#include <malloc.h>
#include <asm/byteorder.h>
#include <jffs2/jffs2.h>
#include <nand.h>
+#include "legacy-mtd-utils.h"
+
#if defined(CONFIG_CMD_MTDPARTS)
/* partition handling routines */
int mtdparts_init(void);
#if defined(CONFIG_CMD_MTDPARTS)
/* partition handling routines */
int mtdparts_init(void);
-int id_parse(const char *id, const char **ret_id, u8 *dev_type, u8 *dev_num);
int find_dev_and_part(const char *id, struct mtd_device **dev,
u8 *part_num, struct part_info **part);
#endif
int find_dev_and_part(const char *id, struct mtd_device **dev,
u8 *part_num, struct part_info **part);
#endif
@@
-184,7
+189,7
@@
static void do_nand_status(struct mtd_info *mtd)
#ifdef CONFIG_ENV_OFFSET_OOB
unsigned long nand_env_oob_offset;
#ifdef CONFIG_ENV_OFFSET_OOB
unsigned long nand_env_oob_offset;
-int do_nand_env_oob(
cmd_tbl_t
*cmdtp, int argc, char *const argv[])
+int do_nand_env_oob(
struct cmd_tbl
*cmdtp, int argc, char *const argv[])
{
int ret;
uint32_t oob_buf[ENV_OFFSET_SIZE/sizeof(uint32_t)];
{
int ret;
uint32_t oob_buf[ENV_OFFSET_SIZE/sizeof(uint32_t)];
@@
-371,7
+376,8
@@
static void adjust_size_for_badblocks(loff_t *size, loff_t offset, int dev)
}
}
}
}
-static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+static int do_nand(struct cmd_tbl *cmdtp, int flag, int argc,
+ char *const argv[])
{
int i, ret = 0;
ulong addr;
{
int i, ret = 0;
ulong addr;
@@
-840,7
+846,7
@@
U_BOOT_CMD(
"NAND sub-system", nand_help_text
);
"NAND sub-system", nand_help_text
);
-static int nand_load_image(
cmd_tbl_t
*cmdtp, struct mtd_info *mtd,
+static int nand_load_image(
struct cmd_tbl
*cmdtp, struct mtd_info *mtd,
ulong offset, ulong addr, char *cmd)
{
int r;
ulong offset, ulong addr, char *cmd)
{
int r;
@@
-923,13
+929,13
@@
static int nand_load_image(cmd_tbl_t *cmdtp, struct mtd_info *mtd,
/* Loading ok, update default load address */
/* Loading ok, update default load address */
- load_addr = addr;
+
image_
load_addr = addr;
return bootm_maybe_autostart(cmdtp, cmd);
}
return bootm_maybe_autostart(cmdtp, cmd);
}
-static int do_nandboot(
cmd_tbl_t
*cmdtp, int flag, int argc,
- char *
const argv[])
+static int do_nandboot(
struct cmd_tbl
*cmdtp, int flag, int argc,
+ char *const argv[])
{
char *boot_device = NULL;
int idx;
{
char *boot_device = NULL;
int idx;