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

2013-07-25 08:22:08 -04:00
parent 0b17998e50 c54fd3efa4
commit aaf5e82560
25 changed files with 384 additions and 43 deletions
--- a/include/common.h
+++ b/include/common.h
@@ -405,6 +405,7 @@ static inline int setenv_addr(const char *varname, const void *addr)
 #endif
 #ifdef CONFIG_NDS32
 # include <asm/mach-types.h>
+# include <asm/setup.h>
 # include <asm/u-boot-nds32.h>
 #endif /* CONFIG_NDS32 */
 #ifdef CONFIG_MIPS