diff options
| author | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2014-05-12 12:18:30 +0900 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2014-05-14 07:52:46 +0200 |
| commit | 66e6715c5ffe817c70485020508c7b9ec47227b7 (patch) | |
| tree | 6a751a0db55256e008d4dbb92a61514344d624b1 /board/xilinx/zynq/Makefile | |
| parent | f05862d7bdba1912d041df1e1434af82d47e64d2 (diff) | |
| download | u-boot-66e6715c5ffe817c70485020508c7b9ec47227b7.tar.gz | |
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>
Diffstat (limited to 'board/xilinx/zynq/Makefile')
| -rw-r--r-- | board/xilinx/zynq/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile index 3f19a1cd8b..fd93f6317b 100644 --- a/board/xilinx/zynq/Makefile +++ b/board/xilinx/zynq/Makefile @@ -6,4 +6,7 @@ # obj-y := board.o -obj-$(CONFIG_SPL_BUILD) += ps7_init.o + +# Please copy ps7_init.c/h from hw project to this directory +obj-$(CONFIG_SPL_BUILD) += \ + $(if $(wildcard $(srctree)/$(src)/ps7_init.c), ps7_init.o) |