[meta-fsl-arm-extra][PATCH 1/4] u-boot-compulab: update the build recipe.

[meta-fsl-arm-extra][PATCH 1/4] u-boot-compulab: update the build recipe.

[Valentin Raevsky]

1) Add the cm-fx6-firmware build and deploy methods.
2) Update the u-boot SRC_URI.

Signed-off-by: Valentin Raevsky <valentin@compulab.co.il>
---
 .../u-boot-compulab-2014.10/cm-fx6-firmware.patch  | 14 ++++++++++++++
 recipes-bsp/u-boot/u-boot-compulab_2014.10.bb      | 22 +++++++++++++++++-----
 2 files changed, 31 insertions(+), 5 deletions(-)
 create mode 100644 recipes-bsp/u-boot/u-boot-compulab-2014.10/cm-fx6-firmware.patch

diff --git a/recipes-bsp/u-boot/u-boot-compulab-2014.10/cm-fx6-firmware.patch b/recipes-bsp/u-boot/u-boot-compulab-2014.10/cm-fx6-firmware.patch
new file mode 100644
index 0000000..37e40b0
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-compulab-2014.10/cm-fx6-firmware.patch
@@ -0,0 +1,14 @@
+diff --git a/Makefile b/Makefile
+index 6808eab..db6d93d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1449,3 +1449,9 @@ FORCE:
+ # Declare the contents of the .PHONY variable as phony.  We keep that
+ # information in a variable so we can use it in if_changed and friends.
+ .PHONY: $(PHONY)
++
++cm-fx6-firmware:
++	@echo cm-fx6-firmware
++	$(objtree)/tools/mkimage -n $(objtree)/board/compulab/cm_fx6/imximage.cfg.cfgtmp -T imximage -e 0x00908000 -d $(objtree)/spl/u-boot-spl.bin spl.img
++	dd if=/dev/zero count=500 bs=1K | tr '\000' '\377' > cm-fx6-firmware
++	dd if=spl.img of=cm-fx6-firmware bs=1K seek=1 conv=notrunc && dd if=u-boot.img of=cm-fx6-firmware bs=1K seek=64 conv=notrunc
diff --git a/recipes-bsp/u-boot/u-boot-compulab_2014.10.bb b/recipes-bsp/u-boot/u-boot-compulab_2014.10.bb
index 02651e0..ed5dc78 100644
--- a/recipes-bsp/u-boot/u-boot-compulab_2014.10.bb
+++ b/recipes-bsp/u-boot/u-boot-compulab_2014.10.bb
@@ -6,12 +6,24 @@ LIC_FILES_CHKSUM = "file://configs/cm_fx6_defconfig;md5=549452418e9e099e5fe19ef1
 
 PROVIDES += "u-boot"
 
-SRCBRANCH = "utilite/master"
-SRCREV = "6803a75f3d40bee3b53f56e7b49c70465819b7ca"
-SRC_URI = "git://github.com/utilite-computer/u-boot.git;branch=${SRCBRANCH}"
-SRC_URI[md5sum] = "fd8234c5b3a460430689848c1f16acef"
+SRC_URI[md5sum] = "78c144ab4a84e063829c81a50174dcca"
+SRC_URI[sha256sum] = "cce769aec902a952e6425e88aa7973680a019ebb2b34359a2417a2bd1f553435"
+SRC_URI = "https://github.com/utilite-computer/u-boot/archive/v2014.10-cm-fx6-2.2.zip"
 
-S = "${WORKDIR}/git"
+S = "${WORKDIR}/u-boot-2014.10-cm-fx6-2.2"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE = "cm-fx6"
+
+SRC_URI += "file://cm-fx6-firmware.patch"
+
+do_compile_append() {
+	oe_runmake
+	oe_runmake cm-fx6-firmware
+}
+
+do_deploy_append() {
+	install ${S}/cm-fx6-firmware ${DEPLOYDIR}/cm-fx6-firmware
+	rm ${DEPLOYDIR}/u-boot*imx
+	dd if=${DEPLOYDIR}/cm-fx6-firmware of=${DEPLOYDIR}/u-boot-cm-fx6.imx skip=2 bs=512
+}
-- 
1.9.1

[meta-fsl-arm-extra][PATCH 2/4] firmware-compulab: add firmware configuration for cm-fx6 machines

[Valentin Raevsky]

Add firmware configuration for cm-fx6 machines.
CM-FX6 is equipped with a Marvell bt/wifi chip.
This chip requires a vendor firmware binary.
This recipe makes the bitbake download the firmware
binary from the vendor git repository.

Signed-off-by: Valentin Raevsky <valentin@compulab.co.il>
---
 recipes-bsp/firmware-compulab/firmware-compulab.bb | 24 ++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 recipes-bsp/firmware-compulab/firmware-compulab.bb

diff --git a/recipes-bsp/firmware-compulab/firmware-compulab.bb b/recipes-bsp/firmware-compulab/firmware-compulab.bb
new file mode 100644
index 0000000..59fd438
--- /dev/null
+++ b/recipes-bsp/firmware-compulab/firmware-compulab.bb
@@ -0,0 +1,24 @@
+SUMMARY = "CompuLab CM-FX6 firmware"
+DESCRIPTION = "Marvell firmware for the bluetooth/wifi 8787"
+SECTION = "base"
+
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://LICENCE.Marvell;md5=9ddea1734a4baf3c78d845151f42a37a"
+
+PROVIDES += "firmware-compulab"
+
+SRCREV = "3f45b8c4cc1eb1d102bc3486b19677332dd215ab"
+SRC_URI = "git://git.marvell.com/mwifiex-firmware.git"
+
+S = "${WORKDIR}/git"
+
+do_install() {
+	install -d ${D}/lib/firmware/mrvl
+	cp -r ${S}/mrvl/sd8787_uapsta.bin ${D}/lib/firmware/mrvl/
+}
+
+FILES_${PN} += "/lib/firmware/mrvl/sd8787_uapsta.bin"
+
+PACKAGE_ARCH = "${MACHINE_SOCARCH}"
+
+COMPATIBLE_MACHINE = "cm-fx6"
-- 
1.9.1

Re: [meta-fsl-arm-extra][PATCH 2/4] firmware-compulab: add firmware configuration for cm-fx6 machines

[Otavio Salvador]

On Wed, Sep 30, 2015 at 12:13 PM, Valentin Raevsky
<valentin@compulab.co.il> wrote:
> Add firmware configuration for cm-fx6 machines.
> CM-FX6 is equipped with a Marvell bt/wifi chip.
> This chip requires a vendor firmware binary.
> This recipe makes the bitbake download the firmware
> binary from the vendor git repository.
>
> Signed-off-by: Valentin Raevsky <valentin@compulab.co.il>

linux-firmware-sd8787 provides this, not need a new recipe for 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

[meta-fsl-arm-extra][PATCH 3/4] cm-fx6: update the cm-fx6 machine configuration

[Valentin Raevsky]

Update the cm-fx6 machine configuration:

1) Fix the device tree blob list.
2) Fix u_boot and kernel virtual providers' names with
respect to the SoC family. This change solves a multiple
provider issue that the image build procedure runs into.
3) Add the firmware-compulab to the buid.

Signed-off-by: Valentin Raevsky <valentin@compulab.co.il>
---
 conf/machine/cm-fx6.conf | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/conf/machine/cm-fx6.conf b/conf/machine/cm-fx6.conf
index 8166b5a..5d8f3dc 100644
--- a/conf/machine/cm-fx6.conf
+++ b/conf/machine/cm-fx6.conf
@@ -9,13 +9,15 @@ require conf/machine/include/tune-cortexa9.inc
 
 SOC_FAMILY = "mx6:mx6dl:mx6q"
 
-PREFERRED_PROVIDER_u-boot = "u-boot-compulab"
-PREFERRED_PROVIDER_virtual/kernel = "linux-compulab"
+PREFERRED_PROVIDER_u-boot_mx6 = "u-boot-compulab"
+PREFERRED_PROVIDER_virtual/kernel_mx6 = "linux-compulab"
 
 UBOOT_MACHINE ?= "cm_fx6_defconfig"
 
-KERNEL_DEVICETREE = "imx6dl-cm-fx6.dtb  imx6dl-sbc-fx6.dtb  imx6dl-sbc-fx6m.dtb  imx6q-cm-fx6.dtb  imx6q-sbc-fx6.dtb  imx6q-sbc-fx6m.dtb"
+KERNEL_DEVICETREE = "imx6dl-sbc-fx6.dtb  imx6dl-sbc-fx6m.dtb  imx6q-sbc-fx6.dtb  imx6q-sbc-fx6m.dtb"
 
 MACHINE_FEATURES += "pci wifi bluetooth alsa bluetooth serial usbhost wifi"
 
+MACHINE_FIRMWARE_append_mx6 += "firmware-compulab"
+
 SERIAL_CONSOLE = "115200 ttymxc3"
-- 
1.9.1

Re: [meta-fsl-arm-extra][PATCH 3/4] cm-fx6: update the cm-fx6 machine configuration

[Igor Grinberg]

Hi Valentin,

On 09/30/15 18:13, Valentin Raevsky wrote:
> Update the cm-fx6 machine configuration:
> 
> 1) Fix the device tree blob list.
> 2) Fix u_boot and kernel virtual providers' names with
> respect to the SoC family. This change solves a multiple
> provider issue that the image build procedure runs into.
> 3) Add the firmware-compulab to the buid.
> 
> Signed-off-by: Valentin Raevsky <valentin@compulab.co.il>
> ---
>  conf/machine/cm-fx6.conf | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/conf/machine/cm-fx6.conf b/conf/machine/cm-fx6.conf
> index 8166b5a..5d8f3dc 100644
> --- a/conf/machine/cm-fx6.conf
> +++ b/conf/machine/cm-fx6.conf
> @@ -9,13 +9,15 @@ require conf/machine/include/tune-cortexa9.inc
>  
>  SOC_FAMILY = "mx6:mx6dl:mx6q"
>  
> -PREFERRED_PROVIDER_u-boot = "u-boot-compulab"
> -PREFERRED_PROVIDER_virtual/kernel = "linux-compulab"
> +PREFERRED_PROVIDER_u-boot_mx6 = "u-boot-compulab"
> +PREFERRED_PROVIDER_virtual/kernel_mx6 = "linux-compulab"
>  
>  UBOOT_MACHINE ?= "cm_fx6_defconfig"
>  
> -KERNEL_DEVICETREE = "imx6dl-cm-fx6.dtb  imx6dl-sbc-fx6.dtb  imx6dl-sbc-fx6m.dtb  imx6q-cm-fx6.dtb  imx6q-sbc-fx6.dtb  imx6q-sbc-fx6m.dtb"
> +KERNEL_DEVICETREE = "imx6dl-sbc-fx6.dtb  imx6dl-sbc-fx6m.dtb  imx6q-sbc-fx6.dtb  imx6q-sbc-fx6m.dtb"

Please do not remove those targets as they are useful for customer specific
base board bring up.

>  
>  MACHINE_FEATURES += "pci wifi bluetooth alsa bluetooth serial usbhost wifi"
>  
> +MACHINE_FIRMWARE_append_mx6 += "firmware-compulab"
> +
>  SERIAL_CONSOLE = "115200 ttymxc3"
> 

-- 
Regards,
Igor.

[meta-fsl-arm-extra][PATCH 4/4] linux-compulab: update cm-fx6 3.14.28 kernel configuration

[Valentin Raevsky]

1) Add the patch that fixes the SD card boot issue.
2) Add the "regulators always-on" patch.

Signed-off-by: Valentin Raevsky <valentin@compulab.co.il>
---
 .../0060-ARM-i.MX6-dts-regulators-always-on.patch  | 49 +++++++++++++++++++
 ...6-cm-fx6-Fix-usdhc3-controller-s-property.patch | 56 ++++++++++++++++++++++
 2 files changed, 105 insertions(+)
 create mode 100644 recipes-kernel/linux/linux-compulab-3.14.28/0060-ARM-i.MX6-dts-regulators-always-on.patch
 create mode 100644 recipes-kernel/linux/linux-compulab-3.14.28/0061-ARM-i.MX6-cm-fx6-Fix-usdhc3-controller-s-property.patch

