[meta-fsl-arm PATCH 1/3] linux-imx (3.0.35): mx6sabresd: Register SDHC3 first

[meta-fsl-arm PATCH 1/3] linux-imx (3.0.35): mx6sabresd: Register SDHC3 first

[Otavio Salvador]

On sabresd boards we boot from SDHC3, so let's register it as mmc0.

Currently eMMC is mmc0 and mmc1 can be SDHC3 or SDHC2 (if present).

Registering SDHC3 is safer as we can always find the rootfs.

Change-Id: I99bb38c1b5939dc095bbddd298db3cf37fb7c2dc
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 ...6-board-mx6q_sabresd-Register-SDHC3-first.patch | 38 ++++++++++++++++++++++
 recipes-kernel/linux/linux-imx_3.0.35.bb           |  3 +-
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 recipes-kernel/linux/linux-imx-3.0.35/0007-ARM-mach-mx6-board-mx6q_sabresd-Register-SDHC3-first.patch

diff --git a/recipes-kernel/linux/linux-imx-3.0.35/0007-ARM-mach-mx6-board-mx6q_sabresd-Register-SDHC3-first.patch b/recipes-kernel/linux/linux-imx-3.0.35/0007-ARM-mach-mx6-board-mx6q_sabresd-Register-SDHC3-first.patch
new file mode 100644
index 0000000..d02aa40
--- /dev/null
+++ b/recipes-kernel/linux/linux-imx-3.0.35/0007-ARM-mach-mx6-board-mx6q_sabresd-Register-SDHC3-first.patch
@@ -0,0 +1,38 @@
+From cd31abbe08372fa870fac78ae845edd4859f8835 Mon Sep 17 00:00:00 2001
+From: Fabio Estevam <fabio.estevam@freescale.com>
+Date: Sat, 28 Sep 2013 18:46:18 -0300
+Subject: [PATCH] ARM: mach-mx6: board-mx6q_sabresd: Register SDHC3 first
+Organization: O.S. Systems Software LTDA.
+
+On sabresd boards we boot from SDHC3, so let's register it as mmc0.
+
+Currently eMMC is mmc0 and mmc1 can be SDHC3 or SDHC2 (if present).
+
+Registering SDHC3 is safer as we can always find the rootfs.
+
+Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
+---
+ arch/arm/mach-mx6/board-mx6q_sabresd.c | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/arch/arm/mach-mx6/board-mx6q_sabresd.c b/arch/arm/mach-mx6/board-mx6q_sabresd.c
+index 3f9a845..4e6b323 100644
+--- a/arch/arm/mach-mx6/board-mx6q_sabresd.c
++++ b/arch/arm/mach-mx6/board-mx6q_sabresd.c
+@@ -1847,12 +1847,9 @@ static void __init mx6_sabresd_board_init(void)
+ 
+ 	imx6q_add_pm_imx(0, &mx6q_sabresd_pm_data);
+ 
+-	/* Move sd4 to first because sd4 connect to emmc.
+-	   Mfgtools want emmc is mmcblk0 and other sd card is mmcblk1.
+-	*/
++	imx6q_add_sdhci_usdhc_imx(2, &mx6q_sabresd_sd3_data);
+ 	imx6q_add_sdhci_usdhc_imx(3, &mx6q_sabresd_sd4_data);
+ 	imx6q_add_sdhci_usdhc_imx(1, &mx6q_sabresd_sd2_data);
+-	imx6q_add_sdhci_usdhc_imx(2, &mx6q_sabresd_sd3_data);
+ 	imx_add_viv_gpu(&imx6_gpu_data, &imx6q_gpu_pdata);
+ 	imx6q_sabresd_init_usb();
+ 	/* SATA is not supported by MX6DL/Solo */
+-- 
+1.8.4.rc3
+
diff --git a/recipes-kernel/linux/linux-imx_3.0.35.bb b/recipes-kernel/linux/linux-imx_3.0.35.bb
index dbdbd97..608fb87 100644
--- a/recipes-kernel/linux/linux-imx_3.0.35.bb
+++ b/recipes-kernel/linux/linux-imx_3.0.35.bb
@@ -18,4 +18,5 @@ SRC_URI += "file://drm-vivante-Add-00-sufix-in-returned-bus-Id.patch \
             file://0003-ARM-7670-1-fix-the-memset-fix.patch \
             file://0004-ENGR00271136-Fix-build-break-when-CONFIG_CLK_DEBUG-i.patch \
             file://0005-ENGR00271359-Add-Multi-touch-support.patch \
-            file://0006-Add-support-for-DVI-monitors.patch"
+            file://0006-Add-support-for-DVI-monitors.patch \
+            file://0007-ARM-mach-mx6-board-mx6q_sabresd-Register-SDHC3-first.patch"
\ No newline at end of file
-- 
1.8.4.rc3

