diff options
author | Ben Levinsky <ben.levinsky@amd.com> | 2023-03-17 08:59:45 -0700 |
---|---|---|
committer | Mark Hatle <mark.hatle@amd.com> | 2023-03-17 11:08:49 -0500 |
commit | 1dc01c7234a7696d7c0e071b52e63f9d962aa10c (patch) | |
tree | 1eb781ed3eeb6b756271021d06071f546a6d3d6a /meta-xilinx-core/dynamic-layers | |
parent | f9d9127ea2511fd790af6c9d3ee11731c38af6be (diff) | |
download | meta-xilinx-1dc01c7234a7696d7c0e071b52e63f9d962aa10c.tar.gz |
open-amp: device-tree: Update Versal NET DTs
In addition update device tree bbappend to mimic how QEMU DTs use overlays
and only update to EXTRA_OVERLAYS if the proper conditions are met
Signed-off-by: Ben Levinsky <ben.levinsky@amd.com>
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
Diffstat (limited to 'meta-xilinx-core/dynamic-layers')
2 files changed, 20 insertions, 21 deletions
diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/device-tree.bbappend b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/device-tree.bbappend index b7c7141e..4fd8b971 100644 --- a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/device-tree.bbappend +++ b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/device-tree.bbappend | |||
@@ -10,20 +10,19 @@ SRC_URI = " \ | |||
10 | # openamp.dtsi is in the WORKDIR | 10 | # openamp.dtsi is in the WORKDIR |
11 | DT_INCLUDE:append = " ${WORKDIR}" | 11 | DT_INCLUDE:append = " ${WORKDIR}" |
12 | 12 | ||
13 | do_configure:append() { | 13 | do_configure[vardeps] += "ENABLE_OPENAMP_DTSI OPENAMP_EXTRA_OVERLAYS" |
14 | if ${@bb.utils.contains('DISTRO_FEATURES', 'openamp', ' true', 'false', d)} && [ "${ENABLE_OPENAMP_DTSI}" = "1" ]; then | 14 | |
15 | if [ -e "${DT_FILES_PATH}/system-top.dts" ]; then | 15 | OPENAMP_EXTRA_OVERLAYS:zynq = "zynq-openamp.dtsi" |
16 | if [ -e "${WORKDIR}/${MACHINE}-openamp.dtsi" ]; then | 16 | OPENAMP_EXTRA_OVERLAYS:zynqmp = "zynqmp-openamp.dtsi" |
17 | sed -i '/${MACHINE}-openamp\.dtsi/d' ${DT_FILES_PATH}/system-top.dts | 17 | OPENAMP_EXTRA_OVERLAYS:versal = "versal-openamp.dtsi" |
18 | echo '/include/ "${MACHINE}-openamp.dtsi"' >> ${DT_FILES_PATH}/system-top.dts | 18 | OPENAMP_EXTRA_OVERLAYS:versal-net = "versal-net-openamp.dtsi" |
19 | elif [ -e "${WORKDIR}/${SOC_FAMILY}-openamp.dtsi" ]; then | 19 | |
20 | sed -i '/${SOC_FAMILY}-openamp\.dtsi/d' ${DT_FILES_PATH}/system-top.dts | 20 | def set_openamp_extra_overlays(d): |
21 | echo '/include/ "${SOC_FAMILY}-openamp.dtsi"' >> ${DT_FILES_PATH}/system-top.dts | 21 | distro_features = d.getVar('DISTRO_FEATURES', True) |
22 | else | 22 | enable_openamp_dtsi = d.getVar('ENABLE_OPENAMP_DTSI') |
23 | bbfatal "${MACHINE}-openamp.dtsi or ${SOC_FAMILY}-openamp.dtsi file is not available. Cannot automatically add to system-top.dts." | 23 | if 'openamp' in distro_features and enable_openamp_dtsi == '1': |
24 | fi | 24 | return d.getVar('OPENAMP_EXTRA_OVERLAYS', True) |
25 | else | 25 | else: |
26 | bbfatal "system-top.dts not found in this configuration, cannot automatically add OpenAmp device tree nodes (openamp.dtsi)" | 26 | return '' |
27 | fi | 27 | |
28 | fi | 28 | EXTRA_OVERLAYS:append = "${@set_openamp_extra_overlays(d)}" |
29 | } | ||
diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/files/versal-net-openamp.dtsi b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/files/versal-net-openamp.dtsi index 773c35a3..694a2fd0 100644 --- a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/files/versal-net-openamp.dtsi +++ b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/files/versal-net-openamp.dtsi | |||
@@ -35,7 +35,7 @@ | |||
35 | reg = <0x0 0xeba00000 0x0 0x10000>; | 35 | reg = <0x0 0xeba00000 0x0 0x10000>; |
36 | status = "okay"; | 36 | status = "okay"; |
37 | compatible = "mmio-sram"; | 37 | compatible = "mmio-sram"; |
38 | power-domain = <&versal_firmware 0x183180cb>; | 38 | power-domain = <&versal_net_firmware 0x183180cb>; |
39 | }; | 39 | }; |
40 | 40 | ||
41 | tcm_0b: tcm_0b@eba10000 { | 41 | tcm_0b: tcm_0b@eba10000 { |
@@ -43,7 +43,7 @@ | |||
43 | reg = <0x0 0xeba10000 0x0 0x8000>; | 43 | reg = <0x0 0xeba10000 0x0 0x8000>; |
44 | status = "okay"; | 44 | status = "okay"; |
45 | compatible = "mmio-sram"; | 45 | compatible = "mmio-sram"; |
46 | power-domain = <&versal_firmware 0x183180cc>; | 46 | power-domain = <&versal_net_firmware 0x183180cc>; |
47 | }; | 47 | }; |
48 | 48 | ||
49 | tcm_0c: tcm_0b@eba20000 { | 49 | tcm_0c: tcm_0b@eba20000 { |
@@ -51,7 +51,7 @@ | |||
51 | reg = <0x0 0xeba20000 0x0 0x8000>; | 51 | reg = <0x0 0xeba20000 0x0 0x8000>; |
52 | status = "okay"; | 52 | status = "okay"; |
53 | compatible = "mmio-sram"; | 53 | compatible = "mmio-sram"; |
54 | power-domain = <&versal_firmware 0x183180cd>; | 54 | power-domain = <&versal_net_firmware 0x183180cd>; |
55 | }; | 55 | }; |
56 | 56 | ||
57 | r52ss { | 57 | r52ss { |
@@ -68,7 +68,7 @@ | |||
68 | ranges; | 68 | ranges; |
69 | sram = <&tcm_0a>, <&tcm_0b>, <&tcm_0c>; | 69 | sram = <&tcm_0a>, <&tcm_0b>, <&tcm_0c>; |
70 | memory-region = <&rproc_0_reserved>, <&rpu0vdev0buffer>, <&rpu0vdev0vring0>, <&rpu0vdev0vring1>; | 70 | memory-region = <&rproc_0_reserved>, <&rpu0vdev0buffer>, <&rpu0vdev0vring0>, <&rpu0vdev0vring1>; |
71 | power-domain = <&versal_firmware 0x181100BF>; | 71 | power-domain = <&versal_net_firmware 0x181100BF>; |
72 | mboxes = <&ipi_mailbox_rpu0 0>, <&ipi_mailbox_rpu0 1>; | 72 | mboxes = <&ipi_mailbox_rpu0 0>, <&ipi_mailbox_rpu0 1>; |
73 | mbox-names = "tx", "rx"; | 73 | mbox-names = "tx", "rx"; |
74 | }; | 74 | }; |