From 272056207ef07f066ac9cafd51f708606f2cde31 Mon Sep 17 00:00:00 2001 From: Daniel Baluta Date: Mon, 19 Jun 2023 15:35:17 +0300 Subject: [PATCH 1/4] app: boards: Add mimx93_evk_a55 overlay file We will use SOF app with default mimx93_evk_a55 board on top of which will add necessary adaptations. e.g we will define SOF required memory areas in the overlay and will get rid of mimx93_evk_a55_sof board. Signed-off-by: Daniel Baluta --- app/boards/mimx93_evk_a55.overlay | 61 +++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 app/boards/mimx93_evk_a55.overlay diff --git a/app/boards/mimx93_evk_a55.overlay b/app/boards/mimx93_evk_a55.overlay new file mode 100644 index 000000000000..739b454e314b --- /dev/null +++ b/app/boards/mimx93_evk_a55.overlay @@ -0,0 +1,61 @@ +/* + * Copyright 2023 NXP + * + * SPDX-License-Identifier: Apache-2.0 + */ + +/ { + /delete-node/ memory@c0000000; + /* Inmate memory, reserved through "mem=1248MB" boot argument, + * starts at 0xce000000. + */ + sram0: memory@ce000000 { + reg = <0xce000000 DT_SIZE_M(1)>; + }; + + /* TODO: all of the nodes below are needed by SOF and should + * be removed once all drivers used by SOF have been moved + * to Zephyr. + * + * They are added in the DTS for the sake of not using hardcoded + * values in mmu_regions.c + */ + mu2_a: memory@42430000 { + reg = <0x42430000 DT_SIZE_K(64)>; + }; + + sai3: memory@42660000 { + reg = <0x42660000 DT_SIZE_K(64)>; + }; + + edma2_ch0: memory@42010000 { + reg = <0x42010000 DT_SIZE_K(32)>; + }; + + edma2_ch1: memory@42018000 { + reg = <0x42018000 DT_SIZE_K(32)>; + }; + + outbox: memory@ce100000 { + reg = <0xce100000 DT_SIZE_K(4)>; + }; + + inbox: memory@ce101000 { + reg = <0xce101000 DT_SIZE_K(4)>; + }; + + stream: memory@ce102000 { + reg = <0xce102000 DT_SIZE_K(4)>; + }; + + /* TODO: this is extremely bad and it's needed here because of + * the fact that the DMA buffer shared by host and FW is situated + * in this region. For now, it's easier to create a mapping for the + * whole region but in the future a mapping should only be created + * for the physical address of the buffer sent to the FW through an + * IPC. + */ + host_ram: memory@80000000 { + reg = <0x80000000 DT_SIZE_M(1024)>; + }; +}; From 5303bd1786eeece40deefdce5e789a280a9c5c61 Mon Sep 17 00:00:00 2001 From: Daniel Baluta Date: Mon, 19 Jun 2023 15:48:40 +0300 Subject: [PATCH 2/4] app: boards: Add mimx93_evk_a55 config fragment We plan to get rid of mimx93_evk_a55_sof board and use the generic mimx93_evk_a55 board + overlays. This patch adds the config fragment to enable mimx93_evk_a55 board for SOF. Signed-off-by: Daniel Baluta --- app/boards/mimx93_evk_a55.conf | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 app/boards/mimx93_evk_a55.conf diff --git a/app/boards/mimx93_evk_a55.conf b/app/boards/mimx93_evk_a55.conf new file mode 100644 index 000000000000..a3c9ce153f62 --- /dev/null +++ b/app/boards/mimx93_evk_a55.conf @@ -0,0 +1,16 @@ +# +# Copyright 2023 NXP +# +# SPDX-License-Identifier: Apache-2.0 + +# Enable dynamic interrupts +CONFIG_DYNAMIC_INTERRUPTS=y + +CONFIG_ARM64_VA_BITS_40=y +CONFIG_ARM64_PA_BITS_40=y + +CONFIG_DCACHE_LINE_SIZE_DETECT=n +CONFIG_DCACHE_LINE_SIZE=64 + +CONFIG_IMX93_A55=y +CONFIG_TRACE=n From cc3f8801e828764d3a982b2cba060d7334feeb85 Mon Sep 17 00:00:00 2001 From: Daniel Baluta Date: Tue, 20 Jun 2023 17:44:04 +0300 Subject: [PATCH 3/4] app: boards: Remove mimx93_evk_a55_sof.conf file We now use mimx93_evk_a55 board so there is no longer need for mimx93_evk_a55_sof.conf. Signed-off-by: Daniel Baluta --- app/boards/mimx93_evk_a55_sof.conf | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 app/boards/mimx93_evk_a55_sof.conf diff --git a/app/boards/mimx93_evk_a55_sof.conf b/app/boards/mimx93_evk_a55_sof.conf deleted file mode 100644 index 0452c6598b19..000000000000 --- a/app/boards/mimx93_evk_a55_sof.conf +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_IMX93_A55=y -CONFIG_TRACE=n From 762959303692e4947804c4c5db6fce245088ebf5 Mon Sep 17 00:00:00 2001 From: Daniel Baluta Date: Tue, 20 Jun 2023 17:47:05 +0300 Subject: [PATCH 4/4] .github: Use mimx93_a55_evk board We no longer use synthetic mimx93_a55_evk_sof board but rather we customize already existing proper mimx93_a55_evk board. Signed-off-by: Daniel Baluta --- .github/workflows/zephyr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/zephyr.yml b/.github/workflows/zephyr.yml index 36555a138975..c93d83a358bb 100644 --- a/.github/workflows/zephyr.yml +++ b/.github/workflows/zephyr.yml @@ -88,7 +88,7 @@ jobs: # four 32bits parameters. cd workspace && ./sof/zephyr/docker-run.sh /bin/sh -c \ 'ln -s /opt/toolchains/zephyr-sdk-* ~/; - west build --board mimx93_evk_a55_sof sof/app' + west build --board mimx93_evk_a55 sof/app' build-linux: