zynq: treat ps7_init.c/h as external files to ignore them
authorMasahiro Yamada <yamada.m@jp.panasonic.com>
Mon, 12 May 2014 03:18:30 +0000 (12:18 +0900)
committerMichal Simek <michal.simek@xilinx.com>
Wed, 14 May 2014 05:52:46 +0000 (07:52 +0200)
commit66e6715c5ffe817c70485020508c7b9ec47227b7
tree6a751a0db55256e008d4dbb92a61514344d624b1
parentf05862d7bdba1912d041df1e1434af82d47e64d2
zynq: treat ps7_init.c/h as external files to ignore them

ps7_init.c and ps7_init.h are supposed to be exported by hw project
and copied to board/xilinx/zynq/ directory.

We want them to be ignored by git.
So what we should do is to always treat them as external files
rather than replacing ps7_init.c

This commit does:

 - Move a weak function ps7_init() to arch/arm/cpu/armv7/zynq/spl.c
   and delete board/xilinx/zynq/ps7_init.c

 - Compile board/xilinx/zynq/ps7_init.c only when it exists

 - Add .gitignore to ignore ps7_init.c/h

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
arch/arm/cpu/armv7/zynq/spl.c
board/xilinx/zynq/.gitignore [new file with mode: 0644]
board/xilinx/zynq/Makefile
board/xilinx/zynq/ps7_init.c [deleted file]