diff options
| author | Tom Rini <trini@konsulko.com> | 2020-05-19 10:51:43 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-05-19 10:51:43 -0400 |
| commit | c2279d784e35fa25ee3a9fa28a74a1ba545f8c1e (patch) | |
| tree | 158fd30f3d06142f6a99cbae6ed8ccb0f3be567b /cmd/nand.c | |
| parent | ed9a3aa6452f57af65eb74f73bd2a54c3a2f4b03 (diff) | |
| parent | cd93d625fd751d55c729c78b10f82109d56a5f1d (diff) | |
Merge branch '2020-05-18-reduce-size-of-common.h'
Bring in the latest round of Simon's changes to reduce what's in
<common.h> overall.
Diffstat (limited to 'cmd/nand.c')
| -rw-r--r-- | cmd/nand.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/cmd/nand.c b/cmd/nand.c index 4de6892a01b..92d039af8f5 100644 --- a/cmd/nand.c +++ b/cmd/nand.c @@ -20,7 +20,9 @@ */ #include <common.h> +#include <bootstage.h> #include <image.h> +#include <asm/cache.h> #include <linux/mtd/mtd.h> #include <command.h> #include <console.h> @@ -187,7 +189,7 @@ static void do_nand_status(struct mtd_info *mtd) #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)]; @@ -374,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; @@ -843,7 +846,7 @@ U_BOOT_CMD( "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; @@ -931,8 +934,8 @@ static int nand_load_image(cmd_tbl_t *cmdtp, struct mtd_info *mtd, 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; |