[PATCH v2 4/4] board/BuR/zynq: initial commit
Michal Simek
michal.simek at amd.com
Thu Mar 6 13:23:09 CET 2025
On 3/6/25 12:52, Bernhard Messerklinger wrote:
>
> From: Michal Simek <michal.simek at amd.com>
> Sent: Thursday, March 6, 2025 11:35 AM
>> On 3/6/25 11:20, Bernhard Messerklinger wrote:
>>> From: Michal Simek <michal.simek at amd.com>
>>> Sent: Wednesday, February 26, 2025 11:23 AM
>>>> On 2/11/25 13:49, Bernhard Messerklinger wrote:
>>>>> This commit adds support for the brcp1, brsmarc2, brcp150 and brcp170
>>>>> boards. This boards are based on the Xilinx Zynq SoC.
>>>>>
>>>>> Signed-off-by: Bernhard Messerklinger <bernhard.messerklinger at br-automation.com>
>>>>> ---
>>>>>
>>>>> Changes in v2:
>>>>> - Remove all unnecessary device-tree entries
>>>>> - Reviewed led names (no pattern restriction found)
>>>>> - Fix maintainers file
>>>>> - Cleanup of code
>>>>> - Move preboot variable to env file
>>>>>
>>>>> arch/arm/dts/Makefile | 8 +-
>>>>> arch/arm/dts/zynq-brcp1-u-boot.dtsi | 110 +++++++
>>>>> arch/arm/dts/zynq-brcp1.dtsi | 133 +++++++++
>>>>> arch/arm/dts/zynq-brcp150-u-boot.dtsi | 129 ++++++++
>>>>> arch/arm/dts/zynq-brcp150.dts | 174 +++++++++++
>>>>> arch/arm/dts/zynq-brcp170-u-boot.dtsi | 113 +++++++
>>>>> arch/arm/dts/zynq-brcp170.dts | 140 +++++++++
>>>>> arch/arm/dts/zynq-brcp1_1r.dts | 29 ++
>>>>> arch/arm/dts/zynq-brcp1_1r_switch.dts | 30 ++
>>>>> arch/arm/dts/zynq-brcp1_2r.dts | 22 ++
>>>>> arch/arm/dts/zynq-brsmarc2-u-boot.dtsi | 110 +++++++
>>>>> arch/arm/dts/zynq-brsmarc2.dts | 158 ++++++++++
>>>>> arch/arm/mach-zynq/Kconfig | 1 +
>>>>> board/BuR/zynq/Kconfig | 14 +
>>>>> board/BuR/zynq/MAINTAINERS | 11 +
>>>>> board/BuR/zynq/Makefile | 15 +
>>>>> board/BuR/zynq/brcp150/board.c | 4 +
>>>>> board/BuR/zynq/brcp150/ps7_init_gpl.c | 278 ++++++++++++++++++
>>>>> board/BuR/zynq/brcp170/board.c | 4 +
>>>>> board/BuR/zynq/brcp170/ps7_init_gpl.c | 274 +++++++++++++++++
>>>>> board/BuR/zynq/brcp1_1r/board.c | 4 +
>>>>> board/BuR/zynq/brcp1_1r/ps7_init_gpl.c | 274 +++++++++++++++++
>>>>> board/BuR/zynq/brcp1_1r_switch/board.c | 4 +
>>>>> board/BuR/zynq/brcp1_1r_switch/ps7_init_gpl.c | 270 +++++++++++++++++
>>>>> board/BuR/zynq/brcp1_2r/board.c | 4 +
>>>>> board/BuR/zynq/brcp1_2r/ps7_init_gpl.c | 277 +++++++++++++++++
>>>>> board/BuR/zynq/brsmarc2/board.c | 30 ++
>>>>> board/BuR/zynq/brsmarc2/ps7_init_gpl.c | 276 +++++++++++++++++
>>>>> board/BuR/zynq/common/board.c | 231 +++++++++++++++
>>>>> board/BuR/zynq/env/brcp1.env | 109 +++++++
>>>>> board/BuR/zynq/env/brcp150.env | 119 ++++++++
>>>>> configs/brcp150_defconfig | 123 ++++++++
>>>>> configs/brcp170_defconfig | 122 ++++++++
>>>>> configs/brcp1_1r_defconfig | 122 ++++++++
>>>>> configs/brcp1_1r_switch_defconfig | 123 ++++++++
>>>>> configs/brcp1_2r_defconfig | 122 ++++++++
>>>>> configs/brsmarc2_defconfig | 122 ++++++++
>>>>> include/configs/brzynq.h | 21 ++
>>>>> 38 files changed, 4109 insertions(+), 1 deletion(-)
>>>>> create mode 100644 arch/arm/dts/zynq-brcp1-u-boot.dtsi
>>>>> create mode 100644 arch/arm/dts/zynq-brcp1.dtsi
>>>>> create mode 100644 arch/arm/dts/zynq-brcp150-u-boot.dtsi
>>>>> create mode 100644 arch/arm/dts/zynq-brcp150.dts
>>>>> create mode 100644 arch/arm/dts/zynq-brcp170-u-boot.dtsi
>>>>> create mode 100644 arch/arm/dts/zynq-brcp170.dts
>>>>> create mode 100644 arch/arm/dts/zynq-brcp1_1r.dts
>>>>> create mode 100644 arch/arm/dts/zynq-brcp1_1r_switch.dts
>>>>> create mode 100644 arch/arm/dts/zynq-brcp1_2r.dts
>>>>> create mode 100644 arch/arm/dts/zynq-brsmarc2-u-boot.dtsi
>>>>> create mode 100644 arch/arm/dts/zynq-brsmarc2.dts
>>>>> create mode 100644 board/BuR/zynq/Kconfig
>>>>> create mode 100644 board/BuR/zynq/MAINTAINERS
>>>>> create mode 100644 board/BuR/zynq/Makefile
>>>>> create mode 100644 board/BuR/zynq/brcp150/board.c
>>>>> create mode 100644 board/BuR/zynq/brcp150/ps7_init_gpl.c
>>>>> create mode 100644 board/BuR/zynq/brcp170/board.c
>>>>> create mode 100644 board/BuR/zynq/brcp170/ps7_init_gpl.c
>>>>> create mode 100644 board/BuR/zynq/brcp1_1r/board.c
>>>>> create mode 100644 board/BuR/zynq/brcp1_1r/ps7_init_gpl.c
>>>>> create mode 100644 board/BuR/zynq/brcp1_1r_switch/board.c
>>>>> create mode 100644 board/BuR/zynq/brcp1_1r_switch/ps7_init_gpl.c
>>>>> create mode 100644 board/BuR/zynq/brcp1_2r/board.c
>>>>> create mode 100644 board/BuR/zynq/brcp1_2r/ps7_init_gpl.c
>>>>> create mode 100644 board/BuR/zynq/brsmarc2/board.c
>>>>> create mode 100644 board/BuR/zynq/brsmarc2/ps7_init_gpl.c
>>>>> create mode 100644 board/BuR/zynq/common/board.c
>>>>> create mode 100644 board/BuR/zynq/env/brcp1.env
>>>>> create mode 100644 board/BuR/zynq/env/brcp150.env
>>>>> create mode 100644 configs/brcp150_defconfig
>>>>> create mode 100644 configs/brcp170_defconfig
>>>>> create mode 100644 configs/brcp1_1r_defconfig
>>>>> create mode 100644 configs/brcp1_1r_switch_defconfig
>>>>> create mode 100644 configs/brcp1_2r_defconfig
>>>>> create mode 100644 configs/brsmarc2_defconfig
>>>>> create mode 100644 include/configs/brzynq.h
>>>>>
>>>>> diff --git a/arch/arm/dts/zynq-brcp1.dtsi b/arch/arm/dts/zynq-brcp1.dtsi
>>>>> new file mode 100644
>>>>> index 00000000000..f1cf75f1277
>>>>> --- /dev/null
>>>>> +++ b/arch/arm/dts/zynq-brcp1.dtsi
>>>>> @@ -0,0 +1,133 @@
>>>>> +// SPDX-License-Identifier: GPL-2.0+
>>>>> +/*
>>>>> + * Copyright 2024 B&R Industrial Automation GmbH
>>>>> + */
>>>>> +
>>>>> +/include/ "zynq-7000.dtsi"
>>>>> +#include <dt-bindings/gpio/gpio.h>
>>>>> +
>>>>> +/ {
>>>>> + model = "BRCP1 CPU";
>>>>> + compatible = "br,cp1",
>>>>> + "xlnx,zynq-7000";
>>>>> +
>>>>> + aliases {
>>>>> + i2c0 = &i2c0;
>>>>> + serial0 = &uart0;
>>>>> + spi0 = &qspi;
>>>>> + mmc0 = &sdhci0;
>>>>> + };
>>>>> +
>>>>> + memory {
>>>>> + device_type = "memory";
>>>>> + reg = <0x0 0x40000000>;
>>>>> + };
>>>>> +
>>>>> + chosen {
>>>>> + stdout-path = "serial0:115200n8";
>>>>> + };
>>>>> +
>>>>> + usb_phy0: phy0 {
>>>>> + compatible = "usb-nop-xceiv";
>>>>> + #phy-cells = <0>;
>>>>> + };
>>>>> +
>>>>> + brd_rst: board_reset {
>>>>> + compatible = "br,board-reset";
>>>>> + pin = <&gpio0 9 GPIO_ACTIVE_HIGH>;
>>>>> + };
>>>>> +
>>>>> + leds {
>>>>> + compatible = "gpio-leds";
>>>>> + se_green {
>>>>> + label = "S_E_GREEN";
>>>>> + gpios = <&ledgpio 0 GPIO_ACTIVE_LOW>;
>>>>> + default-state = "off";
>>>>> + };
>>>>> + se_red {
>>>>> + label = "S_E_RED";
>>>>> + gpios = <&ledgpio 1 GPIO_ACTIVE_LOW>;
>>>>> + default-state = "off";
>>>>> + };
>>>>> + rdy_f_yellow {
>>>>> + label = "RDY_F_YELLOW";
>>>>> + gpios = <&ledgpio 2 GPIO_ACTIVE_LOW>;
>>>>> + default-state = "off";
>>>>> + };
>>>>> + re_green {
>>>>> + label = "R_E_GREEN";
>>>>> + gpios = <&ledgpio 3 GPIO_ACTIVE_LOW>;
>>>>> + default-state = "off";
>>>>> + };
>>>>> + re_red {
>>>>> + label = "R_E_RED";
>>>>> + gpios = <&ledgpio 4 GPIO_ACTIVE_HIGH>;
>>>>> + default-state = "off";
>>>>> + };
>>>>> + plk_se_green {
>>>>> + label = "PLK_S_E_GREEN";
>>>>> + gpios = <&ledgpio 5 GPIO_ACTIVE_LOW>;
>>>>> + default-state = "off";
>>>>> + };
>>>>> + eth_se_green {
>>>>> + label = "ETH_S_E_GREEN";
>>>>> + gpios = <&ledgpio 6 GPIO_ACTIVE_LOW>;
>>>>> + default-state = "off";
>>>>> + };
>>>>> + };
>>>>> +};
>>>>> +
>>>>> +#include "zynq-brcp1-u-boot.dtsi"
>>>>
>>>>
>>>> Why? It should be added automatically when you run build.
>>>
>>> This is not case for me since I have 3 base device-trees:
>>> zynq-brcp1_1r.dts
>>> zynq-brcp1_1r_switch.dts
>>> zynq-brcp1_2r.dts
>>>
>>> This device-trees include the same base file zynq-brcp1.dtsi.
>>> The file zynq-brcp1-u-boot.dtsi is needed in all 3 of the above files.
>>> But the zynq-brcp1.dtsi file naming doesn't trigger the automatic include of the
>>> zynq-brcp1-u-boot.dtsi file.
>>>
>>> My approach is to include zynq-brcp1-u-boot.dtsi manually.
>>>
>>> Also I don't think it is a good idea to create 5 u-boot dtb files:
>>> zynq-brcp1_1r-u-boot.dtsi
>>> zynq-brcp1_1r_switch-u-boot.dtsi
>>> zynq-brcp1_2r-u-boot.dtsi
>>>
>>> Perhaps you have a better suggestion for this problem?
>>
>> pretty much bootp-all can go to your standard files. It is the part of dt-schema
>> for a while now that's why don't need to keep it in u-boot.dtsi only file.
>>
>> And then you have only binman part. You are not adding fdtmap to binman that's
>> why I think map is not added to binary itself and you have only description in
>> DT. I am using CONFIG_BINMAN_DTB and if you don't need to have binman node on
>> your target you can use it too. Then you can simply share this across your
>> boards and you will avoid sourcing these files.
>>
>> M
>
> I use the binman entries in the environment to get the spi-flash offsets.
>
> +/* SPI layout variables */
> +cfg_addr=
> + fdt get value cfgaddr_spi /binman/blob-ext at 0 offset &&
> + fdt get value cfgsize_spi /binman/blob-ext at 0 size
> +
> +fpga_addr=
> + fdt get value fpgaaddr_spi /binman/blob-ext at 1 offset &&
> + fdt get value fpgasize_spi /binman/blob-ext at 1 size
> +
> +os_addr=
> + fdt get value osaddr_spi /binman/blob-ext at 2 offset &&
> + fdt get value ossize_spi /binman/blob-ext at 2 size
> +
> +dtb_addr=
> + fdt get value dtbaddr_spi /binman/blob-ext at 3 offset &&
> + fdt get value dtbsize_spi /binman/blob-ext at 3 size
>
> I also use the binman fdt in the SPL of one board to get the FPGA
> SPI-FLASH offset.
>
> One way of fixing this is to move bootp-all to the standard files and also
> add the binman entries with an extra file with the config option
> CONFIG_DEVICE_TREE_INCLUDES=zynq-binman-brcp.dtsi?
Wasn't aware about this but looks good to me. You can keep -u-boot.dtsi files
for boards which matches the name and for others use this CONFIG option.
Another option would be also to create symlink which make this also clear.
Pretty much it is up to you how you manage that files but one thing what I
didn't like on your solution was that you are including files which should be
included automatically. And trick you did wasn't really described in commit message.
M
More information about the U-Boot
mailing list