diff --git a/config/kernel/linux-imx7d-default.config b/config/kernel/linux-imx7d-default.config index b411230208..cbfb2695a0 100644 --- a/config/kernel/linux-imx7d-default.config +++ b/config/kernel/linux-imx7d-default.config @@ -4120,7 +4120,7 @@ CONFIG_DMA_OF=y CONFIG_FSL_EDMA=y # 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/u-boot-update-boot-scripts.patch b/patch/u-boot/u-boot-imx7d/u-boot-update-boot-scripts.patch index 38725e7e64..88f1c95750 100644 --- a/patch/u-boot/u-boot-imx7d/u-boot-update-boot-scripts.patch +++ b/patch/u-boot/u-boot-imx7d/u-boot-update-boot-scripts.patch @@ -1,5 +1,5 @@ diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h -index f5171bb..d617565 100644 +index f5171bb..922bf63 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -43,6 +43,8 @@ @@ -45,16 +45,27 @@ index f5171bb..d617565 100644 "mmcboot=echo Booting from mmc ...; " \ "run mmcargs; " \ "if test ${tee} = yes; then " \ -@@ -212,7 +214,7 @@ +@@ -212,13 +214,18 @@ "fi;\0" \ "findfdt="\ "if test $fdt_file = undefined; then " \ - "setenv fdt_file imx7d-sdb.dtb; " \ + "setenv fdt_file /boot/dtb/imx7d-sdb.dtb; " \ ++ "fi;\0" \ ++ "loadenv="\ ++ "if ext4load mmc ${mmcdev}:${mmcpart} ${loadaddr} /boot/armbianEnv.txt; then " \ ++ "env import -t ${load_addr} ${filesize};" \ "fi;\0" \ #define CONFIG_BOOTCOMMAND \ -@@ -303,7 +305,7 @@ + "run findfdt;" \ + "mmc dev ${mmcdev};" \ + "mmc dev ${mmcdev}; if mmc rescan; then " \ ++ "run loadenv;"\ + "if run loadbootscript; then " \ + "run bootscript; " \ + "else " \ +@@ -303,7 +310,7 @@ #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_MMC_ENV_DEV 0 /* USDHC1 */ #define CONFIG_SYS_MMC_ENV_PART 0 /* user area */