Eric Lee / meta-smarcimx8m-sumo

Download as
Browse Code ยป

Commit 0b58bbdc1321c1745a99782d12693642d165d708

Authored by Eric Lee
1 parent 723226c1a4
Exists in 8mm_4.14.98_2.0.0_ga_sumo

Initial Release, Yocto Sumo meta layer Support for SMARC-iMX8MM

Showing 13 changed files with 315 additions and 48 deletions Side-by-side Diff

... ... @@ -5,11 +5,11 @@
5 5 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
6 6 ${LAYERDIR}/recipes-*/*/*.bbappend"
7 7  
8   -BBFILE_COLLECTIONS += "smarcimx8m"
9   -BBFILE_PATTERN_smarcimx8m := "^${LAYERDIR}/"
10   -BBFILE_PRIORITY_smarcimx8m = "12"
  8 +BBFILE_COLLECTIONS += "smarcimx8mm"
  9 +BBFILE_PATTERN_smarcimx8mm := "^${LAYERDIR}/"
  10 +BBFILE_PRIORITY_smarcimx8mm = "12"
11 11  
12   -LAYERSERIES_COMPAT_smarcimx8m = "sumo"
  12 +LAYERSERIES_COMPAT_smarcimx8mm = "sumo"
13 13  
14 14 LICENSE_PATH += "${LAYERDIR}/licenses"
15 15  
conf/machine/smarcimx8mm2g.conf
Diff comments   View file @ 0b58bbd
  1 +#@TYPE: Machine
  2 +#@NAME: EMBEDIAN SMARC-iMX8MM COMPUTER ON MODULES with 2GB LPDDR4 MEMORY
  3 +#@SOC: i.MX8MM
  4 +#@DESCRIPTION: Machine configuration for Embedian SMARC-iMX8MM
  5 +#@MAINTAINER: Eric Lee <eric.lee@embedian.com>
  6 +#
  7 +# http://www.www.embedian.com
  8 +
  9 +MACHINEOVERRIDES =. "mx8:mx8m:mx8mm:"
  10 +require conf/machine/include/imx-base.inc
  11 +require conf/machine/include/arm/arch-arm64.inc
  12 +
  13 +MACHINE_FEATURES += " usbgadget vfat ext2 alsa serial pci wifi bluetooth"
  14 +
  15 +IMAGE_FEATURES += "package-management"
  16 +
  17 +# Embedian BSP default providers
  18 +PREFERRED_PROVIDER_virtual/kernel_smarcimx8mm2g ?= "linux-smarcimx8mm"
  19 +PREFERRED_VERSION_linux-smarcimx8mm2g_smarcimx8mm2g = "4.14.98"
  20 +
  21 +KERNEL_DEVICETREE = " \
  22 + embedian/fsl-smarcimx8mm.dtb \
  23 +"
  24 +IMAGE_BOOTFILES_DEPENDS += "imx-m4-demos:do_deploy"
  25 +IMAGE_BOOTFILES += "imx8mm_m4_TCM_hello_world.bin imx8mm_m4_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin imx8mm_m4_TCM_rpmsg_lite_str_echo_rtos.bin"
  26 +
  27 +PREFERRED_PROVIDER_u-boot_smarcimx8mm2g = "u-boot-smarcimx8mm"
  28 +PREFERRED_PROVIDER_virtual/bootloader_smarcimx8mm2g = "u-boot-smarcimx8mm"
  29 +
  30 +UBOOT_CONFIG ??= "sd"
  31 +UBOOT_CONFIG[sd] = "smarcimx8mm_2g_ser3_defconfig,sdcard"
  32 +SPL_BINARY = "spl/u-boot-spl.bin"
  33 +
  34 +# Set DDR FIRMWARE
  35 +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"
  36 +
  37 +# Set U-Boot DTB
  38 +UBOOT_DTB_NAME = "fsl-smarcimx8mm.dtb"
  39 +
  40 +# Set imx-mkimage boot target
  41 +IMXBOOT_TARGETS = "flash_evk"
  42 +
  43 +SERIAL_CONSOLE = "115200 ttymxc1"
  44 +
  45 +IMAGE_BOOTLOADER = "imx-boot"
  46 +
  47 +BOOT_SPACE = "65536"
  48 +
  49 +LOADADDR = ""
  50 +UBOOT_SUFFIX = "bin"
  51 +UBOOT_MAKE_TARGET = ""
  52 +IMX_BOOT_SEEK = "33"
  53 +
  54 +PREFERRED_RPROVIDER_ptpd = "ptpd"
  55 +PREFERRED_RPROVIDER_ptpd-dev = "ptpd"
  56 +
  57 +MACHINE_EXTRA_RDEPENDS += " \
  58 + packagegroup-tools-bluetooth \
  59 + pm-utils \
  60 + kmod \
  61 + hdparm \
  62 + gptfdisk \
  63 + lftp \
  64 + vim \
  65 + ntp \
  66 + boost \
  67 + nodejs \
  68 + networkmanager \
  69 + imx-gpu-viv \
  70 + "
  71 +
  72 +BBMASK_prepend = "fsl-image-mfgtool-initramfs "
  73 +
  74 +# Packages added to all images (including core-image-minimal)
  75 +IMAGE_INSTALL_append = " \
  76 + firmware-imx-sdma \
  77 + firmware-imx-epdc \
  78 + fsl-rc-local \
  79 +"
  80 +
  81 +IMAGE_FSTYPES = "tar.bz2"
  82 +
  83 +# Ship all kernel modules by default
  84 +MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
  85 +
  86 +MACHINE_FIRMWARE_append_mx8 = " linux-firmware-ath10k"
conf/machine/smarcimx8mm4g.conf
Diff comments   View file @ 0b58bbd
  1 +#@TYPE: Machine
  2 +#@NAME: EMBEDIAN SMARC-iMX8MM COMPUTER ON MODULES with 4GB LPDDR4 MEMORY
  3 +#@SOC: i.MX8MM
  4 +#@DESCRIPTION: Machine configuration for Embedian SMARC-iMX8MM
  5 +#@MAINTAINER: Eric Lee <eric.lee@embedian.com>
  6 +#
  7 +# http://www.www.embedian.com
  8 +
  9 +MACHINEOVERRIDES =. "mx8:mx8m:mx8mm:"
  10 +require conf/machine/include/imx-base.inc
  11 +require conf/machine/include/arm/arch-arm64.inc
  12 +
  13 +MACHINE_FEATURES += " usbgadget vfat ext2 alsa serial pci wifi bluetooth"
  14 +
  15 +IMAGE_FEATURES += "package-management"
  16 +
  17 +# Embedian BSP default providers
  18 +PREFERRED_PROVIDER_virtual/kernel_smarcimx8mm4g ?= "linux-smarcimx8mm"
  19 +PREFERRED_VERSION_linux-smarcimx8mm4g_smarcimx8mm4g = "4.14.98"
  20 +
  21 +KERNEL_DEVICETREE = " \
  22 + embedian/fsl-smarcimx8mm.dtb \
  23 +"
  24 +IMAGE_BOOTFILES_DEPENDS += "imx-m4-demos:do_deploy"
  25 +IMAGE_BOOTFILES += "imx8mm_m4_TCM_hello_world.bin imx8mm_m4_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin imx8mm_m4_TCM_rpmsg_lite_str_echo_rtos.bin"
  26 +
  27 +PREFERRED_PROVIDER_u-boot_smarcimx8mm4g = "u-boot-smarcimx8mm"
  28 +PREFERRED_PROVIDER_virtual/bootloader_smarcimx8mm4g = "u-boot-smarcimx8mm"
  29 +
  30 +UBOOT_CONFIG ??= "sd"
  31 +UBOOT_CONFIG[sd] = "smarcimx8mm_4g_ser3_defconfig,sdcard"
  32 +SPL_BINARY = "spl/u-boot-spl.bin"
  33 +
  34 +# Set DDR FIRMWARE
  35 +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"
  36 +
  37 +# Set U-Boot DTB
  38 +UBOOT_DTB_NAME = "fsl-smarcimx8mm.dtb"
  39 +
  40 +# Set imx-mkimage boot target
  41 +IMXBOOT_TARGETS = "flash_evk"
  42 +
  43 +SERIAL_CONSOLE = "115200 ttymxc1"
  44 +
  45 +IMAGE_BOOTLOADER = "imx-boot"
  46 +
  47 +BOOT_SPACE = "65536"
  48 +
  49 +LOADADDR = ""
  50 +UBOOT_SUFFIX = "bin"
  51 +UBOOT_MAKE_TARGET = ""
  52 +IMX_BOOT_SEEK = "33"
  53 +
  54 +PREFERRED_RPROVIDER_ptpd = "ptpd"
  55 +PREFERRED_RPROVIDER_ptpd-dev = "ptpd"
  56 +
  57 +MACHINE_EXTRA_RDEPENDS += " \
  58 + packagegroup-tools-bluetooth \
  59 + pm-utils \
  60 + kmod \
  61 + hdparm \
  62 + gptfdisk \
  63 + lftp \
  64 + vim \
  65 + ntp \
  66 + boost \
  67 + nodejs \
  68 + networkmanager \
  69 + imx-gpu-viv \
  70 + "
  71 +
  72 +BBMASK_prepend = "fsl-image-mfgtool-initramfs "
  73 +
  74 +# Packages added to all images (including core-image-minimal)
  75 +IMAGE_INSTALL_append = " \
  76 + firmware-imx-sdma \
  77 + firmware-imx-epdc \
  78 + fsl-rc-local \
  79 +"
  80 +
  81 +IMAGE_FSTYPES = "tar.bz2"
  82 +
  83 +# Ship all kernel modules by default
  84 +MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
  85 +
  86 +MACHINE_FIRMWARE_append_mx8 = " linux-firmware-ath10k"
recipes-bsp/imx-atf/imx-atf/imx8mm-atf-uart4.patch
Diff comments   View file @ 0b58bbd
  1 +diff --git a/plat/imx/imx8mm/imx8mm_bl31_setup.c b/plat/imx/imx8mm/imx8mm_bl31_setup.c
  2 +index aa1c336e2..8abb61f5a 100644
  3 +--- a/plat/imx/imx8mm/imx8mm_bl31_setup.c
  4 ++++ b/plat/imx/imx8mm/imx8mm_bl31_setup.c
  5 +@@ -310,7 +310,8 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
  6 +
  7 + /* Assign M4 to domain 1 */
  8 + mmio_write_32(IMX_RDC_BASE + 0x204, 0x1);
  9 +- mmio_write_32(IMX_RDC_BASE + 0x518, 0xfc);
  10 ++ /* Assign UART4 to domain 0 */
  11 ++ mmio_write_32(IMX_RDC_BASE + 0x518, 0xff);
  12 + mmio_write_32(IMX_RDC_BASE + 0x5A4, 0xf3);
  13 +
  14 + #if defined (CSU_RDC_TEST)
