projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-arm
[platform/kernel/u-boot.git]
/
include
/
configs
/
bf537-minotaur.h
diff --git
a/include/configs/bf537-minotaur.h
b/include/configs/bf537-minotaur.h
index
463b7d0
..
11929c7
100644
(file)
--- a/
include/configs/bf537-minotaur.h
+++ b/
include/configs/bf537-minotaur.h
@@
-115,7
+115,7
@@
#define CONFIG_ENV_OFFSET 0x10000
#define CONFIG_ENV_SIZE 0x10000
#define CONFIG_ENV_SECT_SIZE 0x10000
#define CONFIG_ENV_OFFSET 0x10000
#define CONFIG_ENV_SIZE 0x10000
#define CONFIG_ENV_SECT_SIZE 0x10000
-#define
ENV_IS_EMBEDDED_CUSTOM
+#define
CONFIG_ENV_IS_EMBEDDED_IN_LDR
/*
/*
@@
-156,6
+156,7
@@
# define CONFIG_CMD_PING
#else
# undef CONFIG_CMD_NET
# define CONFIG_CMD_PING
#else
# undef CONFIG_CMD_NET
+# undef CONFIG_CMD_NFS
#endif
#define CONFIG_CMD_BOOTLDR
#endif
#define CONFIG_CMD_BOOTLDR