[U-Boot] [PATCH v2] zynq: treat ps7_init.c/h as external files to ignore them

[Michal Simek]

On 05/12/2014 05:18 AM, Masahiro Yamada wrote:
> 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 at jp.panasonic.com>
> Signed-off-by: Michal Simek <michal.simek at xilinx.com>
> ---
> 
> Changes in v2:
>   (only cosmetic changes in v2)
>   - Improve the comment in arch/arm/cpu/armv7/zynq/spl.c
>           s/replaced/overridden/
>   - Add Signed-off-by credit of Michal Simek
> 
>  arch/arm/cpu/armv7/zynq/spl.c |  8 ++++++++
>  board/xilinx/zynq/.gitignore  |  1 +
>  board/xilinx/zynq/Makefile    |  5 ++++-
>  board/xilinx/zynq/ps7_init.c  | 12 ------------
>  4 files changed, 13 insertions(+), 13 deletions(-)
>  create mode 100644 board/xilinx/zynq/.gitignore
>  delete mode 100644 board/xilinx/zynq/ps7_init.c

Applied to my zynq branch.

Thanks,
Michal

-- 
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 263 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140513/9d5082e0/attachment.pgp>