Changes in Makefile

e7f9350525d73233d4eaf1793f8fe618e9fd4910 - Merge branch 'master' of git://git.denx.de/u-boot-arm

Thu, 15 May 2014 08:27:32 +0000

Merge branch 'master' of git://git.denx.de/u-boot-arm List of files: /rk3399_rockchip-uboot/board/broadcom/bcm28155_ap/Makefile

d2a3e911390f9fc4d8c0ee4b3c7fc75f4fd3fd19 - Merge branch 'u-boot/master'

Fri, 09 May 2014 08:47:05 +0000

Merge branch 'u-boot/master'Conflicts: drivers/net/Makefile(trivial merge) List of files: /rk3399_rockchip-uboot/board/broadcom/bcm28155_ap/Makefile

46d330a6badd60e96127a3c6f722d3d3193d5a31 - kbuild: do not use $(BOARD) to specify exact object name

Mon, 31 Mar 2014 04:30:18 +0000

kbuild: do not use $(BOARD) to specify exact object nameSigned-off-by: Masahiro Yamada List of files: /rk3399_rockchip-uboot/board/broadcom/bcm28155_ap/Makefile

1ad6364eeb4f578e423081d1748e8a3fdf1ab01d - Merge branch 'master' of git://git.denx.de/u-boot-arm

Wed, 05 Mar 2014 11:51:26 +0000

Merge branch 'master' of git://git.denx.de/u-boot-arm List of files: /rk3399_rockchip-uboot/board/broadcom/bcm28155_ap/Makefile

eeb72e67619b98d2502fe634a3a5d9953de92ad0 - Merge branch 'master' of git://git.denx.de/u-boot-arm

Wed, 26 Feb 2014 21:49:58 +0000

Merge branch 'master' of git://git.denx.de/u-boot-armConflicts: arch/arm/cpu/armv7/config.mk board/ti/am43xx/mux.c include/configs/am43xx_evm.hSigned-off-by: Tom Rini List of files: /rk3399_rockchip-uboot/board/broadcom/bcm28155_ap/Makefile

9ed679aeeb9899123bf92ed1eafb7cf6965473dc - board: bcm28155_ap: Add board files

Tue, 11 Feb 2014 19:06:38 +0000

board: bcm28155_ap: Add board filesAdd support for the bcm28155_ap reference board.Signed-off-by: Darwin Rambo Reviewed-by: Steve Rae Reviewed-by: Tim Kryger List of files: /rk3399_rockchip-uboot/board/broadcom/bcm28155_ap/Makefile