[meta-fsl-arm PATCH 2/3] u-boot-fslc: Update to d97067b revision

[Otavio Salvador]

This includes U-Boot 2013.10-rc4 based version plus following change:

d97067b mx6sabresd: Use mmcblk0 for CONFIG_MMCROOT

The change is need, together with a linux-imx change for eMMC
registering number, to allow same U-Boot environment to be compatible
with Linux mainline and Linux FSL 3.0.35-4.1.0.

Change-Id: Id9937a7be74b5dd6a5848e81395193bfd13e67a9
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-bsp/u-boot/u-boot-fslc-mxsboot_2013.10.bb | 2 +-
 recipes-bsp/u-boot/u-boot-fslc_2013.10.bb         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2013.10.bb b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2013.10.bb
index b8b0151..0c69185 100644
--- a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2013.10.bb
+++ b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2013.10.bb
@@ -7,7 +7,7 @@ PROVIDES = "u-boot-mxsboot"
 
 PV = "v2013.10"
 
-SRCREV = "aa822f4980039073e03f98998813061af833b2bf"
+SRCREV = "d97067b3e3a82f79ede9c3bef043269874a28e33"
 SRC_URI = "git://github.com/Freescale/u-boot-imx.git"
 
 S = "${WORKDIR}/git"
diff --git a/recipes-bsp/u-boot/u-boot-fslc_2013.10.bb b/recipes-bsp/u-boot/u-boot-fslc_2013.10.bb
index f7784dd..43cb2f0 100644
--- a/recipes-bsp/u-boot/u-boot-fslc_2013.10.bb
+++ b/recipes-bsp/u-boot/u-boot-fslc_2013.10.bb
@@ -10,7 +10,7 @@ PROVIDES += "u-boot"
 
 PV = "v2013.10"
 
-SRCREV = "aa822f4980039073e03f98998813061af833b2bf"
+SRCREV = "d97067b3e3a82f79ede9c3bef043269874a28e33"
 SRC_URI = "git://github.com/Freescale/u-boot-imx.git"
 
 S = "${WORKDIR}/git"
-- 
1.8.4.rc3

[meta-fsl-arm PATCH 3/3] imx-kobs: Add version 3.5.7-1.0.0

[Otavio Salvador]

From: Lauren Post <lauren.post@freescale.com>

NAND boot writer

Change-Id: Ibb835df13a595b3a70c374853c6861d3444f279a
Signed-off-by: Lauren Post <lauren.post@freescale.com>
---
 recipes-bsp/imx-kobs/imx-kobs_3.5.7-1.0.0.bb | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 recipes-bsp/imx-kobs/imx-kobs_3.5.7-1.0.0.bb

diff --git a/recipes-bsp/imx-kobs/imx-kobs_3.5.7-1.0.0.bb b/recipes-bsp/imx-kobs/imx-kobs_3.5.7-1.0.0.bb
new file mode 100644
index 0000000..8c433e3
--- /dev/null
+++ b/recipes-bsp/imx-kobs/imx-kobs_3.5.7-1.0.0.bb
@@ -0,0 +1,19 @@
+# Copyright (C) 2013 Freescale Semiconductor
+
+SUMMARY = "Nand boot write source"
+DESCRIPTION = "Nand boot write source for IMX BSP"
+SECTION = "base"
+DEPENDS = "virtual/kernel"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
+
+SRC_URI = "${FSL_MIRROR}/imx-kobs-${PV}.tar.gz"
+SRC_URI[md5sum] = "1c07f922215d1fe7e202d1ba3dca0293"
+SRC_URI[sha256sum] = "a2854f5dc4c5728fef83a8b68d0e3e0aaba7910557976fc46265a86dc268038a"
+
+inherit autotools pkgconfig
+
+INCLUDE_DIR="-I${STAGING_INCDIR}  -I${STAGING_KERNEL_DIR}/include/mtd"
+EXTRA_OE = "INCLUDE=/"${INCLUDE_DIR}/" all"
+
+COMPATIBLE_MACHINE = "(mx6)"
-- 
1.8.4.rc3

