diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-04-08 09:25:08 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-04-08 09:25:08 +0200 |
| commit | 519fdde9e6a6ebce7dc743b4f5621503d25b7a45 (patch) | |
| tree | 29649f48b92b92342183f71565c34afeca0b1735 /include/configs/bfin_adi_common.h | |
| parent | c71645ad2bd5179ad21e2501c26f574e9688f02a (diff) | |
| parent | 04d2f0a9f33112bd70ce4d9c451fdca1682e3a59 (diff) | |
Merge branch 'u-boot/master' into 'u-boot-arm/master'
Conflicts:
arch/arm/cpu/arm926ejs/mxs/Makefile
include/configs/trats.h
include/configs/trats2.h
include/mmc.h
Diffstat (limited to 'include/configs/bfin_adi_common.h')
| -rw-r--r-- | include/configs/bfin_adi_common.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/configs/bfin_adi_common.h b/include/configs/bfin_adi_common.h index 08ccce0b9a..ea9acf69d1 100644 --- a/include/configs/bfin_adi_common.h +++ b/include/configs/bfin_adi_common.h @@ -17,6 +17,7 @@ # define CONFIG_BOOTP_DNS # define CONFIG_BOOTP_NTPSERVER # define CONFIG_BOOTP_RANDOM_DELAY +# define CONFIG_LIB_RAND # define CONFIG_KEEP_SERVERADDR # define CONFIG_CMD_DNS # define CONFIG_CMD_PING |