Merge git://git.denx.de/u-boot-x86

[people/ms/u-boot.git] / include / _exports.h

diff --git a/include/_exports.h b/include/_exports.h
index 11beeb24f18327f87e5c73a30e24c4bb5c7bf1cb..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*)
 
@@ -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,
@@ -75,6 +75,7 @@
                    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)