diff options
| author | Wolfgang Denk <wd@denx.de> | 2012-02-26 22:17:40 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-02-26 22:17:40 +0100 |
| commit | 54e96680cb96fb7a4b8f43fd949c62054004d3e5 (patch) | |
| tree | 136d8161c0a68034b2f08e7c488533dabfb583b5 /include | |
| parent | cec487a435ac106d1a611feba1a36043142c839b (diff) | |
| parent | 4eb29cf043afb36b414482c117413a8ff8f00410 (diff) | |
| download | u-boot-imx-54e96680cb96fb7a4b8f43fd949c62054004d3e5.zip u-boot-imx-54e96680cb96fb7a4b8f43fd949c62054004d3e5.tar.gz u-boot-imx-54e96680cb96fb7a4b8f43fd949c62054004d3e5.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-microblaze
* 'master' of git://git.denx.de/u-boot-microblaze:
microblaze: Enable TFTP put command
microblaze: avoid interrupt race conditions
microblaze: fix build failure due to undefined reference to `get_ticks'
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/microblaze-generic.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 03a6f5a..1f4aefd 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -255,6 +255,7 @@ #else # define CONFIG_CMD_PING # define CONFIG_CMD_DHCP +# define CONFIG_CMD_TFTPPUT #endif #if defined(CONFIG_SYSTEMACE) |