remoteproc: imx_rproc: Merge TCML/U

Merge contiguous TCML/U regions into one to avoid load elf files which
has large sections failure.

Reviewed-by: Iuliana Prodan <iuliana.prodan@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
Link: https://lore.kernel.org/r/20240719-imx_rproc-v2-4-10d0268c7eb1@nxp.com
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>

diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c
index 9e99bb27c033ef91a7d289aef5b6fc39942ae294..552fccebf7e2e2b811dcecab0ab27a81deaabfba 100644 (file)
--- a/drivers/remoteproc/imx_rproc.c
+++ b/drivers/remoteproc/imx_rproc.c
@@ -119,20 +119,16 @@ struct imx_rproc {
 static const struct imx_rproc_att imx_rproc_att_imx93[] = {
        /* dev addr , sys addr  , size      , flags */
        /* TCM CODE NON-SECURE */
-       { 0x0FFC0000, 0x201C0000, 0x00020000, ATT_OWN | ATT_IOMEM },
-       { 0x0FFE0000, 0x201E0000, 0x00020000, ATT_OWN | ATT_IOMEM },
+       { 0x0FFC0000, 0x201C0000, 0x00040000, ATT_OWN | ATT_IOMEM },
 
        /* TCM CODE SECURE */
-       { 0x1FFC0000, 0x201C0000, 0x00020000, ATT_OWN | ATT_IOMEM },
-       { 0x1FFE0000, 0x201E0000, 0x00020000, ATT_OWN | ATT_IOMEM },
+       { 0x1FFC0000, 0x201C0000, 0x00040000, ATT_OWN | ATT_IOMEM },
 
        /* TCM SYS NON-SECURE*/
-       { 0x20000000, 0x20200000, 0x00020000, ATT_OWN | ATT_IOMEM },
-       { 0x20020000, 0x20220000, 0x00020000, ATT_OWN | ATT_IOMEM },
+       { 0x20000000, 0x20200000, 0x00040000, ATT_OWN | ATT_IOMEM },
 
        /* TCM SYS SECURE*/
-       { 0x30000000, 0x20200000, 0x00020000, ATT_OWN | ATT_IOMEM },
-       { 0x30020000, 0x20220000, 0x00020000, ATT_OWN | ATT_IOMEM },
+       { 0x30000000, 0x20200000, 0x00040000, ATT_OWN | ATT_IOMEM },
 
        /* DDR */
        { 0x80000000, 0x80000000, 0x10000000, 0 },
@@ -211,10 +207,8 @@ static const struct imx_rproc_att imx_rproc_att_imx8mq[] = {
        { 0x08000000, 0x08000000, 0x08000000, 0 },
        /* DDR (Code) - alias */
        { 0x10000000, 0x40000000, 0x0FFE0000, 0 },
-       /* TCML */
-       { 0x1FFE0000, 0x007E0000, 0x00020000, ATT_OWN  | ATT_IOMEM},
-       /* TCMU */
-       { 0x20000000, 0x00800000, 0x00020000, ATT_OWN  | ATT_IOMEM},
+       /* TCML/U */
+       { 0x1FFE0000, 0x007E0000, 0x00040000, ATT_OWN  | ATT_IOMEM},
        /* OCRAM_S */
        { 0x20180000, 0x00180000, 0x00008000, ATT_OWN },
        /* OCRAM */