From: Hugo Villeneuve <hvilleneuve@dimonoff.com>
Date: Fri, 6 Feb 2026 20:55:29 +0000 (-0500)
Subject: board: imx8mn-var-som: compile SPL-only stuff only in SPL build
X-Git-Tag: v2026.04-rc2~11^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48133bcd1685a24925205d32fb4e3e2dbc885514;p=thirdparty%2Fu-boot.git

board: imx8mn-var-som: compile SPL-only stuff only in SPL build

SPL-specific stuff is already in spl.c, so avoid compiling other source
files in SPL build.

Signed-off-by: Hugo Villeneuve <hvilleneuve@dimonoff.com>
---

diff --git a/board/variscite/imx8mn_var_som/Makefile b/board/variscite/imx8mn_var_som/Makefile
index 36d9c36dd2d..b75661ce271 100644
--- a/board/variscite/imx8mn_var_som/Makefile
+++ b/board/variscite/imx8mn_var_som/Makefile
@@ -4,9 +4,9 @@
 # SPDX-License-Identifier:      GPL-2.0+
 #
 
-obj-y += imx8mn_var_som.o
-
 ifdef CONFIG_XPL_BUILD
 obj-y += spl.o
 obj-y += ddr4_timing.o
+else
+obj-y += imx8mn_var_som.o
 endif
diff --git a/board/variscite/imx8mn_var_som/imx8mn_var_som.c b/board/variscite/imx8mn_var_som/imx8mn_var_som.c
index 14aa93c527b..945f389cdd9 100644
--- a/board/variscite/imx8mn_var_som/imx8mn_var_som.c
+++ b/board/variscite/imx8mn_var_som/imx8mn_var_som.c
@@ -49,8 +49,6 @@ int board_mmc_get_env_dev(int devno)
 	return devno;
 }
 
-#if !defined(CONFIG_XPL_BUILD)
-
 #if defined(CONFIG_DISPLAY_BOARDINFO)
 
 static void display_som_infos(struct var_imx8_eeprom_info *info)
@@ -221,5 +219,3 @@ int ft_board_setup(void *blob, struct bd_info *bd)
 	return configure_phy_reset_gpios(blob);
 }
 #endif /* CONFIG_OF_BOARD_SETUP */
-
-#endif /* CONFIG_XPL_BUILD */