recipes-bsp/imx-atf/imx-atf_2.0.bbappend
Diff comments   View file @ 0b58bbd
  1 +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
  2 +
  3 +SRC_URI += "file://imx8mm-atf-uart4.patch"
recipes-bsp/imx-mkimage/imx-boot_0.2.bbappend
Diff comments   View file @ 0b58bbd
1   -# Workaround to fix do_compile() failure due to missing fsl-imx8mq-evk.dtb
  1 +# Workaround to fix do_compile() failure due to missing fsl-imx8mm-evk.dtb
2 2 do_compile_prepend() {
3 3 echo "Copying DTB"
4   - if [ -f ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/fsl-smarcimx8mq.dtb ]; then
5   - cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/fsl-smarcimx8mq.dtb ${S}/iMX8M/fsl-imx8mq-evk.dtb
  4 + if [ -f ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/fsl-smarcimx8mm.dtb ]; then
  5 + cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/fsl-smarcimx8mm.dtb ${S}/iMX8M/fsl-imx8mm-evk.dtb
6 6 fi
7 7 }
recipes-bsp/u-boot/u-boot-smarcimx8mm_2018.03.bb
Diff comments   View file @ 0b58bbd
  1 +# Copyright (C) 2013-2016 Freescale Semiconductor
  2 +# Copyright 2017-2018 NXP
  3 +
  4 +DESCRIPTION = "i.MX U-Boot suppporting i.MX reference boards."
  5 +require recipes-bsp/u-boot/u-boot.inc
  6 +inherit pythonnative
  7 +
  8 +PROVIDES += "u-boot"
  9 +DEPENDS_append = " python dtc-native"
  10 +
  11 +LICENSE = "GPLv2+"
  12 +LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263"
  13 +
  14 +UBOOT_SRC ?= "${EMB_UBOOT_MIRROR};protocol=ssh"
  15 +SRCBRANCH = "smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga"
  16 +SRC_URI = "${UBOOT_SRC};branch=${SRCBRANCH}"
  17 +SRCREV = "77f9e189ffd989486d49035ba08c1c76e1e19e8c"
  18 +
  19 +S = "${WORKDIR}/git"
  20 +
  21 +inherit fsl-u-boot-localversion
  22 +
  23 +LOCALVERSION ?= "-${SRCBRANCH}"
  24 +
  25 +BOOT_TOOLS = "imx-boot-tools"
  26 +
  27 +do_deploy_append_mx8m () {
  28 + # Deploy the mkimage, u-boot-nodtb.bin and fsl-imx8mq-XX.dtb for mkimage to generate boot binary
  29 + if [ -n "${UBOOT_CONFIG}" ]
  30 + then
  31 + for config in ${UBOOT_MACHINE}; do
  32 + i=$(expr $i + 1);
  33 + for type in ${UBOOT_CONFIG}; do
  34 + j=$(expr $j + 1);
  35 + if [ $j -eq $i ]
  36 + then
  37 + install -d ${DEPLOYDIR}/${BOOT_TOOLS}
  38 + install -m 0777 ${B}/${config}/arch/arm/dts/${UBOOT_DTB_NAME} ${DEPLOYDIR}/${BOOT_TOOLS}
  39 + install -m 0777 ${B}/${config}/tools/mkimage ${DEPLOYDIR}/${BOOT_TOOLS}/mkimage_uboot
  40 + install -m 0777 ${B}/${config}/u-boot-nodtb.bin ${DEPLOYDIR}/${BOOT_TOOLS}/u-boot-nodtb.bin-${MACHINE}-${UBOOT_CONFIG}
  41 + fi
  42 + done
  43 + unset j
  44 + done
  45 + unset i
  46 + fi
  47 +
  48 +}
  49 +
  50 +PACKAGE_ARCH = "${MACHINE_ARCH}"
  51 +COMPATIBLE_MACHINE = "(mx6|mx7|mx8)"
  52 +
  53 +UBOOT_NAME_mx6 = "u-boot-${MACHINE}.bin-${UBOOT_CONFIG}"
  54 +UBOOT_NAME_mx7 = "u-boot-${MACHINE}.bin-${UBOOT_CONFIG}"
  55 +UBOOT_NAME_mx8 = "u-boot-${MACHINE}.bin-${UBOOT_CONFIG}"
