Commit 0fbe9d6c6dc6e715cddb32133a3da13f3b87f68a

Authored by Eric Lee
1 parent 6375fa2366

Fix SDMA not being integrated into rootfs

Showing 2 changed files with 6 additions and 0 deletions Inline Diff

conf/machine/smarcimx8m2g.conf
1 #@TYPE: Machine 1 #@TYPE: Machine
2 #@NAME: EMBEDIAN SMARC-iMX8M COMPUTER ON MODULES with 2GB LPDDR4 MEMORY 2 #@NAME: EMBEDIAN SMARC-iMX8M COMPUTER ON MODULES with 2GB LPDDR4 MEMORY
3 #@SOC: i.MX8MQ 3 #@SOC: i.MX8MQ
4 #@DESCRIPTION: Machine configuration for Embedian SMARC-iMX8M 4 #@DESCRIPTION: Machine configuration for Embedian SMARC-iMX8M
5 #@MAINTAINER: Eric Lee <eric.lee@embedian.com> 5 #@MAINTAINER: Eric Lee <eric.lee@embedian.com>
6 # 6 #
7 # http://www.www.embedian.com 7 # http://www.www.embedian.com
8 8
9 MACHINEOVERRIDES =. "mx8:mx8m:mx8mq:" 9 MACHINEOVERRIDES =. "mx8:mx8m:mx8mq:"
10 10
11 require conf/machine/include/imx-base.inc 11 require conf/machine/include/imx-base.inc
12 require conf/machine/include/arm/arch-arm64.inc 12 require conf/machine/include/arm/arch-arm64.inc
13 13
14 MACHINE_FEATURES_append_smarcimx8m2g = " jailhouse"
15
14 MACHINE_FEATURES += " usbgadget vfat ext2 alsa serial pci wifi bluetooth" 16 MACHINE_FEATURES += " usbgadget vfat ext2 alsa serial pci wifi bluetooth"
15 17
16 IMAGE_FEATURES += "package-management" 18 IMAGE_FEATURES += "package-management"
17 19
18 # Embedian BSP default providers 20 # Embedian BSP default providers
19 PREFERRED_PROVIDER_virtual/kernel_smarcimx8m2g ?= "linux-smarcimx8m" 21 PREFERRED_PROVIDER_virtual/kernel_smarcimx8m2g ?= "linux-smarcimx8m"
20 PREFERRED_VERSION_linux-smarcimx8m2g_smarcimx8m2g = "4.19.35" 22 PREFERRED_VERSION_linux-smarcimx8m2g_smarcimx8m2g = "4.19.35"
21 23
22 KERNEL_DEVICETREE = " \ 24 KERNEL_DEVICETREE = " \
23 embedian/fsl-smarcimx8mq.dtb \ 25 embedian/fsl-smarcimx8mq.dtb \
24 embedian/fsl-smarcimx8mq-dcss-lvds.dtb \ 26 embedian/fsl-smarcimx8mq-dcss-lvds.dtb \
25 embedian/fsl-smarcimx8mq-lcdif-lvds.dtb \ 27 embedian/fsl-smarcimx8mq-lcdif-lvds.dtb \
26 embedian/fsl-smarcimx8mq-hdmi.dtb \ 28 embedian/fsl-smarcimx8mq-hdmi.dtb \
27 embedian/fsl-smarcimx8mq-dp.dtb \ 29 embedian/fsl-smarcimx8mq-dp.dtb \
28 embedian/fsl-smarcimx8mq-edp.dtb \ 30 embedian/fsl-smarcimx8mq-edp.dtb \
29 embedian/fsl-smarcimx8mq-dual-display.dtb \ 31 embedian/fsl-smarcimx8mq-dual-display.dtb \
30 " 32 "
31 IMAGE_BOOTFILES_DEPENDS += "imx-m4-demos:do_deploy" 33 IMAGE_BOOTFILES_DEPENDS += "imx-m4-demos:do_deploy"
32 IMAGE_BOOT_FILES += "imx8mq_m4_TCM_hello_world.bin imx8mq_m4_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin imx8mq_m4_TCM_rpmsg_lite_str_echo_rtos.bin" 34 IMAGE_BOOT_FILES += "imx8mq_m4_TCM_hello_world.bin imx8mq_m4_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin imx8mq_m4_TCM_rpmsg_lite_str_echo_rtos.bin"
33 35
34 PREFERRED_PROVIDER_u-boot_smarcimx8m2g = "u-boot-smarcimx8m" 36 PREFERRED_PROVIDER_u-boot_smarcimx8m2g = "u-boot-smarcimx8m"
35 PREFERRED_PROVIDER_virtual/bootloader_smarcimx8m2g = "u-boot-smarcimx8m" 37 PREFERRED_PROVIDER_virtual/bootloader_smarcimx8m2g = "u-boot-smarcimx8m"
36 38
37 UBOOT_CONFIG ??= "sd" 39 UBOOT_CONFIG ??= "sd"
38 UBOOT_CONFIG[sd] = "smarcimx8mq_2g_ser3_defconfig,sdcard" 40 UBOOT_CONFIG[sd] = "smarcimx8mq_2g_ser3_defconfig,sdcard"
39 SPL_BINARY = "spl/u-boot-spl.bin" 41 SPL_BINARY = "spl/u-boot-spl.bin"
40 42
41 # Set DDR FIRMWARE 43 # Set DDR FIRMWARE
42 DDR_FIRMWARE_NAME = "lpddr4_pmu_train_1d_imem.bin lpddr4_pmu_train_1d_dmem.bin lpddr4_pmu_train_2d_imem.bin lpddr4_pmu_train_2d_dmem.bin" 44 DDR_FIRMWARE_NAME = "lpddr4_pmu_train_1d_imem.bin lpddr4_pmu_train_1d_dmem.bin lpddr4_pmu_train_2d_imem.bin lpddr4_pmu_train_2d_dmem.bin"
43 45
44 # Set U-Boot DTB 46 # Set U-Boot DTB
45 UBOOT_DTB_NAME = "fsl-smarcimx8mq.dtb" 47 UBOOT_DTB_NAME = "fsl-smarcimx8mq.dtb"
46 48
47 # Set imx-mkimage boot target 49 # Set imx-mkimage boot target
48 IMXBOOT_TARGETS = "flash_evk flash_evk_no_hdmi flash_dp_evk" 50 IMXBOOT_TARGETS = "flash_evk flash_evk_no_hdmi flash_dp_evk"
49 51
50 SERIAL_CONSOLE = "115200 ttymxc0" 52 SERIAL_CONSOLE = "115200 ttymxc0"
51 53
52 IMAGE_BOOTLOADER = "imx-boot" 54 IMAGE_BOOTLOADER = "imx-boot"
53 55
54 LOADADDR = "" 56 LOADADDR = ""
55 UBOOT_MAKE_TARGET = "" 57 UBOOT_MAKE_TARGET = ""
56 IMX_BOOT_SEEK = "33" 58 IMX_BOOT_SEEK = "33"
57 59
58 MACHINE_EXTRA_RDEPENDS += " \ 60 MACHINE_EXTRA_RDEPENDS += " \
59 imx-boot \ 61 imx-boot \
60 packagegroup-tools-bluetooth \ 62 packagegroup-tools-bluetooth \
61 pm-utils \ 63 pm-utils \
62 kmod \ 64 kmod \
63 hdparm \ 65 hdparm \
64 gptfdisk \ 66 gptfdisk \
65 lftp \ 67 lftp \
66 vim \ 68 vim \
67 ntp \ 69 ntp \
68 boost \ 70 boost \
69 nodejs \ 71 nodejs \
70 networkmanager \ 72 networkmanager \
71 imx-gpu-viv \ 73 imx-gpu-viv \
74 firmware-imx-sdma \
72 " 75 "
73 76
74 IMAGE_FSTYPES = "tar.bz2" 77 IMAGE_FSTYPES = "tar.bz2"
75 78
76 # Ship all kernel modules by default 79 # Ship all kernel modules by default
77 MACHINE_EXTRA_RRECOMMENDS = "kernel-modules" 80 MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
78 81
79 MACHINE_FIRMWARE_append_mx8 = " linux-firmware-ath10k" 82 MACHINE_FIRMWARE_append_mx8 = " linux-firmware-ath10k"
80 83
conf/machine/smarcimx8m4g.conf
1 #@TYPE: Machine 1 #@TYPE: Machine
2 #@NAME: EMBEDIAN SMARC-iMX8M COMPUTER ON MODULES with 2GB LPDDR4 MEMORY 2 #@NAME: EMBEDIAN SMARC-iMX8M COMPUTER ON MODULES with 2GB LPDDR4 MEMORY
3 #@SOC: i.MX8MQ 3 #@SOC: i.MX8MQ
4 #@DESCRIPTION: Machine configuration for Embedian SMARC-iMX8M 4 #@DESCRIPTION: Machine configuration for Embedian SMARC-iMX8M
5 #@MAINTAINER: Eric Lee <eric.lee@embedian.com> 5 #@MAINTAINER: Eric Lee <eric.lee@embedian.com>
6 # 6 #
7 # http://www.www.embedian.com 7 # http://www.www.embedian.com
8 8
9 MACHINEOVERRIDES =. "mx8:mx8m:mx8mq:" 9 MACHINEOVERRIDES =. "mx8:mx8m:mx8mq:"
10 10
11 require conf/machine/include/imx-base.inc 11 require conf/machine/include/imx-base.inc
12 require conf/machine/include/arm/arch-arm64.inc 12 require conf/machine/include/arm/arch-arm64.inc
13 13
14 MACHINE_FEATURES_append_smarcimx8m4g = " jailhouse"
15
14 MACHINE_FEATURES += " usbgadget vfat ext2 alsa serial pci wifi bluetooth" 16 MACHINE_FEATURES += " usbgadget vfat ext2 alsa serial pci wifi bluetooth"
15 17
16 IMAGE_FEATURES += "package-management" 18 IMAGE_FEATURES += "package-management"
17 19
18 # Embedian BSP default providers 20 # Embedian BSP default providers
19 PREFERRED_PROVIDER_virtual/kernel_smarcimx8m4g ?= "linux-smarcimx8m" 21 PREFERRED_PROVIDER_virtual/kernel_smarcimx8m4g ?= "linux-smarcimx8m"
20 PREFERRED_VERSION_linux-smarcimx8m4g_smarcimx8m4g = "4.19.35" 22 PREFERRED_VERSION_linux-smarcimx8m4g_smarcimx8m4g = "4.19.35"
21 23
22 KERNEL_DEVICETREE = " \ 24 KERNEL_DEVICETREE = " \
23 embedian/fsl-smarcimx8mq.dtb \ 25 embedian/fsl-smarcimx8mq.dtb \
24 embedian/fsl-smarcimx8mq-dcss-lvds.dtb \ 26 embedian/fsl-smarcimx8mq-dcss-lvds.dtb \
25 embedian/fsl-smarcimx8mq-lcdif-lvds.dtb \ 27 embedian/fsl-smarcimx8mq-lcdif-lvds.dtb \
26 embedian/fsl-smarcimx8mq-hdmi.dtb \ 28 embedian/fsl-smarcimx8mq-hdmi.dtb \
27 embedian/fsl-smarcimx8mq-dp.dtb \ 29 embedian/fsl-smarcimx8mq-dp.dtb \
28 embedian/fsl-smarcimx8mq-edp.dtb \ 30 embedian/fsl-smarcimx8mq-edp.dtb \
29 embedian/fsl-smarcimx8mq-dual-display.dtb \ 31 embedian/fsl-smarcimx8mq-dual-display.dtb \
30 " 32 "
31 IMAGE_BOOTFILES_DEPENDS += "imx-m4-demos:do_deploy" 33 IMAGE_BOOTFILES_DEPENDS += "imx-m4-demos:do_deploy"
32 IMAGE_BOOT_FILES += "imx8mq_m4_TCM_hello_world.bin imx8mq_m4_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin imx8mq_m4_TCM_rpmsg_lite_str_echo_rtos.bin" 34 IMAGE_BOOT_FILES += "imx8mq_m4_TCM_hello_world.bin imx8mq_m4_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin imx8mq_m4_TCM_rpmsg_lite_str_echo_rtos.bin"
33 35
34 PREFERRED_PROVIDER_u-boot_smarcimx8m4g = "u-boot-smarcimx8m" 36 PREFERRED_PROVIDER_u-boot_smarcimx8m4g = "u-boot-smarcimx8m"
35 PREFERRED_PROVIDER_virtual/bootloader_smarcimx8m4g = "u-boot-smarcimx8m" 37 PREFERRED_PROVIDER_virtual/bootloader_smarcimx8m4g = "u-boot-smarcimx8m"
36 38
37 UBOOT_CONFIG ??= "sd" 39 UBOOT_CONFIG ??= "sd"
38 UBOOT_CONFIG[sd] = "smarcimx8mq_4g_ser3_defconfig,sdcard" 40 UBOOT_CONFIG[sd] = "smarcimx8mq_4g_ser3_defconfig,sdcard"
39 SPL_BINARY = "spl/u-boot-spl.bin" 41 SPL_BINARY = "spl/u-boot-spl.bin"
40 42
41 # Set DDR FIRMWARE 43 # Set DDR FIRMWARE
42 DDR_FIRMWARE_NAME = "lpddr4_pmu_train_1d_imem.bin lpddr4_pmu_train_1d_dmem.bin lpddr4_pmu_train_2d_imem.bin lpddr4_pmu_train_2d_dmem.bin" 44 DDR_FIRMWARE_NAME = "lpddr4_pmu_train_1d_imem.bin lpddr4_pmu_train_1d_dmem.bin lpddr4_pmu_train_2d_imem.bin lpddr4_pmu_train_2d_dmem.bin"
43 45
44 # Set U-Boot DTB 46 # Set U-Boot DTB
45 UBOOT_DTB_NAME = "fsl-smarcimx8mq.dtb" 47 UBOOT_DTB_NAME = "fsl-smarcimx8mq.dtb"
46 48
47 # Set imx-mkimage boot target 49 # Set imx-mkimage boot target
48 IMXBOOT_TARGETS = "flash_evk flash_evk_no_hdmi flash_dp_evk" 50 IMXBOOT_TARGETS = "flash_evk flash_evk_no_hdmi flash_dp_evk"
49 51
50 SERIAL_CONSOLE = "115200 ttymxc0" 52 SERIAL_CONSOLE = "115200 ttymxc0"
51 53
52 IMAGE_BOOTLOADER = "imx-boot" 54 IMAGE_BOOTLOADER = "imx-boot"
53 55
54 LOADADDR = "" 56 LOADADDR = ""
55 UBOOT_MAKE_TARGET = "" 57 UBOOT_MAKE_TARGET = ""
56 IMX_BOOT_SEEK = "33" 58 IMX_BOOT_SEEK = "33"
57 59
58 MACHINE_EXTRA_RDEPENDS += " \ 60 MACHINE_EXTRA_RDEPENDS += " \
59 imx-boot \ 61 imx-boot \
60 packagegroup-tools-bluetooth \ 62 packagegroup-tools-bluetooth \
61 pm-utils \ 63 pm-utils \
62 kmod \ 64 kmod \
63 hdparm \ 65 hdparm \
64 gptfdisk \ 66 gptfdisk \
65 lftp \ 67 lftp \
66 vim \ 68 vim \
67 ntp \ 69 ntp \
68 boost \ 70 boost \
69 nodejs \ 71 nodejs \
70 networkmanager \ 72 networkmanager \
71 imx-gpu-viv \ 73 imx-gpu-viv \
74 firmware-imx-sdma \
72 " 75 "
73 76
74 IMAGE_FSTYPES = "tar.bz2" 77 IMAGE_FSTYPES = "tar.bz2"
75 78
76 # Ship all kernel modules by default 79 # Ship all kernel modules by default
77 MACHINE_EXTRA_RRECOMMENDS = "kernel-modules" 80 MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
78 81
79 MACHINE_FIRMWARE_append_mx8 = " linux-firmware-ath10k" 82 MACHINE_FIRMWARE_append_mx8 = " linux-firmware-ath10k"
80 83