[meta-fsl-arm PATCH 1/3] u-boot-fslc: Update to patches-2013.04's 20130415 snapshot based on 2013.04-rc3

[meta-fsl-arm PATCH 1/3] u-boot-fslc: Update to patches-2013.04's 20130415 snapshot based on 2013.04-rc3

[Otavio Salvador]

This updates to U-Boot 2013.04-rc3 based code and changes the U-Boot
target for using in i.MX31PDK as it was changed in this release.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 conf/machine/imx31pdk.conf                   | 4 ++--
 recipes-bsp/u-boot/u-boot-fslc_2013.04.bb    | 2 +-
 recipes-bsp/u-boot/u-boot-mxsboot_2013.04.bb | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/conf/machine/imx31pdk.conf b/conf/machine/imx31pdk.conf
index 3aa6606..3898fc7 100644
--- a/conf/machine/imx31pdk.conf
+++ b/conf/machine/imx31pdk.conf
@@ -10,10 +10,10 @@ SOC_FAMILY = "mx3:mx31"
 
 GUI_MACHINE_CLASS = "smallscreen"
 
-UBOOT_MAKE_TARGET = "u-boot-nand.bin"
+UBOOT_MAKE_TARGET = "u-boot-with-spl.bin"
 UBOOT_SUFFIX = "bin"
 UBOOT_MACHINE = "mx31pdk_config"
-UBOOT_BINARY = "u-boot-nand.bin"
+UBOOT_BINARY = "u-boot-with-spl.bin"
 UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"
 
diff --git a/recipes-bsp/u-boot/u-boot-fslc_2013.04.bb b/recipes-bsp/u-boot/u-boot-fslc_2013.04.bb
index f339996..e1dc1d2 100644
--- a/recipes-bsp/u-boot/u-boot-fslc_2013.04.bb
+++ b/recipes-bsp/u-boot/u-boot-fslc_2013.04.bb
@@ -10,7 +10,7 @@ PROVIDES += "u-boot"
 
 PV = "v2013.04"
 
-SRCREV = "debad5d6cba77538d183ac947a41f6b88f9498b2"
+SRCREV = "6675aaab17b944867aa13164e50ecdab0884b8b8"
 SRC_URI = "git://github.com/Freescale/u-boot-imx.git"
 
 S = "${WORKDIR}/git"
diff --git a/recipes-bsp/u-boot/u-boot-mxsboot_2013.04.bb b/recipes-bsp/u-boot/u-boot-mxsboot_2013.04.bb
index 0ef48a2..74b7cc2 100644
--- a/recipes-bsp/u-boot/u-boot-mxsboot_2013.04.bb
+++ b/recipes-bsp/u-boot/u-boot-mxsboot_2013.04.bb
@@ -5,7 +5,7 @@ SECTION = "bootloader"
 
 PV = "v2013.04"
 
-SRCREV = "debad5d6cba77538d183ac947a41f6b88f9498b2"
+SRCREV = "6675aaab17b944867aa13164e50ecdab0884b8b8"
 SRC_URI = "git://github.com/Freescale/u-boot-imx.git"
 
 S = "${WORKDIR}/git"
-- 
1.8.1

[meta-fsl-arm PATCH 2/3] linux-imx.inc: Pass LOADADDRESS to kernel build

[Otavio Salvador]

By default, the kernel uses the known value for the entry address
however we cannot rely on this for having the right value. To
workaround it we should pass LOADADDRESS value to the kernel build
system.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-kernel/linux/linux-imx.inc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/recipes-kernel/linux/linux-imx.inc b/recipes-kernel/linux/linux-imx.inc
index 5fbdfe0..9020f57 100644
--- a/recipes-kernel/linux/linux-imx.inc
+++ b/recipes-kernel/linux/linux-imx.inc
@@ -19,6 +19,10 @@ SRC_URI = "git://git.freescale.com/imx/linux-2.6-imx.git \
 
 S = "${WORKDIR}/git"
 
