From a28cc807fa3abbd3602982c88f1c419c80a7e8b8 Mon Sep 17 00:00:00 2001
From: Marek Vasut <marek.vasut+renesas@mailbox.org>
Date: Wed, 6 Sep 2023 23:29:53 +0200
Subject: cmd: nvedit: Remove unused NEEDS_MANUAL_RELOC code bits

The last user of the NEEDS_MANUAL_RELOC has been removed in commit
26af162ac8f8 ("arch: m68k: Implement relocation")
Remove now unused NEEDS_MANUAL_RELOC code.

Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
---
 env/common.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'env/common.c')

diff --git a/env/common.c b/env/common.c
index 0ecdb248a08..4cf2dadc694 100644
--- a/env/common.c
+++ b/env/common.c
@@ -429,7 +429,6 @@ int env_export(env_t *env_out)
 void env_relocate(void)
 {
 #if defined(CONFIG_NEEDS_MANUAL_RELOC)
-	env_reloc();
 	env_fix_drivers();
 	env_htab.change_ok += gd->reloc_off;
 #endif
-- 
cgit v1.2.3


From decbc8184430b1a7ede088d438868563ce783165 Mon Sep 17 00:00:00 2001
From: Marek Vasut <marek.vasut+renesas@mailbox.org>
Date: Wed, 6 Sep 2023 23:29:57 +0200
Subject: env: Remove unused NEEDS_MANUAL_RELOC code bits

The last user of the NEEDS_MANUAL_RELOC has been removed in commit
26af162ac8f8 ("arch: m68k: Implement relocation")
Remove now unused NEEDS_MANUAL_RELOC code.

Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
---
 env/common.c | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'env/common.c')

diff --git a/env/common.c b/env/common.c
index 4cf2dadc694..21045a7eb33 100644
--- a/env/common.c
+++ b/env/common.c
@@ -428,10 +428,6 @@ int env_export(env_t *env_out)
 
 void env_relocate(void)
 {
-#if defined(CONFIG_NEEDS_MANUAL_RELOC)
-	env_fix_drivers();
-	env_htab.change_ok += gd->reloc_off;
-#endif
 	if (gd->env_valid == ENV_INVALID) {
 #if defined(CONFIG_ENV_IS_NOWHERE) || defined(CONFIG_SPL_BUILD)
 		/* Environment not changable */
-- 
cgit v1.2.3


From 1e94b46f73cedcebbff73799203f3266c5b28d90 Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
Date: Thu, 14 Sep 2023 18:21:46 -0600
Subject: common: Drop linux/printk.h from common header

This old patch was marked as deferred. Bring it back to life, to continue
towards the removal of common.h

Move this out of the common header and include it only where needed.

Signed-off-by: Simon Glass <sjg@chromium.org>
---
 env/common.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'env/common.c')

diff --git a/env/common.c b/env/common.c
index 21045a7eb33..eb1a9137953 100644
--- a/env/common.c
+++ b/env/common.c
@@ -15,6 +15,7 @@
 #include <log.h>
 #include <sort.h>
 #include <asm/global_data.h>
+#include <linux/printk.h>
 #include <linux/stddef.h>
 #include <search.h>
 #include <errno.h>
-- 
cgit v1.2.3