Re: [meta-fsl-arm PATCH 1/3] linux-imx (3.0.35): mx6sabresd: Register SDHC3 first

[Daiane Angolini]

On 10/08/2013 09:32 AM, Otavio Salvador wrote:
> On sabresd boards we boot from SDHC3, so let's register it as mmc0.
>
> Currently eMMC is mmc0 and mmc1 can be SDHC3 or SDHC2 (if present).
>
> Registering SDHC3 is safer as we can always find the rootfs.

I agree

>
> Change-Id: I99bb38c1b5939dc095bbddd298db3cf37fb7c2dc
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
>   ...6-board-mx6q_sabresd-Register-SDHC3-first.patch | 38 ++++++++++++++++++++++
>   recipes-kernel/linux/linux-imx_3.0.35.bb           |  3 +-
>   2 files changed, 40 insertions(+), 1 deletion(-)
>   create mode 100644 recipes-kernel/linux/linux-imx-3.0.35/0007-ARM-mach-mx6-board-mx6q_sabresd-Register-SDHC3-first.patch
>
> diff --git a/recipes-kernel/linux/linux-imx-3.0.35/0007-ARM-mach-mx6-board-mx6q_sabresd-Register-SDHC3-first.patch b/recipes-kernel/linux/linux-imx-3.0.35/0007-ARM-mach-mx6-board-mx6q_sabresd-Register-SDHC3-first.patch
> new file mode 100644
> index 0000000..d02aa40
> --- /dev/null
> +++ b/recipes-kernel/linux/linux-imx-3.0.35/0007-ARM-mach-mx6-board-mx6q_sabresd-Register-SDHC3-first.patch
> @@ -0,0 +1,38 @@
> +From cd31abbe08372fa870fac78ae845edd4859f8835 Mon Sep 17 00:00:00 2001
> +From: Fabio Estevam <fabio.estevam@freescale.com>
> +Date: Sat, 28 Sep 2013 18:46:18 -0300
> +Subject: [PATCH] ARM: mach-mx6: board-mx6q_sabresd: Register SDHC3 first
> +Organization: O.S. Systems Software LTDA.
> +
> +On sabresd boards we boot from SDHC3, so let's register it as mmc0.
> +
> +Currently eMMC is mmc0 and mmc1 can be SDHC3 or SDHC2 (if present).
> +
> +Registering SDHC3 is safer as we can always find the rootfs.
> +
> +Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> +---
> + arch/arm/mach-mx6/board-mx6q_sabresd.c | 5 +----
> + 1 file changed, 1 insertion(+), 4 deletions(-)
> +
> +diff --git a/arch/arm/mach-mx6/board-mx6q_sabresd.c b/arch/arm/mach-mx6/board-mx6q_sabresd.c
> +index 3f9a845..4e6b323 100644
> +--- a/arch/arm/mach-mx6/board-mx6q_sabresd.c
> ++++ b/arch/arm/mach-mx6/board-mx6q_sabresd.c
> +@@ -1847,12 +1847,9 @@ static void __init mx6_sabresd_board_init(void)
> +
> + 	imx6q_add_pm_imx(0, &mx6q_sabresd_pm_data);
> +
> +-	/* Move sd4 to first because sd4 connect to emmc.
> +-	   Mfgtools want emmc is mmcblk0 and other sd card is mmcblk1.
> +-	*/
> ++	imx6q_add_sdhci_usdhc_imx(2, &mx6q_sabresd_sd3_data);
> + 	imx6q_add_sdhci_usdhc_imx(3, &mx6q_sabresd_sd4_data);
> + 	imx6q_add_sdhci_usdhc_imx(1, &mx6q_sabresd_sd2_data);
> +-	imx6q_add_sdhci_usdhc_imx(2, &mx6q_sabresd_sd3_data);
> + 	imx_add_viv_gpu(&imx6_gpu_data, &imx6q_gpu_pdata);
> + 	imx6q_sabresd_init_usb();
> + 	/* SATA is not supported by MX6DL/Solo */
> +--
> +1.8.4.rc3
> +
> diff --git a/recipes-kernel/linux/linux-imx_3.0.35.bb b/recipes-kernel/linux/linux-imx_3.0.35.bb
> index dbdbd97..608fb87 100644
> --- a/recipes-kernel/linux/linux-imx_3.0.35.bb
> +++ b/recipes-kernel/linux/linux-imx_3.0.35.bb
> @@ -18,4 +18,5 @@ SRC_URI += "file://drm-vivante-Add-00-sufix-in-returned-bus-Id.patch \
>               file://0003-ARM-7670-1-fix-the-memset-fix.patch \
>               file://0004-ENGR00271136-Fix-build-break-when-CONFIG_CLK_DEBUG-i.patch \
>               file://0005-ENGR00271359-Add-Multi-touch-support.patch \
> -            file://0006-Add-support-for-DVI-monitors.patch"
> +            file://0006-Add-support-for-DVI-monitors.patch \
> +            file://0007-ARM-mach-mx6-board-mx6q_sabresd-Register-SDHC3-first.patch"
> \ No newline at end of file

