[meta-fsl-arm][PATCH 0/4] Linux kernel and U-Boot updates

[meta-fsl-arm][PATCH 0/4] Linux kernel and U-Boot updates

[Otavio Salvador]

Hello everyone,

Those 4 patches includes fixes for linux-imx (3.10.17 and 2.6.35.3),
linux-fslc (3.14) which should be fairly safe, and a bigger change is
the move to the upcoming release of U-Boot which is at 2014.07-rc4
now.

Otavio Salvador (4):
  linux-imx (3.10.17): Update to 2a69800 revision
  linux-imx (2.6.35.3): Update to the b3912bb revision
  linux-fslc (3.14): Update to 4202f3c revision
  u-boot-fslc: Update to 2014.07-based release

 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 ++++++
 recipes-kernel/linux/linux-fslc_3.14.bb                            | 2 +-
 recipes-kernel/linux/linux-imx_2.6.35.3.bb                         | 2 +-
 recipes-kernel/linux/linux-imx_3.10.17.bb                          | 2 +-
 13 files changed, 19 insertions(+), 14 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

-- 
2.0.0

[meta-fsl-arm][PATCH 1/4] linux-imx (3.10.17): Update to 2a69800 revision

[Otavio Salvador]

This includes the following updates to the 3.10.17-1.0.0-GA:

2a69800 ENGR00318392 ARM:imx6x: Save/restore SCU and some CP15
2a7bd41 ENGR00301078-2: ARM: dts: imx6sl-evk: add support for pfuze200 on imx6sl-evk
f0790e4 ENGR00301078-1: ARM: dts: imx6dl-sabresd: add support for pfuze200 on mx6dl-sabresd
d52df5f pfuze100-regulator: Fix of_node_get() parameter
ce1917e regulator: pfuze100: Use of_get_child_by_name
097577d regulator: pfuze100: Add PFUZE200 support to Kconfig and module description
dad7af3 regulator: pfuze100: Add terminate entry for [i2c|of]_device_id tables
792bf11 regulator: pfuze100: add pfuze200 support
df8c0fa regulator: pfuze100: Fix address of FABID
dd27604 ENGR00309838 ARM: imx6sl: gpc: add chip revision check for dispmix

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-kernel/linux/linux-imx_3.10.17.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-kernel/linux/linux-imx_3.10.17.bb b/recipes-kernel/linux/linux-imx_3.10.17.bb
index afa31e2..c643d26 100644
--- a/recipes-kernel/linux/linux-imx_3.10.17.bb
+++ b/recipes-kernel/linux/linux-imx_3.10.17.bb
@@ -11,7 +11,7 @@ require recipes-kernel/linux/linux-dtb.inc
 DEPENDS += "lzop-native bc-native"
 
 SRCBRANCH = "imx_3.10.17_1.0.0_ga"
-SRCREV = "232293e0abb46639e188ab9d8643f1dbf94534f6"
+SRCREV = "2a69800d94f182e975e4ed3ae2e64d30d35a3603"
 LOCALVERSION = "-1.0.0_ga"
 
 COMPATIBLE_MACHINE = "(mx6)"
-- 
2.0.0

Re: [meta-fsl-arm][PATCH 1/4] linux-imx (3.10.17): Update to 2a69800 revision

[Daiane Angolini]

On Mon, Jul 7, 2014 at 10:22 AM, Otavio Salvador
<otavio@ossystems.com.br> wrote:
> This includes the following updates to the 3.10.17-1.0.0-GA:
>
> 2a69800 ENGR00318392 ARM:imx6x: Save/restore SCU and some CP15
> 2a7bd41 ENGR00301078-2: ARM: dts: imx6sl-evk: add support for pfuze200 on imx6sl-evk
> f0790e4 ENGR00301078-1: ARM: dts: imx6dl-sabresd: add support for pfuze200 on mx6dl-sabresd
> d52df5f pfuze100-regulator: Fix of_node_get() parameter
> ce1917e regulator: pfuze100: Use of_get_child_by_name
> 097577d regulator: pfuze100: Add PFUZE200 support to Kconfig and module description
> dad7af3 regulator: pfuze100: Add terminate entry for [i2c|of]_device_id tables
> 792bf11 regulator: pfuze100: add pfuze200 support
> df8c0fa regulator: pfuze100: Fix address of FABID
> dd27604 ENGR00309838 ARM: imx6sl: gpc: add chip revision check for dispmix
>
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

looks good to me

