From f430600d735d603b93b839a9a97a85d057a71172 Mon Sep 17 00:00:00 2001 From: Lech Perczak Date: Sun, 24 Apr 2022 15:53:25 +0200 Subject: imx: bundle correct SDMA firmware for i.MX 7 boards Import sdma-imx7d.bin from linux-firmware repository at commit: 55edf5202154: ("imx: sdma: update firmware to v3.5/v4.5") Cortex-A7 boards (i.MX 7 based) use different SDMA firmware than i.MX 6 boards - bundle the correct files in per-subtarget kernel options. Signed-off-by: Lech Perczak --- target/linux/imx/config-5.15 | 2 -- target/linux/imx/cortexa7/config-default | 2 ++ target/linux/imx/cortexa9/config-default | 2 ++ target/linux/imx/files/firmware/imx/sdma/sdma-imx7d.bin | Bin 0 -> 2862 bytes 4 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 target/linux/imx/files/firmware/imx/sdma/sdma-imx7d.bin diff --git a/target/linux/imx/config-5.15 b/target/linux/imx/config-5.15 index 3c3691b649..3ca915ae9a 100644 --- a/target/linux/imx/config-5.15 +++ b/target/linux/imx/config-5.15 @@ -158,8 +158,6 @@ CONFIG_EXT4_FS=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y CONFIG_EXTCON=y -CONFIG_EXTRA_FIRMWARE="imx/sdma/sdma-imx6q.bin" -CONFIG_EXTRA_FIRMWARE_DIR="firmware" CONFIG_F2FS_FS=y # CONFIG_FEC is not set CONFIG_FIXED_PHY=y diff --git a/target/linux/imx/cortexa7/config-default b/target/linux/imx/cortexa7/config-default index 6b1493fe19..08829c3c77 100644 --- a/target/linux/imx/cortexa7/config-default +++ b/target/linux/imx/cortexa7/config-default @@ -14,6 +14,8 @@ CONFIG_CMA_AREAS=7 # CONFIG_CMA_SYSFS is not set CONFIG_CONTIG_ALLOC=y # CONFIG_DMA_CMA is not set +CONFIG_EXTRA_FIRMWARE="imx/sdma/sdma-imx7d.bin" +CONFIG_EXTRA_FIRMWARE_DIR="firmware" CONFIG_FEC=y CONFIG_FSL_GUTS=y CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y diff --git a/target/linux/imx/cortexa9/config-default b/target/linux/imx/cortexa9/config-default index d829bc7741..9319381590 100644 --- a/target/linux/imx/cortexa9/config-default +++ b/target/linux/imx/cortexa9/config-default @@ -10,6 +10,8 @@ CONFIG_CLK_IMX6SX=y CONFIG_CMDLINE="pci=nomsi" CONFIG_CMDLINE_EXTEND=y CONFIG_E1000E=y +CONFIG_EXTRA_FIRMWARE="imx/sdma/sdma-imx6q.bin" +CONFIG_EXTRA_FIRMWARE_DIR="firmware" CONFIG_FEC=y CONFIG_FSL_GUTS=y CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y diff --git a/target/linux/imx/files/firmware/imx/sdma/sdma-imx7d.bin b/target/linux/imx/files/firmware/imx/sdma/sdma-imx7d.bin new file mode 100644 index 0000000000..148f4fe87b Binary files /dev/null and b/target/linux/imx/files/firmware/imx/sdma/sdma-imx7d.bin differ -- cgit v1.2.3