[meta-freescale] [3rdparty PATCH] Rework machines to use wic support

Daiane Angolini daiane.list at gmail.com
Thu Oct 5 11:25:00 PDT 2017 

On Thu, Oct 5, 2017 at 1:56 PM, Otavio Salvador <otavio at ossystems.com.br> wrote:
> This rework existing machines to use the wic support. It allows for a
> lot of code removal as the image dependencies can be defined in a more
> accurate way.
>
> Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>

Reviewed-by: Daiane Angolini <daiane.angolini at nxp.com>


> ---
>
>  conf/machine/cgtqmx6.conf               |  2 +-
>  conf/machine/cubox-i.conf               |  6 +-----
>  conf/machine/imx6dl-riotboard.conf      |  5 +----
>  conf/machine/imx6qdl-variscite-som.conf |  1 +
>  conf/machine/nitrogen6sx.conf           | 22 ++++++++--------------
>  conf/machine/nitrogen6x-lite.conf       | 22 ++++++++--------------
>  conf/machine/nitrogen6x.conf            | 25 ++++++++-----------------
>  conf/machine/nitrogen7.conf             | 22 ++++++++--------------
>  conf/machine/wandboard.conf             |  5 +----
>  9 files changed, 37 insertions(+), 73 deletions(-)
>
> diff --git a/conf/machine/cgtqmx6.conf b/conf/machine/cgtqmx6.conf
> index fd85be0..5be7971 100644
> --- a/conf/machine/cgtqmx6.conf
> +++ b/conf/machine/cgtqmx6.conf
> @@ -15,8 +15,8 @@ UBOOT_MAKE_TARGET = ""
>  UBOOT_SUFFIX = "img"
>  SPL_BINARY = "SPL"
>  UBOOT_CONFIG ??= "cgtqmx6"
> -
>  UBOOT_CONFIG[cgtqmx6] = "cgtqmx6eval_defconfig"
> +WKS_FILE = "imx-uboot-spl-bootpart.wks"
>
>  # Use linux kernel QMX6
>  PREFERRED_PROVIDER_virtual/kernel ??= "linux-congatec"
> diff --git a/conf/machine/cubox-i.conf b/conf/machine/cubox-i.conf
> index 24e8519..4c9ae2e 100644
> --- a/conf/machine/cubox-i.conf
> +++ b/conf/machine/cubox-i.conf
> @@ -23,6 +23,7 @@ UBOOT_CONFIG ??= "sd"
>  UBOOT_CONFIG[sd] = "mx6cuboxi_defconfig,sdcard"
>  UENV_FILENAME = "uEnv-${MACHINE}.txt"
>  SPL_BINARY = "SPL"
> +WKS_FILES = "imx-uboot-spl.wks"
>
>  UBOOT_EXTLINUX = "1"
>  UBOOT_EXTLINUX_ROOT = "root=PARTUUID=${uuid}"
> @@ -40,8 +41,3 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += " \
>      kernel-devicetree \
>      u-boot-fslc \
>  "
> -
> -WKS_FILES ?= "imx-uboot-spl.wks"
> -WKS_FILE_DEPENDS ?= ""
> -
> -IMAGE_FSTYPES = "wic.gz"
> diff --git a/conf/machine/imx6dl-riotboard.conf b/conf/machine/imx6dl-riotboard.conf
> index 7823cd5..157e2c9 100644
> --- a/conf/machine/imx6dl-riotboard.conf
> +++ b/conf/machine/imx6dl-riotboard.conf
> @@ -22,7 +22,4 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += " \
>      u-boot-fslc \
>  "
>
> -WKS_FILES ?= "imx-uboot.wks"
> -WKS_FILE_DEPENDS ?= ""
> -
> -IMAGE_FSTYPES = "wic.gz"
> +WKS_FILES = "imx-uboot.wks"
> diff --git a/conf/machine/imx6qdl-variscite-som.conf b/conf/machine/imx6qdl-variscite-som.conf
> index c397649..c42741a 100644
> --- a/conf/machine/imx6qdl-variscite-som.conf
> +++ b/conf/machine/imx6qdl-variscite-som.conf
> @@ -28,6 +28,7 @@ KERNEL_IMAGETYPE = "uImage"
>  UBOOT_SPL_BUILD = "yes"
>  UBOOT_MAKE_TARGET = "all"
>  UBOOT_SUFFIX = "img"
> +WKS_FILE = "imx-uboot-spl-bootpart.wks"
>
>  PREFERRED_PROVIDER_virtual/bootloader = "u-boot-variscite"
>  PREFERRED_PROVIDER_u-boot = "u-boot-variscite"
> diff --git a/conf/machine/nitrogen6sx.conf b/conf/machine/nitrogen6sx.conf
> index ae6fff2..1dec579 100644
> --- a/conf/machine/nitrogen6sx.conf
> +++ b/conf/machine/nitrogen6sx.conf
> @@ -16,23 +16,17 @@ PREFERRED_PROVIDER_u-boot = "u-boot-boundary"
>  PREFERRED_PROVIDER_virtual/kernel ??= "linux-boundary"
>  PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp ??= "linux-fslc"
>
> -# Use SPI NOR U-Boot by default
> -IMAGE_BOOTLOADER ?= ""
> -
> -# Ensure boot scripts will be available at rootfs time
> -do_rootfs[depends] += "u-boot-script-boundary:do_deploy"
> -
>  # wic support
> -WKS_FILE ?= "sdimage-bootpart.wks"
> -IMAGE_BOOT_FILES = " \
> +WKS_FILE = "sdimage-bootpart.wks"
> +IMAGE_BOOT_FILES_append = " \
>      6x_bootscript-${MACHINE};6x_bootscript \
> -    ${KERNEL_IMAGETYPE} \
> -    ${KERNEL_IMAGETYPE}-imx6sx-nitrogen6sx.dtb;imx6sx-nitrogen6sx.dtb \
>  "
> -WKS_FILE_DEPENDS ?= ""
> -
> -# Boot scripts to install
> -BOOT_SCRIPTS = "6x_bootscript-${MACHINE}:6x_bootscript"
> +WKS_FILE_DEPENDS = " \
> +    u-boot-script-boundary \
> +    \
> +    e2fsprogs-native \
> +    bmap-tools-native \
> +"
>
>  UBOOT_MACHINE ?= "nitrogen6sx_config"
>
> diff --git a/conf/machine/nitrogen6x-lite.conf b/conf/machine/nitrogen6x-lite.conf
> index 5a120c3..04b24eb 100644
> --- a/conf/machine/nitrogen6x-lite.conf
> +++ b/conf/machine/nitrogen6x-lite.conf
> @@ -16,23 +16,17 @@ PREFERRED_PROVIDER_u-boot = "u-boot-boundary"
>  PREFERRED_PROVIDER_virtual/kernel ??= "linux-boundary"
>  PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp ??= "linux-fslc"
>
> -# Use SPI NOR U-Boot by default
> -IMAGE_BOOTLOADER ?= ""
> -
> -# Ensure boot scripts will be available at rootfs time
> -do_rootfs[depends] += "u-boot-script-boundary:do_deploy"
> -
>  # wic support
> -WKS_FILE ?= "sdimage-bootpart.wks"
> -IMAGE_BOOT_FILES = " \
> +WKS_FILE = "sdimage-bootpart.wks"
> +IMAGE_BOOT_FILES_append = " \
>      6x_bootscript-${MACHINE};6x_bootscript \
> -    ${KERNEL_IMAGETYPE} \
> -    ${KERNEL_IMAGETYPE}-imx6dl-nit6xlite.dtb;imx6dl-nit6xlite.dtb \
>  "
> -WKS_FILE_DEPENDS ?= ""
> -
> -# Boot scripts to install
> -BOOT_SCRIPTS = "6x_bootscript-${MACHINE}:6x_bootscript"
> +WKS_FILE_DEPENDS = " \
> +    u-boot-script-boundary \
> +    \
> +    e2fsprogs-native \
> +    bmap-tools-native \
> +"
>
>  UBOOT_MACHINE ?= "nit6xlite_config"
>
> diff --git a/conf/machine/nitrogen6x.conf b/conf/machine/nitrogen6x.conf
> index aa6f1ba..9073d80 100644
> --- a/conf/machine/nitrogen6x.conf
> +++ b/conf/machine/nitrogen6x.conf
> @@ -50,26 +50,17 @@ PREFERRED_PROVIDER_u-boot = "u-boot-boundary"
>  PREFERRED_PROVIDER_virtual/kernel ??= "linux-boundary"
>  PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp ??= "linux-fslc"
>
> -# Use SPI NOR U-Boot by default
> -IMAGE_BOOTLOADER ?= ""
> -
> -# Ensure boot scripts will be available at rootfs time
> -do_rootfs[depends] += "u-boot-script-boundary:do_deploy"
> -
> -# Boot scripts to install
> -BOOT_SCRIPTS = "6x_bootscript-${MACHINE}:6x_bootscript"
> -
>  # wic support
> -WKS_FILE ?= "sdimage-bootpart.wks"
> -IMAGE_BOOT_FILES = " \
> +WKS_FILE = "sdimage-bootpart.wks"
> +IMAGE_BOOT_FILES_append = " \
>      6x_bootscript-${MACHINE};6x_bootscript \
> -    ${KERNEL_IMAGETYPE} \
> -    ${KERNEL_IMAGETYPE}-imx6q-sabrelite.dtb;imx6q-sabrelite.dtb \
> -    ${KERNEL_IMAGETYPE}-imx6q-nitrogen6_max.dtb;imx6q-nitrogen6_max.dtb ${KERNEL_IMAGETYPE}-imx6qp-nitrogen6_max.dtb;imx6qp-nitrogen6_max.dtb \
> -    ${KERNEL_IMAGETYPE}-imx6q-nitrogen6x.dtb;imx6q-nitrogen6x.dtb ${KERNEL_IMAGETYPE}-imx6dl-nitrogen6x.dtb;imx6dl-nitrogen6x.dtb \
> -    ${KERNEL_IMAGETYPE}-imx6q-nitrogen6_som2.dtb;imx6q-nitrogen6_som2.dtb ${KERNEL_IMAGETYPE}-imx6qp-nitrogen6_som2.dtb;imx6qp-nitrogen6_som2.dtb \
>  "
> -WKS_FILE_DEPENDS ?= ""
> +WKS_FILE_DEPENDS = " \
> +    u-boot-script-boundary \
> +    \
> +    e2fsprogs-native \
> +    bmap-tools-native \
> +"
>
>  UBOOT_MACHINE ?= "nitrogen6q_config"
>
> diff --git a/conf/machine/nitrogen7.conf b/conf/machine/nitrogen7.conf
> index 2382c13..0f1a58e 100644
> --- a/conf/machine/nitrogen7.conf
> +++ b/conf/machine/nitrogen7.conf
> @@ -16,23 +16,17 @@ PREFERRED_PROVIDER_u-boot = "u-boot-boundary"
>  PREFERRED_PROVIDER_virtual/kernel ??= "linux-boundary"
>  PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp ??= "linux-fslc"
>
> -# Use SPI NOR U-Boot by default
> -IMAGE_BOOTLOADER ?= ""
> -
> -# Ensure boot scripts will be available at rootfs time
> -do_rootfs[depends] += "u-boot-script-boundary:do_deploy"
> -
>  # wic support
> -WKS_FILE ?= "sdimage-bootpart.wks"
> -IMAGE_BOOT_FILES = " \
> +WKS_FILE = "sdimage-bootpart.wks"
> +IMAGE_BOOT_FILES_append = " \
>      6x_bootscript-${MACHINE};6x_bootscript \
> -    ${KERNEL_IMAGETYPE} \
> -    ${KERNEL_IMAGETYPE}-imx7d-nitrogen7.dtb;imx7d-nitrogen7.dtb \
>  "
> -WKS_FILE_DEPENDS ?= ""
> -
> -# Boot scripts to install
> -BOOT_SCRIPTS = "6x_bootscript-${MACHINE}:6x_bootscript"
> +WKS_FILE_DEPENDS = " \
> +    u-boot-script-boundary \
> +    \
> +    e2fsprogs-native \
> +    bmap-tools-native \
> +"
>
>  UBOOT_MACHINE ?= "nitrogen7_config"
>
> diff --git a/conf/machine/wandboard.conf b/conf/machine/wandboard.conf
> index d11dfed..e07046d 100644
> --- a/conf/machine/wandboard.conf
> +++ b/conf/machine/wandboard.conf
> @@ -47,7 +47,4 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += " \
>      u-boot-fslc \
>  "
>
> -WKS_FILES ?= "imx-uboot-spl.wks"
> -WKS_FILE_DEPENDS ?= ""
> -
> -SOC_DEFAULT_IMAGE_FSTYPES = "wic.gz"
> +WKS_FILES = "imx-uboot-spl.wks"
> --
> 2.14.2
>
> --
> _______________________________________________
> meta-freescale mailing list
> meta-freescale at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-freescale

More information about the meta-freescale mailing list