From 90526e9fbac47af16d70f323feae45d8d1b0f9b7 Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
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 <sjg@chromium.org>
---
 common/board_f.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'common/board_f.c')

diff --git a/common/board_f.c b/common/board_f.c
index a5ead31ca7d..bae42674ebc 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -40,6 +40,7 @@
 #include <trace.h>
 #include <video.h>
 #include <watchdog.h>
+#include <asm/cache.h>
 #ifdef CONFIG_MACH_TYPE
 #include <asm/mach-types.h>
 #endif
-- 
cgit v1.2.3


From b67eefdb6ec9467c41b1c0081f0823bbfff36b00 Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
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 <sjg@chromium.org>
---
 common/board_f.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'common/board_f.c')

diff --git a/common/board_f.c b/common/board_f.c
index bae42674ebc..c4247cd75f9 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -823,9 +823,9 @@ static int initf_dm(void)
 #if defined(CONFIG_DM) && CONFIG_VAL(SYS_MALLOC_F_LEN)
 	int ret;
 
-	bootstage_start(BOOTSTATE_ID_ACCUM_DM_F, "dm_f");
+	bootstage_start(BOOTSTAGE_ID_ACCUM_DM_F, "dm_f");
 	ret = dm_init_and_scan(true);
-	bootstage_accum(BOOTSTATE_ID_ACCUM_DM_F);
+	bootstage_accum(BOOTSTAGE_ID_ACCUM_DM_F);
 	if (ret)
 		return ret;
 #endif
-- 
cgit v1.2.3


From 52f24238046ca28085f6de946d0358e5c7c7cbe8 Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
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 <sjg@chromium.org>
---
 common/board_f.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'common/board_f.c')

diff --git a/common/board_f.c b/common/board_f.c
index c4247cd75f9..b9b5b8d6fa1 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <bloblist.h>
+#include <bootstage.h>
 #include <clock_legacy.h>
 #include <console.h>
 #include <cpu.h>
-- 
cgit v1.2.3


From f7ae49fc4f363a803dab3be078e93ead8e75a8e9 Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
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 <sjg@chromium.org>
---
 common/board_f.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'common/board_f.c')

diff --git a/common/board_f.c b/common/board_f.c
index b9b5b8d6fa1..01194eaa0e4 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -26,6 +26,7 @@
 #include <init.h>
 #include <initcall.h>
 #include <lcd.h>
+#include <log.h>
 #include <malloc.h>
 #include <mapmem.h>
 #include <os.h>
-- 
cgit v1.2.3