From 90526e9fbac47af16d70f323feae45d8d1b0f9b7 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 10 May 2020 11:39:56 -0600 Subject: common: Drop net.h from common header Move this header out of the common header. Network support is used in quite a few places but it still does not warrant blanket inclusion. Note that this net.h header itself has quite a lot in it. It could be split into the driver-mode support, functions, structures, checksumming, etc. Signed-off-by: Simon Glass --- cmd/nand.c | 1 + 1 file changed, 1 insertion(+) (limited to 'cmd/nand.c') diff --git a/cmd/nand.c b/cmd/nand.c index 4de6892a01b..9c2b5d718ef 100644 --- a/cmd/nand.c +++ b/cmd/nand.c @@ -21,6 +21,7 @@ #include #include +#include #include #include #include -- cgit v1.2.3 From 52f24238046ca28085f6de946d0358e5c7c7cbe8 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 10 May 2020 11:40:00 -0600 Subject: common: Drop bootstage.h from common header Move this fairly uncommon header out of the common header. Signed-off-by: Simon Glass --- cmd/nand.c | 1 + 1 file changed, 1 insertion(+) (limited to 'cmd/nand.c') diff --git a/cmd/nand.c b/cmd/nand.c index 9c2b5d718ef..c42ab24ec06 100644 --- a/cmd/nand.c +++ b/cmd/nand.c @@ -20,6 +20,7 @@ */ #include +#include #include #include #include -- cgit v1.2.3 From 09140113108541b95d340f3c7b6ee597d31ccc73 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 10 May 2020 11:40:03 -0600 Subject: command: Remove the cmd_tbl_t typedef We should not use typedefs in U-Boot. They cannot be used as forward declarations which means that header files must include the full header to access them. Drop the typedef and rename the struct to remove the _s suffix which is now not useful. This requires quite a few header-file additions. Signed-off-by: Simon Glass --- cmd/nand.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'cmd/nand.c') diff --git a/cmd/nand.c b/cmd/nand.c index c42ab24ec06..92d039af8f5 100644 --- a/cmd/nand.c +++ b/cmd/nand.c @@ -189,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)]; @@ -376,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; @@ -845,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; @@ -933,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; -- cgit v1.2.3