Merge branch 'master' of git://git.denx.de/u-boot-sunxi

[u-boot] / include / _exports.h

diff --git a/include/_exports.h b/include/_exports.h
index 279017e87f6fd0a2d568af05345000ddd7045d7f..5416041243d67c025b6c79f9f58b1bde40bb2680 100644 (file)
--- a/include/_exports.h
+++ b/include/_exports.h
@@ -13,7 +13,7 @@
        EXPORT_FUNC(putc, void, putc, const char)
        EXPORT_FUNC(puts, void, puts, const char *)
        EXPORT_FUNC(printf, int, printf, const char*, ...)
-#if defined(CONFIG_X86) || defined(CONFIG_PPC)
+#if (defined(CONFIG_X86) && !defined(CONFIG_X86_64)) || defined(CONFIG_PPC)
        EXPORT_FUNC(irq_install_handler, void, install_hdlr,
                    int, interrupt_handler_t, void*)
 
@@ -23,7 +23,7 @@
        EXPORT_FUNC(dummy, void, free_hdlr, void)
 #endif
        EXPORT_FUNC(malloc, void *, malloc, size_t)
-#ifndef CONFIG_SYS_MALLOC_SIMPLE
+#if !CONFIG_IS_ENABLED(SYS_MALLOC_SIMPLE)
        EXPORT_FUNC(free, void, free, void *)
 #endif
        EXPORT_FUNC(udelay, void, udelay, unsigned long)
@@ -31,8 +31,8 @@
        EXPORT_FUNC(vprintf, int, vprintf, const char *, va_list)
        EXPORT_FUNC(do_reset, int, do_reset, cmd_tbl_t *,
                    int , int , char * const [])
-       EXPORT_FUNC(getenv, char  *, getenv, const char*)
-       EXPORT_FUNC(setenv, int, setenv, const char *, const char *)
+       EXPORT_FUNC(env_get, char  *, env_get, const char*)
+       EXPORT_FUNC(env_set, int, env_set, const char *, const char *)
        EXPORT_FUNC(simple_strtoul, unsigned long, simple_strtoul,
                    const char *, char **, unsigned int)
        EXPORT_FUNC(strict_strtoul, int, strict_strtoul,
@@ -73,3 +73,17 @@
                    const char *, char **, unsigned int)
        EXPORT_FUNC(ustrtoull, unsigned long long, ustrtoull,
                    const char *, char **, unsigned int)
+       EXPORT_FUNC(strcpy, char *, strcpy, char *dest, const char *src)
+       EXPORT_FUNC(mdelay, void, mdelay, unsigned long msec)
+       EXPORT_FUNC(memset, void *, memset, void *, int, size_t)
+#ifdef CONFIG_PHY_AQUANTIA
+       EXPORT_FUNC(mdio_get_current_dev, struct mii_dev *,
+                   mdio_get_current_dev, void)
+       EXPORT_FUNC(phy_find_by_mask, struct phy_device *, phy_find_by_mask,
+                   struct mii_dev *bus, unsigned phy_mask,
+                   phy_interface_t interface)
+       EXPORT_FUNC(mdio_phydev_for_ethname, struct phy_device *,
+                   mdio_phydev_for_ethname, const char *ethname)
+       EXPORT_FUNC(miiphy_set_current_dev, int, miiphy_set_current_dev,
+                   const char *devname)
+#endif