| #
05d134b0 |
| 20-May-2014 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge remote-tracking branch 'u-boot/master'
Conflicts: boards.cfg
Conflicts were trivial once u-boot-arm/master boards.cfg was reformatted (commit 6130c146) to match u-boot/master's own reformatt
Merge remote-tracking branch 'u-boot/master'
Conflicts: boards.cfg
Conflicts were trivial once u-boot-arm/master boards.cfg was reformatted (commit 6130c146) to match u-boot/master's own reformatting (commit 1b37fa83).
show more ...
|
| #
cd834a05 |
| 28-Apr-2014 |
Marek Vasut <marex@denx.de> |
tools: env: Add aes.c placeholder
Add missing aes.c placeholder which includes lib/aes.c . Without this one, tools/env/ will fail to build.
Signed-off-by: Marek Vasut <marex@denx.de> Cc: Alexey Bro
tools: env: Add aes.c placeholder
Add missing aes.c placeholder which includes lib/aes.c . Without this one, tools/env/ will fail to build.
Signed-off-by: Marek Vasut <marex@denx.de> Cc: Alexey Brodkin <Alexey.Brodkin@synopsys.com> Cc: Masahiro Yamada <yamada.m@jp.panasonic.com> Tested-by: Alexey Brodkin <abrodkin@synopsys.com> Tested-by: Heiko Schocher <hs@denx.de>
show more ...
|