U-Boot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Jonas Jelonek <jelonek.jonas@gmail.com>
To: u-boot@lists.denx.de
Cc: Jonas Jelonek <jelonek.jonas@gmail.com>, Tom Rini <trini@konsulko.com>
Subject: [PATCH 1/1] arm: provide noncached_set_region prototype to fix build
Date: Wed, 16 Oct 2024 13:24:55 +0200	[thread overview]
Message-ID: <20241016112455.35700-2-jelonek.jonas@gmail.com> (raw)
In-Reply-To: <20241016112455.35700-1-jelonek.jonas@gmail.com>

Due to the removal of weak functions in 7d6cee2cd0 ("cmd: cache: Remove
weak function"), uboot fails to compile after updating to v2024.10 for
mediatek target in OpenWrt with GCC-14 with error:
cmd/cache.c: In function 'do_dcache':
cmd/cache.c:57:25: error: implicit declaration of function
	'noncached_set_region' [-Wimplicit-function-declaration]

Thus, provide a prototype in arm's include/asm/system.h to fix a build
error in cmd/cache.c, since related prototypes are also located there.
Also add an include of asm/system.h in cmd/cache.c to have the function
available there.

The issue occured after the update of uboot-mediatek in OpenWrt to
v2024.10, in combination with GCC-14 toolchain. It was reported and
discussed in https://github.com/openwrt/openwrt/issues/16697, and
temporarily fixed with
https://github.com/openwrt/openwrt/commit/92ca322dd1f48158b8829fec59319a12e4ae4295.

Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>
Cc: Tom Rini <trini@konsulko.com>
---
 arch/arm/include/asm/system.h | 1 +
 cmd/cache.c                   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/arch/arm/include/asm/system.h b/arch/arm/include/asm/system.h
index 2237d7d006..0100096202 100644
--- a/arch/arm/include/asm/system.h
+++ b/arch/arm/include/asm/system.h
@@ -668,6 +668,7 @@ void mmu_set_region_dcache_behaviour(phys_addr_t start, size_t size,
  * Return: 0 if OK
  */
 int noncached_init(void);
+void noncached_set_region(void);
 
 phys_addr_t noncached_alloc(size_t size, size_t align);
 #endif /* CONFIG_SYS_NONCACHED_MEMORY */
diff --git a/cmd/cache.c b/cmd/cache.c
index 3049f5c305..f873f2c8fb 100644
--- a/cmd/cache.c
+++ b/cmd/cache.c
@@ -10,6 +10,7 @@
 #include <command.h>
 #include <cpu_func.h>
 #include <linux/compiler.h>
+#include <asm/system.h>
 
 static int parse_argv(const char *);
 
-- 
2.39.5 (Apple Git-154)


  reply	other threads:[~2024-10-16 13:34 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-10-16 11:24 [PATCH 0/1] arm: provide noncached_set_region prototype to fix build Jonas Jelonek
2024-10-16 11:24 ` Jonas Jelonek [this message]
2024-10-16 17:44   ` [PATCH 1/1] " Tom Rini

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20241016112455.35700-2-jelonek.jonas@gmail.com \
    --to=jelonek.jonas@gmail.com \
    --cc=trini@konsulko.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox