On 20.9.2016 08:51, Mike Looijmans wrote: > On 15-09-16 09:41, Mike Looijmans wrote: >> On 15-09-16 08:54, Michal Simek wrote: >>> Hi Mike, >>> >>> On 15.9.2016 08:02, Mike Looijmans wrote: >>>> These patches add support for the Miami range of boards from TOPIC. >>>> The boards are based on Xilinx Zynq SoCs, these two patches are for >>>> the 7-series, the Ultrascale MPSOC boards are to be added later. >>>> >>>> Please note that the "ps7_init_gpl" files are largely generated by a >>>> tool and as a result of that, contain many style issues. >>>> >>>> Mike Looijmans (2): >>>> Add topic-miami board support >>>> Add topic_miamiplus board >>>> >>>> arch/arm/dts/Makefile | 2 + >>>> arch/arm/dts/zynq-topic-miami.dts | 98 + >>>> arch/arm/dts/zynq-topic-miamiplus.dts | 22 + >>>> board/xilinx/zynq/zynq-topic-miami/ps7_init_gpl.c | 4324 >>>> +++++++++++++++++++ >>>> board/xilinx/zynq/zynq-topic-miami/ps7_init_gpl.h | 118 + >>>> .../zynq/zynq-topic-miamiplus/ps7_init_gpl.c | 4425 >>>> ++++++++++++++++++++ >>>> .../zynq/zynq-topic-miamiplus/ps7_init_gpl.h | 150 + >>>> configs/topic_miami_defconfig | 47 + >>>> configs/topic_miamiplus_defconfig | 47 + >>>> include/configs/topic_miami.h | 147 + >>>> include/configs/topic_miamiplus.h | 2 + >>>> 11 files changed, 9382 insertions(+) >>>> create mode 100644 arch/arm/dts/zynq-topic-miami.dts >>>> create mode 100644 arch/arm/dts/zynq-topic-miamiplus.dts >>>> create mode 100644 board/xilinx/zynq/zynq-topic-miami/ps7_init_gpl.c >>>> create mode 100644 board/xilinx/zynq/zynq-topic-miami/ps7_init_gpl.h >>>> create mode 100644 >>>> board/xilinx/zynq/zynq-topic-miamiplus/ps7_init_gpl.c >>>> create mode 100644 >>>> board/xilinx/zynq/zynq-topic-miamiplus/ps7_init_gpl.h >>>> create mode 100644 configs/topic_miami_defconfig >>>> create mode 100644 configs/topic_miamiplus_defconfig >>>> create mode 100644 include/configs/topic_miami.h >>>> create mode 100644 include/configs/topic_miamiplus.h >>>> >>> >>> It is a question if this should go to board/xilinx folder. >>> I think you should create own folder just for your company. >>> Probably doesn't make sense to copy all Makefiles and so but I think >>> you can source them from Xilinx folder to be only at one location. >> >> I think a "topic" folder would be better, if I can avoid duplicating >> stuff. >> It'd also solve the merge conflict between the u-boot-xlnx tree and >> mainline, >> which have different makefiles. > > Tried that, but leads to needless complication and duplication. Xilinx > does not produce the "zed" or "zybo" boards either, so there's probably > no "digilent" folder for the same reasons.
It is started with zedboard which was made by Avnet and Digilent together with Xilinx help that's why it was added there. There is cooperation between Xilinx and Digilent on these boards that's why they are added there. For your case this is private board which I expect none can buy as a kit that's why it should be in separate folder. I did play with it and it is not that hard. I did just these changes and move stuff to your folder. diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig index a98232097b28..525f0d3e6b2e 100644 --- a/arch/arm/mach-zynq/Kconfig +++ b/arch/arm/mach-zynq/Kconfig @@ -4,6 +4,7 @@ config SYS_BOARD default "zynq" config SYS_VENDOR + string "Vendor name" default "xilinx" config SYS_SOC diff --git a/board/topic/zynq/Makefile b/board/topic/zynq/Makefile new file mode 100644 index 000000000000..5653b9928a3c --- /dev/null +++ b/board/topic/zynq/Makefile @@ -0,0 +1,5 @@ +# +# SPDX-License-Identifier: GPL-2.0+ +# + +include $(srctree)/board/xilinx/zynq/Makefile diff --git a/board/topic/zynq/board.c b/board/topic/zynq/board.c new file mode 120000 index 000000000000..75964550f37a --- /dev/null +++ b/board/topic/zynq/board.c @@ -0,0 +1 @@ +../../xilinx/zynq/board.c \ No newline at end of file diff --git a/board/topic/zynq/xil_io.h b/board/topic/zynq/xil_io.h new file mode 120000 index 000000000000..c0f3a8a26321 --- /dev/null +++ b/board/topic/zynq/xil_io.h @@ -0,0 +1 @@ +../../xilinx/zynq/xil_io.h \ No newline at end of file diff --git a/board/topic/zynq/zynq-topic-miami/ps7_init_gpl.c b/board/topic/zynq/zynq-topic-miami/ps7_init_gpl.c new file mode 100644 index 000000000000..0b4735a2b739 --- /dev/null +++ b/board/topic/zynq/zynq-topic-miami/ps7_init_gpl.c >>> The next thing is that there needs to be additional steps to fix >>> ps7_init_gpl.* files to keep checkpatch happy. >>> I have created change request to fix this directly in tools but still >>> none has fixed it and the team which is responsible for it is keep >>> moving to the next release but I can do nothing with it. >> >> A bit of scripting would take care of most of the problems I guess. Just >> removing all those C++ comment lines would be a good start. > > Just wonder why other boards can include these messy files without > anyone caring? We did that in past but for example if you look at zybo which was added the last coding style is fixed there. >> Currently I just include zynq-common.h and then have to #undef a lot of >> things. Maybe I'd better just copy the relevant parts and avoid using >> zynq-common.h. The alternative would be to make zynq-common more >> common and >> less specific to the evaluation boards. > > Any thoughts on that? As you see all stuff is coming to Kconfig that's why I hope that we can reduce number of configurations files for every board. Also currently as you see buildman is reporting this as a bug now. Thanks, Michal -- Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Xilinx Microblaze Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP SoCs
Description: OpenPGP digital signature
_______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot