From: Peng Fan <peng.fan@nxp.com>
Date: Tue, 21 Apr 2026 13:41:20 +0000 (+0800)
Subject: mx6: sabreauto/sd: Exclude power_init_board from SPL build
X-Git-Tag: v2026.07-rc1~29^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b29ce12fc2463960162510660345895158b01864;p=thirdparty%2Fu-boot.git

mx6: sabreauto/sd: Exclude power_init_board from SPL build

To mx6sabreauto and mx6sabresd, power_init_board is called in board_r phase.
After CONFIG_SPL_DM_PMIC_PFUZE100 included, there will be build error to build
power_init_board() when CONFIG_SPL_DM_PMIC_PFUZE100 is not enabled.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
---

diff --git a/board/nxp/mx6sabreauto/mx6sabreauto.c b/board/nxp/mx6sabreauto/mx6sabreauto.c
index 8ca57e0b2ac..aef8bc0ad90 100644
--- a/board/nxp/mx6sabreauto/mx6sabreauto.c
+++ b/board/nxp/mx6sabreauto/mx6sabreauto.c
@@ -465,6 +465,7 @@ int board_spi_cs_gpio(unsigned bus, unsigned cs)
 }
 #endif
 
+#ifndef CONFIG_XPL_BUILD
 int power_init_board(void)
 {
 	struct udevice *dev;
@@ -488,6 +489,7 @@ int power_init_board(void)
 
 	return pfuze_mode_init(dev, APS_PFM);
 }
+#endif
 
 #ifdef CONFIG_CMD_BMODE
 static const struct boot_mode board_boot_modes[] = {
diff --git a/board/nxp/mx6sabresd/mx6sabresd.c b/board/nxp/mx6sabresd/mx6sabresd.c
index dff3a9c33bf..9404535104c 100644
--- a/board/nxp/mx6sabresd/mx6sabresd.c
+++ b/board/nxp/mx6sabresd/mx6sabresd.c
@@ -437,6 +437,7 @@ int board_init(void)
 	return 0;
 }
 
+#ifndef CONFIG_XPL_BUILD
 int power_init_board(void)
 {
 	struct udevice *dev;
@@ -468,6 +469,7 @@ int power_init_board(void)
 
 	return 0;
 }
+#endif
 
 #ifdef CONFIG_MXC_SPI
 int board_spi_cs_gpio(unsigned bus, unsigned cs)