diff --git a/recipes-kernel/linux/linux-compulab-3.14.28/0060-ARM-i.MX6-dts-regulators-always-on.patch b/recipes-kernel/linux/linux-compulab-3.14.28/0060-ARM-i.MX6-dts-regulators-always-on.patch
new file mode 100644
index 0000000..899700b
--- /dev/null
+++ b/recipes-kernel/linux/linux-compulab-3.14.28/0060-ARM-i.MX6-dts-regulators-always-on.patch
@@ -0,0 +1,49 @@
+From d05c003c32f0d911011747cd1ad7f52839aaa27e Mon Sep 17 00:00:00 2001
+From: Valentin Raevsky <valentin@compulab.co.il>
+Date: Thu, 30 Apr 2015 13:26:48 +0300
+Subject: [PATCH 60/61] ARM: i.MX6: dts: regulators always-on
+
+Turn some regulators into always-on in order to make them work
+acording to the new regulator core rules.
+
+Signed-off-by: Valentin Raevsky <valentin@compulab.co.il>
+---
+ arch/arm/boot/dts/imx6q-cm-fx6.dtsi   | 1 +
+ arch/arm/boot/dts/imx6qdl-cm-fx6.dtsi | 2 ++
+ 2 files changed, 3 insertions(+)
+
+diff --git a/arch/arm/boot/dts/imx6q-cm-fx6.dtsi b/arch/arm/boot/dts/imx6q-cm-fx6.dtsi
+index 3a10e5e..010b74b 100644
+--- a/arch/arm/boot/dts/imx6q-cm-fx6.dtsi
++++ b/arch/arm/boot/dts/imx6q-cm-fx6.dtsi
+@@ -82,6 +82,7 @@
+ 			startup-delay-us = <100>;
+ 			enable-active-high;
+ 			regulator-boot-on;
++			regulator-always-on;
+ 			vin-supply = <&reg_sata_nstandby1>;
+ 		};
+ 
+diff --git a/arch/arm/boot/dts/imx6qdl-cm-fx6.dtsi b/arch/arm/boot/dts/imx6qdl-cm-fx6.dtsi
+index e8f80bc..d8aaaea 100644
+--- a/arch/arm/boot/dts/imx6qdl-cm-fx6.dtsi
++++ b/arch/arm/boot/dts/imx6qdl-cm-fx6.dtsi
+@@ -50,6 +50,7 @@
+ 			regulator-name = "regulator-pcie-power-on-gpio";
+ 			regulator-min-microvolt = <3300000>;
+ 			regulator-max-microvolt = <3300000>;
++			regulator-always-on;
+ 			gpio = <&gpio2 24 0>;
+ 			enable-active-high;
+ 		};
+@@ -80,6 +81,7 @@
+ 			regulator-name = "regulator-awnh387-wifi-nreset";
+ 			regulator-min-microvolt = <3300000>;
+ 			regulator-max-microvolt = <3300000>;
++			regulator-always-on;
+ 			gpio = <&gpio6 16 0>;
+ 			startup-delay-us = <10000>;
+ 		};
+-- 
+1.9.1
+
diff --git a/recipes-kernel/linux/linux-compulab-3.14.28/0061-ARM-i.MX6-cm-fx6-Fix-usdhc3-controller-s-property.patch b/recipes-kernel/linux/linux-compulab-3.14.28/0061-ARM-i.MX6-cm-fx6-Fix-usdhc3-controller-s-property.patch
new file mode 100644
index 0000000..33434e1
--- /dev/null
+++ b/recipes-kernel/linux/linux-compulab-3.14.28/0061-ARM-i.MX6-cm-fx6-Fix-usdhc3-controller-s-property.patch
@@ -0,0 +1,56 @@
+From 0c05543b40b627cc4ad842d4d99265c3943a71fa Mon Sep 17 00:00:00 2001
+From: Valentin Raevsky <valentin@compulab.co.il>
+Date: Sun, 6 Sep 2015 18:53:20 +0300
+Subject: [PATCH 61/61] ARM: i.MX6: cm-fx6: Fix usdhc3 controller's property
+
+Fix usdhc3 controller's property in ordert to match
+the sbc-fx6, sbc-fx6m hw implementation.
+
+Signed-off-by: Valentin Raevsky <valentin@compulab.co.il>
+---
+ arch/arm/boot/dts/imx6qdl-sb-fx6.dtsi  | 1 +
+ arch/arm/boot/dts/imx6qdl-sb-fx6m.dtsi | 1 +
+ arch/arm/boot/dts/imx6qdl-sb-fx6x.dtsi | 2 +-
+ 3 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/arch/arm/boot/dts/imx6qdl-sb-fx6.dtsi b/arch/arm/boot/dts/imx6qdl-sb-fx6.dtsi
+index 85836d7..fb389fb 100644
+--- a/arch/arm/boot/dts/imx6qdl-sb-fx6.dtsi
++++ b/arch/arm/boot/dts/imx6qdl-sb-fx6.dtsi
+@@ -72,6 +72,7 @@
+ 
+ &usdhc3 {
+ 	wp-gpios = <&gpio7 0 0>;
++	cd-gpios = <&gpio7 1 0>;
+ 	status = "okay";
+ };
+ 
+diff --git a/arch/arm/boot/dts/imx6qdl-sb-fx6m.dtsi b/arch/arm/boot/dts/imx6qdl-sb-fx6m.dtsi
+index 5394364..dc6449d 100644
+--- a/arch/arm/boot/dts/imx6qdl-sb-fx6m.dtsi
++++ b/arch/arm/boot/dts/imx6qdl-sb-fx6m.dtsi
+@@ -93,6 +93,7 @@
+ };
+ 
+ &usdhc3 {
++	non-removable;
+ 	status = "okay";
+ };
+ 
+diff --git a/arch/arm/boot/dts/imx6qdl-sb-fx6x.dtsi b/arch/arm/boot/dts/imx6qdl-sb-fx6x.dtsi
+index 01f73ae..f98a87d 100644
+--- a/arch/arm/boot/dts/imx6qdl-sb-fx6x.dtsi
++++ b/arch/arm/boot/dts/imx6qdl-sb-fx6x.dtsi
+@@ -103,8 +103,8 @@
+ 	pinctrl-0 = <&pinctrl_usdhc3>;
+ 	pinctrl-1 = <&pinctrl_usdhc3_100mhz>;
+ 	pinctrl-2 = <&pinctrl_usdhc3_200mhz>;
+-	cd-gpios = <&gpio7 1 0>;
+ 	no-1-8-v;
++	keep-power-in-suspend;
+ 	vmmc-supply = <&reg_3p3v>;
+ 	status = "disabled";
+ };
+-- 
+1.9.1
+
-- 
1.9.1

