Changes in 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/spear/x600/Makefile

3e11350255d9c5d4bd03c2a65769da84c05d3294 - Merge branch 'u-boot/master' into 'u-boot-arm/master'

Thu, 20 Feb 2014 12:16:05 +0000

Merge branch 'u-boot/master' into 'u-boot-arm/master'Conflicts: Makefile drivers/net/npe/MakefileThese two conflicts arise from commit 0b2d3f20("ARM: NET: Remove the IXP NPE ethernet driver") and areresolved by deleting the drivers/net/npe/Makefile fileand removing the CONFIG_IXP4XX_NPE line from Makefile. List of files: /rk3399_rockchip-uboot/board/spear/x600/Makefile

7c8278a866122ef6c1201b94cd602f98cc649a2f - kbuild: add dummy obj-y to create built-in.o

Tue, 04 Feb 2014 08:24:25 +0000

kbuild: add dummy obj-y to create built-in.oWe are going to switch over to Kbuild in upcoming commits.Each makefile must have non-empty obj- or obj-yto generate built-in.o on Kbuild.Signed-off-by: Masahiro Yamada List of files: /rk3399_rockchip-uboot/board/spear/x600/Makefile

a79854a90f7297ddfda2114c867fd62643fa6e3a - board: arm: convert makefiles to Kbuild style

Mon, 21 Oct 2013 02:53:37 +0000

board: arm: convert makefiles to Kbuild styleSigned-off-by: Masahiro Yamada Cc: Albert ARIBAUD Cc: Andreas Bießmann Cc: Stefano Babic Cc: Prafulla Wadaskar Cc: Minkyu Kang Cc: Vipin Kumar Cc: Tom Warren Cc: Tom Rini List of files: /rk3399_rockchip-uboot/board/spear/x600/Makefile

326ea986ac150acdc7656d57fca647db80b50158 - Merge git://git.denx.de/u-boot-arm

Wed, 31 Jul 2013 09:30:38 +0000

Merge git://git.denx.de/u-boot-armConflicts: board/freescale/mx6qsabrelite/Makefile board/freescale/mx6qsabrelite/mx6qsabrelite.c include/configs/mx6qsabrelite.hSigned-off-by: Stefano Babic List of files: /rk3399_rockchip-uboot/board/spear/x600/Makefile

8b485ba12b0defa0c4ed3559789250238f8331a8 - Merge branch 'u-boot/master' into u-boot-arm/master

Thu, 25 Jul 2013 15:57:46 +0000

Merge branch 'u-boot/master' into u-boot-arm/master List of files: /rk3399_rockchip-uboot/board/spear/x600/Makefile

1a4596601fd395f3afb8f82f3f840c5e00bdd57a - Add GPL-2.0+ SPDX-License-Identifier to source files

Mon, 08 Jul 2013 07:37:19 +0000

Add GPL-2.0+ SPDX-License-Identifier to source filesSigned-off-by: Wolfgang Denk [trini: Fixup common/cmd_io.c]Signed-off-by: Tom Rini List of files: /rk3399_rockchip-uboot/board/spear/x600/Makefile

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

Thu, 04 Oct 2012 17:00:42 +0000

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

995b72ddda77ffa471930fdc1c3e587d5a6b4aa8 - ARM: Add X600 board support (SPEAr600 based)

Wed, 30 May 2012 22:59:08 +0000

ARM: Add X600 board support (SPEAr600 based)This patch adds support for the X600 SPEAr600 based board. Its alsothe first SPEAr600 board that uses the newly introduced SPEAr600SPL support. Xloader is not necessary any more. By using the new"u-boot.spr" make target, one image will generated containing both,U-Boot SPL (with mkimage header as needed by the SPEAr BootROM, andthe main U-Boot with mkimage header.Signed-off-by: Stefan Roese Cc: Amit Virdi Cc: Vipin Kumar List of files: /rk3399_rockchip-uboot/board/spear/x600/Makefile