+# We need to pass it as param since kernel might support more then one
+# machine, with different entry points
+KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
+
 kernel_conf_variable() {
 	CONF_SED_SCRIPT="$CONF_SED_SCRIPT /CONFIG_$1[ =]/d;"
 	if test "$2" = "n"
-- 
1.8.1

[meta-fsl-arm PATCH 3/3] linux-fslc: Use KERNEL_EXTRA_ARGS instead of EXTRA_OEMAKE

[Otavio Salvador]

The use of EXTRA_OEMAKE is not the best variable to be used here so we
should use KERNEL_EXTRA_ARGS instead.

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

diff --git a/recipes-kernel/linux/linux-fslc_3.8.bb b/recipes-kernel/linux/linux-fslc_3.8.bb
index 06f6dfb..d989e6d 100644
--- a/recipes-kernel/linux/linux-fslc_3.8.bb
+++ b/recipes-kernel/linux/linux-fslc_3.8.bb
@@ -30,6 +30,6 @@ do_configure_append () {
 
 # We need to pass it as param since kernel might support more then one
 # machine, with different entry points
-EXTRA_OEMAKE += "LOADADDR=${UBOOT_ENTRYPOINT}"
+KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
 
 COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6)"
-- 
1.8.1

Re: [meta-fsl-arm PATCH 3/3] linux-fslc: Use KERNEL_EXTRA_ARGS instead of EXTRA_OEMAKE

[Fabio Estevam]

On Thu, Apr 18, 2013 at 10:12 AM, Otavio Salvador
<otavio@ossystems.com.br> wrote:

>  # We need to pass it as param since kernel might support more then one
>  # machine, with different entry points
> -EXTRA_OEMAKE += "LOADADDR=${UBOOT_ENTRYPOINT}"
> +KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"

Can't we put KERNEL_EXTRA_ARGS into a more common location?

In 2/3 you placed it in linux-imx.inc, which covers 2.6.35/3.0.35
kernels, but I am was wondering if you could make this applied for all
the kernels generated by meta-fsl-arm.

This way we do not have to add this entry to every newer version of
the kernel recipes.

For example, when linux-fslc_3.9.bb comes out we can rely on
KERNEL_EXTRA_ARGS being set on a common location, instead of having to
add it inside linux-fslc_3.9.bb.

Re: [meta-fsl-arm PATCH 3/3] linux-fslc: Use KERNEL_EXTRA_ARGS instead of EXTRA_OEMAKE

[Daiane Angolini]

On 04/18/2013 12:42 PM, Fabio Estevam wrote:
> On Thu, Apr 18, 2013 at 10:12 AM, Otavio Salvador
> <otavio@ossystems.com.br> wrote:
>
>>   # We need to pass it as param since kernel might support more then one
>>   # machine, with different entry points
>> -EXTRA_OEMAKE += "LOADADDR=${UBOOT_ENTRYPOINT}"
>> +KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
>
> Can't we put KERNEL_EXTRA_ARGS into a more common location?
>
> In 2/3 you placed it in linux-imx.inc, which covers 2.6.35/3.0.35
> kernels, but I am was wondering if you could make this applied for all
> the kernels generated by meta-fsl-arm.

Maybe POKY layer.

I'm not complete happy this is being handling by meta-fsl-arm


-- 
Daiane

Re: [meta-fsl-arm PATCH 3/3] linux-fslc: Use KERNEL_EXTRA_ARGS instead of EXTRA_OEMAKE

[Otavio Salvador]

On Thu, Apr 18, 2013 at 1:23 PM, Daiane Angolini
<daiane.angolini@freescale.com> wrote:
> On 04/18/2013 12:42 PM, Fabio Estevam wrote:
>>
>> On Thu, Apr 18, 2013 at 10:12 AM, Otavio Salvador
>> <otavio@ossystems.com.br> wrote:
>>
>>>   # We need to pass it as param since kernel might support more then one
>>>   # machine, with different entry points
>>> -EXTRA_OEMAKE += "LOADADDR=${UBOOT_ENTRYPOINT}"
>>> +KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
>>
>>
>> Can't we put KERNEL_EXTRA_ARGS into a more common location?
>>
>> In 2/3 you placed it in linux-imx.inc, which covers 2.6.35/3.0.35
>> kernels, but I am was wondering if you could make this applied for all
>> the kernels generated by meta-fsl-arm.
>
>
> Maybe POKY layer.
>
> I'm not complete happy this is being handling by meta-fsl-arm

I will propose a v2 for this patchset ... and reuse linux-imx.inc

--
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br