Re: [meta-fsl-arm-extra][PATCH 4/4] linux-compulab: update cm-fx6 3.14.28 kernel configuration

[Igor Grinberg]

On 09/30/15 18:13, Valentin Raevsky wrote:
> 1) Add the patch that fixes the SD card boot issue.
> 2) Add the "regulators always-on" patch.
> 
> Signed-off-by: Valentin Raevsky <valentin@compulab.co.il>
> ---
>  .../0060-ARM-i.MX6-dts-regulators-always-on.patch  | 49 +++++++++++++++++++
>  ...6-cm-fx6-Fix-usdhc3-controller-s-property.patch | 56 ++++++++++++++++++++++
>  2 files changed, 105 insertions(+)
>  create mode 100644 recipes-kernel/linux/linux-compulab-3.14.28/0060-ARM-i.MX6-dts-regulators-always-on.patch
>  create mode 100644 recipes-kernel/linux/linux-compulab-3.14.28/0061-ARM-i.MX6-cm-fx6-Fix-usdhc3-controller-s-property.patch
> 
> diff --git a/recipes-kernel/linux/linux-compulab-3.14.28/0060-ARM-i.MX6-dts-regulators-always-on.patch b/recipes-kernel/linux/linux-compulab-3.14.28/0060-ARM-i.MX6-dts-regulators-always-on.patch
> new file mode 100644
> index 0000000..899700b
> --- /dev/null
> +++ b/recipes-kernel/linux/linux-compulab-3.14.28/0060-ARM-i.MX6-dts-regulators-always-on.patch
> @@ -0,0 +1,49 @@
> +From d05c003c32f0d911011747cd1ad7f52839aaa27e Mon Sep 17 00:00:00 2001
> +From: Valentin Raevsky <valentin@compulab.co.il>
> +Date: Thu, 30 Apr 2015 13:26:48 +0300
> +Subject: [PATCH 60/61] ARM: i.MX6: dts: regulators always-on
> +
> +Turn some regulators into always-on in order to make them work
> +acording to the new regulator core rules.
> +
> +Signed-off-by: Valentin Raevsky <valentin@compulab.co.il>
> +---
> + arch/arm/boot/dts/imx6q-cm-fx6.dtsi   | 1 +
> + arch/arm/boot/dts/imx6qdl-cm-fx6.dtsi | 2 ++
> + 2 files changed, 3 insertions(+)
> +
> +diff --git a/arch/arm/boot/dts/imx6q-cm-fx6.dtsi b/arch/arm/boot/dts/imx6q-cm-fx6.dtsi
> +index 3a10e5e..010b74b 100644
> +--- a/arch/arm/boot/dts/imx6q-cm-fx6.dtsi
> ++++ b/arch/arm/boot/dts/imx6q-cm-fx6.dtsi
> +@@ -82,6 +82,7 @@
> + 			startup-delay-us = <100>;
> + 			enable-active-high;
> + 			regulator-boot-on;
> ++			regulator-always-on;
> + 			vin-supply = <&reg_sata_nstandby1>;
> + 		};
> + 
> +diff --git a/arch/arm/boot/dts/imx6qdl-cm-fx6.dtsi b/arch/arm/boot/dts/imx6qdl-cm-fx6.dtsi
> +index e8f80bc..d8aaaea 100644
> +--- a/arch/arm/boot/dts/imx6qdl-cm-fx6.dtsi
> ++++ b/arch/arm/boot/dts/imx6qdl-cm-fx6.dtsi
> +@@ -50,6 +50,7 @@
> + 			regulator-name = "regulator-pcie-power-on-gpio";
> + 			regulator-min-microvolt = <3300000>;
> + 			regulator-max-microvolt = <3300000>;
> ++			regulator-always-on;
> + 			gpio = <&gpio2 24 0>;
> + 			enable-active-high;
> + 		};
> +@@ -80,6 +81,7 @@
> + 			regulator-name = "regulator-awnh387-wifi-nreset";
> + 			regulator-min-microvolt = <3300000>;
> + 			regulator-max-microvolt = <3300000>;
> ++			regulator-always-on;
> + 			gpio = <&gpio6 16 0>;
> + 			startup-delay-us = <10000>;

