diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2016-11-10 16:39:27 -0800 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2018-02-01 15:15:21 +0100 |
| commit | dfa01e8a2827faea771f138119c8d62c9e1bf7b5 (patch) | |
| tree | 767cba7c87c83360d3096ce45d27fe6ec6c4f05b | |
| parent | 6fe5177a1ab17fa971ac6c914676aa15c6402bcc (diff) | |
board: colibri_imx7: reserve DDR memory for Cortex-M4
i.MX 7's Cortex-M4 core can run from DDR and uses DDR memory for
the rpmsg communication. Both use cases need a fixed location of
memory reserved. For the rpmsg use case the reserved area needs
to be in sync with the kernel's hardcoded vring descriptor location.
Use the linux,usable-memory property to carve out 1MB of memory
in case the M4 core is running. Also make sure that the i.MX 7
specific rpmsg driver does not get loaded in case we do not carve
out memory.
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
| -rw-r--r-- | board/toradex/colibri_imx7/colibri_imx7.c | 43 | ||||
| -rw-r--r-- | include/configs/colibri_imx7.h | 1 |
2 files changed, 44 insertions, 0 deletions
diff --git a/board/toradex/colibri_imx7/colibri_imx7.c b/board/toradex/colibri_imx7/colibri_imx7.c index 8ec2199fdd..e4a6ed5d5d 100644 --- a/board/toradex/colibri_imx7/colibri_imx7.c +++ b/board/toradex/colibri_imx7/colibri_imx7.c @@ -15,6 +15,7 @@ #include <asm/io.h> #include <linux/sizes.h> #include <common.h> +#include <fdt_support.h> #include <fsl_esdhc.h> #include <mmc.h> #include <micrel.h> @@ -782,3 +783,45 @@ void udc_pins_setting(void) } #endif /*CONFIG_IMX_UDC*/ + +#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_CMD_BOOTAUX) +int ft_board_setup(void *blob, bd_t *bd) +{ + int up; + + up = arch_auxiliary_core_check_up(0); + if (up) { + int ret; + int areas = 1; + u64 start[2], size[2]; + + /* + * Reserve 1MB of memory for M4 (1MiB is also the minimum + * alignment for Linux due to MMU section size restrictions). + */ + start[0] = gd->bd->bi_dram[0].start; + size[0] = SZ_256M - SZ_1M; + + /* If needed, create a second entry for memory beyond 256M */ + if (gd->bd->bi_dram[0].size > SZ_256M) { + start[1] = gd->bd->bi_dram[0].start + SZ_256M; + size[1] = gd->bd->bi_dram[0].size - SZ_256M; + areas = 2; + } + + ret = fdt_set_usable_memory(blob, start, size, areas); + if (ret) { + eprintf("Cannot set usable memory\n"); + return ret; + } + } else { + int off; + + off = fdt_node_offset_by_compatible(blob, -1, "fsl,imx7d-rpmsg"); + if (off > 0) + fdt_status_disabled(blob, off); + } + + return 0; +} +#endif diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index 2fe2422045..8716938034 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -361,6 +361,7 @@ #define CONFIG_MMCROOT "/dev/mmcblk0p2" /* USDHC1 */ #define CONFIG_OF_LIBFDT +#define CONFIG_OF_BOARD_SETUP #define CONFIG_OF_SYSTEM_SETUP #define CONFIG_CMD_BOOTZ #define CONFIG_SUPPORT_RAW_INITRD |