Skip to contentSkip to conversation

zynq: treat ps7_init.c/h as external files to ignore them

PATCH New Masahiro Yamada 2 participants 2 messages May 12, 2014 – May 13, 2014

Subsystems (2)
Arm (32-bit) Arm/Zynq architecture
lore
Share & tools
lore

Masahiro Yamada

author
#0 lore raw

PATCH v2 1/1 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 <[email protected]>
Signed-off-by Michal Simek <[email protected]>

---

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
arch/arm/cpu/armv7/zynq/spl.c +8 -0
index fcad762..60da4d1 100644
@@ -67,3 +67,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.
+	 */
+}
board/xilinx/zynq/.gitignore new file +1 -0
new file mode 100644
index 0000000..68b8edd
@@ -0,0 +1 @@
+ps7_init.[ch]
board/xilinx/zynq/Makefile +4 -1
index 3f19a1c..fd93f63 100644
@@ -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)
board/xilinx/zynq/ps7_init.c deleted +0 -12
deleted file mode 100644
index c47da09..0000000
@@ -1,12 +0,0 @@
-/*
- * (C) Copyright 2014 Xilinx, Inc. Michal Simek
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-#include <common.h>
-#include <asm/arch/spl.h>
-
-__weak void ps7_init(void)
-{
-	puts("Please copy ps7_init.c/h from hw project\n");
-}
Signature · 1 line
1.8.3.2
Applied
#1 lore raw

PATCH v2 1/1 zynq: treat ps7_init.c/h as external files to ignore them

Quoted 26 lines · Masahiro Yamada

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 <[email protected]>
Signed-off-by Michal Simek <[email protected]>

---

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

Quoted 7 lines
 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

Signature · 14 lines
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>