pfla02: Rework excluding NAND from SPL

[oweals/u-boot.git] / include / _exports.h

diff --git a/include/_exports.h b/include/_exports.h
index 5416041243d67c025b6c79f9f58b1bde40bb2680..1e9ba8610880cb3e3b128aee6080f9e945c31d64 100644 (file)
--- a/include/_exports.h
+++ b/include/_exports.h
@@ -29,7 +29,7 @@
        EXPORT_FUNC(udelay, void, udelay, unsigned long)
        EXPORT_FUNC(get_timer, unsigned long, get_timer, unsigned long)
        EXPORT_FUNC(vprintf, int, vprintf, const char *, va_list)
-       EXPORT_FUNC(do_reset, int, do_reset, cmd_tbl_t *,
+       EXPORT_FUNC(do_reset, int, do_reset, struct cmd_tbl *,
                    int , int , char * const [])
        EXPORT_FUNC(env_get, char  *, env_get, const char*)
        EXPORT_FUNC(env_set, int, env_set, const char *, const char *)
@@ -40,8 +40,7 @@
        EXPORT_FUNC(simple_strtol, long, simple_strtol,
                    const char *, char **, unsigned int)
        EXPORT_FUNC(strcmp, int, strcmp, const char *cs, const char *ct)
-#if defined(CONFIG_CMD_I2C) && \
-               (!defined(CONFIG_DM_I2C) || defined(CONFIG_DM_I2C_COMPAT))
+#if defined(CONFIG_CMD_I2C) && !defined(CONFIG_DM_I2C)
        EXPORT_FUNC(i2c_write, int, i2c_write, uchar, uint, int , uchar * , int)
        EXPORT_FUNC(i2c_read, int, i2c_read, uchar, uint, int , uchar * , int)
 #else
@@ -50,11 +49,9 @@
 #endif
 
 #if !defined(CONFIG_CMD_SPI) || defined(CONFIG_DM_SPI)
-       EXPORT_FUNC(dummy, void, spi_init, void)
        EXPORT_FUNC(dummy, void, spi_setup_slave, void)
        EXPORT_FUNC(dummy, void, spi_free_slave, void)
 #else
-       EXPORT_FUNC(spi_init, void, spi_init, void)
        EXPORT_FUNC(spi_setup_slave, struct spi_slave *, spi_setup_slave,
                    unsigned int, unsigned int, unsigned int, unsigned int)
        EXPORT_FUNC(spi_free_slave, void, spi_free_slave, struct spi_slave *)