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' into next
[platform/kernel/u-boot.git]
/
include
/
configs
/
poplar.h
diff --git
a/include/configs/poplar.h
b/include/configs/poplar.h
index
c581055
..
6e8adf9
100644
(file)
--- a/
include/configs/poplar.h
+++ b/
include/configs/poplar.h
@@
-31,7
+31,7
@@
func(DHCP, dhcp, na)
#include <config_distro_bootcmd.h>
-#define C
ONFIG_EXTRA_ENV_SETTINGS
\
+#define C
FG_EXTRA_ENV_SETTINGS
\
"loader_mmc_blknum=0x0\0" \
"loader_mmc_nblks=0x780\0" \
"env_mmc_blknum=0xf80\0" \