Which git option do you use to generate this "\ No newline at end of file"?


-- 
Daiane

Re: [meta-fsl-arm PATCH 2/3] u-boot-fslc: Update to d97067b revision

[Daiane Angolini]

On 10/08/2013 09:32 AM, Otavio Salvador wrote:
> This includes U-Boot 2013.10-rc4 based version plus following change:
>
> d97067b mx6sabresd: Use mmcblk0 for CONFIG_MMCROOT
>
> The change is need, together with a linux-imx change for eMMC
> registering number, to allow same U-Boot environment to be compatible
> with Linux mainline and Linux FSL 3.0.35-4.1.0.
>
> Change-Id: Id9937a7be74b5dd6a5848e81395193bfd13e67a9
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

Agree.

Thanks ;)

> ---
>   recipes-bsp/u-boot/u-boot-fslc-mxsboot_2013.10.bb | 2 +-
>   recipes-bsp/u-boot/u-boot-fslc_2013.10.bb         | 2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2013.10.bb b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2013.10.bb
> index b8b0151..0c69185 100644
> --- a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2013.10.bb
> +++ b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2013.10.bb
> @@ -7,7 +7,7 @@ PROVIDES = "u-boot-mxsboot"
>
>   PV = "v2013.10"
>
> -SRCREV = "aa822f4980039073e03f98998813061af833b2bf"
> +SRCREV = "d97067b3e3a82f79ede9c3bef043269874a28e33"
>   SRC_URI = "git://github.com/Freescale/u-boot-imx.git"
>
>   S = "${WORKDIR}/git"
> diff --git a/recipes-bsp/u-boot/u-boot-fslc_2013.10.bb b/recipes-bsp/u-boot/u-boot-fslc_2013.10.bb
> index f7784dd..43cb2f0 100644
> --- a/recipes-bsp/u-boot/u-boot-fslc_2013.10.bb
> +++ b/recipes-bsp/u-boot/u-boot-fslc_2013.10.bb
> @@ -10,7 +10,7 @@ PROVIDES += "u-boot"
>
>   PV = "v2013.10"
>
> -SRCREV = "aa822f4980039073e03f98998813061af833b2bf"
> +SRCREV = "d97067b3e3a82f79ede9c3bef043269874a28e33"
>   SRC_URI = "git://github.com/Freescale/u-boot-imx.git"
>
>   S = "${WORKDIR}/git"
>


-- 
Daiane