Skip to contentSkip to conversation

imx: bootaux: Fix build warning when LTO is enabled

PATCH New Philippe Schenker 2 participants 3 messages Jan 4, 2023 – Jan 31, 2023

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 imx: bootaux: Fix build warning when LTO is enabled

From: Francesco Dolcini <[email protected]>

Fix conflicting declaration of hostmap[] variable. When building with CONFIG_LTO=y we get the following warning:

KSLCC keep-syms-lto.o
LTO u-boot
arch/arm/mach-imx/imx_bootaux.c:24:31: warning: type of ‘hostmap’ does not match original declaration [-Wlto-type-mismatch]
24 | const __weak struct rproc_att hostmap[] = { };
| ^
arch/arm/mach-imx/imx8m/soc.c:1590:24: note: array types have different bounds
1590 | const struct rproc_att hostmap[] = {
| ^
arch/arm/mach-imx/imx8m/soc.c:1590:24: note: ‘hostmap’ was previously declared here
OBJCOPY u-boot.srec
OBJCOPY u-boot-nodtb.bin

Just remove the __weak declaration and add an extern, in any case this variable is supposed to be declared in the SOC file and there is no way to have imx_bootaux build with this variable not declared.

In addition to that the weak variable definition is not correct, get_host_mapping() will just reference non initialized data, if ever now will have a build error instead of undefined behavior at runtime.

---

 arch/arm/mach-imx/imx_bootaux.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-imx/imx_bootaux.c +1 -1
index 8115bf40f1a9..6c00ef6007e7 100644
@@ -21,7 +21,7 @@
 #define SRC_M4_REG_OFFSET		0
 #endif
 
-const __weak struct rproc_att hostmap[] = { };
+extern const struct rproc_att hostmap[];
 
 static const struct rproc_att *get_host_mapping(unsigned long auxcore)
 {
Signature · 1 line
2.39.0
#1 lore raw

PATCH 2/2 configs: verdin-imx8mm: Add bootaux command

From: Philippe Schenker <[email protected]>

The i.MX 8M Mini SoC does incorporate an additional M-Core. To be able to load it with a firmware, enable bootaux command as other Toradex modules also have it enabled to be consistent.

---

 configs/verdin-imx8mm_defconfig | 1 +
 1 file changed, 1 insertion(+)
configs/verdin-imx8mm_defconfig +1 -0
index 62f85883cb2d..5b5f7c051e54 100644
@@ -16,6 +16,7 @@ CONFIG_SPL_MMC=y
 CONFIG_SPL_SERIAL=y
 CONFIG_SPL_DRIVERS_MISC=y
 CONFIG_SPL=y
+CONFIG_IMX_BOOTAUX=y
 CONFIG_SYS_LOAD_ADDR=0x48200000
 CONFIG_SYS_MEMTEST_START=0x40000000
 CONFIG_SYS_MEMTEST_END=0x80000000
Signature · 1 line
2.39.0
#2 lore raw

PATCH 2/2 configs: verdin-imx8mm: Add bootaux command

Quoted 5 lines

From: Philippe Schenker <[email protected]>
The i.MX 8M Mini SoC does incorporate an additional M-Core. To be able to load it with a firmware, enable bootaux command as other Toradex modules also have it enabled to be consistent.

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,        Managing Director: Erika Unter  
HRB 165235 Munich,   Office: Kirchenstr.5, 82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================