diff options
| author | Tom Rini <[email protected]> | 2025-11-04 13:06:26 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-11-04 13:06:26 -0600 |
| commit | 1c250e444ad3b15315ee8b0fcb3fc3acc26449e2 (patch) | |
| tree | 47cd432ccfc396c9fabd4631566289f120c01605 /include | |
| parent | ef34776f21969a71594dc6224d0e54cf5a2a980c (diff) | |
| parent | 2b7892255bd617dfc523cfe8455dbf386a3dfaf5 (diff) | |
Merge tag 'u-boot-imx-master-20251104' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/28144
- Extend USB support for the i.MX9 family.
- Update memory controller for imx6ulz_smm_m2.
- Add remoteproc support for several i.MX boards.
- Add support for iMX95 15x15 EVK.
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/dh_imx6.h | 1 | ||||
| -rw-r--r-- | include/configs/imx95_evk.h | 8 | ||||
| -rw-r--r-- | include/remoteproc.h | 3 |
3 files changed, 9 insertions, 3 deletions
diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h index 09354936d73..d849cb544be 100644 --- a/include/configs/dh_imx6.h +++ b/include/configs/dh_imx6.h @@ -38,6 +38,7 @@ #define CFG_EXTRA_ENV_SETTINGS \ "bootm_size=0x10000000\0" \ "console=ttymxc0,115200\0" \ + "dfu_alt_info=sf 0:0=flash-bin raw 0 0x200000\0" \ "fdt_addr=0x18000000\0" \ "kernel_addr_r=0x10008000\0" \ "fdt_addr_r=0x13000000\0" \ diff --git a/include/configs/imx95_evk.h b/include/configs/imx95_evk.h index 2eebdadc51d..3d22740b3f4 100644 --- a/include/configs/imx95_evk.h +++ b/include/configs/imx95_evk.h @@ -15,9 +15,13 @@ #define CFG_SYS_SDRAM_BASE 0x90000000 #define PHYS_SDRAM 0x90000000 -/* Totally 16GB */ + #define PHYS_SDRAM_SIZE 0x70000000 /* 2GB - 256MB DDR */ -#define PHYS_SDRAM_2_SIZE 0x380000000 /* 14GB */ +#ifdef CONFIG_TARGET_IMX95_15X15_EVK +#define PHYS_SDRAM_2_SIZE 0x180000000 /* 6GB (Totally 8GB) */ +#else +#define PHYS_SDRAM_2_SIZE 0x380000000 /* 14GB (Totally 16GB) */ +#endif #define WDOG_BASE_ADDR WDG3_BASE_ADDR diff --git a/include/remoteproc.h b/include/remoteproc.h index 6f8068e1496..9adc3d17d8f 100644 --- a/include/remoteproc.h +++ b/include/remoteproc.h @@ -495,9 +495,10 @@ struct dm_rproc_ops { * @dev: Remote proc device * @da: Device address * @size: Size of the memory region @da is pointing to + * @is_iomem: optional pointer filled in to indicate if @da is iomapped memory * @return virtual address. */ - void * (*device_to_virt)(struct udevice *dev, ulong da, ulong size); + void * (*device_to_virt)(struct udevice *dev, ulong da, ulong size, bool *is_iomem); int (*add_res)(struct udevice *dev, struct rproc_mem_entry *mapping); void * (*alloc_mem)(struct udevice *dev, unsigned long len, |