[meta-freescale] [PATCH v2] u-boot-fslc: Upgrade to 2017.07-based release

Daiane Angolini daiane.list at gmail.com
Mon Jul 10 12:29:12 PDT 2017 

On Mon, Jul 10, 2017 at 4:05 PM, Otavio Salvador
<otavio at ossystems.com.br> wrote:
> This release provides a huge improvement regarding the support for SPL
> to more boards.
>

> diff --git a/conf/machine/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf
> new file mode 100644
> index 00000000..d221da15
> --- /dev/null
> +++ b/conf/machine/imx6qdlsabresd.conf
> @@ -0,0 +1,32 @@
> +#@TYPE: Machine
> +#@NAME: NXP i.MX6Q/DL SABRE Smart Device
> +#@SOC: i.MX6Q
> +#@DESCRIPTION: Machine configuration for NXP i.MX6Q/DL SABRE Smart Device

It also includes imx6QP

I think we must have a README explaining in a more verbose way this change.

I suggest a comment:


// This machine works for:
// * imx6qpsabresd
// * imx6qsabresd
// * imx6dlsabresd
// This means one SDCard flashed with one image targeting this machine
is able to boot all those boards.

I think it's important to include the machine name as it was before
the change, and make sure to say why it has changed "one binary for
all machines".

Daiane

