Skip to contentSkip to conversation

zynq: add empty xil_io.h to avoid compile error

PATCH New Masahiro Yamada 3 participants 3 messages May 8, 2014 – May 9, 2014 Arm/Zynq architecture

lore
Share & tools
lore

Masahiro Yamada

author
#0 lore raw

PATCH 1/1 zynq: add empty xil_io.h to avoid compile error

ps7_init.c exported by hw project has #include "xil_io.h" line but U-Boot does not have "xil_io.h".

So we get an error on SPL build:
ps7_init.c:12581:20: fatal error: xil_io.h: No such file or directory

We can delete the include directive in ps7_init.c to avoid this error. But it is painful to do this every time we export ps7_init.c file.

Instead, we can put an empty xil_io.h in the same directory so we can directly copy ps7_init.c as is.

Signed-off-by Masahiro Yamada <[email protected]>
Cc Michal Simek <[email protected]>
---
 board/xilinx/zynq/xil_io.h | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 board/xilinx/zynq/xil_io.h
board/xilinx/zynq/xil_io.h new file +13 -0
new file mode 100644
index 0000000..e59a977
@@ -0,0 +1,13 @@
+/*
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#ifndef XIL_IO_H           /* prevent circular inclusions */
+#define XIL_IO_H
+
+/*
+ * This empty file is here because ps7_init.c exported by hw project
+ * has #include "xil_io.h" line.
+ */
+
+#endif /* XIL_IO_H */
Signature · 1 line
1.8.3.2
#1 lore raw

PATCH 1/1 zynq: add empty xil_io.h to avoid compile error

Quoted 29 lines · Masahiro Yamada

ps7_init.c exported by hw project has #include "xil_io.h" line but U-Boot does not have "xil_io.h".

So we get an error on SPL build:
ps7_init.c:12581:20: fatal error: xil_io.h: No such file or directory

We can delete the include directive in ps7_init.c to avoid this error. But it is painful to do this every time we export ps7_init.c file.

Instead, we can put an empty xil_io.h in the same directory so we can directly copy ps7_init.c as is.

Signed-off-by Masahiro Yamada <[email protected]>
Cc Michal Simek <[email protected]>
---
 board/xilinx/zynq/xil_io.h | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 board/xilinx/zynq/xil_io.h
board/xilinx/zynq/xil_io.h new file +3 -0
new file mode 100644
index 0000000..e59a977
@@ -0,0 +1,13 @@
+/*
+ * SPDX-License-Identifier:    GPL-2.0+
+ */

board/xilinx/zynq/xil_io.h line 13

Quoted 10 lines
board/xilinx/zynq/xil_io.h new file +10 -0
+
+#ifndef XIL_IO_H           /* prevent circular inclusions */
+#define XIL_IO_H
+
+/*
+ * This empty file is here because ps7_init.c exported by hw project
+ * has #include "xil_io.h" line.
+ */
+
+#endif /* XIL_IO_H */

This is good if this is acceptable by others.

Acked-by Michal Simek <[email protected]>

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/20140508/f89d82ef/attachment.pgp>
#2 lore raw

PATCH 1/1 zynq: add empty xil_io.h to avoid compile error

Quoted 43 lines · Michal Simek
Quoted 29 lines · Masahiro Yamada

ps7_init.c exported by hw project has #include "xil_io.h" line but U-Boot does not have "xil_io.h".

So we get an error on SPL build:
ps7_init.c:12581:20: fatal error: xil_io.h: No such file or directory

We can delete the include directive in ps7_init.c to avoid this error. But it is painful to do this every time we export ps7_init.c file.

Instead, we can put an empty xil_io.h in the same directory so we can directly copy ps7_init.c as is.

Signed-off-by Masahiro Yamada <[email protected]>
Cc Michal Simek <[email protected]>
---
 board/xilinx/zynq/xil_io.h | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 board/xilinx/zynq/xil_io.h
board/xilinx/zynq/xil_io.h new file +3 -0
new file mode 100644
index 0000000..e59a977
@@ -0,0 +1,13 @@
+/*
+ * SPDX-License-Identifier:    GPL-2.0+
+ */

board/xilinx/zynq/xil_io.h line 13

Quoted 10 lines
board/xilinx/zynq/xil_io.h new file +10 -0
+
+#ifndef XIL_IO_H           /* prevent circular inclusions */
+#define XIL_IO_H
+
+/*
+ * This empty file is here because ps7_init.c exported by hw project
+ * has #include "xil_io.h" line.
+ */
+
+#endif /* XIL_IO_H */

This is good if this is acceptable by others.

Quoted 1 line
Acked-by Michal Simek <[email protected]>

I can live with this too.

Acked-by Tom Rini <[email protected]>
Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140509/43b96ae3/attachment.pgp>