Daiane
> ---
>  recipes-kernel/linux/linux-imx_3.10.17.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/recipes-kernel/linux/linux-imx_3.10.17.bb b/recipes-kernel/linux/linux-imx_3.10.17.bb
> index afa31e2..c643d26 100644
> --- a/recipes-kernel/linux/linux-imx_3.10.17.bb
> +++ b/recipes-kernel/linux/linux-imx_3.10.17.bb
> @@ -11,7 +11,7 @@ require recipes-kernel/linux/linux-dtb.inc
>  DEPENDS += "lzop-native bc-native"
>
>  SRCBRANCH = "imx_3.10.17_1.0.0_ga"
> -SRCREV = "232293e0abb46639e188ab9d8643f1dbf94534f6"
> +SRCREV = "2a69800d94f182e975e4ed3ae2e64d30d35a3603"
>  LOCALVERSION = "-1.0.0_ga"
>
>  COMPATIBLE_MACHINE = "(mx6)"
> --
> 2.0.0
>
> --
> _______________________________________________
> meta-freescale mailing list
> meta-freescale@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-freescale

[meta-fsl-arm][PATCH 2/4] linux-imx (2.6.35.3): Update to the b3912bb revision

[Otavio Salvador]

This includes following updates:

b3912bb ENGR00285448 [MX28] SAIF: Out of Voltage in SAIF clock PINs
90ce77d ENGR00285446-3 [MX28] SAIF: Bit Shift in SAIF RX Data
1ea685a ENGR00285446-2 [MX28] SAIF: Bit Shift in SAIF RX Data
1ca8992 ENGR00285446-1 [MX28] SAIF: Bit Shift in SAIF RX Data
45fe172 mach-mx5/devices.c: Add PMU device

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-kernel/linux/linux-imx_2.6.35.3.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-kernel/linux/linux-imx_2.6.35.3.bb b/recipes-kernel/linux/linux-imx_2.6.35.3.bb
index be39179..bfc56b7 100644
--- a/recipes-kernel/linux/linux-imx_2.6.35.3.bb
+++ b/recipes-kernel/linux/linux-imx_2.6.35.3.bb
@@ -12,7 +12,7 @@ include linux-imx.inc
 COMPATIBLE_MACHINE = "(mx28|mx5)"
 
 # Revision of imx_2.6.35_maintain branch
-SRCREV = "903363ed80a113f2d1e3e96e508ecf128d9af323"
+SRCREV = "b3912bb8a4caf3ec50909135e88af959982c43ca"
 LOCALVERSION = "-maintain+yocto"
 SRCBRANCH = "imx_2.6.35_maintain"
 
-- 
2.0.0

Re: [meta-fsl-arm][PATCH 2/4] linux-imx (2.6.35.3): Update to the b3912bb revision

[Daiane Angolini]

On Mon, Jul 7, 2014 at 10:22 AM, Otavio Salvador
<otavio@ossystems.com.br> wrote:
> This includes following updates:
>
> b3912bb ENGR00285448 [MX28] SAIF: Out of Voltage in SAIF clock PINs
> 90ce77d ENGR00285446-3 [MX28] SAIF: Bit Shift in SAIF RX Data
> 1ea685a ENGR00285446-2 [MX28] SAIF: Bit Shift in SAIF RX Data
> 1ca8992 ENGR00285446-1 [MX28] SAIF: Bit Shift in SAIF RX Data
> 45fe172 mach-mx5/devices.c: Add PMU device

Looks good to me.

Please, add this only in master-next (at first) as we must double
check if this kernel is OK for imx53

Daiane
>
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
>  recipes-kernel/linux/linux-imx_2.6.35.3.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/recipes-kernel/linux/linux-imx_2.6.35.3.bb b/recipes-kernel/linux/linux-imx_2.6.35.3.bb
> index be39179..bfc56b7 100644
> --- a/recipes-kernel/linux/linux-imx_2.6.35.3.bb
> +++ b/recipes-kernel/linux/linux-imx_2.6.35.3.bb
> @@ -12,7 +12,7 @@ include linux-imx.inc
>  COMPATIBLE_MACHINE = "(mx28|mx5)"
>
>  # Revision of imx_2.6.35_maintain branch
> -SRCREV = "903363ed80a113f2d1e3e96e508ecf128d9af323"
> +SRCREV = "b3912bb8a4caf3ec50909135e88af959982c43ca"
>  LOCALVERSION = "-maintain+yocto"
>  SRCBRANCH = "imx_2.6.35_maintain"
>
> --
> 2.0.0
>
> --
> _______________________________________________
> meta-freescale mailing list
> meta-freescale@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-freescale