recipes-kernel/linux/linux-smarcimx8mm_4.14.98.bb
Diff comments   View file @ 0b58bbd
  1 +# Copyright (C) 2013-2016 Freescale Semiconductor
  2 +# Copyright 2017 NXP
  3 +# Copyright 2019-2020 Embedian, Inc.
  4 +# Released under the MIT license (see COPYING.MIT for the terms)
  5 +
  6 +SUMMARY = "Linux kernel provided and supported by Embedian"
  7 +DESCRIPTION = "Linux kernel provided and supported by Embedian (based on the kernel imx_4.14.98_2.0.0_ga provided by NXP) \
  8 +with focus on i.MX Family SOMs. It includes support for many IPs such as GPU, VPU and IPU."
  9 +
  10 +require recipes-kernel/linux/linux-imx.inc
  11 +
  12 +DEPENDS += "lzop-native bc-native"
  13 +
  14 +DEFAULT_PREFERENCE = "1"
  15 +
  16 +SRCBRANCH = "smarc_8mm_imx_4.14.98_2.0.0_ga"
  17 +
  18 +LOCALVERSION = "-${SRCBRANCH}"
  19 +KERNEL_DEFCONFIG = "${S}/arch/arm64/configs/smarcimx8mm_defconfig"
  20 +DEFAULT_DTB = "fsl-smarcimx8mm"
  21 +
  22 +KERNEL_SRC ?= "git@git.embedian.com:developer/smarc-fsl-linux-kernel.git;protocol=git"
  23 +SRC_URI = "${EMB_KERNEL_MIRROR};protocol=ssh;branch=${SRCBRANCH}"
  24 +SRCREV = "3d1e6a796a51ee3e393c458b1b2b908ee7bb6827"
  25 +
  26 +S = "${WORKDIR}/git"
  27 +
  28 +addtask copy_defconfig after do_unpack before do_preconfigure
  29 +do_copy_defconfig () {
  30 + install -d ${B}
  31 + mkdir -p ${B}
  32 + cp ${KERNEL_DEFCONFIG} ${B}/.config
  33 + cp ${KERNEL_DEFCONFIG} ${B}/../defconfig
  34 +}
  35 +
  36 +pkg_postinst_kernel-devicetree_append_mx8 () {
  37 + cd $D/boot
  38 + ln -s ${DEFAULT_DTB}.dtb ${UBOOT_DTB_NAME}
  39 +}
  40 +
  41 +COMPATIBLE_MACHINE = "(mx6|mx7|mx8)"
  42 +EXTRA_OEMAKE_append_mx8 = " ARCH=arm64"
