env: Move env_set() to env.h

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

diff --git a/include/exports.h b/include/exports.h
index c3a5d2f32e76903927e723642401ac29668f0f4b..147a00f860b04384c14a305a46d8e6c908a1c918 100644 (file)
--- a/include/exports.h
+++ b/include/exports.h
@@ -2,8 +2,12 @@
 #define __EXPORTS_H__
 
 #ifndef __ASSEMBLY__
+#ifdef CONFIG_PHY_AQUANTIA
+#include <env.h>
+#include <phy_interface.h>
+#endif
 
-#include <common.h>
+struct spi_slave;
 
 /* These are declarations of exported functions available in C code */
 unsigned long get_version(void);
@@ -11,45 +15,50 @@ int  getc(void);
 int  tstc(void);
 void putc(const char);
 void puts(const char*);
-void printf(const char* fmt, ...);
-void install_hdlr(int, interrupt_handler_t*, void*);
+int printf(const char* fmt, ...);
+void install_hdlr(int, interrupt_handler_t, void*);
 void free_hdlr(int);
 void *malloc(size_t);
+#if !CONFIG_IS_ENABLED(SYS_MALLOC_SIMPLE)
 void free(void*);
+#endif
 void __udelay(unsigned long);
 unsigned long get_timer(unsigned long);
-void vprintf(const char *, va_list);
-void do_reset (void);
-unsigned long simple_strtoul(const char *cp,char **endp,unsigned int base);
-char *getenv (char *name);
-int setenv (char *varname, char *varvalue);
-long simple_strtol(const char *cp,char **endp,unsigned int base);
-int strcmp(const char * cs,const char * ct);
-int ustrtoul(const char *cp, char **endp, unsigned int base);
-#ifdef CONFIG_HAS_UID
-void forceenv (char *varname, char *varvalue);
-#endif
-#if defined(CONFIG_CMD_I2C)
+int vprintf(const char *, va_list);
+unsigned long simple_strtoul(const char *cp, char **endp, unsigned int base);
+int strict_strtoul(const char *cp, unsigned int base, unsigned long *res);
+char *env_get(const char *name);
+int env_set(const char *varname, const char *value);
+long simple_strtol(const char *cp, char **endp, unsigned int base);
+int strcmp(const char *cs, const char *ct);
+unsigned long ustrtoul(const char *cp, char **endp, unsigned int base);
+unsigned long long ustrtoull(const char *cp, char **endp, unsigned int base);
+#if defined(CONFIG_CMD_I2C) && !defined(CONFIG_DM_I2C)
 int i2c_write (uchar, uint, int , uchar* , int);
 int i2c_read (uchar, uint, int , uchar* , int);
 #endif
-#include <spi.h>
+#ifdef CONFIG_PHY_AQUANTIA
+struct mii_dev *mdio_get_current_dev(void);
+struct phy_device *phy_find_by_mask(struct mii_dev *bus, unsigned phy_mask,
+               phy_interface_t interface);
+struct phy_device *mdio_phydev_for_ethname(const char *ethname);
+int miiphy_set_current_dev(const char *devname);
+#endif
 
-void app_startup(char **);
+void app_startup(char * const *);
 
 #endif    /* ifndef __ASSEMBLY__ */
 
-enum {
-#define EXPORT_FUNC(x) XF_ ## x ,
+struct jt_funcs {
+#define EXPORT_FUNC(impl, res, func, ...) res(*func)(__VA_ARGS__);
 #include <_exports.h>
 #undef EXPORT_FUNC
-
-       XF_MAX
 };
 
-#define XF_VERSION     6
 
-#if defined(CONFIG_I386)
+#define XF_VERSION     9
+
+#if defined(CONFIG_X86)
 extern gd_t *global_data;
 #endif