Eric Lee / meta-smarcimx8m

Download as
Browse Code ยป

Commit 6c461cb769b9e9850341bba1bd71335c718ee443

Authored by Eric Lee
1 parent 6acbd0d057
Exists in 8mq_5.10.9_1.0.0_gatesgarth

Add SDMA to yocto rootfs

Showing 3 changed files with 8 additions and 2 deletions Inline Diff

conf/machine/smarcimx8mp4g.conf
Diff comments   View file @ 6c461cb
1 #@TYPE: Machine 1 #@TYPE: Machine
2 #@NAME: EMBEDIAN SMARC-iMX8MP CPU Module with 4GB LPDDR4 2 #@NAME: EMBEDIAN SMARC-iMX8MP CPU Module with 4GB LPDDR4
3 #@SOC: i.MX8MP 3 #@SOC: i.MX8MP
4 #@DESCRIPTION: Machine configuration for Embedian SMARC-iMX8MP 4 #@DESCRIPTION: Machine configuration for Embedian SMARC-iMX8MP
5 #@MAINTAINER: Eric Lee <eric.lee@embedian.com> 5 #@MAINTAINER: Eric Lee <eric.lee@embedian.com>
6 6
7 MACHINEOVERRIDES =. "mx8:mx8m:mx8mp:" 7 MACHINEOVERRIDES =. "mx8:mx8m:mx8mp:"
8 8
9 require conf/machine/include/imx-base.inc 9 require conf/machine/include/imx-base.inc
10 require conf/machine/include/tune-cortexa53.inc 10 require conf/machine/include/tune-cortexa53.inc
11 require conf/machine/include/smarc-common.inc 11 require conf/machine/include/smarc-common.inc
12 12
13 MACHINE_FEATURES += " usbgadget vfat ext2 alsa serial pci wifi bluetooth optee nxp8997" 13 MACHINE_FEATURES += " usbgadget vfat ext2 alsa serial pci wifi bluetooth optee nxp8997"
14 14
15 IMAGE_FEATURES += "package-management" 15 IMAGE_FEATURES += "package-management"
16 16
17 # Embedian BSP default providers 17 # Embedian BSP default providers
18 PREFERRED_PROVIDER_virtual/kernel_smarcimx8mp4g ?= "linux-smarcimx8mp" 18 PREFERRED_PROVIDER_virtual/kernel_smarcimx8mp4g ?= "linux-smarcimx8mp"
19 PREFERRED_VERSION_linux-smarcimx8mp4g_smarcimx8mp4g = "5.10" 19 PREFERRED_VERSION_linux-smarcimx8mp4g_smarcimx8mp4g = "5.10"
20 20
21 KERNEL_DEVICETREE = " \ 21 KERNEL_DEVICETREE = " \
22 embedian/imx8mp-smarc.dtb \ 22 embedian/imx8mp-smarc.dtb \
23 embedian/imx8mp-smarc-hdmi.dtb \ 23 embedian/imx8mp-smarc-hdmi.dtb \
24 embedian/imx8mp-smarc-lvds.dtb \ 24 embedian/imx8mp-smarc-lvds.dtb \
25 embedian/imx8mp-smarc-m7.dtb \ 25 embedian/imx8mp-smarc-m7.dtb \
26 " 26 "
27 27
28 WKS_FILE_DEPENDS_append = " imx-m7-demos" 28 WKS_FILE_DEPENDS_append = " imx-m7-demos"
29 IMAGE_BOOT_FILES += "imx8mp_m7_TCM_hello_world.bin \ 29 IMAGE_BOOT_FILES += "imx8mp_m7_TCM_hello_world.bin \
30 imx8mp_m7_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \ 30 imx8mp_m7_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \
31 imx8mp_m7_TCM_rpmsg_lite_str_echo_rtos.bin \ 31 imx8mp_m7_TCM_rpmsg_lite_str_echo_rtos.bin \
32 " 32 "
33 33
34 PREFERRED_PROVIDER_u-boot_smarcimx8mp4g = "u-boot-smarcimx8mp" 34 PREFERRED_PROVIDER_u-boot_smarcimx8mp4g = "u-boot-smarcimx8mp"
35 PREFERRED_PROVIDER_virtual/bootloader_smarcimx8mp4g = "u-boot-smarcimx8mp" 35 PREFERRED_PROVIDER_virtual/bootloader_smarcimx8mp4g = "u-boot-smarcimx8mp"
36 36
37 UBOOT_CONFIG ??= "sd" 37 UBOOT_CONFIG ??= "sd"
38 UBOOT_CONFIG[sd] = "smarcimx8mp_4g_ser3_defconfig,sdcard" 38 UBOOT_CONFIG[sd] = "smarcimx8mp_4g_ser3_defconfig,sdcard"
39 SPL_BINARY = "spl/u-boot-spl.bin" 39 SPL_BINARY = "spl/u-boot-spl.bin"
40 40
41 # Set DDR FIRMWARE 41 # Set DDR FIRMWARE
42 DDR_FIRMWARE_NAME = "lpddr4_pmu_train_1d_dmem_202006.bin lpddr4_pmu_train_1d_imem_202006.bin lpddr4_pmu_train_2d_dmem_202006.bin lpddr4_pmu_train_2d_imem_202006.bin" 42 DDR_FIRMWARE_NAME = "lpddr4_pmu_train_1d_dmem_202006.bin lpddr4_pmu_train_1d_imem_202006.bin lpddr4_pmu_train_2d_dmem_202006.bin lpddr4_pmu_train_2d_imem_202006.bin"
43 43
44 # Set u-boot DTB 44 # Set u-boot DTB
45 UBOOT_DTB_NAME = "imx8mp-smarc.dtb" 45 UBOOT_DTB_NAME = "imx8mp-smarc.dtb"
46 46
47 # Set imx-mkimage boot target 47 # Set imx-mkimage boot target
48 IMXBOOT_TARGETS = "flash_evk" 48 IMXBOOT_TARGETS = "flash_evk"
49 49
50 # Set Serial console 50 # Set Serial console
51 SERIAL_CONSOLES = "115200;ttymxc1" 51 SERIAL_CONSOLES = "115200;ttymxc1"
52 52
53 IMAGE_BOOTLOADER = "imx-boot" 53 IMAGE_BOOTLOADER = "imx-boot"
54 54
55 LOADADDR = "" 55 LOADADDR = ""
56 UBOOT_SUFFIX = "bin" 56 UBOOT_SUFFIX = "bin"
57 UBOOT_MAKE_TARGET = "" 57 UBOOT_MAKE_TARGET = ""
58 IMX_BOOT_SEEK = "32" 58 IMX_BOOT_SEEK = "32"
59 59
60 OPTEE_BIN_EXT = "8mp" 60 OPTEE_BIN_EXT = "8mp"
61 61
62 MACHINE_EXTRA_RDEPENDS += " \ 62 MACHINE_EXTRA_RDEPENDS += " \
63 imx-boot \ 63 imx-boot \
64 packagegroup-tools-bluetooth \ 64 packagegroup-tools-bluetooth \
65 pm-utils \ 65 pm-utils \
66 kmod \ 66 kmod \
67 hdparm \ 67 hdparm \
68 gptfdisk \ 68 gptfdisk \
69 lftp \ 69 lftp \
70 vim \ 70 vim \
71 ntp \ 71 ntp \
72 boost \ 72 boost \
73 nodejs \ 73 nodejs \
74 networkmanager \ 74 networkmanager \
75 android-tools \ 75 android-tools \
76 " 76 "
77 77
78 # eIQ Machine Learning. Note that many of the features require Qt 5. Disable 78 # eIQ Machine Learning. Note that many of the features require Qt 5. Disable
79 # this when you build image without QT 5. 79 # this when you build image without QT 5.
80 IMAGE_INSTALL_append = " \ 80 IMAGE_INSTALL_append = " \
81 packagegroup-imx-ml \ 81 packagegroup-imx-ml \
82 firmware-imx-sdma \
83 firmware-imx-regulatory \
84 fsl-rc-local \
82 " 85 "
83 86
84 #TOOLCHAIN_TARGET_TASK_append += " tensorflow-lite-staticdev tensorflow-lite-dev armnn-dev onnxruntimedev" 87 #TOOLCHAIN_TARGET_TASK_append += " tensorflow-lite-staticdev tensorflow-lite-dev armnn-dev onnxruntimedev"
85 88
86 IMAGE_FSTYPES = "tar.bz2" 89 IMAGE_FSTYPES = "tar.bz2"
87 90
88 # Ship all kernel modules by default 91 # Ship all kernel modules by default
89 MACHINE_EXTRA_RRECOMMENDS = "kernel-modules" 92 MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
90 93
91 # Add additional firmware 94 # Add additional firmware
92 MACHINE_FIRMWARE_append = " linux-firmware-ath10k" 95 MACHINE_FIRMWARE_append = " linux-firmware-ath10k"
93 96
conf/machine/smarcimx8mp6g.conf
Diff comments   View file @ 6c461cb
1 #@TYPE: Machine 1 #@TYPE: Machine
2 #@NAME: EMBEDIAN SMARC-iMX8MP CPU Module with 4GB LPDDR4 2 #@NAME: EMBEDIAN SMARC-iMX8MP CPU Module with 4GB LPDDR4
3 #@SOC: i.MX8MP 3 #@SOC: i.MX8MP
4 #@DESCRIPTION: Machine configuration for Embedian SMARC-iMX8MP 4 #@DESCRIPTION: Machine configuration for Embedian SMARC-iMX8MP
5 #@MAINTAINER: Eric Lee <eric.lee@embedian.com> 5 #@MAINTAINER: Eric Lee <eric.lee@embedian.com>
6 6
7 MACHINEOVERRIDES =. "mx8:mx8m:mx8mp:" 7 MACHINEOVERRIDES =. "mx8:mx8m:mx8mp:"
8 8
9 require conf/machine/include/imx-base.inc 9 require conf/machine/include/imx-base.inc
10 require conf/machine/include/tune-cortexa53.inc 10 require conf/machine/include/tune-cortexa53.inc
11 require conf/machine/include/smarc-common.inc 11 require conf/machine/include/smarc-common.inc
12 12
13 MACHINE_FEATURES += " usbgadget vfat ext2 alsa serial pci wifi bluetooth optee nxp8997" 13 MACHINE_FEATURES += " usbgadget vfat ext2 alsa serial pci wifi bluetooth optee nxp8997"
14 14
15 IMAGE_FEATURES += "package-management" 15 IMAGE_FEATURES += "package-management"
16 16
17 # Embedian BSP default providers 17 # Embedian BSP default providers
18 PREFERRED_PROVIDER_virtual/kernel_smarcimx8mp6g ?= "linux-smarcimx8mp" 18 PREFERRED_PROVIDER_virtual/kernel_smarcimx8mp6g ?= "linux-smarcimx8mp"
19 PREFERRED_VERSION_linux-smarcimx8mp6g_smarcimx8mp6g = "5.10" 19 PREFERRED_VERSION_linux-smarcimx8mp6g_smarcimx8mp6g = "5.10"
20 20
21 KERNEL_DEVICETREE = " \ 21 KERNEL_DEVICETREE = " \
22 embedian/imx8mp-smarc.dtb \ 22 embedian/imx8mp-smarc.dtb \
23 embedian/imx8mp-smarc-hdmi.dtb \ 23 embedian/imx8mp-smarc-hdmi.dtb \
24 embedian/imx8mp-smarc-lvds.dtb \ 24 embedian/imx8mp-smarc-lvds.dtb \
25 embedian/imx8mp-smarc-m7.dtb \ 25 embedian/imx8mp-smarc-m7.dtb \
26 " 26 "
27 27
28 WKS_FILE_DEPENDS_append = " imx-m7-demos" 28 WKS_FILE_DEPENDS_append = " imx-m7-demos"
29 IMAGE_BOOT_FILES += "imx8mp_m7_TCM_hello_world.bin \ 29 IMAGE_BOOT_FILES += "imx8mp_m7_TCM_hello_world.bin \
30 imx8mp_m7_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \ 30 imx8mp_m7_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \
31 imx8mp_m7_TCM_rpmsg_lite_str_echo_rtos.bin \ 31 imx8mp_m7_TCM_rpmsg_lite_str_echo_rtos.bin \
32 " 32 "
33 33
34 PREFERRED_PROVIDER_u-boot_smarcimx8mp6g = "u-boot-smarcimx8mp" 34 PREFERRED_PROVIDER_u-boot_smarcimx8mp6g = "u-boot-smarcimx8mp"
35 PREFERRED_PROVIDER_virtual/bootloader_smarcimx8mp6g = "u-boot-smarcimx8mp" 35 PREFERRED_PROVIDER_virtual/bootloader_smarcimx8mp6g = "u-boot-smarcimx8mp"
36 36
37 UBOOT_CONFIG ??= "sd" 37 UBOOT_CONFIG ??= "sd"
38 UBOOT_CONFIG[sd] = "smarcimx8mp_6g_ser3_defconfig,sdcard" 38 UBOOT_CONFIG[sd] = "smarcimx8mp_6g_ser3_defconfig,sdcard"
39 SPL_BINARY = "spl/u-boot-spl.bin" 39 SPL_BINARY = "spl/u-boot-spl.bin"
40 40
41 # Set DDR FIRMWARE 41 # Set DDR FIRMWARE
42 DDR_FIRMWARE_NAME = "lpddr4_pmu_train_1d_dmem_202006.bin lpddr4_pmu_train_1d_imem_202006.bin lpddr4_pmu_train_2d_dmem_202006.bin lpddr4_pmu_train_2d_imem_202006.bin" 42 DDR_FIRMWARE_NAME = "lpddr4_pmu_train_1d_dmem_202006.bin lpddr4_pmu_train_1d_imem_202006.bin lpddr4_pmu_train_2d_dmem_202006.bin lpddr4_pmu_train_2d_imem_202006.bin"
43 43
44 # Set u-boot DTB 44 # Set u-boot DTB
45 UBOOT_DTB_NAME = "imx8mp-smarc.dtb" 45 UBOOT_DTB_NAME = "imx8mp-smarc.dtb"
46 46
47 # Set imx-mkimage boot target 47 # Set imx-mkimage boot target
48 IMXBOOT_TARGETS = "flash_evk" 48 IMXBOOT_TARGETS = "flash_evk"
49 49
50 # Set Serial console 50 # Set Serial console
51 SERIAL_CONSOLES = "115200;ttymxc1" 51 SERIAL_CONSOLES = "115200;ttymxc1"
52 52
53 IMAGE_BOOTLOADER = "imx-boot" 53 IMAGE_BOOTLOADER = "imx-boot"
54 54
55 LOADADDR = "" 55 LOADADDR = ""
56 UBOOT_SUFFIX = "bin" 56 UBOOT_SUFFIX = "bin"
57 UBOOT_MAKE_TARGET = "" 57 UBOOT_MAKE_TARGET = ""
58 IMX_BOOT_SEEK = "32" 58 IMX_BOOT_SEEK = "32"
59 59
60 OPTEE_BIN_EXT = "8mp" 60 OPTEE_BIN_EXT = "8mp"
61 61
62 MACHINE_EXTRA_RDEPENDS += " \ 62 MACHINE_EXTRA_RDEPENDS += " \
63 imx-boot \ 63 imx-boot \
64 packagegroup-tools-bluetooth \ 64 packagegroup-tools-bluetooth \
65 pm-utils \ 65 pm-utils \
66 kmod \ 66 kmod \
67 hdparm \ 67 hdparm \
68 gptfdisk \ 68 gptfdisk \
69 lftp \ 69 lftp \
70 vim \ 70 vim \
71 ntp \ 71 ntp \
72 boost \ 72 boost \
73 nodejs \ 73 nodejs \
74 networkmanager \ 74 networkmanager \
75 android-tools \ 75 android-tools \
76 " 76 "
77 77
78 # eIQ Machine Learning. Note that many of the features require Qt 5. Disable 78 # eIQ Machine Learning. Note that many of the features require Qt 5. Disable
79 # this when you build image without QT 5. 79 # this when you build image without QT 5.
80 IMAGE_INSTALL_append = " \ 80 IMAGE_INSTALL_append = " \
81 packagegroup-imx-ml \ 81 packagegroup-imx-ml \
82 firmware-imx-sdma \
83 firmware-imx-regulatory \
84 fsl-rc-local \
82 " 85 "
83 86
84 TOOLCHAIN_TARGET_TASK_append += " tensorflow-lite-staticdev tensorflow-lite-dev armnn-dev onnxruntimedev" 87 TOOLCHAIN_TARGET_TASK_append += " tensorflow-lite-staticdev tensorflow-lite-dev armnn-dev onnxruntimedev"
85 88
86 IMAGE_FSTYPES = "tar.bz2" 89 IMAGE_FSTYPES = "tar.bz2"
87 90
88 # Ship all kernel modules by default 91 # Ship all kernel modules by default
89 MACHINE_EXTRA_RRECOMMENDS = "kernel-modules" 92 MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
90 93
91 # Add additional firmware 94 # Add additional firmware
92 MACHINE_FIRMWARE_append = " linux-firmware-ath10k" 95 MACHINE_FIRMWARE_append = " linux-firmware-ath10k"
93 96
recipes-kernel/linux/linux-smarcimx8mp_5.10.bb
Diff comments   View file @ 6c461cb
1 # Copyright (C) 2013-2016 Freescale Semiconductor 1 # Copyright (C) 2013-2016 Freescale Semiconductor
2 # Copyright 2017-2021 NXP 2 # Copyright 2017-2021 NXP
3 # Released under the MIT license (see COPYING.MIT for the terms) 3 # Released under the MIT license (see COPYING.MIT for the terms)
4 4
5 SUMMARY = "Linux Kernel provided and supported by NXP" 5 SUMMARY = "Linux Kernel provided and supported by NXP"
6 DESCRIPTION = "Linux Kernel provided and supported by NXP with focus on \ 6 DESCRIPTION = "Linux Kernel provided and supported by NXP with focus on \
7 i.MX Family Reference Boards. It includes support for many IPs such as GPU, VPU and IPU." 7 i.MX Family Reference Boards. It includes support for many IPs such as GPU, VPU and IPU."
8 8
9 require recipes-kernel/linux/linux-imx.inc 9 require recipes-kernel/linux/linux-imx.inc
10 10
11 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" 11 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
12 12
13 DEPENDS += "lzop-native bc-native" 13 DEPENDS += "lzop-native bc-native"
14 14
15 SRCBRANCH = "smarc_8mp_lf-5.10.y" 15 SRCBRANCH = "smarc_8mp_lf-5.10.y"
16 LOCALVERSION = "-1.0.0" 16 LOCALVERSION = "-1.0.0"
17 KERNEL_DEFCONFIG = "${S}/arch/arm64/configs/smarcimx8mp_defconfig" 17 KERNEL_DEFCONFIG = "${S}/arch/arm64/configs/smarcimx8mp_defconfig"
18 18
19 KERNEL_SRC ?= "git@git.embedian.com:developer/smarc-fsl-linux-kernel.git;protocol=git" 19 KERNEL_SRC ?= "git@git.embedian.com:developer/smarc-fsl-linux-kernel.git;protocol=git"
20 SRC_URI = "${EMB_KERNEL_MIRROR};protocol=ssh;branch=${SRCBRANCH}" 20 SRC_URI = "${EMB_KERNEL_MIRROR};protocol=ssh;branch=${SRCBRANCH}"
21 SRCREV = "546afca980851426df56db1ff3994bbeddb692a8" 21 SRCREV = "5e48acb5632181b79396eaf129e72f8745aa4b33"
22 22
23 LINUX_VERSION = "5.10.9" 23 LINUX_VERSION = "5.10.9"
24 24
25 FILES_${KERNEL_PACKAGE_NAME}-base += "${nonarch_base_libdir}/modules/${KERNEL_VERSION}/modules.builtin.modinfo " 25 FILES_${KERNEL_PACKAGE_NAME}-base += "${nonarch_base_libdir}/modules/${KERNEL_VERSION}/modules.builtin.modinfo "
26 26
27 KERNEL_CONFIG_COMMAND = "oe_runmake_call -C ${S} CC="${KERNEL_CC}" O=${B} olddefconfig" 27 KERNEL_CONFIG_COMMAND = "oe_runmake_call -C ${S} CC="${KERNEL_CC}" O=${B} olddefconfig"
28 28
29 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" 29 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
30 30
31 DEFAULT_PREFERENCE = "1" 31 DEFAULT_PREFERENCE = "1"
32 32
33 DO_CONFIG_V7_COPY = "no" 33 DO_CONFIG_V7_COPY = "no"
34 DO_CONFIG_V7_COPY_mx6 = "yes" 34 DO_CONFIG_V7_COPY_mx6 = "yes"
35 DO_CONFIG_V7_COPY_mx7 = "yes" 35 DO_CONFIG_V7_COPY_mx7 = "yes"
36 DO_CONFIG_V7_COPY_mx8 = "no" 36 DO_CONFIG_V7_COPY_mx8 = "no"
37 37
38 # Add setting for LF Mainline build 38 # Add setting for LF Mainline build
39 IMX_KERNEL_CONFIG_AARCH32 = "imx_v7_defconfig" 39 IMX_KERNEL_CONFIG_AARCH32 = "imx_v7_defconfig"
40 IMX_KERNEL_CONFIG_AARCH64 = "smarcimx8mp_defconfig" 40 IMX_KERNEL_CONFIG_AARCH64 = "smarcimx8mp_defconfig"
41 KBUILD_DEFCONFIG ?= "" 41 KBUILD_DEFCONFIG ?= ""
42 KBUILD_DEFCONFIG_mx6= "${IMX_KERNEL_CONFIG_AARCH32}" 42 KBUILD_DEFCONFIG_mx6= "${IMX_KERNEL_CONFIG_AARCH32}"
43 KBUILD_DEFCONFIG_mx7= "${IMX_KERNEL_CONFIG_AARCH32}" 43 KBUILD_DEFCONFIG_mx7= "${IMX_KERNEL_CONFIG_AARCH32}"
44 KBUILD_DEFCONFIG_mx8= "${IMX_KERNEL_CONFIG_AARCH64}" 44 KBUILD_DEFCONFIG_mx8= "${IMX_KERNEL_CONFIG_AARCH64}"
45 45
46 46
47 # Use a verbatim copy of the defconfig from the linux-imx repo. 47 # Use a verbatim copy of the defconfig from the linux-imx repo.
48 # IMPORTANT: This task effectively disables kernel config fragments 48 # IMPORTANT: This task effectively disables kernel config fragments
49 # since the config fragments applied in do_kernel_configme are replaced. 49 # since the config fragments applied in do_kernel_configme are replaced.
50 addtask copy_defconfig after do_kernel_configme before do_preconfigure 50 addtask copy_defconfig after do_kernel_configme before do_preconfigure
51 do_copy_defconfig () { 51 do_copy_defconfig () {
52 install -d ${B} 52 install -d ${B}
53 if [ ${DO_CONFIG_V7_COPY} = "yes" ]; then 53 if [ ${DO_CONFIG_V7_COPY} = "yes" ]; then
54 # copy latest IMX_KERNEL_CONFIG_AARCH32 to use for mx6, mx6ul and mx7 54 # copy latest IMX_KERNEL_CONFIG_AARCH32 to use for mx6, mx6ul and mx7
55 mkdir -p ${B} 55 mkdir -p ${B}
56 cp ${S}/arch/arm/configs/${IMX_KERNEL_CONFIG_AARCH32} ${B}/.config 56 cp ${S}/arch/arm/configs/${IMX_KERNEL_CONFIG_AARCH32} ${B}/.config
57 else 57 else
58 # copy latest IMX_KERNEL_CONFIG_AARCH64 to use for mx8 58 # copy latest IMX_KERNEL_CONFIG_AARCH64 to use for mx8
59 mkdir -p ${B} 59 mkdir -p ${B}
60 cp ${S}/arch/arm64/configs/${IMX_KERNEL_CONFIG_AARCH64} ${B}/.config 60 cp ${S}/arch/arm64/configs/${IMX_KERNEL_CONFIG_AARCH64} ${B}/.config
61 fi 61 fi
62 } 62 }
63 63
64 DELTA_KERNEL_DEFCONFIG ?= "" 64 DELTA_KERNEL_DEFCONFIG ?= ""
65 #DELTA_KERNEL_DEFCONFIG_mx8 = "imx.config" 65 #DELTA_KERNEL_DEFCONFIG_mx8 = "imx.config"
66 66
67 do_merge_delta_config[dirs] = "${B}" 67 do_merge_delta_config[dirs] = "${B}"
68 do_merge_delta_config[depends] += " \ 68 do_merge_delta_config[depends] += " \
69 flex-native:do_populate_sysroot \ 69 flex-native:do_populate_sysroot \
70 bison-native:do_populate_sysroot \ 70 bison-native:do_populate_sysroot \
71 " 71 "
72 do_merge_delta_config() { 72 do_merge_delta_config() {
73 for deltacfg in ${DELTA_KERNEL_DEFCONFIG}; do 73 for deltacfg in ${DELTA_KERNEL_DEFCONFIG}; do
74 if [ -f ${S}/arch/${ARCH}/configs/${deltacfg} ]; then 74 if [ -f ${S}/arch/${ARCH}/configs/${deltacfg} ]; then
75 ${KERNEL_CONFIG_COMMAND} 75 ${KERNEL_CONFIG_COMMAND}
76 oe_runmake_call -C ${S} CC="${KERNEL_CC}" O=${B} ${deltacfg} 76 oe_runmake_call -C ${S} CC="${KERNEL_CC}" O=${B} ${deltacfg}
77 elif [ -f "${WORKDIR}/${deltacfg}" ]; then 77 elif [ -f "${WORKDIR}/${deltacfg}" ]; then
78 ${S}/scripts/kconfig/merge_config.sh -m .config ${WORKDIR}/${deltacfg} 78 ${S}/scripts/kconfig/merge_config.sh -m .config ${WORKDIR}/${deltacfg}
79 elif [ -f "${deltacfg}" ]; then 79 elif [ -f "${deltacfg}" ]; then
80 ${S}/scripts/kconfig/merge_config.sh -m .config ${deltacfg} 80 ${S}/scripts/kconfig/merge_config.sh -m .config ${deltacfg}
81 fi 81 fi
82 done 82 done
83 cp .config ${WORKDIR}/defconfig 83 cp .config ${WORKDIR}/defconfig
84 } 84 }
85 addtask merge_delta_config before do_preconfigure after do_copy_defconfig 85 addtask merge_delta_config before do_preconfigure after do_copy_defconfig
86 86
87 COMPATIBLE_MACHINE = "(mx6|mx7|mx8)" 87 COMPATIBLE_MACHINE = "(mx6|mx7|mx8)"
88 88