scripts/emb_mk_yocto_sdcard/README.txt
Diff comments   View file @ 0b58bbd
... ... @@ -11,7 +11,7 @@
11 11  
12 12  
13 13 Usage:
14   -sudo MACHINE=<smarcimx8m2g|smarcimx8m4g> ./emb-create-yocto-sdcard.sh [options] /dev/sdX
  14 +sudo MACHINE=<smarcimx8mm2g|smarcimx8mn4g> ./emb-create-yocto-sdcard.sh [options] /dev/sdX
15 15 (Change /dev/sdX to your device name)
16 16  
17 17 options:
scripts/emb_mk_yocto_sdcard/emb-create-yocto-emmc.sh
Diff comments   View file @ 0b58bbd
... ... @@ -22,7 +22,6 @@
22 22 BOOTLOADER_RESERVED_SIZE=2
23 23 PART1_SIZE=48
24 24 BOOTLOADER_OFFSET=33
25   -DISPLAY=-hdmi
26 25 PART=p
27 26 BOOTPART=1
28 27 ROOTFSPART=2
29 28  
... ... @@ -31,18 +30,9 @@
31 30 check_board()
32 31 {
33 32 if grep -q "i.MX8M" /sys/devices/soc0/soc_id; then
34   - BOARD=smarc-imx8m
35   - DTB_PREFIX=fsl-smarcimx8mq
  33 + BOARD=smarc-imx8mm
  34 + DTB_PREFIX=fsl-smarcimx8mm
36 35 BLOCK=mmcblk0
37   -
38   - if [[ $DISPLAY != "-lvds" && $DISPLAY != "-hdmi" && \
39   - $DISPLAY != "-dual-display" && $DISPLAY != "" ]]; then
40   - red_bold_echo "ERROR: invalid display, should be lvds, hdmi, dual-display or empty"
41   - exit 1
42   - fi
43   - else
44   - red_bold_echo "ERROR: Unsupported board"
45   - exit 1
46 36 fi
47 37  
48 38  
... ... @@ -65,8 +55,8 @@
65 55 exit 1
66 56 fi
67 57  
68   - if [[ ! -f $IMGS_PATH/${DTB_PREFIX}${DISPLAY}.dtb ]] ; then
69   - red_bold_echo "ERROR: \"$IMGS_PATH/${DTB_PREFIX}${DISPLAY}.dtb\" does not exist"
  58 + if [[ ! -f $IMGS_PATH/${DTB_PREFIX}.dtb ]] ; then
  59 + red_bold_echo "ERROR: \"$IMGS_PATH/${DTB_PREFIX}.dtb\" does not exist"
70 60 exit 1
71 61 fi
72 62  
... ... @@ -149,7 +139,7 @@
149 139 mount /dev/${BLOCK}${PART}${BOOTPART} ${MOUNTDIR}
150 140 mkdir -p ${MOUNTDIR}/dtbs/
151 141 cp -v ${IMGS_PATH}/${KERNEL_IMAGE} ${MOUNTDIR}
152   - cp -v ${IMGS_PATH}/${DTB_PREFIX}${DISPLAY}.dtb ${MOUNTDIR}/dtbs/fsl-smarcimx8mq.dtb
  142 + cp -v ${IMGS_PATH}/${DTB_PREFIX}.dtb ${MOUNTDIR}/dtbs/fsl-smarcimx8mm.dtb
153 143 cp -v ${IMGS_PATH}/uEnv.txt ${MOUNTDIR}
154 144  
155 145 echo
... ... @@ -171,7 +161,7 @@
171 161 tar --warning=no-timestamp -jxvf ${IMGS_PATH}/${ROOTFS_IMAGE} -C ${MOUNTDIR} --checkpoint=.1200
172 162  
173 163 # Create DTB symlink
174   - (cd ${MOUNTDIR}/${BOOTDIR}; ln -fs ${DTB_PREFIX}${DISPLAY}.dtb ${DTB_PREFIX}.dtb)
  164 + (cd ${MOUNTDIR}/${BOOTDIR}; ln -fs ${DTB_PREFIX}.dtb ${DTB_PREFIX}.dtb)
175 165  
176 166 echo
177 167 sync
scripts/emb_mk_yocto_sdcard/emb-create-yocto-sdcard.sh
Diff comments   View file @ 0b58bbd
... ... @@ -15,15 +15,12 @@
15 15 readonly YOCTO_ROOT="${SCRIPT_POINT}/../../../../"
16 16  
17 17 readonly BSP_TYPE="YOCTO"
18   -readonly YOCTO_BUILD=${YOCTO_ROOT}/imx8m-build-qt5wayland
  18 +readonly YOCTO_BUILD=${YOCTO_ROOT}/imx8mm-build-qt5wayland
19 19 readonly YOCTO_DEFAULT_IMAGE=fsl-image-qt5-validation-imx
20 20  
21 21 readonly YOCTO_SCRIPTS_PATH=${SCRIPT_POINT}
22 22 readonly YOCTO_IMGS_PATH=${YOCTO_BUILD}/tmp/deploy/images/${MACHINE}
23 23  
24   -## display (one of "-hdmi", "-lcdif-lvds", "-dp", "-dcss-lvds", "-dual-display", "-edp")
25   -readonly DISPLAY="-hdmi"
26   -
27 24 # $1 -- block device
28 25 # $2 -- output images dir
29 26 readonly LPARAM_BLOCK_DEVICE=${1}
... ... @@ -100,7 +97,7 @@
100 97  
101 98 help() {
102 99 bn=`basename $0`
103   - echo " Usage: MACHINE=<smarcimx8m2g|smarcimx8m4g> $bn <options> device_node"
  100 + echo " Usage: MACHINE=<smarcimx8mm2g|smarcimx8mm4g> $bn <options> device_node"
104 101 echo
105 102 echo " options:"
106 103 echo " -h display this Help message"
... ... @@ -117,7 +114,7 @@
117 114 exit 1
118 115 fi
119 116  
120   -if [[ $MACHINE != "smarcimx8m2g" && $MACHINE != "smarcimx8m4g" ]] ; then
  117 +if [[ $MACHINE != "smarcimx8mm2g" && $MACHINE != "smarcimx8mm4g" ]] ; then
121 118 help
122 119 exit 1
123 120 fi
... ... @@ -262,7 +259,7 @@
262 259 echo "Flashing \"Image, device tree and uEnv.txt\" partition"
263 260 cp -v ${YOCTO_IMGS_PATH}/Image ${P1_MOUNT_DIR}/
264 261 mkdir -p ${P1_MOUNT_DIR}/dtbs/
265   - cp -v ${YOCTO_IMGS_PATH}/fsl-smarcimx8mq${DISPLAY}.dtb ${P1_MOUNT_DIR}/dtbs/fsl-smarcimx8mq.dtb
  262 + cp -v ${YOCTO_IMGS_PATH}/fsl-smarcimx8mm.dtb ${P1_MOUNT_DIR}/dtbs/fsl-smarcimx8mm.dtb
266 263 cp -v ${YOCTO_SCRIPTS_PATH}/uEnv.txt ${P1_MOUNT_DIR}/
267 264  
268 265 echo
... ... @@ -296,7 +293,7 @@
296 293 echo "Copying Kernel Parameter uEnv.txt to /opt/images/"
297 294 cp -v ${YOCTO_SCRIPTS_PATH}/uEnv_emmc.txt ${P2_MOUNT_DIR}/opt/images/Yocto/uEnv.txt
298 295  
299   - if [[ $MACHINE = "smarcimx8m2g" || ${MACHINE} = "smarcimx8m4g" ]]; then
  296 + if [[ $MACHINE = "smarcimx8mm2g" || ${MACHINE} = "smarcimx8mm4g" ]]; then
300 297 cp ${YOCTO_IMGS_PATH}/imx-boot-${MACHINE}-sd.bin-* ${P2_MOUNT_DIR}/opt/images/Yocto
301 298 (cd ${P2_MOUNT_DIR}/opt/images/Yocto; ln -fs imx-boot-${MACHINE}-sd.bin-flash_evk imx-boot-sd.bin)
302 299 else
scripts/emb_mk_yocto_sdcard/uEnv.txt
Diff comments   View file @ 0b58bbd
1   -optargs="video=HDMI-A-1:1920x1080-32@60 consoleblank=0"
2   -#optargs="video=HDMI-A-1:3840x2160-32@30 consoleblank=0"
3   -#optargs="video=HDMI-A-1:3840x2160-32@60 consoleblank=0"
4 1 #console port SER3
5   -console=ttymxc0,115200 earlycon=ec_imx6q,0x30860000,115200
  2 +console=ttymxc1,115200 earlycon=ec_imx6q,0x30890000,115200
6 3 #console port SER2
7   -#console=ttymxc1,115200 earlycon=ec_imx6q,0x30890000,115200
8   -#console port SER1
9 4 #console=ttymxc2,115200 earlycon=ec_imx6q,0x30880000,115200
  5 +#console port SER1
  6 +#console=ttymxc3,115200 earlycon=ec_imx6q,0x30a60000,115200
10 7 #console port SER0
11   -#console=ttymxc3,115200 earlycon=ec_imx6q,0x30A60000,115200
  8 +#console=ttymxc0,115200 earlycon=ec_imx6q,0x30860000,115200
12 9 mmcdev=1
13 10 mmcpart=1
14 11 image=Image
... ... @@ -22,7 +19,7 @@
22 19 ipaddr=192.168.1.150
23 20 serverip=192.168.1.53
24 21 gatewayip=192.168.1.254
25   -mmcargs=setenv bootargs console=${console} root=${mmcroot} rootfstype=${mmcrootfstype} ${optargs}
  22 +mmcargs=setenv bootargs console=${console} root=${mmcroot} rootfstype=${mmcrootfstype} ${optargs} cma=400M
26 23 uenvcmd=run loadimage; run loadfdt; run mmcboot
27 24 # USB Boot
28 25 #usbargs=setenv bootargs console=${console} root=${usbroot} rootfstype=${mmcrootfstype} ${optargs}
scripts/emb_mk_yocto_sdcard/uEnv_emmc.txt
Diff comments   View file @ 0b58bbd
1   -optargs="video=HDMI-A-1:1920x1080-32@60 consoleblank=0"
2   -#optargs="video=HDMI-A-1:3840x2160-32@30 consoleblank=0"
3   -#optargs="video=HDMI-A-1:3840x2160-32@60 consoleblank=0"
4 1 #console port SER3
5   -console=ttymxc0,115200 earlycon=ec_imx6q,0x30860000,115200
  2 +console=ttymxc1,115200 earlycon=ec_imx6q,0x30890000,115200
6 3 #console port SER2
7   -#console=ttymxc1,115200 earlycon=ec_imx6q,0x30890000,115200
8   -#console port SER1
9 4 #console=ttymxc2,115200 earlycon=ec_imx6q,0x30880000,115200
  5 +#console port SER1
  6 +#console=ttymxc3,115200 earlycon=ec_imx6q,0x30a60000,115200
10 7 #console port SER0
11   -#console=ttymxc3,115200 earlycon=ec_imx6q,0x30A60000,115200
  8 +#console=ttymxc0,115200 earlycon=ec_imx6q,0x30860000,115200
12 9 mmcdev=0
13 10 mmcpart=1
14 11 image=Image
... ... @@ -22,7 +19,7 @@
22 19 ipaddr=192.168.1.150
23 20 serverip=192.168.1.53
24 21 gatewayip=192.168.1.254
25   -mmcargs=setenv bootargs console=${console} root=${mmcroot} rootfstype=${mmcrootfstype} ${optargs}
  22 +mmcargs=setenv bootargs console=${console} root=${mmcroot} rootfstype=${mmcrootfstype} ${optargs} cma=400M
26 23 uenvcmd=run loadimage; run loadfdt; run mmcboot
27 24 # USB Boot
28 25 #usbargs=setenv bootargs console=${console} root=${usbroot} rootfstype=${mmcrootfstype} ${optargs}