Those two above should toggle-able...
If this is a temporary measure, please comment it as such.

> + 		};
> +-- 
> +1.9.1
> +
> diff --git a/recipes-kernel/linux/linux-compulab-3.14.28/0061-ARM-i.MX6-cm-fx6-Fix-usdhc3-controller-s-property.patch b/recipes-kernel/linux/linux-compulab-3.14.28/0061-ARM-i.MX6-cm-fx6-Fix-usdhc3-controller-s-property.patch
> new file mode 100644
> index 0000000..33434e1
> --- /dev/null
> +++ b/recipes-kernel/linux/linux-compulab-3.14.28/0061-ARM-i.MX6-cm-fx6-Fix-usdhc3-controller-s-property.patch
> @@ -0,0 +1,56 @@
> +From 0c05543b40b627cc4ad842d4d99265c3943a71fa Mon Sep 17 00:00:00 2001
> +From: Valentin Raevsky <valentin@compulab.co.il>
> +Date: Sun, 6 Sep 2015 18:53:20 +0300
> +Subject: [PATCH 61/61] ARM: i.MX6: cm-fx6: Fix usdhc3 controller's property
> +
> +Fix usdhc3 controller's property in ordert to match
> +the sbc-fx6, sbc-fx6m hw implementation.
> +
> +Signed-off-by: Valentin Raevsky <valentin@compulab.co.il>

