X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=common%2Fexports.c;h=88fcfc8cb6fc652e8fb5242869ebdb4c0813f5dd;hb=f3b4bc458de3285a04c5f60df6372ad5ca79fa60;hp=3dff7351bc3d3a5204d4fde0cdeb5d16b28d4bc9;hpb=6d014adfa2ac4b1151d2b80a6943f59c3e254239;p=oweals%2Fu-boot.git

diff --git a/common/exports.c b/common/exports.c
index 3dff7351bc..88fcfc8cb6 100644
--- a/common/exports.c
+++ b/common/exports.c
@@ -1,5 +1,6 @@
 #include <common.h>
 #include <exports.h>
+#include <spi.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -15,7 +16,7 @@ unsigned long get_version(void)
 /* Reuse _exports.h with a little trickery to avoid bitrot */
 #define EXPORT_FUNC(sym) gd->jt[XF_##sym] = (void *)sym;
 
-#if !defined(CONFIG_I386) && !defined(CONFIG_PPC)
+#if !defined(CONFIG_X86) && !defined(CONFIG_PPC)
 # define install_hdlr      dummy
 # define free_hdlr         dummy
 #else /* kludge for non-standard function naming */
@@ -26,10 +27,12 @@ unsigned long get_version(void)
 # define i2c_write         dummy
 # define i2c_read          dummy
 #endif
-#ifndef CONFIG_CMD_SPI
+#if !defined(CONFIG_CMD_SPI) || defined(CONFIG_DM_SPI)
 # define spi_init          dummy
 # define spi_setup_slave   dummy
 # define spi_free_slave    dummy
+#endif
+#ifndef CONFIG_CMD_SPI
 # define spi_claim_bus     dummy
 # define spi_release_bus   dummy
 # define spi_xfer          dummy