From b2e98daf7b83b189a18d6e2f8a17a4969c60fee6 Mon Sep 17 00:00:00 2001 From: andpp Date: Sat, 3 Jul 2021 12:57:43 -0700 Subject: [PATCH] Fixed u-boot script and kernel config for i.MX7D (#2953) * Updated kernel/u-boot for MCIMX7SABRE board Supporing 'current' and 'legacy' branches for MCIMX7SABRE board current branch: u-boot: imx_v2020.04_5.4.70_2.3.0 kernel: imx_5.4.70_2.3.0 legacy branch: u-boot: imx_v2018.03_4.14.98_2.0.0_ga kernel: imx_4.14.98_2.0.0_ga * Update kernel config with few additional options like zram, bonding, ... just a few to keep minimum consistency over kernels. * Fixed u-boot script and kernel config for i.MX7D Fixed bug in u-boot script preventing to use armbianEnv.txt Configured SDMA as module to fix loading SDMA firmware Co-authored-by: Igor Pecovnik --- config/kernel/linux-imx7d-current.config | 2 +- .../u-boot-imx7d-current/u-boot-update-boot-scripts.patch | 2 +- .../u-boot/u-boot-imx7d-legacy/u-boot-update-boot-scripts.patch | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/kernel/linux-imx7d-current.config b/config/kernel/linux-imx7d-current.config index 2d3058e3e2..bf8da8ec83 100644 --- a/config/kernel/linux-imx7d-current.config +++ b/config/kernel/linux-imx7d-current.config @@ -5046,7 +5046,7 @@ CONFIG_FSL_EDMA=y # CONFIG_FSL_QDMA is not set # CONFIG_FSL_EDMA_V3 is not set # CONFIG_IMX_DMA is not set -CONFIG_IMX_SDMA=y +CONFIG_IMX_SDMA=m # CONFIG_INTEL_IDMA64 is not set CONFIG_MXS_DMA=y CONFIG_MXC_PXP_V2=y diff --git a/patch/u-boot/u-boot-imx7d-current/u-boot-update-boot-scripts.patch b/patch/u-boot/u-boot-imx7d-current/u-boot-update-boot-scripts.patch index 689edcc800..0b0a852540 100644 --- a/patch/u-boot/u-boot-imx7d-current/u-boot-update-boot-scripts.patch +++ b/patch/u-boot/u-boot-imx7d-current/u-boot-update-boot-scripts.patch @@ -45,7 +45,7 @@ index 5a2fef79..0df9d538 100644 + "fi;\0" \ + "loadenv="\ + "if ext4load mmc ${mmcdev}:${mmcpart} ${loadaddr} /boot/armbianEnv.txt; then " \ -+ "env import -t ${load_addr} ${filesize};" \ ++ "env import -t ${loadaddr} ${filesize};" \ "fi;\0" \ #define CONFIG_BOOTCOMMAND \ diff --git a/patch/u-boot/u-boot-imx7d-legacy/u-boot-update-boot-scripts.patch b/patch/u-boot/u-boot-imx7d-legacy/u-boot-update-boot-scripts.patch index 88f1c95750..042a498a3d 100644 --- a/patch/u-boot/u-boot-imx7d-legacy/u-boot-update-boot-scripts.patch +++ b/patch/u-boot/u-boot-imx7d-legacy/u-boot-update-boot-scripts.patch @@ -54,7 +54,7 @@ index f5171bb..922bf63 100644 + "fi;\0" \ + "loadenv="\ + "if ext4load mmc ${mmcdev}:${mmcpart} ${loadaddr} /boot/armbianEnv.txt; then " \ -+ "env import -t ${load_addr} ${filesize};" \ ++ "env import -t ${loadaddr} ${filesize};" \ "fi;\0" \ #define CONFIG_BOOTCOMMAND \