Merge tag 'u-boot-amlogic-20190828' of https://gitlab.denx.de/u-boot/custodians/u...

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

diff --git a/include/exports.h b/include/exports.h
index a3e0469d40e8d0e5cf8d51a12ff0a03d2de6b1b0..147a00f860b04384c14a305a46d8e6c908a1c918 100644 (file)
--- a/include/exports.h
+++ b/include/exports.h
@@ -3,8 +3,8 @@
 
 #ifndef __ASSEMBLY__
 #ifdef CONFIG_PHY_AQUANTIA
-#include <miiphy.h>
-#include <phy.h>
+#include <env.h>
+#include <phy_interface.h>
 #endif
 
 struct spi_slave;
@@ -19,7 +19,7 @@ int printf(const char* fmt, ...);
 void install_hdlr(int, interrupt_handler_t, void*);
 void free_hdlr(int);
 void *malloc(size_t);
-#ifndef CONFIG_SYS_MALLOC_SIMPLE
+#if !CONFIG_IS_ENABLED(SYS_MALLOC_SIMPLE)
 void free(void*);
 #endif
 void __udelay(unsigned long);
@@ -27,14 +27,13 @@ unsigned long get_timer(unsigned long);
 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 *getenv (const char *name);
-int setenv (const char *varname, const char *varvalue);
+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) || defined(CONFIG_DM_I2C_COMPAT))
+#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
@@ -57,7 +56,7 @@ struct jt_funcs {
 };
 
 
-#define XF_VERSION     8
+#define XF_VERSION     9
 
 #if defined(CONFIG_X86)
 extern gd_t *global_data;