From f430600d735d603b93b839a9a97a85d057a71172 Mon Sep 17 00:00:00 2001
From: Lech Perczak <lech.perczak@gmail.com>
Date: Sun, 24 Apr 2022 15:53:25 +0200
Subject: [PATCH] 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 <lech.perczak@gmail.com>
---
 target/linux/imx/config-5.15                     |   2 --
 target/linux/imx/cortexa7/config-default         |   2 ++
 target/linux/imx/cortexa9/config-default         |   2 ++
 .../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 3c3691b6490..3ca915ae9af 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 6b1493fe190..08829c3c778 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 d829bc7741b..93193815902 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 0000000000000000000000000000000000000000..148f4fe87bed695d16a610d91000feaa8317107e
GIT binary patch
literal 2862
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
KE@tWwnF|0RGuB!F

literal 0
HcmV?d00001

-- 
GitLab