> +#@MAINTAINER: Otavio Salvador <otavio at ossystems.com.br>
> +
> +MACHINEOVERRIDES =. "mx6:mx6q:mx6dl:"
> +
> +require conf/machine/include/imx-base.inc
> +require conf/machine/include/tune-cortexa9.inc
> +
> +KERNEL_DEVICETREE = " \
> +    imx6qp-sabresd.dtb imx6qp-sabresd-btwifi.dtb imx6qp-sabresd-hdcp.dtb \
> +    imx6qp-sabresd-ldo.dtb imx6qp-sabresd-ldo-pcie-cert.dtb \
> +    \
> +    imx6q-sabresd.dtb imx6q-sabresd-ldo.dtb imx6q-sabresd-hdcp.dtb \
> +    imx6q-sabresd-enetirq.dtb imx6q-sabresd-btwifi.dtb \
> +    \
> +    imx6dl-sabresd.dtb imx6dl-sabresd-ldo.dtb imx6dl-sabresd-hdcp.dtb \
> +    imx6dl-sabresd-enetirq.dtb imx6dl-sabresd-btwifi.dtb \
> +"
> +
> +UBOOT_MACHINE ?= "mx6sabresd_defconfig"
> +UBOOT_MAKE_TARGET = "all"
> +UBOOT_SUFFIX = "img"
> +SPL_BINARY = "SPL"
> +
> +SERIAL_CONSOLE = "115200 ttymxc0"
> +
> +MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k"
> +
> +MACHINE_FEATURES += " pci wifi bluetooth"
> diff --git a/conf/machine/imx6qpsabreauto.conf b/conf/machine/imx6qpsabreauto.conf
> deleted file mode 100644
> index 505d341c..00000000
> --- a/conf/machine/imx6qpsabreauto.conf
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -#@TYPE: Machine
> -#@NAME: NXP i.MX6Q Plus SABRE Automotive
> -#@SOC: i.MX6QP
> -#@DESCRIPTION: Machine configuration for NXP i.MX6QP SABRE Automotive
> -#@MAINTAINER: Lauren Post <lauren.post at nxp.com>
> -
> -MACHINEOVERRIDES =. "mx6:mx6q:"
> -
> -require conf/machine/include/imx6sabreauto-common.inc
> -
> -KERNEL_DEVICETREE = "imx6qp-sabreauto.dtb imx6qp-sabreauto-ecspi.dtb imx6qp-sabreauto-flexcan1.dtb \
> -                     imx6qp-sabreauto-gpmi-weim.dtb"
> -
> -PREFERRED_PROVIDER_u-boot = "u-boot-imx"
> -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx"
> -PREFERRED_PROVIDER_virtual/kernel = "linux-imx"
> -
> -UBOOT_CONFIG ??= "sd"
> -UBOOT_CONFIG[sd] = "mx6qpsabreauto_config,sdcard"
> -UBOOT_CONFIG[eimnor] = "mx6qpsabreauto_eimnor_config"
> -UBOOT_CONFIG[nand] = "mx6qpsabreauto_nand_config,ubifs"
> -UBOOT_CONFIG[spinor] = "mx6qpsabreauto_spinor_config"
> -UBOOT_CONFIG[sata] = "mx6qpsabreauto_sata_config"
> -UBOOT_CONFIG[mfgtool] = "mx6qpsabreauto_config"
> diff --git a/conf/machine/imx6qpsabresd.conf b/conf/machine/imx6qpsabresd.conf
> deleted file mode 100644
> index 369d5b7d..00000000
> --- a/conf/machine/imx6qpsabresd.conf
> +++ /dev/null
> @@ -1,20 +0,0 @@
> -#@TYPE: Machine
> -#@NAME: NXP i.MX6Q Plus SABRE Smart Device
> -#@SOC: i.MX6QP
> -#@DESCRIPTION: Machine configuration for NXP i.MX6QP SABRE Smart Device
> -#@MAINTAINER: Lauren Post <lauren.post at nxp.com>
> -
> -MACHINEOVERRIDES =. "mx6:mx6q:"
> -
> -require conf/machine/include/imx6sabresd-common.inc
> -
> -KERNEL_DEVICETREE = "imx6qp-sabresd.dtb imx6qp-sabresd-btwifi.dtb imx6qp-sabresd-hdcp.dtb \
> -                     imx6qp-sabresd-ldo.dtb imx6qp-sabresd-ldo-pcie-cert.dtb"
> -
> -PREFERRED_PROVIDER_u-boot = "u-boot-imx"
> -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx"
> -
> -UBOOT_CONFIG ??= "sd"
> -UBOOT_CONFIG[sd] = "mx6qpsabresd_config,sdcard"
> -UBOOT_CONFIG[sata] = "mx6qpsabresd_sata_config"
> -UBOOT_CONFIG[mfgtool] = "mx6qpsabresd_config"
> diff --git a/conf/machine/imx6qsabreauto.conf b/conf/machine/imx6qsabreauto.conf
> deleted file mode 100644
> index e419c5d4..00000000
> --- a/conf/machine/imx6qsabreauto.conf
> +++ /dev/null
> @@ -1,20 +0,0 @@
> -#@TYPE: Machine
> -#@NAME: NXP i.MX6Q SABRE Automotive
> -#@SOC: i.MX6Q
> -#@DESCRIPTION: Machine configuration for NXP i.MX6Q SABRE Automotive
> -#@MAINTAINER: Daiane Angolini <daiane.angolini at nxp.com>
> -
> -MACHINEOVERRIDES =. "mx6:mx6q:"
> -
> -require conf/machine/include/imx6sabreauto-common.inc
> -
> -KERNEL_DEVICETREE = "imx6q-sabreauto.dtb imx6q-sabreauto-gpmi-weim.dtb imx6q-sabreauto-ecspi.dtb \
> -                     imx6q-sabreauto-flexcan1.dtb imx6q-sabreauto-enetirq.dtb"
> -
> -UBOOT_CONFIG ??= "sd"
> -UBOOT_CONFIG[sd] = "mx6qsabreauto_config,sdcard"
> -UBOOT_CONFIG[eimnor] = "mx6qsabreauto_eimnor_config"
> -UBOOT_CONFIG[nand] = "mx6qsabreauto_nand_config,ubifs"
> -UBOOT_CONFIG[spinor] = "mx6qsabreauto_spinor_config"
> -UBOOT_CONFIG[sata] = "mx6qsabreauto_sata_config"
> -UBOOT_CONFIG[mfgtool] = "mx6qsabreauto_config"
> diff --git a/conf/machine/imx6qsabresd.conf b/conf/machine/imx6qsabresd.conf
> deleted file mode 100644
> index ea9119a9..00000000
> --- a/conf/machine/imx6qsabresd.conf
> +++ /dev/null
> @@ -1,17 +0,0 @@
> -#@TYPE: Machine
> -#@NAME: NXP i.MX6Q SABRE Smart Device
> -#@SOC: i.MX6Q
> -#@DESCRIPTION: Machine configuration for NXP i.MX6Q SABRE Smart Device
> -#@MAINTAINER: Otavio Salvador <otavio at ossystems.com.br>
> -
> -MACHINEOVERRIDES =. "mx6:mx6q:"
> -
> -require conf/machine/include/imx6sabresd-common.inc
> -
> -KERNEL_DEVICETREE = "imx6q-sabresd.dtb imx6q-sabresd-ldo.dtb imx6q-sabresd-hdcp.dtb \
> -                     imx6q-sabresd-enetirq.dtb imx6q-sabresd-btwifi.dtb"
> -
> -UBOOT_CONFIG ??= "sd"
> -UBOOT_CONFIG[sd] = "mx6qsabresd_config,sdcard"
> -UBOOT_CONFIG[sata] = "mx6qsabresd_sata_config"
> -UBOOT_CONFIG[mfgtool] = "mx6qsabresd_config"
> diff --git a/conf/machine/imx6solosabreauto.conf b/conf/machine/imx6solosabreauto.conf
> deleted file mode 100644
> index 09997c33..00000000
> --- a/conf/machine/imx6solosabreauto.conf
> +++ /dev/null
> @@ -1,21 +0,0 @@
> -#@TYPE: Machine
> -#@NAME: NXP i.MX6Solo SABRE Automotive
> -#@SOC: i.MX6S
> -#@DESCRIPTION: Machine configuration for NXP i.MX6Solo SABRE Automotive
> -
> -MACHINEOVERRIDES =. "mx6:mx6dl:"
> -
> -require conf/machine/include/imx6sabresd-common.inc
> -
> -KERNEL_DEVICETREE = "imx6dl-sabreauto.dtb"
> -
> -PREFERRED_PROVIDER_u-boot = "u-boot-imx"
> -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx"
> -KERNEL_IMAGETYPE = "zImage"
> -
> -UBOOT_CONFIG ??= "sd"
> -UBOOT_CONFIG[sd] = "mx6solosabreauto_config,sdcard"
> -UBOOT_CONFIG[eimnor] = "mx6solosabreauto_eimnor_config"
> -UBOOT_CONFIG[nand] = "mx6solosabreauto_nand_config,ubifs"
> -UBOOT_CONFIG[spinor] = "mx6solosabreauto_spinor_config"
> -UBOOT_CONFIG[mfgtool] = "mx6solosabreauto_config"
> diff --git a/conf/machine/imx6solosabresd.conf b/conf/machine/imx6solosabresd.conf
> deleted file mode 100644
> index 65155bcc..00000000
> --- a/conf/machine/imx6solosabresd.conf
> +++ /dev/null
> @@ -1,19 +0,0 @@
> -#@TYPE: Machine
> -#@NAME: NXP i.MX6Solo SABRE Smart Device
> -#@SOC: i.MX6S
> -#@DESCRIPTION: Machine configuration for NXP i.MX6Solo SABRE Smart Device
> -#@MAINTAINER: Otavio Salvador <otavio at ossystems.com.br>
> -
> -MACHINEOVERRIDES =. "mx6:mx6dl:"
> -
> -require conf/machine/include/imx6sabresd-common.inc
> -
> -KERNEL_DEVICETREE = "imx6dl-sabresd.dtb imx6dl-sabresd-ldo.dtb"
> -
> -PREFERRED_PROVIDER_u-boot = "u-boot-imx"
> -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx"
> -KERNEL_IMAGETYPE = "zImage"
> -
> -UBOOT_CONFIG ??= "sd"
> -UBOOT_CONFIG[sd] = "mx6solosabresd_config,sdcard"
> -UBOOT_CONFIG[mfgtool] = "mx6solosabresd_config"
> diff --git a/conf/machine/imx6sxsabreauto.conf b/conf/machine/imx6sxsabreauto.conf
> index b3bae2a4..19a8d9f8 100644
> --- a/conf/machine/imx6sxsabreauto.conf
> +++ b/conf/machine/imx6sxsabreauto.conf
> @@ -6,7 +6,8 @@
>
>  MACHINEOVERRIDES =. "mx6:mx6sx:"
>
> -require conf/machine/include/imx6sabreauto-common.inc
> +require conf/machine/include/imx-base.inc
> +require conf/machine/include/tune-cortexa9.inc
>
>  KERNEL_DEVICETREE = "imx6sx-sabreauto.dtb imx6sx-sabreauto-m4.dtb"
>
> @@ -18,3 +19,9 @@ UBOOT_CONFIG[sd] = "mx6sxsabreauto_config,sdcard"
>  UBOOT_CONFIG[qspi1] = "mx6sxsabreauto_qspi1_config"
>  UBOOT_CONFIG[nand] = "mx6sxsabreauto_nand_config,ubifs"
>  UBOOT_CONFIG[mfgtool] = "mx6sxsabreauto_config"
> +
> +SERIAL_CONSOLE = "115200 ttymxc3"
> +
> +MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k"
> +
> +MACHINE_FEATURES += " pci wifi bluetooth"
> diff --git a/conf/machine/imx6sxsabresd.conf b/conf/machine/imx6sxsabresd.conf
> index d702bed7..f7946361 100644
> --- a/conf/machine/imx6sxsabresd.conf
> +++ b/conf/machine/imx6sxsabresd.conf
> @@ -6,7 +6,8 @@
>
>  MACHINEOVERRIDES =. "mx6:mx6sx:"
>
> -require conf/machine/include/imx6sabresd-common.inc
> +require conf/machine/include/imx-base.inc
> +require conf/machine/include/tune-cortexa9.inc
>
>  KERNEL_DEVICETREE = "imx6sx-sdb.dtb imx6sx-sdb-emmc.dtb imx6sx-sdb-m4.dtb \
>                       imx6sx-sdb-sai.dtb imx6sx-sdb-lcdif1.dtb imx6sx-sdb-ldo.dtb \
> @@ -19,3 +20,9 @@ UBOOT_CONFIG[emmc] = "mx6sxsabresd_emmc_config,sdcard"
>  UBOOT_CONFIG[qspi2] = "mx6sxsabresd_qspi2_config"
>  UBOOT_CONFIG[m4fastup] = "mx6sxsabresd_m4fastup_config"
>  UBOOT_CONFIG[mfgtool] = "mx6sxsabresd_config"
> +
> +SERIAL_CONSOLE = "115200 ttymxc0"
> +
> +MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k"
> +
> +MACHINE_FEATURES += " pci wifi bluetooth"
> diff --git a/conf/machine/include/imx6sabreauto-common.inc b/conf/machine/include/imx6sabreauto-common.inc
> deleted file mode 100644
> index b4f37b3c..00000000
> --- a/conf/machine/include/imx6sabreauto-common.inc
> +++ /dev/null
> @@ -1,10 +0,0 @@
> -# Provides the i.MX6 SABRE AUTO common settings
> -
> -require conf/machine/include/imx-base.inc
> -require conf/machine/include/tune-cortexa9.inc
> -
> -SERIAL_CONSOLE = "115200 ttymxc3"
> -
> -MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k"
> -
> -MACHINE_FEATURES += " pci wifi bluetooth"
> diff --git a/conf/machine/include/imx6sabresd-common.inc b/conf/machine/include/imx6sabresd-common.inc
> deleted file mode 100644
> index 40e3cde6..00000000
> --- a/conf/machine/include/imx6sabresd-common.inc
> +++ /dev/null
> @@ -1,10 +0,0 @@
> -# Provides the i.MX6 SABRE SD common settings
> -
> -require conf/machine/include/imx-base.inc
> -require conf/machine/include/tune-cortexa9.inc
> -
> -SERIAL_CONSOLE = "115200 ttymxc0"
> -
> -MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k"
> -
> -MACHINE_FEATURES += " pci wifi bluetooth"
> diff --git a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2016.09.bb b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2017.07.bb
> similarity index 87%
> rename from recipes-bsp/u-boot/u-boot-fslc-mxsboot_2016.09.bb
> rename to recipes-bsp/u-boot/u-boot-fslc-mxsboot_2017.07.bb
> index 86a6abf2..9ae03d4a 100644
> --- a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2016.09.bb
> +++ b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2017.07.bb
> @@ -5,10 +5,10 @@ SECTION = "bootloader"
>  DEPENDS = "openssl"
>  PROVIDES = "u-boot-mxsboot"
>
> -PV = "v2016.09+git${SRCPV}"
> +PV = "v2017.07+git${SRCPV}"
>
> -SRCREV = "a3d27ead69a9e84a7794117cf965af20d0cfec4f"
> -SRCBRANCH = "2016.09+fslc"
> +SRCREV = "f2f4106d7e40253d18de80e5fb99362618b67b91"
> +SRCBRANCH = "2017.07+fslc"
>
>  SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH}"
>
> diff --git a/recipes-bsp/u-boot/u-boot-fslc_2017.03.bb b/recipes-bsp/u-boot/u-boot-fslc_2017.03.bb
> deleted file mode 100644
> index ce62e53a..00000000
> --- a/recipes-bsp/u-boot/u-boot-fslc_2017.03.bb
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -include u-boot-fslc.inc
> -
> -PV = "v2017.03+git${SRCPV}"
> -
> -SRCREV = "ac3b20cdbe5282fbfa46d7fd39358f5ee07e24d9"
> -SRCBRANCH = "2017.03+fslc"
> diff --git a/recipes-bsp/u-boot/u-boot-fslc_2017.07.bb b/recipes-bsp/u-boot/u-boot-fslc_2017.07.bb
> new file mode 100644
> index 00000000..49545ee1
> --- /dev/null
> +++ b/recipes-bsp/u-boot/u-boot-fslc_2017.07.bb
> @@ -0,0 +1,6 @@
> +include u-boot-fslc.inc
> +
> +PV = "v2017.07+git${SRCPV}"
> +
> +SRCREV = "f2f4106d7e40253d18de80e5fb99362618b67b91"
> +SRCBRANCH = "2017.07+fslc"
> --
> 2.13.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