IMO, this patch is not needed anymore... since CM-FX6 U-Boot version
v2015.07-cm-fx6-3 the SD card h/w differences are dealt with.

> +---
> + arch/arm/boot/dts/imx6qdl-sb-fx6.dtsi  | 1 +
> + arch/arm/boot/dts/imx6qdl-sb-fx6m.dtsi | 1 +
> + arch/arm/boot/dts/imx6qdl-sb-fx6x.dtsi | 2 +-
> + 3 files changed, 3 insertions(+), 1 deletion(-)
> +
> +diff --git a/arch/arm/boot/dts/imx6qdl-sb-fx6.dtsi b/arch/arm/boot/dts/imx6qdl-sb-fx6.dtsi
> +index 85836d7..fb389fb 100644
> +--- a/arch/arm/boot/dts/imx6qdl-sb-fx6.dtsi
> ++++ b/arch/arm/boot/dts/imx6qdl-sb-fx6.dtsi
> +@@ -72,6 +72,7 @@
> + 
> + &usdhc3 {
> + 	wp-gpios = <&gpio7 0 0>;
> ++	cd-gpios = <&gpio7 1 0>;
> + 	status = "okay";
> + };
> + 
> +diff --git a/arch/arm/boot/dts/imx6qdl-sb-fx6m.dtsi b/arch/arm/boot/dts/imx6qdl-sb-fx6m.dtsi
> +index 5394364..dc6449d 100644
> +--- a/arch/arm/boot/dts/imx6qdl-sb-fx6m.dtsi
> ++++ b/arch/arm/boot/dts/imx6qdl-sb-fx6m.dtsi
> +@@ -93,6 +93,7 @@
> + };
> + 
> + &usdhc3 {
> ++	non-removable;
> + 	status = "okay";
> + };
> + 
> +diff --git a/arch/arm/boot/dts/imx6qdl-sb-fx6x.dtsi b/arch/arm/boot/dts/imx6qdl-sb-fx6x.dtsi
> +index 01f73ae..f98a87d 100644
> +--- a/arch/arm/boot/dts/imx6qdl-sb-fx6x.dtsi
> ++++ b/arch/arm/boot/dts/imx6qdl-sb-fx6x.dtsi
> +@@ -103,8 +103,8 @@
> + 	pinctrl-0 = <&pinctrl_usdhc3>;
> + 	pinctrl-1 = <&pinctrl_usdhc3_100mhz>;
> + 	pinctrl-2 = <&pinctrl_usdhc3_200mhz>;
> +-	cd-gpios = <&gpio7 1 0>;
> + 	no-1-8-v;
> ++	keep-power-in-suspend;
> + 	vmmc-supply = <&reg_3p3v>;
> + 	status = "disabled";
> + };
> +-- 
> +1.9.1
> +
> 

-- 
Regards,
Igor.

Re: [meta-fsl-arm-extra][PATCH 1/4] u-boot-compulab: update the build recipe.

[Otavio Salvador]

On Wed, Sep 30, 2015 at 12:13 PM, Valentin Raevsky
<valentin@compulab.co.il> wrote:
> 1) Add the cm-fx6-firmware build and deploy methods.
> 2) Update the u-boot SRC_URI.
>
> Signed-off-by: Valentin Raevsky <valentin@compulab.co.il>
> ---
>  .../u-boot-compulab-2014.10/cm-fx6-firmware.patch  | 14 ++++++++++++++
>  recipes-bsp/u-boot/u-boot-compulab_2014.10.bb      | 22 +++++++++++++++++-----
>  2 files changed, 31 insertions(+), 5 deletions(-)
>  create mode 100644 recipes-bsp/u-boot/u-boot-compulab-2014.10/cm-fx6-firmware.patch
>
> diff --git a/recipes-bsp/u-boot/u-boot-compulab-2014.10/cm-fx6-firmware.patch b/recipes-bsp/u-boot/u-boot-compulab-2014.10/cm-fx6-firmware.patch
> new file mode 100644
> index 0000000..37e40b0
> --- /dev/null
> +++ b/recipes-bsp/u-boot/u-boot-compulab-2014.10/cm-fx6-firmware.patch

