Commit 24429fdecb972c4b5965bbbfff139ec98e749907

Authored by Eric Lee
1 parent 2a81539004

Fix firmware install bug

Showing 2 changed files with 10 additions and 2 deletions Inline Diff

conf/machine/smarcimx8mq2g.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/tune-cortexa53.inc 12 require conf/machine/include/tune-cortexa53.inc
13 require conf/machine/include/smarc-common.inc 13 require conf/machine/include/smarc-common.inc
14 14
15 MACHINE_FEATURES += " usbgadget vfat ext2 alsa serial pci wifi bluetooth" 15 MACHINE_FEATURES += " usbgadget vfat ext2 alsa serial pci wifi bluetooth"
16 16
17 # Embedian BSP default providers 17 # Embedian BSP default providers
18 PREFERRED_PROVIDER_virtual/kernel_smarcimx8mq2g ?= "linux-smarcimx8mq" 18 PREFERRED_PROVIDER_virtual/kernel_smarcimx8mq2g ?= "linux-smarcimx8mq"
19 PREFERRED_VERSION_linux-smarcimx8mq4g_smarcimx8mq2g = "5.4" 19 PREFERRED_VERSION_linux-smarcimx8mq4g_smarcimx8mq2g = "5.4"
20 20
21 KERNEL_DEVICETREE = " \ 21 KERNEL_DEVICETREE = " \
22 embedian/imx8mq-smarc.dtb \ 22 embedian/imx8mq-smarc.dtb \
23 embedian/imx8mq-smarc-dcss-lvds.dtb \ 23 embedian/imx8mq-smarc-dcss-lvds.dtb \
24 embedian/imx8mq-smarc-lcdif-lvds.dtb \ 24 embedian/imx8mq-smarc-lcdif-lvds.dtb \
25 embedian/imx8mq-smarc-hdmi.dtb \ 25 embedian/imx8mq-smarc-hdmi.dtb \
26 embedian/imx8mq-smarc-dp.dtb \ 26 embedian/imx8mq-smarc-dp.dtb \
27 embedian/imx8mq-smarc-dual-display.dtb \ 27 embedian/imx8mq-smarc-dual-display.dtb \
28 embedian/imx8mq-smarc-m4.dtb \ 28 embedian/imx8mq-smarc-m4.dtb \
29 embedian/imx8mq-smarc-m4-dcss-lvds.dtb \ 29 embedian/imx8mq-smarc-m4-dcss-lvds.dtb \
30 embedian/imx8mq-smarc-m4-lcdif-lvds.dtb \ 30 embedian/imx8mq-smarc-m4-lcdif-lvds.dtb \
31 embedian/imx8mq-smarc-m4-hdmi.dtb \ 31 embedian/imx8mq-smarc-m4-hdmi.dtb \
32 embedian/imx8mq-smarc-m4-dp.dtb \ 32 embedian/imx8mq-smarc-m4-dp.dtb \
33 embedian/imx8mq-smarc-m4-dual-display.dtb \ 33 embedian/imx8mq-smarc-m4-dual-display.dtb \
34 " 34 "
35 MACHINE_EXTRA_RRECOMMENDS_append_mx8mq = " imx-m4-demos" 35 MACHINE_EXTRA_RRECOMMENDS_append_mx8mq = " imx-m4-demos"
36 IMAGE_BOOTFILES_DEPENDS += "imx-m4-demos:do_deploy" 36 IMAGE_BOOTFILES_DEPENDS += "imx-m4-demos:do_deploy"
37 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" 37 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"
38 38
39 PREFERRED_PROVIDER_u-boot_smarcimx8mq2g = "u-boot-smarcimx8mq" 39 PREFERRED_PROVIDER_u-boot_smarcimx8mq2g = "u-boot-smarcimx8mq"
40 PREFERRED_PROVIDER_virtual/bootloader_smarcimx8mq2g = "u-boot-smarcimx8mq" 40 PREFERRED_PROVIDER_virtual/bootloader_smarcimx8mq2g = "u-boot-smarcimx8mq"
41 41
42 UBOOT_CONFIG ??= "sd" 42 UBOOT_CONFIG ??= "sd"
43 UBOOT_CONFIG[sd] = "smarcimx8mq_2g_ser3_defconfig,sdcard" 43 UBOOT_CONFIG[sd] = "smarcimx8mq_2g_ser3_defconfig,sdcard"
44 SPL_BINARY = "spl/u-boot-spl.bin" 44 SPL_BINARY = "spl/u-boot-spl.bin"
45 45
46 # Set DDR FIRMWARE 46 # Set DDR FIRMWARE
47 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" 47 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"
48 48
49 # Set U-Boot DTB 49 # Set U-Boot DTB
50 UBOOT_DTB_NAME = "imx8mq-smarc.dtb" 50 UBOOT_DTB_NAME = "imx8mq-smarc.dtb"
51 51
52 # Set imx-mkimage boot target 52 # Set imx-mkimage boot target
53 IMXBOOT_TARGETS = "flash_evk flash_evk_no_hdmi flash_dp_evk" 53 IMXBOOT_TARGETS = "flash_evk flash_evk_no_hdmi flash_dp_evk"
54 54
55 SERIAL_CONSOLE = "115200 ttymxc0" 55 SERIAL_CONSOLE = "115200 ttymxc0"
56 56
57 IMAGE_BOOTLOADER = "imx-boot" 57 IMAGE_BOOTLOADER = "imx-boot"
58 58
59 LOADADDR = "" 59 LOADADDR = ""
60 UBOOT_MAKE_TARGET = "" 60 UBOOT_MAKE_TARGET = ""
61 IMX_BOOT_SEEK = "33" 61 IMX_BOOT_SEEK = "33"
62 62
63 MACHINE_EXTRA_RDEPENDS += " \ 63 MACHINE_EXTRA_RDEPENDS += " \
64 imx-boot \ 64 imx-boot \
65 packagegroup-tools-bluetooth \ 65 packagegroup-tools-bluetooth \
66 pm-utils \ 66 pm-utils \
67 kmod \ 67 kmod \
68 hdparm \ 68 hdparm \
69 gptfdisk \ 69 gptfdisk \
70 lftp \ 70 lftp \
71 vim \ 71 vim \
72 ntp \ 72 ntp \
73 boost \ 73 boost \
74 nodejs \ 74 nodejs \
75 networkmanager \ 75 networkmanager \
76 imx-gpu-viv \ 76 imx-gpu-viv \
77 " 77 "
78 78
79 # Packages added to all images (including core-image-minimal) 79 # Packages added to all images (including core-image-minimal)
80 80
81 # eIQ Machine Learning. Note that many of the features require Qt 5. Disable 81 # eIQ Machine Learning. Note that many of the features require Qt 5. Disable
82 # this when you build image without QT 5. 82 # this when you build image without QT 5.
83 IMAGE_INSTALL_append = " \ 83 IMAGE_INSTALL_append = " \
84 packagegroup-imx-ml \ 84 packagegroup-imx-ml \
85 firmware-imx-sdma \
86 firmware-imx-regulatory \
85 fsl-rc-local \ 87 fsl-rc-local \
86 " 88 "
87 #IMAGE_INSTALL_append = " \ 89 #IMAGE_INSTALL_append = " \
90 # firmware-imx-sdma \
91 # firmware-imx-regulatory \
88 # fsl-rc-local \ 92 # fsl-rc-local \
89 # " 93 # "
90 94
91 IMAGE_FSTYPES = "tar.bz2" 95 IMAGE_FSTYPES = "tar.bz2"
92 96
93 # Ship all kernel modules by default 97 # Ship all kernel modules by default
94 MACHINE_EXTRA_RRECOMMENDS = "kernel-modules" 98 MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
95 99
96 MACHINE_FIRMWARE_append_mx8 = " linux-firmware-ath10k firmware-imx-sdma firmware-imx-regulatory" 100 MACHINE_FIRMWARE_append_mx8 = " linux-firmware-ath10k"
97 101
conf/machine/smarcimx8mq4g.conf
1 #@TYPE: Machine 1 #@TYPE: Machine
2 #@NAME: EMBEDIAN SMARC-iMX8M COMPUTER ON MODULES with 4GB LPDDR4 MEMORY 2 #@NAME: EMBEDIAN SMARC-iMX8M COMPUTER ON MODULES with 4GB 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/tune-cortexa53.inc 12 require conf/machine/include/tune-cortexa53.inc
13 require conf/machine/include/smarc-common.inc 13 require conf/machine/include/smarc-common.inc
14 14
15 MACHINE_FEATURES += " usbgadget vfat ext2 alsa serial pci wifi bluetooth" 15 MACHINE_FEATURES += " usbgadget vfat ext2 alsa serial pci wifi bluetooth"
16 16
17 # Embedian BSP default providers 17 # Embedian BSP default providers
18 PREFERRED_PROVIDER_virtual/kernel_smarcimx8mq4g ?= "linux-smarcimx8mq" 18 PREFERRED_PROVIDER_virtual/kernel_smarcimx8mq4g ?= "linux-smarcimx8mq"
19 PREFERRED_VERSION_linux-smarcimx8mq4g_smarcimx8mq4g = "5.4" 19 PREFERRED_VERSION_linux-smarcimx8mq4g_smarcimx8mq4g = "5.4"
20 20
21 KERNEL_DEVICETREE = " \ 21 KERNEL_DEVICETREE = " \
22 embedian/imx8mq-smarc.dtb \ 22 embedian/imx8mq-smarc.dtb \
23 embedian/imx8mq-smarc-dcss-lvds.dtb \ 23 embedian/imx8mq-smarc-dcss-lvds.dtb \
24 embedian/imx8mq-smarc-lcdif-lvds.dtb \ 24 embedian/imx8mq-smarc-lcdif-lvds.dtb \
25 embedian/imx8mq-smarc-hdmi.dtb \ 25 embedian/imx8mq-smarc-hdmi.dtb \
26 embedian/imx8mq-smarc-dp.dtb \ 26 embedian/imx8mq-smarc-dp.dtb \
27 embedian/imx8mq-smarc-dual-display.dtb \ 27 embedian/imx8mq-smarc-dual-display.dtb \
28 embedian/imx8mq-smarc-m4.dtb \ 28 embedian/imx8mq-smarc-m4.dtb \
29 embedian/imx8mq-smarc-m4-dcss-lvds.dtb \ 29 embedian/imx8mq-smarc-m4-dcss-lvds.dtb \
30 embedian/imx8mq-smarc-m4-lcdif-lvds.dtb \ 30 embedian/imx8mq-smarc-m4-lcdif-lvds.dtb \
31 embedian/imx8mq-smarc-m4-hdmi.dtb \ 31 embedian/imx8mq-smarc-m4-hdmi.dtb \
32 embedian/imx8mq-smarc-m4-dp.dtb \ 32 embedian/imx8mq-smarc-m4-dp.dtb \
33 embedian/imx8mq-smarc-m4-dual-display.dtb \ 33 embedian/imx8mq-smarc-m4-dual-display.dtb \
34 " 34 "
35 MACHINE_EXTRA_RRECOMMENDS_append_mx8mq = " imx-m4-demos" 35 MACHINE_EXTRA_RRECOMMENDS_append_mx8mq = " imx-m4-demos"
36 IMAGE_BOOTFILES_DEPENDS += "imx-m4-demos:do_deploy" 36 IMAGE_BOOTFILES_DEPENDS += "imx-m4-demos:do_deploy"
37 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" 37 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"
38 38
39 PREFERRED_PROVIDER_u-boot_smarcimx8mq4g = "u-boot-smarcimx8mq" 39 PREFERRED_PROVIDER_u-boot_smarcimx8mq4g = "u-boot-smarcimx8mq"
40 PREFERRED_PROVIDER_virtual/bootloader_smarcimx8mq4g = "u-boot-smarcimx8mq" 40 PREFERRED_PROVIDER_virtual/bootloader_smarcimx8mq4g = "u-boot-smarcimx8mq"
41 41
42 UBOOT_CONFIG ??= "sd" 42 UBOOT_CONFIG ??= "sd"
43 UBOOT_CONFIG[sd] = "smarcimx8mq_4g_ser3_defconfig,sdcard" 43 UBOOT_CONFIG[sd] = "smarcimx8mq_4g_ser3_defconfig,sdcard"
44 SPL_BINARY = "spl/u-boot-spl.bin" 44 SPL_BINARY = "spl/u-boot-spl.bin"
45 45
46 # Set DDR FIRMWARE 46 # Set DDR FIRMWARE
47 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" 47 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"
48 48
49 # Set U-Boot DTB 49 # Set U-Boot DTB
50 UBOOT_DTB_NAME = "imx8mq-smarc.dtb" 50 UBOOT_DTB_NAME = "imx8mq-smarc.dtb"
51 51
52 # Set imx-mkimage boot target 52 # Set imx-mkimage boot target
53 IMXBOOT_TARGETS = "flash_evk flash_evk_no_hdmi flash_dp_evk" 53 IMXBOOT_TARGETS = "flash_evk flash_evk_no_hdmi flash_dp_evk"
54 54
55 SERIAL_CONSOLE = "115200 ttymxc0" 55 SERIAL_CONSOLE = "115200 ttymxc0"
56 56
57 IMAGE_BOOTLOADER = "imx-boot" 57 IMAGE_BOOTLOADER = "imx-boot"
58 58
59 LOADADDR = "" 59 LOADADDR = ""
60 UBOOT_MAKE_TARGET = "" 60 UBOOT_MAKE_TARGET = ""
61 IMX_BOOT_SEEK = "33" 61 IMX_BOOT_SEEK = "33"
62 62
63 MACHINE_EXTRA_RDEPENDS += " \ 63 MACHINE_EXTRA_RDEPENDS += " \
64 imx-boot \ 64 imx-boot \
65 packagegroup-tools-bluetooth \ 65 packagegroup-tools-bluetooth \
66 pm-utils \ 66 pm-utils \
67 kmod \ 67 kmod \
68 hdparm \ 68 hdparm \
69 gptfdisk \ 69 gptfdisk \
70 lftp \ 70 lftp \
71 vim \ 71 vim \
72 ntp \ 72 ntp \
73 boost \ 73 boost \
74 nodejs \ 74 nodejs \
75 networkmanager \ 75 networkmanager \
76 imx-gpu-viv \ 76 imx-gpu-viv \
77 " 77 "
78 78
79 # Packages added to all images (including core-image-minimal) 79 # Packages added to all images (including core-image-minimal)
80 80
81 # eIQ Machine Learning. Note that many of the features require Qt 5. Disable 81 # eIQ Machine Learning. Note that many of the features require Qt 5. Disable
82 # this when you build image without QT 5. 82 # this when you build image without QT 5.
83 IMAGE_INSTALL_append = " \ 83 IMAGE_INSTALL_append = " \
84 packagegroup-imx-ml \ 84 packagegroup-imx-ml \
85 firmware-imx-sdma \
86 firmware-imx-regulatory \
85 fsl-rc-local \ 87 fsl-rc-local \
86 " 88 "
87 #IMAGE_INSTALL_append = " \ 89 #IMAGE_INSTALL_append = " \
90 # firmware-imx-sdma \
91 # firmware-imx-regulatory \
88 # fsl-rc-local \ 92 # fsl-rc-local \
89 # " 93 # "
90 94
91 IMAGE_FSTYPES = "tar.bz2" 95 IMAGE_FSTYPES = "tar.bz2"
92 96
93 # Ship all kernel modules by default 97 # Ship all kernel modules by default
94 MACHINE_EXTRA_RRECOMMENDS = "kernel-modules" 98 MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
95 99
96 MACHINE_FIRMWARE_append_mx8 = " linux-firmware-ath10k firmware-imx-sdma firmware-imx-regulatory" 100 MACHINE_FIRMWARE_append_mx8 = " linux-firmware-ath10k"
97 101