05d134b084590684bcf4d832c0035952727b7cd9 - Merge remote-tracking branch 'u-boot/master'

Tue, 20 May 2014 08:05:42 +0000

Merge remote-tracking branch 'u-boot/master'Conflicts: boards.cfgConflicts were trivial once u-boot-arm/master boards.cfg wasreformatted (commit 6130c146) to match u-boot/master's ownreformatting (commit 1b37fa83). List of files: /rk3399_rockchip-uboot/board/sandbox/Makefile

2dabac1337facbdef20d1a9bf54b68225d2518dc - sandbox: set sandbox's vendor to null

Wed, 14 May 2014 03:57:28 +0000

sandbox: set sandbox's vendor to nullBecause sandbox is not a real hardware, setting vendor=sandbox isalmost meaningless.This commit sets sandbox's vendor field to '-'.It is a good thing that it decreases one level directory hierarchy.The files board/sandbox/sandbox/* have been moved to board/sandbox/*.Signed-off-by: Masahiro Yamada Acked-by: Simon Glass Tested-by: Simon Glass List of files: /rk3399_rockchip-uboot/board/sandbox/Makefile

Changes in Makefile

05d134b084590684bcf4d832c0035952727b7cd9 - Merge remote-tracking branch 'u-boot/master'

2dabac1337facbdef20d1a9bf54b68225d2518dc - sandbox: set sandbox's vendor to null