The patch needs a short description and upstream-status information[1].

1. http://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines

> @@ -0,0 +1,14 @@
> +diff --git a/Makefile b/Makefile
> +index 6808eab..db6d93d 100644
> +--- a/Makefile
> ++++ b/Makefile
> +@@ -1449,3 +1449,9 @@ FORCE:
> + # Declare the contents of the .PHONY variable as phony.  We keep that
> + # information in a variable so we can use it in if_changed and friends.
> + .PHONY: $(PHONY)
> ++
> ++cm-fx6-firmware:
> ++      @echo cm-fx6-firmware
> ++      $(objtree)/tools/mkimage -n $(objtree)/board/compulab/cm_fx6/imximage.cfg.cfgtmp -T imximage -e 0x00908000 -d $(objtree)/spl/u-boot-spl.bin spl.img
> ++      dd if=/dev/zero count=500 bs=1K | tr '\000' '\377' > cm-fx6-firmware
> ++      dd if=spl.img of=cm-fx6-firmware bs=1K seek=1 conv=notrunc && dd if=u-boot.img of=cm-fx6-firmware bs=1K seek=64 conv=notrunc
> diff --git a/recipes-bsp/u-boot/u-boot-compulab_2014.10.bb b/recipes-bsp/u-boot/u-boot-compulab_2014.10.bb
> index 02651e0..ed5dc78 100644
> --- a/recipes-bsp/u-boot/u-boot-compulab_2014.10.bb
> +++ b/recipes-bsp/u-boot/u-boot-compulab_2014.10.bb
> @@ -6,12 +6,24 @@ LIC_FILES_CHKSUM = "file://configs/cm_fx6_defconfig;md5=549452418e9e099e5fe19ef1
>
>  PROVIDES += "u-boot"
>
> -SRCBRANCH = "utilite/master"
> -SRCREV = "6803a75f3d40bee3b53f56e7b49c70465819b7ca"
> -SRC_URI = "git://github.com/utilite-computer/u-boot.git;branch=${SRCBRANCH}"
> -SRC_URI[md5sum] = "fd8234c5b3a460430689848c1f16acef"
> +SRC_URI[md5sum] = "78c144ab4a84e063829c81a50174dcca"
> +SRC_URI[sha256sum] = "cce769aec902a952e6425e88aa7973680a019ebb2b34359a2417a2bd1f553435"
> +SRC_URI = "https://github.com/utilite-computer/u-boot/archive/v2014.10-cm-fx6-2.2.zip"

Use Git protocol ad Github tarballs are not stable and are generated
from time to time.

> -S = "${WORKDIR}/git"
> +S = "${WORKDIR}/u-boot-2014.10-cm-fx6-2.2"
>
>  PACKAGE_ARCH = "${MACHINE_ARCH}"
>  COMPATIBLE_MACHINE = "cm-fx6"
> +
> +SRC_URI += "file://cm-fx6-firmware.patch"
> +
> +do_compile_append() {
> +       oe_runmake
> +       oe_runmake cm-fx6-firmware
> +}
> +
> +do_deploy_append() {
> +       install ${S}/cm-fx6-firmware ${DEPLOYDIR}/cm-fx6-firmware
> +       rm ${DEPLOYDIR}/u-boot*imx
> +       dd if=${DEPLOYDIR}/cm-fx6-firmware of=${DEPLOYDIR}/u-boot-cm-fx6.imx skip=2 bs=512
> +}

It seems you could do the dd generation straight in the deploy task.
No? You have the image generated so I fail to see why you are
generating it again?

-- 
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