From b79fdc76978515fba2c4f3b5b4f2e679c5ff1463 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 10 May 2020 11:39:54 -0600 Subject: common: Drop flash.h from common header Move this uncommon header out of the common header. Fix up some style problems in flash.h while we are here. Signed-off-by: Simon Glass --- common/board_r.c | 1 + 1 file changed, 1 insertion(+) (limited to 'common/board_r.c') diff --git a/common/board_r.c b/common/board_r.c index 96034b874e5..bd074ebaa11 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include -- cgit v1.2.3 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 --- common/board_r.c | 1 + 1 file changed, 1 insertion(+) (limited to 'common/board_r.c') diff --git a/common/board_r.c b/common/board_r.c index bd074ebaa11..33efcf6ad5b 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -18,6 +18,7 @@ #include #include #include +#include #include /* TODO: can we just include all these headers whether needed or not? */ #if defined(CONFIG_CMD_BEDBUG) -- cgit v1.2.3 From b67eefdb6ec9467c41b1c0081f0823bbfff36b00 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 10 May 2020 11:39:59 -0600 Subject: bootstage: Use BOOTSTAGE instead of BOOTSTATE Some of the enum members are wrong. Fix them. Signed-off-by: Simon Glass --- common/board_r.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'common/board_r.c') diff --git a/common/board_r.c b/common/board_r.c index 33efcf6ad5b..bd1ac353c7a 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -312,9 +312,9 @@ static int initr_dm(void) #ifdef CONFIG_TIMER gd->timer = NULL; #endif - bootstage_start(BOOTSTATE_ID_ACCUM_DM_R, "dm_r"); + bootstage_start(BOOTSTAGE_ID_ACCUM_DM_R, "dm_r"); ret = dm_init_and_scan(false); - bootstage_accum(BOOTSTATE_ID_ACCUM_DM_R); + bootstage_accum(BOOTSTAGE_ID_ACCUM_DM_R); if (ret) return ret; -- 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 --- common/board_r.c | 1 + 1 file changed, 1 insertion(+) (limited to 'common/board_r.c') diff --git a/common/board_r.c b/common/board_r.c index bd1ac353c7a..a79a273d8f8 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -11,6 +11,7 @@ #include #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 --- common/board_r.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'common/board_r.c') diff --git a/common/board_r.c b/common/board_r.c index a79a273d8f8..45fde19ab71 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -357,8 +357,8 @@ static int initr_announce(void) #ifdef CONFIG_NEEDS_MANUAL_RELOC static int initr_manual_reloc_cmdtable(void) { - fixup_cmdtable(ll_entry_start(cmd_tbl_t, cmd), - ll_entry_count(cmd_tbl_t, cmd)); + fixup_cmdtable(ll_entry_start(struct cmd_tbl, cmd), + ll_entry_count(struct cmd_tbl, cmd)); return 0; } #endif -- 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 --- common/board_r.c | 1 + 1 file changed, 1 insertion(+) (limited to 'common/board_r.c') diff --git a/common/board_r.c b/common/board_r.c index 45fde19ab71..bce87cbf01c 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include -- cgit v1.2.3