[meta-freescale] [PATCH] wic:mx8: Fix the image creation

[Fabio Berton]

Hi Daiane!

On Thu, Jan 10, 2019 at 10:36 PM Daiane Angolini
<daiane.angolini at nxp.com> wrote:
>
> imx8 family boards use u-boot as boot loader in addition to some other
> binaries. The final bootloader binary is gathered by mkimage into a file
> called imx-boot.
>
> Add the wks file to create the wic image tailored for imx8 family.
> Fix the symbolic link file create to point to imx-boot (so it works for
> all the imx8 flavors).
> Set the wks file as default for all imx8.
>
> Signed-off-by: Daiane Angolini <daiane.angolini at nxp.com>
> ---
>  conf/machine/include/imx-base.inc        |  3 +++
>  recipes-bsp/imx-mkimage/imx-boot_0.2.bb  |  2 +-
>  recipes-bsp/u-boot/u-boot-imx_2017.03.bb |  2 +-
>  wic/imx-imx-boot-bootpart.wks            | 19 +++++++++++++++++++
>  4 files changed, 24 insertions(+), 2 deletions(-)
>  create mode 100644 wic/imx-imx-boot-bootpart.wks
>
> diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
> index 572e8e5e..005b71e1 100644
> --- a/conf/machine/include/imx-base.inc
> +++ b/conf/machine/include/imx-base.inc
> @@ -301,7 +301,10 @@ WKS_FILE_DEPENDS ?= " \
>      bmap-tools-native \
>  "
>
> +WKS_FILE_DEPENDS_mx8 += "imx-boot"
> +
>  SOC_DEFAULT_WKS_FILE ?= "imx-uboot-bootpart.wks"
> +SOC_DEFAULT_WKS_FILE_mx8 ?= "imx-imx-boot-bootpart.wks"

Why duplicate imx- prefix?

>  SOC_DEFAULT_WKS_FILE_mxs ?= "imx-uboot-mxs-bootpart.wks.in"
>
>  WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}"
> diff --git a/recipes-bsp/imx-mkimage/imx-boot_0.2.bb b/recipes-bsp/imx-mkimage/imx-boot_0.2.bb
> index 5ffddd0e..b232ed52 100644
> --- a/recipes-bsp/imx-mkimage/imx-boot_0.2.bb
> +++ b/recipes-bsp/imx-mkimage/imx-boot_0.2.bb
> @@ -180,7 +180,7 @@ do_deploy() {
>          install -m 0644 ${S}/${BOOT_CONFIG_MACHINE}-${target} ${DEPLOYDIR}
>      done
>      cd ${DEPLOYDIR}
> -    ln -sf ${BOOT_CONFIG_MACHINE}-${IMAGE_IMXBOOT_TARGET} ${BOOT_CONFIG_MACHINE}
> +    ln -sf ${BOOT_CONFIG_MACHINE}-${IMAGE_IMXBOOT_TARGET} ${BOOT_NAME}
>      cd -
>  }
>  addtask deploy before do_build after do_compile
> diff --git a/recipes-bsp/u-boot/u-boot-imx_2017.03.bb b/recipes-bsp/u-boot/u-boot-imx_2017.03.bb
> index 705ff164..86eca196 100644
> --- a/recipes-bsp/u-boot/u-boot-imx_2017.03.bb
> +++ b/recipes-bsp/u-boot/u-boot-imx_2017.03.bb
> @@ -35,7 +35,7 @@ do_deploy_append_mx8m() {
>                      install -d ${DEPLOYDIR}/${BOOT_TOOLS}
>                      install -m 0777 ${B}/${config}/arch/arm/dts/${UBOOT_DTB_NAME}  ${DEPLOYDIR}/${BOOT_TOOLS}
>                      install -m 0777 ${B}/${config}/tools/mkimage  ${DEPLOYDIR}/${BOOT_TOOLS}/mkimage_uboot
> -                    install -m 0777 ${B}/${config}/u-boot-nodtb.bin  ${DEPLOYDIR}/${BOOT_TOOLS}/u-boot-nodtb.bin-${MACHINE}-${UBOOT_CONFIG}
> +                    install -m 0777 ${B}/${config}/u-boot-nodtb.bin  ${DEPLOYDIR}/${BOOT_TOOLS}/u-boot-nodtb.bin
>                  fi
>              done
>              unset  j
> diff --git a/wic/imx-imx-boot-bootpart.wks b/wic/imx-imx-boot-bootpart.wks
> new file mode 100644
> index 00000000..8bbcd6c0
> --- /dev/null
> +++ b/wic/imx-imx-boot-bootpart.wks
> @@ -0,0 +1,19 @@
> +# short-description: Create SD card image with a boot partition
> +# long-description:
> +# Create an image that can be written onto a SD card using dd for use
> +# with i.MX SoC family
> +# It uses u-boot
> +#
> +# The disk layout used is:
> +#  - ---------- -------------- --------------
> +# | | imx-boot |     boot     |    rootfs   |
> +#  - ---------- -------------- --------------
> +# ^ ^          ^              ^
> +# | |          |              |
> +# 0 33kiB    4MiB          16MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB)
> +#
> +part u-boot --source rawcopy --sourceparams="file=imx-boot" --ondisk mmcblk --no-table --align 33
> +part /boot --source bootimg-partition --ondisk mmcblk --fstype=vfat --label boot --active --align 4096 --size 16
> +part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 4096
> +
> +bootloader --ptable msdos
> \ No newline at end of file
> --
> 2.17.1
>
> --
> _______________________________________________
> meta-freescale mailing list
> meta-freescale at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-freescale