diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2018-07-03 19:13:51 -0300 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2018-09-26 14:55:29 -0300 |
commit | d2bff417fa7953303f3111731638f8c0d2336510 (patch) | |
tree | 76b52256133124a302ff9bcb844b7e77b8e209a4 | |
parent | 4401cfc422d937b9e50e9197fd42933339d13439 (diff) | |
download | meta-freescale-d2bff417fa7953303f3111731638f8c0d2336510.tar.gz |
image_types_fsl.bbclass: Use IMAGE_LINK_NAME for mxs binaries
The binary is generated as part of the image build so it should use
the same naming schema to provide consistency. This also fixes the wks
templates which use it.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r-- | classes/image_types_fsl.bbclass | 18 | ||||
-rw-r--r-- | wic/imx-uboot-mxs-bootpart.wks.in | 2 | ||||
-rw-r--r-- | wic/imx-uboot-mxs.wks.in | 2 |
3 files changed, 15 insertions, 7 deletions
diff --git a/classes/image_types_fsl.bbclass b/classes/image_types_fsl.bbclass index 5e50f476..c49c51b7 100644 --- a/classes/image_types_fsl.bbclass +++ b/classes/image_types_fsl.bbclass | |||
@@ -11,15 +11,23 @@ MXSBOOT_NAND_ARGS ?= "" | |||
11 | # U-Boot mxsboot generation for uSD | 11 | # U-Boot mxsboot generation for uSD |
12 | do_image_uboot_mxsboot_sdcard[depends] += "u-boot-mxsboot-native:do_populate_sysroot \ | 12 | do_image_uboot_mxsboot_sdcard[depends] += "u-boot-mxsboot-native:do_populate_sysroot \ |
13 | u-boot:do_deploy" | 13 | u-boot:do_deploy" |
14 | IMAGE_CMD_uboot-mxsboot-sdcard = "mxsboot sd ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.${UBOOT_SUFFIX} \ | 14 | IMAGE_CMD_uboot-mxsboot-sdcard() { |
15 | ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.uboot-mxsboot-sdcard" | 15 | mxsboot sd ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.${UBOOT_SUFFIX} \ |
16 | ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.uboot-mxsboot-sdcard | ||
17 | ln -sf ${IMAGE_NAME}.rootfs.uboot-mxsboot-sdcard \ | ||
18 | ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.uboot-mxsboot-sdcard | ||
19 | } | ||
16 | 20 | ||
17 | # U-Boot mxsboot generation for NAND | 21 | # U-Boot mxsboot generation for NAND |
18 | do_image_uboot_mxsboot_nand[depends] += "u-boot-mxsboot-native:do_populate_sysroot \ | 22 | do_image_uboot_mxsboot_nand[depends] += "u-boot-mxsboot-native:do_populate_sysroot \ |
19 | u-boot:do_deploy" | 23 | u-boot:do_deploy" |
20 | IMAGE_CMD_uboot-mxsboot-nand = "mxsboot ${MXSBOOT_NAND_ARGS} nand \ | 24 | IMAGE_CMD_uboot-mxsboot-nand() { |
21 | ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.${UBOOT_SUFFIX} \ | 25 | mxsboot ${MXSBOOT_NAND_ARGS} nand \ |
22 | ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.uboot-mxsboot-nand" | 26 | ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.${UBOOT_SUFFIX} \ |
27 | ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.uboot-mxsboot-nand | ||
28 | ln -sf ${IMAGE_NAME}.rootfs.uboot-mxsboot-nand \ | ||
29 | ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.uboot-mxsboot-nand | ||
30 | } | ||
23 | 31 | ||
24 | # In case we are building for i.MX23 or i.MX28 we need to have the | 32 | # In case we are building for i.MX23 or i.MX28 we need to have the |
25 | # image stream built before the wic generation | 33 | # image stream built before the wic generation |
diff --git a/wic/imx-uboot-mxs-bootpart.wks.in b/wic/imx-uboot-mxs-bootpart.wks.in index 8b5bdd48..01eb88cc 100644 --- a/wic/imx-uboot-mxs-bootpart.wks.in +++ b/wic/imx-uboot-mxs-bootpart.wks.in | |||
@@ -12,7 +12,7 @@ | |||
12 | # | | | | | 12 | # | | | | |
13 | # 0 1kiB 4MiB 16MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB) | 13 | # 0 1kiB 4MiB 16MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB) |
14 | # | 14 | # |
15 | part u-boot --source rawcopy --sourceparams="file=${IMAGE_NAME}.rootfs.uboot-mxsboot-sdcard" --ondisk mmcblk --align 1024 | 15 | part u-boot --source rawcopy --sourceparams="file=${IMAGE_LINK_NAME}.rootfs.uboot-mxsboot-sdcard" --ondisk mmcblk --align 1024 |
16 | part /boot --source bootimg-partition --ondisk mmcblk --fstype=vfat --label boot --active --align 4096 --size 16 | 16 | part /boot --source bootimg-partition --ondisk mmcblk --fstype=vfat --label boot --active --align 4096 --size 16 |
17 | part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 4096 | 17 | part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 4096 |
18 | 18 | ||
diff --git a/wic/imx-uboot-mxs.wks.in b/wic/imx-uboot-mxs.wks.in index 44b6f931..8d82b7b8 100644 --- a/wic/imx-uboot-mxs.wks.in +++ b/wic/imx-uboot-mxs.wks.in | |||
@@ -12,7 +12,7 @@ | |||
12 | # | | | | | 12 | # | | | | |
13 | # 0 1kiB 4MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB) | 13 | # 0 1kiB 4MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB) |
14 | # | 14 | # |
15 | part u-boot --source rawcopy --sourceparams="file=${IMAGE_NAME}.rootfs.uboot-mxsboot-sdcard" --ondisk mmcblk --align 1024 | 15 | part u-boot --source rawcopy --sourceparams="file=${IMAGE_LINK_NAME}.rootfs.uboot-mxsboot-sdcard" --ondisk mmcblk --align 1024 |
16 | part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 4096 | 16 | part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 4096 |
17 | 17 | ||
18 | bootloader --ptable msdos | 18 | bootloader --ptable msdos |