Changes in 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/boundary/nitrogen6x/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/boundary/nitrogen6x/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/boundary/nitrogen6x/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/boundary/nitrogen6x/Makefile

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

Mon, 18 Mar 2013 16:31:00 +0000

Merge branch 'master' of git://git.denx.de/u-boot-armAlbert's rework of the linker scripts conflicted with Simon's makingeveryone use __bss_end. We also had a minor conflict overREADME.scrapyard being added to in mainline and enhanced inu-boot-arm/master with proper formatting.Conflicts: arch/arm/cpu/ixp/u-boot.lds arch/arm/cpu/u-boot.lds arch/arm/lib/Makefile board/actux1/u-boot.lds board/actux2/u-boot.lds board/actux3/u-boot.lds board/dvlhost/u-boot.lds board/freescale/mx31ads/u-boot.lds doc/README.scrapyard include/configs/tegra-common.hBuild tested for all of ARM and run-time tested on am335x_evm.Signed-off-by: Tom Rini List of files: /rk3399_rockchip-uboot/board/boundary/nitrogen6x/Makefile

6579d15c58e2b6b051f126ea8b77dd767252aa14 - Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

Fri, 15 Mar 2013 14:18:31 +0000

Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' List of files: /rk3399_rockchip-uboot/board/boundary/nitrogen6x/Makefile

d67b0d97b156f9ec2fc4c838d84b1e510d6e49b4 - Add Boundary Devices Nitrogen6X boards

Mon, 11 Mar 2013 08:44:53 +0000

Add Boundary Devices Nitrogen6X boardsSigned-off-by: Eric Nelson List of files: /rk3399_rockchip-uboot/board/boundary/nitrogen6x/Makefile