Branch: refs/heads/main Home: https://github.com/OpenAMP/openamp-system-reference Commit: 5ade8282cb2486bbc8b3a1a8b3fb20fa187345c7 https://github.com/OpenAMP/openamp-system-reference/commit/5ade8282cb2486bbc... Author: Bill Mills bill.mills@linaro.org Date: 2023-10-29 (Sun, 29 Oct 2023)

Changed paths: M examples/zephyr/rpmsg_multi_services/boards/kv260_r5.overlay M examples/zephyr/rpmsg_multi_services/boards/qemu_cortex_r5.overlay A examples/zephyr/rpmsg_multi_services/boards/zynqmp_r5_override.dtsi

Log Message: ----------- zephyr: fixup kv260_r5 DT memory until it can be fixed in Zephyr

We are currently using Zephyr v3.5.0. The memory definitions for kv260_r5 are inappropriate for general usage and for ours. (This is partially our doing so not throwing stones.)

The current flash definition refers to the QSPI XIP area of the zynqmp. This is unlikely to be appropriate to use in the general case. The current usage also assumes use at offset 0 in the QSPI which is even less likely to be appropriate. It is OK zynqmp_r5 to define this (perhaps with the name of qspi-xip) but it should not be selected as the default for flash. Let people that needs this opt into it.

For now we disable the zephyr,flash choice. This does not eliminate the memory report line but it at least shows a region size of 0.

Likewise for the definition of RAM. Zynqmp_r5 defines 64MB of RAM starting at offset 0. This would be a mix of TCM and DDR depending on the R5 mode split vs lockstep mode.

In lockstep, DDR would be used for anything >=256K. For split mode, DDR would be used for 64K to 128K-1 and for >=192K.

Using DDR like this is dangerous if another OS is running on the A53s. Linux for example does not reserve this early DDR memory for use by the the R5(s).

For now assume lockstep (only mode supported by Zephyr v3.5.0) and provide a new memory definition for combined TCM and use it for RAM.

Put all these overrides in an include file so they are easy to undo when Zephyr upstream is fixed.

We are using qemu_cortex_r5 as stand-in for zcu102_r5 for right now so do the same for that board. However once we have zcu102_r5 we should leave qemu_cortex_r5 alone as its purpose is a generic R5 target not a full zynqmp system.

Signed-off-by: Bill Mills bill.mills@linaro.org