From 0528979fa7ab7853faaf2ecf34b7721dd4c0b383 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 10 May 2020 11:39:57 -0600 Subject: part: Drop disk_partition_t typedef We should not be using typedefs and these make it harder to use forward declarations (to reduce header file inclusions). Drop the typedef. Signed-off-by: Simon Glass --- cmd/disk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmd/disk.c') diff --git a/cmd/disk.c b/cmd/disk.c index 15973b7d132..9e008a38890 100644 --- a/cmd/disk.c +++ b/cmd/disk.c @@ -16,7 +16,7 @@ int common_diskboot(cmd_tbl_t *cmdtp, const char *intf, int argc, int part; ulong addr = CONFIG_SYS_LOAD_ADDR; ulong cnt; - disk_partition_t info; + struct disk_partition info; #if defined(CONFIG_LEGACY_IMAGE_FORMAT) image_header_t *hdr; #endif -- 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/disk.c | 1 + 1 file changed, 1 insertion(+) (limited to 'cmd/disk.c') diff --git a/cmd/disk.c b/cmd/disk.c index 9e008a38890..da0660148c1 100644 --- a/cmd/disk.c +++ b/cmd/disk.c @@ -4,6 +4,7 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */ #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/disk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmd/disk.c') diff --git a/cmd/disk.c b/cmd/disk.c index da0660148c1..dbd08a06b2f 100644 --- a/cmd/disk.c +++ b/cmd/disk.c @@ -10,7 +10,7 @@ #include #include -int common_diskboot(cmd_tbl_t *cmdtp, const char *intf, int argc, +int common_diskboot(struct cmd_tbl *cmdtp, const char *intf, int argc, char *const argv[]) { __maybe_unused int dev; -- cgit v1.2.3 From f7ae49fc4f363a803dab3be078e93ead8e75a8e9 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 10 May 2020 11:40:05 -0600 Subject: common: Drop log.h from common header Move this header out of the common header. Signed-off-by: Simon Glass --- cmd/disk.c | 1 + 1 file changed, 1 insertion(+) (limited to 'cmd/disk.c') diff --git a/cmd/disk.c b/cmd/disk.c index dbd08a06b2f..8060e753ebd 100644 --- a/cmd/disk.c +++ b/cmd/disk.c @@ -8,6 +8,7 @@ #include #include #include +#include #include int common_diskboot(struct cmd_tbl *cmdtp, const char *intf, int argc, -- cgit v1.2.3