[meta-fsl-arm][PATCH 3/4] linux-fslc (3.14): Update to 4202f3c revision

[Otavio Salvador]

This updates the 3.14-based kernel to the 3.14.9 release.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-kernel/linux/linux-fslc_3.14.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-kernel/linux/linux-fslc_3.14.bb b/recipes-kernel/linux/linux-fslc_3.14.bb
index fb41d2d..d2a4fd4 100644
--- a/recipes-kernel/linux/linux-fslc_3.14.bb
+++ b/recipes-kernel/linux/linux-fslc_3.14.bb
@@ -12,6 +12,6 @@ include linux-fslc.inc
 PV = "3.14+git${SRCPV}"
 
 SRCBRANCH = "patches-3.14"
-SRCREV = "c34636a55713cace69f1f753f30da3d63fbf72ad"
+SRCREV = "4202f3c53a02bd79417e10cf3592d4d9517f110f"
 
 COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6)"
-- 
2.0.0

Re: [meta-fsl-arm][PATCH 3/4] linux-fslc (3.14): Update to 4202f3c revision

[Fabio Estevam]

On Mon, Jul 7, 2014 at 10:22 AM, Otavio Salvador
<otavio@ossystems.com.br> wrote:
> This updates the 3.14-based kernel to the 3.14.9 release.

Why not 3.14.11 instead?


And what about upgrading master to 3.15.4?

Re: [meta-fsl-arm][PATCH 3/4] linux-fslc (3.14): Update to 4202f3c revision

[Eric Bénard]

Hi Fabio,

Le Mon, 7 Jul 2014 11:05:31 -0300,
Fabio Estevam <festevam@gmail.com> a écrit :

> 
> On Mon, Jul 7, 2014 at 10:22 AM, Otavio Salvador
> <otavio@ossystems.com.br> wrote:
> > This updates the 3.14-based kernel to the 3.14.9 release.
> 
> Why not 3.14.11 instead?
> 
> 
> And what about upgrading master to 3.15.4?

3.14.x would be interesting to keep as it's a long term version (up to
August 2016).

Best regards,
Eric

Re: [meta-fsl-arm][PATCH 3/4] linux-fslc (3.14): Update to 4202f3c revision

[Otavio Salvador]

On Mon, Jul 7, 2014 at 11:05 AM, Fabio Estevam <festevam@gmail.com> wrote:
> On Mon, Jul 7, 2014 at 10:22 AM, Otavio Salvador
> <otavio@ossystems.com.br> wrote:
>> This updates the 3.14-based kernel to the 3.14.9 release.
>
> Why not 3.14.11 instead?

Will do.

> And what about upgrading master to 3.15.4?

I pondered about it. I am not sure it'd be good or not to go for now.
I'd be more intended to go to 3.16 and target this one for 1.7.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [meta-fsl-arm][PATCH 3/4] linux-fslc (3.14): Update to 4202f3c revision

[Daiane Angolini]

On Mon, Jul 7, 2014 at 12:13 PM, Otavio Salvador
<otavio@ossystems.com.br> wrote:
> On Mon, Jul 7, 2014 at 11:05 AM, Fabio Estevam <festevam@gmail.com> wrote:
>> On Mon, Jul 7, 2014 at 10:22 AM, Otavio Salvador
>> <otavio@ossystems.com.br> wrote:
>>> This updates the 3.14-based kernel to the 3.14.9 release.
>>
>> Why not 3.14.11 instead?
>
> Will do.
>
>> And what about upgrading master to 3.15.4?
>
> I pondered about it. I am not sure it'd be good or not to go for now.
> I'd be more intended to go to 3.16 and target this one for 1.7.

I´m Ok with any

I review the patch when you send v2

Daiane

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

[Otavio Salvador]

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

Signed-off-by: Otavio Salvador <otavio@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
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
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

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

[Daiane Angolini]

On Mon, Jul 7, 2014 at 10:22 AM, Otavio Salvador
<otavio@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@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@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-freescale

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

[Otavio Salvador]

Hello Daiane,

On Tue, Jul 8, 2014 at 8:43 AM, Daiane Angolini <daiane.list@gmail.com> wrote:
...
> 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.

This depends on the amount of changes from one file to another so Git
detects the rename or not.

The u-boot-fslc file has been completely modified so Git does it.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750