Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Zynqmp DTS: Update for v6.6 kernel #47

Merged
merged 1 commit into from
Jul 5, 2024
Merged

Zynqmp DTS: Update for v6.6 kernel #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions examples/linux/dts/xilinx/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ DTBS += zynqmp-smk-k26-revA.dtb zynqmp-zcu102-rev1.0.dtb
DTBS += zcu102-xilinx-bm-lockstep.dtb kv260-xilinx-bm-lockstep.dtb

DTBOS := zynqmp-split.dtbo zcu102-openamp.dtbo zynqmp-openamp.dtbo
DTBOS += zynqmp-sck-kv-g-revB.dtbo xilinx-openamp-for-v6.5.dtbo
DTBOS += zynqmp-sck-kv-g-revB.dtbo xilinx-openamp-for-v6.x.dtbo

# any file to test we have a valid kernel source dir
XILINX_DTS_DIR := $(LINUX_SRC_DIR)/arch/arm64/boot/dts/xilinx
Expand Down Expand Up @@ -89,13 +89,13 @@ kv260-openamp-split.dtb: \

zcu102-xilinx-bm-lockstep.dtb: \
zynqmp-zcu102-rev1.0.dtb \
xilinx-openamp-for-v6.5.dtbo \
xilinx-openamp-for-v6.x.dtbo \
zcu102-openamp.dtbo
fdtoverlay -o $@ -i $(filter-out .linux-src-check,$^)

kv260-xilinx-bm-lockstep.dtb: \
zynqmp-smk-k26-revA.dtb zynqmp-sck-kv-g-revB.dtbo \
xilinx-openamp-for-v6.5.dtbo
xilinx-openamp-for-v6.x.dtbo
fdtoverlay -o $@ -i $(filter-out .linux-src-check,$^)

clean:
Expand Down
55 changes: 11 additions & 44 deletions ...x/dts/xilinx/xilinx-openamp-for-v6.5.dtso → ...x/dts/xilinx/xilinx-openamp-for-v6.x.dtso
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@
/* Applies to all zynqmp boards to configure the IPC & memory for OpenAMP */
/* Applies to all zynqmp boards to configure the IPC & memory for OpenAMP
**
** This configuration is compatible with old bare-metal apps built with
** petalinux v2023 and before.
**
** It uses different IPC interrupt channels
** It only supports lockstep mode
**
** Bare-metal apps that do not use rpmsg (or any other IPI) can use the normal
** dtbs and thus can support lockstep and split mode.
*/

/dts-v1/;
/plugin/;
Expand Down Expand Up @@ -58,55 +68,12 @@
};
};

#if 0
zynqmp_ipi {
#address-cells = <2>;
#size-cells = <2>;
ranges;

ipi_mailbox_rpu0: mailbox@ff990040 {
reg = <0x00 0xff990040 0x00 0x20>,
<0x00 0xff990060 0x00 0x20>,
<0x00 0xff990200 0x00 0x20>,
< 0x00 0xff990220 0x00 0x20>;
reg-names = "local_request_region",
"local_response_region",
"remote_request_region",
"remote_response_region";
#mbox-cells = <0x01>;
xlnx,ipi-id = <0x01>;
};

ipi_mailbox_rpu1: mailbox@ff990080 {
reg = <0x00 0xff990420 0x00 0x20>,
<0x00 0xff990440 0x00 0x20>,
<0x00 0xff990260 0x00 0x20>,
<0x00 0xff990280 0x00 0x20>;
reg-names = "local_request_region",
"local_response_region",
"remote_request_region",
"remote_response_region";
#mbox-cells = <0x01>;
xlnx,ipi-id = <0x02>;
};
};
#endif

remoteproc: remoteproc {
r5f-0 {
memory-region = <&rproc_0_fw_image>, <&rpu0vdev0vring0>,
<&rpu0vdev0vring1>, <&rpu0vdev0buffer>;
mboxes = <&ipi_mailbox_rpu0 0>, <&ipi_mailbox_rpu0 1>;
mbox-names = "tx", "rx";
};

#if 0
r5f-1 {
memory-region = <&rproc_1_fw_image>, <&rpu1vdev1vring0>,
<&rpu1vdev1vring1>, <&rpu1vdev1buffer>;
mboxes = <&ipi_mailbox_rpu1 0>, <&ipi_mailbox_rpu1 1>;
mbox-names = "tx", "rx";
};
#endif
};
};
5 changes: 4 additions & 1 deletion examples/linux/dts/xilinx/zynqmp-openamp.dtso
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
/* Applies to all zynqmp boards to configure the IPC & memory for OpenAMP */
/* Applies to all zynqmp boards to configure the IPC & memory for OpenAMP
** This configuration is compatible with zephyr rpmsg and other modern uses of
** rpmsg
*/

/dts-v1/;
/plugin/;
Expand Down