summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2014-05-12 12:18:30 +0900
committerMichal Simek <michal.simek@xilinx.com>2014-05-14 07:52:46 +0200
commit66e6715c5ffe817c70485020508c7b9ec47227b7 (patch)
tree6a751a0db55256e008d4dbb92a61514344d624b1 /arch/arm
parentf05862d7bdba1912d041df1e1434af82d47e64d2 (diff)
downloadu-boot-imx-66e6715c5ffe817c70485020508c7b9ec47227b7.zip
u-boot-imx-66e6715c5ffe817c70485020508c7b9ec47227b7.tar.gz
u-boot-imx-66e6715c5ffe817c70485020508c7b9ec47227b7.tar.bz2
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 'arch/arm')
-rw-r--r--arch/arm/cpu/armv7/zynq/spl.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/zynq/spl.c b/arch/arm/cpu/armv7/zynq/spl.c
index c3ea221..d73e5cb 100644
--- a/arch/arm/cpu/armv7/zynq/spl.c
+++ b/arch/arm/cpu/armv7/zynq/spl.c
@@ -74,3 +74,11 @@ int spl_start_uboot(void)
return 0;
}
#endif
+
+__weak void ps7_init(void)
+{
+ /*
+ * This function is overridden by the one in
+ * board/xilinx/zynq/ps7_init.c, if it exists.
+ */
+}