[meta-freescale] [meta-fsl-arm][PATCH 4/4] u-boot-fslc: Update to 2014.07-based release

Tue Jul 8 04:43:02 PDT 2014

On Mon, Jul 7, 2014 at 10:22 AM, Otavio Salvador
<otavio at ossystems.com.br> wrote:
> This updates the FSL Community's U-Boot fork to a 2014.07-based
> release.
>
> Along with the recipe revision changes, this modifies the default
> kernel image to "zImage" as most machines maintained in meta-fsl-arm
> now uses it.
>
> The machines that are still using uImage are:
>
>  - imx31pdk
>  - imx35pdk
>  - imx53ard
>  - imx6dlsabreauto
>  - imx6solosabreauto
>  - imx6solosabresd

Please, merge this in master-next at first, I would like to test the
boards I have only to "double check twice"

>
> Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
> ---
>  conf/machine/imx31pdk.conf                                         | 1 +
>  conf/machine/imx35pdk.conf                                         | 1 +
>  conf/machine/imx53ard.conf                                         | 1 +
>  conf/machine/imx6dlsabreauto.conf                                  | 1 +
>  conf/machine/imx6solosabreauto.conf                                | 1 +
>  conf/machine/imx6solosabresd.conf                                  | 1 +
>  conf/machine/include/imx-base.inc                                  | 2 +-
>  ...boot-fslc-mxsboot_2014.01.bb => u-boot-fslc-mxsboot_2014.07.bb} | 6 +++---
>  recipes-bsp/u-boot/u-boot-fslc_2014.01.bb                          | 7 -------
>  recipes-bsp/u-boot/u-boot-fslc_2014.07.bb                          | 6 ++++++
>  10 files changed, 16 insertions(+), 11 deletions(-)
>  rename recipes-bsp/u-boot/{u-boot-fslc-mxsboot_2014.01.bb => u-boot-fslc-mxsboot_2014.07.bb} (87%)
>  delete mode 100644 recipes-bsp/u-boot/u-boot-fslc_2014.01.bb
>  create mode 100644 recipes-bsp/u-boot/u-boot-fslc_2014.07.bb
>
> diff --git a/conf/machine/imx31pdk.conf b/conf/machine/imx31pdk.conf
> index 50da78e..cf368eb 100644
> --- a/conf/machine/imx31pdk.conf
> +++ b/conf/machine/imx31pdk.conf
> @@ -14,6 +14,7 @@ UBOOT_MAKE_TARGET = "u-boot-with-spl.bin"
>  UBOOT_SUFFIX = "bin"
>  UBOOT_MACHINE = "mx31pdk_config"
>  UBOOT_BINARY = "u-boot-with-spl.bin"
> +KERNEL_IMAGETYPE = "uImage"
>
>  IMAGE_FSTYPES = "ubi jffs2 tar.bz2"
>  MKUBIFS_ARGS = "-m 2048 -e 129024 -c 2030"
> diff --git a/conf/machine/imx35pdk.conf b/conf/machine/imx35pdk.conf
> index b49e9f2..a3fc60c 100644
> --- a/conf/machine/imx35pdk.conf
> +++ b/conf/machine/imx35pdk.conf
> @@ -12,6 +12,7 @@ UBOOT_MACHINE = "mx35pdk_config"
>  UBOOT_SUFFIX = "bin"
>  UBOOT_BINARY = "u-boot.bin"
>  UBOOT_MAKE_TARGET = "u-boot.bin"
> +KERNEL_IMAGETYPE = "uImage"
>
>  GUI_MACHINE_CLASS = "bigscreen"
>
> diff --git a/conf/machine/imx53ard.conf b/conf/machine/imx53ard.conf
> index 2da165a..8a64e22 100644
> --- a/conf/machine/imx53ard.conf
> +++ b/conf/machine/imx53ard.conf
> @@ -12,6 +12,7 @@ SOC_FAMILY = "mx5:mx53"
>  KERNEL_DEVICETREE = "imx53-ard.dtb"
>
>  UBOOT_MACHINE = "mx53ard_config"
> +KERNEL_IMAGETYPE = "uImage"
>
>  MACHINE_FIRMWARE += "linux-firmware-ar3k \
>                       linux-firmware-ath6k"
> diff --git a/conf/machine/imx6dlsabreauto.conf b/conf/machine/imx6dlsabreauto.conf
> index 29d79d5..6477ba4 100644
> --- a/conf/machine/imx6dlsabreauto.conf
> +++ b/conf/machine/imx6dlsabreauto.conf
> @@ -13,6 +13,7 @@ KERNEL_DEVICETREE += "imx6dl-sabreauto-flexcan1.dtb "
>
>  PREFERRED_PROVIDER_u-boot = "u-boot-imx"
>  PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx"
> +KERNEL_IMAGETYPE = "uImage"
>
>  UBOOT_CONFIG ??= "sd"
>  UBOOT_CONFIG[sd] = "mx6dlsabreauto_config,sdcard"
> diff --git a/conf/machine/imx6solosabreauto.conf b/conf/machine/imx6solosabreauto.conf
> index 255c189..5f3782d 100644
> --- a/conf/machine/imx6solosabreauto.conf
> +++ b/conf/machine/imx6solosabreauto.conf
> @@ -11,6 +11,7 @@ KERNEL_DEVICETREE = "imx6dl-sabreauto.dtb"
>
>  PREFERRED_PROVIDER_u-boot = "u-boot-imx"
>  PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx"
> +KERNEL_IMAGETYPE = "uImage"
>
>  UBOOT_CONFIG ??= "sd"
>  UBOOT_CONFIG[sd] = "mx6solosabreauto_config,sdcard"
> diff --git a/conf/machine/imx6solosabresd.conf b/conf/machine/imx6solosabresd.conf
> index f670ed3..085463a 100644
> --- a/conf/machine/imx6solosabresd.conf
> +++ b/conf/machine/imx6solosabresd.conf
> @@ -12,6 +12,7 @@ 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 = "uImage"
>
>  UBOOT_CONFIG ??= "sd"
>  UBOOT_CONFIG[sd] = "mx6solosabresd_config,sdcard"
> diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
> index 9ac5e8a..9f0217e 100644
> --- a/conf/machine/include/imx-base.inc
> +++ b/conf/machine/include/imx-base.inc
> @@ -103,6 +103,6 @@ IMAGE_FSTYPES ?= "tar.bz2 ext3 sdcard"
>
>  SERIAL_CONSOLE = "115200 ttymxc0"
>
> -KERNEL_IMAGETYPE = "uImage"
> +KERNEL_IMAGETYPE = "zImage"
>
>  MACHINE_FEATURES = "apm usbgadget usbhost vfat alsa touchscreen"
> diff --git a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2014.01.bb b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2014.07.bb
> similarity index 87%
> rename from recipes-bsp/u-boot/u-boot-fslc-mxsboot_2014.01.bb
> rename to recipes-bsp/u-boot/u-boot-fslc-mxsboot_2014.07.bb

