Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

conf: add new bootloader offset variable to be used on eMMC and SD card images. 

This commit adds a new bootloader eMMC and SD card installation offset
variable.

Signed-off-by: Mike Engel <Mike.Engel@digi.com>
This commit is contained in:
Mike Engel 2022-06-06 11:26:39 +02:00
parent 85f84f6438
commit 3e84b9007a
7 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta-digi-arm/classes/image_types_digi.bbclass
View File

@ -251,7 +251,7 @@ BOARD_BOOTIMAGE_PARTITION_SIZE ??= "65536"
# SD card image name # SD card image name
SDIMG = "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.sdcard" SDIMG = "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.sdcard"
BOOTLOADER_SEEK ?= "1" BOOTLOADER_SEEK_USERDATA ?= "1"
SDIMG_BOOTLOADER ?= "${DEPLOY_DIR_IMAGE}/${UBOOT_SYMLINK}" SDIMG_BOOTLOADER ?= "${DEPLOY_DIR_IMAGE}/${UBOOT_SYMLINK}"
SDIMG_BOOTFS_TYPE ?= "boot.vfat" SDIMG_BOOTFS_TYPE ?= "boot.vfat"
@ -319,7 +319,7 @@ IMAGE_CMD:sdcard() {
gzip -d -k ${SDIMG_ROOTFS}.gz gzip -d -k ${SDIMG_ROOTFS}.gz
# Burn bootloader, boot and rootfs partitions # Burn bootloader, boot and rootfs partitions
dd if=${SDIMG_BOOT} of=${SDIMG} conv=notrunc,fsync seek=${BOOTLOADER_SEEK} bs=1K dd if=${SDIMG_BOOT} of=${SDIMG} conv=notrunc,fsync seek=${BOOTLOADER_SEEK_USERDATA} bs=1K
dd if=${SDIMG_BOOTFS} of=${SDIMG} conv=notrunc,fsync seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) dd if=${SDIMG_BOOTFS} of=${SDIMG} conv=notrunc,fsync seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024)
dd if=${SDIMG_ROOTFS} of=${SDIMG} conv=notrunc,fsync seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024 + ${BOOT_SPACE_ALIGNED} \* 1024) dd if=${SDIMG_ROOTFS} of=${SDIMG} conv=notrunc,fsync seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024 + ${BOOT_SPACE_ALIGNED} \* 1024)

2
meta-digi-arm/conf/machine/ccimx6qpsbc.conf
View File

@ -24,6 +24,8 @@ UBOOT_CONFIG ??= "ccimx6qpsbc1GB ccimx6qpsbc2GB"
UBOOT_CONFIG[ccimx6qpsbc1GB] = "ccimx6qpsbc1GB_defconfig,,u-boot-dtb.${UBOOT_SUFFIX}" UBOOT_CONFIG[ccimx6qpsbc1GB] = "ccimx6qpsbc1GB_defconfig,,u-boot-dtb.${UBOOT_SUFFIX}"
UBOOT_CONFIG[ccimx6qpsbc2GB] = "ccimx6qpsbc2GB_defconfig,,u-boot-dtb.${UBOOT_SUFFIX}" UBOOT_CONFIG[ccimx6qpsbc2GB] = "ccimx6qpsbc2GB_defconfig,,u-boot-dtb.${UBOOT_SUFFIX}"
BOOTLOADER_SEEK_BOOT = "1"
KERNEL_DEVICETREE ?= " \ KERNEL_DEVICETREE ?= " \
imx6qp-ccimx6qpsbc.dtb \ imx6qp-ccimx6qpsbc.dtb \
imx6qp-ccimx6qpsbc-id160.dtb \ imx6qp-ccimx6qpsbc-id160.dtb \

2
meta-digi-arm/conf/machine/ccimx6sbc.conf
View File

@ -22,6 +22,8 @@ UBOOT_CONFIG[ccimx6qsbc2GB] = "ccimx6qsbc2GB_defconfig,,u-boot-dtb.${UBOOT_SUFFI
UBOOT_CONFIG[ccimx6qsbc512MB] = "ccimx6qsbc512MB_defconfig,,u-boot-dtb.${UBOOT_SUFFIX}" UBOOT_CONFIG[ccimx6qsbc512MB] = "ccimx6qsbc512MB_defconfig,,u-boot-dtb.${UBOOT_SUFFIX}"
UBOOT_CONFIG[ccimx6qsbc] = "ccimx6qsbc_defconfig,,u-boot-dtb.${UBOOT_SUFFIX}" UBOOT_CONFIG[ccimx6qsbc] = "ccimx6qsbc_defconfig,,u-boot-dtb.${UBOOT_SUFFIX}"
BOOTLOADER_SEEK_BOOT = "1"
KERNEL_DEVICETREE ?= " \ KERNEL_DEVICETREE ?= " \
imx6dl-ccimx6sbc.dtb \ imx6dl-ccimx6sbc.dtb \
imx6dl-ccimx6sbc-w.dtb \ imx6dl-ccimx6sbc-w.dtb \

