Changes in .gitignore

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/dts/.gitignore

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/dts/.gitignore

6ab6b2afa091dbceb37719b8a81637a00834be19 - dts: re-write dts/Makefile more simply with Kbuild

Wed, 05 Feb 2014 02:28:25 +0000

dts: re-write dts/Makefile more simply with KbuildUseful rules in scripts/Makefile.lib allows us to easilygenerate a device tree blob and wrap it in assembly code.We do not need to parse a linker script to get output format and arch.This commit deletes ./u-boot.dtb since it is a copy of dts/dt.dtb.Signed-off-by: Masahiro Yamada List of files: /rk3399_rockchip-uboot/dts/.gitignore