the file u-boot-fslc-mxsboot you have renamed...

> index 298f1c0..2f5bb11 100644
> --- a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2014.01.bb
> +++ b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2014.07.bb
> @@ -5,10 +5,10 @@ SECTION = "bootloader"
>  DEPENDS = "openssl"
>  PROVIDES = "u-boot-mxsboot"
>
> -PV = "v2014.01"
> +PV = "v2014.07"
>
> -SRCREV = "f5d80303de12e6fefc022426a73136a288f70294"
> -SRCBRANCH = "patches-2014.01"
> +SRCREV = "23f23f23d509e8e873797884456070c8a47d72b2"
> +SRCBRANCH = "patches-2014.07"
>  SRC_URI = "git://github.com/Freescale/u-boot-imx.git;branch=${SRCBRANCH}"
>
>  S = "${WORKDIR}/git"
> diff --git a/recipes-bsp/u-boot/u-boot-fslc_2014.01.bb b/recipes-bsp/u-boot/u-boot-fslc_2014.01.bb
> deleted file mode 100644

The file u-boot-fslc you have deleted + created a new one.

I know the final result is the same, however the git log is different.
I would prefer to be consistent, in case you send v2 for any reason.

> index f6d4657..0000000
> --- a/recipes-bsp/u-boot/u-boot-fslc_2014.01.bb
> +++ /dev/null
> @@ -1,7 +0,0 @@
> -include u-boot-fslc.inc
> -
> -PV = "v2014.01"
> -
> -SRCBRANCH = "patches-2014.01"
> -
> -SRCREV = "f5d80303de12e6fefc022426a73136a288f70294"
> diff --git a/recipes-bsp/u-boot/u-boot-fslc_2014.07.bb b/recipes-bsp/u-boot/u-boot-fslc_2014.07.bb
> new file mode 100644
> index 0000000..5178b2d
> --- /dev/null
> +++ b/recipes-bsp/u-boot/u-boot-fslc_2014.07.bb
> @@ -0,0 +1,6 @@
> +include u-boot-fslc.inc
> +
> +PV = "v2014.07"
> +
> +SRCREV = "23f23f23d509e8e873797884456070c8a47d72b2"
> +SRCBRANCH = "patches-2014.07"
> --
> 2.0.0
>
> --
> _______________________________________________
> meta-freescale mailing list
> meta-freescale at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-freescale