3
meta-digi-arm/conf/machine/ccimx8mm-dvk.conf
View File

@ -8,7 +8,8 @@ MACHINEOVERRIDES =. "mx8:mx8m:mx8mm:ccimx8m:${DIGI_FAMILY}:"
# Include the machine configuration for Digi's ConnectCore 8M module. # Include the machine configuration for Digi's ConnectCore 8M module.
include conf/machine/include/ccimx8m.inc include conf/machine/include/ccimx8m.inc
BOOTLOADER_SEEK = "33" BOOTLOADER_SEEK_USERDATA = "33"
BOOTLOADER_SEEK_BOOT = "0"
# U-Boot configurations # U-Boot configurations
# Last one is the default (the one the symlinks point at) # Last one is the default (the one the symlinks point at)

3
meta-digi-arm/conf/machine/ccimx8mn-dvk.conf
View File

@ -8,7 +8,8 @@ MACHINEOVERRIDES =. "mx8:mx8m:mx8mn:ccimx8m:${DIGI_FAMILY}:"
# Include the machine configuration for Digi's ConnectCore 8M module. # Include the machine configuration for Digi's ConnectCore 8M module.
include conf/machine/include/ccimx8m.inc include conf/machine/include/ccimx8m.inc
BOOTLOADER_SEEK = "32" BOOTLOADER_SEEK_USERDATA = "32"
BOOTLOADER_SEEK_BOOT = "0"
# U-Boot configurations # U-Boot configurations
# Last one is the default (the one the symlinks point at) # Last one is the default (the one the symlinks point at)

3
meta-digi-arm/conf/machine/ccimx8mp-dvk.conf
View File

@ -12,7 +12,8 @@ MACHINE_FEATURES:remove = "wifi bluetooth"
DIGI_FAMILY = "ccimx8mp" DIGI_FAMILY = "ccimx8mp"
MACHINEOVERRIDES =. "mx8:mx8m:mx8mp:ccimx8m:${DIGI_FAMILY}:" MACHINEOVERRIDES =. "mx8:mx8m:mx8mp:ccimx8m:${DIGI_FAMILY}:"
BOOTLOADER_SEEK = "32" BOOTLOADER_SEEK_USERDATA = "32"
BOOTLOADER_SEEK_BOOT = "0"
# U-Boot configurations # U-Boot configurations
# Last one is the default (the one the symlinks point at) # Last one is the default (the one the symlinks point at)

6
meta-digi-arm/conf/machine/include/ccimx8x.inc
View File

@ -16,8 +16,10 @@ UBOOT_HAS_FASTBOOT = "true"
# The bootloader image that gets flashed consists of U-Boot and several fw binaries # The bootloader image that gets flashed consists of U-Boot and several fw binaries
EXTRA_IMAGEDEPENDS = "imx-boot" EXTRA_IMAGEDEPENDS = "imx-boot"
BOOTLOADER_IMAGE_RECIPE = "imx-boot" BOOTLOADER_IMAGE_RECIPE = "imx-boot"
# BOOTLOADER_SEEK is 33 for step A of the silicon and 32 for step B # BOOTLOADER_SEEK_USERDATA is 33 for step A of the silicon and 32 for step B
BOOTLOADER_SEEK = "32" BOOTLOADER_SEEK_USERDATA = "32"
# BOOTLOADER_SEEK_BOOT is 32 for step B of silicon and 0 for step C
BOOTLOADER_SEEK_BOOT ?= "0"
BOOTABLE_FILENAME = "${UBOOT_PREFIX}-${MACHINE}.bin" BOOTABLE_FILENAME = "${UBOOT_PREFIX}-${MACHINE}.bin"
SDIMG_BOOTLOADER = "${DEPLOY_DIR_IMAGE}/${BOOTABLE_FILENAME}" SDIMG_BOOTLOADER = "${DEPLOY_DIR_IMAGE}/${BOOTABLE_FILENAME}"