[meta-fsl-arm-extra][PATCH 1/6] imx233-olinuxino: Add mx23 to the SoC family

[meta-fsl-arm-extra][PATCH 1/6] imx233-olinuxino: Add mx23 to the SoC family

[Otavio Salvador]

Change-Id: Ia1cf14ddbb29bed200c0a128aa6cf3757b45cd07
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 conf/machine/include/imx233-olinuxino.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/machine/include/imx233-olinuxino.inc b/conf/machine/include/imx233-olinuxino.inc
index 8f8a9a1..fa2bfd4 100644
--- a/conf/machine/include/imx233-olinuxino.inc
+++ b/conf/machine/include/imx233-olinuxino.inc
@@ -3,7 +3,7 @@
 include conf/machine/include/mxs-base.inc
 
 # Add a override for all iMX233-OLinuXino variants
-SOC_FAMILY_append = ":imx233-olinuxino"
+SOC_FAMILY = "imx233-olinuxino:mx23:mxs"
 
 IMXBOOTLETS_MACHINE = "stmp378x_dev"
 
-- 
1.8.1

[meta-fsl-arm-extra][PATCH 2/6] imx233-olinuxino: Enable USB HID support

[Otavio Salvador]

Change-Id: Idd61888e932b0fdc9534cf6957a5b7061ba27675
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 .../linux-imx-2.6.35.3/imx233-olinuxino/defconfig  | 55 +++++++++++++++++++++-
 recipes-kernel/linux/linux-imx_2.6.35.3.bbappend   |  2 +-
 2 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/recipes-kernel/linux/linux-imx-2.6.35.3/imx233-olinuxino/defconfig b/recipes-kernel/linux/linux-imx-2.6.35.3/imx233-olinuxino/defconfig
index e7aae80..16a864c 100644
--- a/recipes-kernel/linux/linux-imx-2.6.35.3/imx233-olinuxino/defconfig
+++ b/recipes-kernel/linux/linux-imx-2.6.35.3/imx233-olinuxino/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.35.3
-# Tue Aug  7 10:37:00 2012
+# Fri Feb 15 09:13:16 2013
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1280,7 +1280,58 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_ALL_CODECS is not set
 CONFIG_SND_SOC_MXS_ADC_CODEC=y
 # CONFIG_SOUND_PRIME is not set
-# CONFIG_HID_SUPPORT is not set
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
+# CONFIG_HIDRAW is not set
+
+#
+# USB Input Devices
+#
+CONFIG_USB_HID=y
+# CONFIG_HID_PID is not set
+# CONFIG_USB_HIDDEV is not set
+
+#
+# Special HID drivers
+#
+# CONFIG_HID_3M_PCT is not set
+# CONFIG_HID_A4TECH is not set
+# CONFIG_HID_APPLE is not set
+# CONFIG_HID_BELKIN is not set
+# CONFIG_HID_CANDO is not set
+# CONFIG_HID_CHERRY is not set
+# CONFIG_HID_CHICONY is not set
+# CONFIG_HID_PRODIKEYS is not set
+# CONFIG_HID_CYPRESS is not set
+# CONFIG_HID_DRAGONRISE is not set
+# CONFIG_HID_EGALAX is not set
+# CONFIG_HID_EZKEY is not set
+# CONFIG_HID_KYE is not set
+# CONFIG_HID_GYRATION is not set
+# CONFIG_HID_TWINHAN is not set
+# CONFIG_HID_KENSINGTON is not set
+# CONFIG_HID_LOGITECH is not set
+# CONFIG_HID_MICROSOFT is not set
+# CONFIG_HID_MOSART is not set
+# CONFIG_HID_MONTEREY is not set
+# CONFIG_HID_NTRIG is not set
+# CONFIG_HID_ORTEK is not set
+# CONFIG_HID_PANTHERLORD is not set
+# CONFIG_HID_PETALYNX is not set
+# CONFIG_HID_PICOLCD is not set
+# CONFIG_HID_QUANTA is not set
+# CONFIG_HID_ROCCAT is not set
+# CONFIG_HID_ROCCAT_KONE is not set
+# CONFIG_HID_SAMSUNG is not set
+# CONFIG_HID_SONY is not set
+# CONFIG_HID_STANTUM is not set
+# CONFIG_HID_SUNPLUS is not set
+# CONFIG_HID_GREENASIA is not set
+# CONFIG_HID_SMARTJOYPLUS is not set
+# CONFIG_HID_TOPSEED is not set
+# CONFIG_HID_THRUSTMASTER is not set
+# CONFIG_HID_ZEROPLUS is not set
+# CONFIG_HID_ZYDACRON is not set
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_ARCH_HAS_HCD=y
 # CONFIG_USB_ARCH_HAS_OHCI is not set
diff --git a/recipes-kernel/linux/linux-imx_2.6.35.3.bbappend b/recipes-kernel/linux/linux-imx_2.6.35.3.bbappend
index a0f2ac8..1c70b1c 100644
--- a/recipes-kernel/linux/linux-imx_2.6.35.3.bbappend
+++ b/recipes-kernel/linux/linux-imx_2.6.35.3.bbappend
@@ -1,6 +1,6 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
 
-PRINC := "${@int(PRINC) + 11}"
+PRINC := "${@int(PRINC) + 12}"
 
 # Board specific patches
 SRC_URI_append_imx233-olinuxino = " file://imx233-olinuxino.patch"
-- 
1.8.1

[meta-fsl-arm-extra][PATCH 3/6] imx233-olinuxino.inc: Use U-Boot by default

[Otavio Salvador]

The U-Boot now supports the mx23-olinuxino boards so we now use it by
default. The imx-bootlets support is still available in case someone
needs it.

Change-Id: I0ddf95f73b444db97056eb6568646cf236fa2b89
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 conf/machine/include/imx233-olinuxino.inc | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/conf/machine/include/imx233-olinuxino.inc b/conf/machine/include/imx233-olinuxino.inc
index fa2bfd4..62a6e8b 100644
--- a/conf/machine/include/imx233-olinuxino.inc
+++ b/conf/machine/include/imx233-olinuxino.inc
@@ -2,17 +2,16 @@
 
 include conf/machine/include/mxs-base.inc
 
+IMXBOOTLETS_MACHINE = "stmp378x_dev"
+UBOOT_MACHINE = "mx23_olinuxino_config"
+
 # Add a override for all iMX233-OLinuXino variants
 SOC_FAMILY = "imx233-olinuxino:mx23:mxs"
 
-IMXBOOTLETS_MACHINE = "stmp378x_dev"
-
-KERNEL_IMAGETYPE = "zImage"
+KERNEL_IMAGETYPE = "uImage"
 KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx23-olinuxino.dts"
 
-IMAGE_BOOTLOADER = "imx-bootlets"
-
 SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
-IMAGE_FSTYPES ?= "tar.bz2 ext3 linux.sb sdcard"
+IMAGE_FSTYPES ?= "tar.bz2 ext3 uboot.mxsboot-sdcard sdcard"
 
 MACHINE_FEATURES = "apm usbgadget usbhost vfat alsa"
-- 
1.8.1

[meta-fsl-arm-extra][PATCH 4/6] wandboard: Add 'wandboard' as SoC family and restrict kernel compatibility

[Otavio Salvador]

This allow for addition of wandboard-solo soon, while avoid build
warning due lack of a generic 'defconfig' file.

Change-Id: Ifedad79f8093f1f5f4d9df9d5a4e5c45d452cdbf
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 conf/machine/wandboard-dual.conf               | 2 +-
 recipes-kernel/linux/linux-wandboard_3.0.35.bb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/machine/wandboard-dual.conf b/conf/machine/wandboard-dual.conf
index 0dd32f9..02d63b7 100644
--- a/conf/machine/wandboard-dual.conf
+++ b/conf/machine/wandboard-dual.conf
@@ -5,7 +5,7 @@
 include conf/machine/include/imx-base.inc
 include conf/machine/include/tune-cortexa9.inc
 
-SOC_FAMILY = "mx6dl:mx6"
+SOC_FAMILY = "wandboard:mx6dl:mx6"
 
 KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx6dl-wandboard.dts"
 
diff --git a/recipes-kernel/linux/linux-wandboard_3.0.35.bb b/recipes-kernel/linux/linux-wandboard_3.0.35.bb
index b2cd3ab..0d23d4a 100644
--- a/recipes-kernel/linux/linux-wandboard_3.0.35.bb
+++ b/recipes-kernel/linux/linux-wandboard_3.0.35.bb
@@ -7,4 +7,4 @@ include linux-wandboard.inc
 SRCREV = "64fee2d5ee42688a813a33b0d2f047f3dcc6b56f"
 LOCALVERSION = "-wandboard+yocto"
 
-COMPATIBLE_MACHINE = "(mx6)"
+COMPATIBLE_MACHINE = "(wandboard)"
-- 
1.8.1

[meta-fsl-arm-extra][PATCH 5/6] wandboard-dual: Use U-Boot mainline

[Otavio Salvador]

The U-Boot 2013.04 has support for Wandboard so we use it, from now on.

Change-Id: I9bdf3ce688d13f8d07d83643df097a1ce6341b6c
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 conf/machine/wandboard-dual.conf | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/conf/machine/wandboard-dual.conf b/conf/machine/wandboard-dual.conf
index 02d63b7..f19b1a4 100644
--- a/conf/machine/wandboard-dual.conf
+++ b/conf/machine/wandboard-dual.conf
@@ -9,12 +9,9 @@ SOC_FAMILY = "wandboard:mx6dl:mx6"
 
 KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx6dl-wandboard.dts"
 
-PREFERRED_PROVIDER_u-boot = "u-boot-imx" 
 PREFERRED_PROVIDER_virtual/kernel = "linux-wandboard"
 
-UBOOT_MACHINE = "wandboard_config"
-UBOOT_SUFFIX = "bin"
-UBOOT_PADDING = "2"
+UBOOT_MACHINE = "wandboard_dl_config"
 
 SERIAL_CONSOLE = "115200 ttymxc0"
 
-- 
1.8.1

[meta-fsl-arm-extra][PATCH 6/6] wandboard-solo: Add machine configuration

[Otavio Salvador]

The kernel configuration is the same for Dual and Solo variants; to
fix it, we move the Dual defconfig to common directory avoiding
duplication.

Change-Id: I5d4b304c9980115318fdda75a6dc623783cb5cf7
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 conf/machine/wandboard-solo.conf                       | 18 ++++++++++++++++++
 .../{wandboard-dual => }/defconfig                     |  0
 2 files changed, 18 insertions(+)
 create mode 100644 conf/machine/wandboard-solo.conf
 rename recipes-kernel/linux/linux-wandboard-3.0.35/{wandboard-dual => }/defconfig (100%)

diff --git a/conf/machine/wandboard-solo.conf b/conf/machine/wandboard-solo.conf
new file mode 100644
index 0000000..0816b59
--- /dev/null
+++ b/conf/machine/wandboard-solo.conf
@@ -0,0 +1,18 @@
+#@TYPE: Machine
+#@NAME: i.MX6 Wandboard Solo
+#@DESCRIPTION: Machine configuration for i.MX6 Wandboard Solo
+
+include conf/machine/include/imx-base.inc
+include conf/machine/include/tune-cortexa9.inc
+
+SOC_FAMILY = "wandboard:mx6s:mx6"
+
+KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx6s-wandboard.dts"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-wandboard"
+
+UBOOT_MACHINE = "wandboard_solo_config"
+
+SERIAL_CONSOLE = "115200 ttymxc0"
+
+MACHINE_FEATURES += " pci wifi bluetooth"
diff --git a/recipes-kernel/linux/linux-wandboard-3.0.35/wandboard-dual/defconfig b/recipes-kernel/linux/linux-wandboard-3.0.35/defconfig
similarity index 100%
rename from recipes-kernel/linux/linux-wandboard-3.0.35/wandboard-dual/defconfig
rename to recipes-kernel/linux/linux-wandboard-3.0.35/defconfig
-- 
1.8.1

Re: [meta-fsl-arm-extra][PATCH 5/6] wandboard-dual: Use U-Boot mainline

[John Weber]

> diff --git a/conf/machine/wandboard-dual.conf b/conf/machine/wandboard-dual.conf
> index 02d63b7..f19b1a4 100644
> --- a/conf/machine/wandboard-dual.conf
> +++ b/conf/machine/wandboard-dual.conf
> @@ -9,12 +9,9 @@ SOC_FAMILY = "wandboard:mx6dl:mx6"
>
>   KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx6dl-wandboard.dts"

Same question as in the solo recipe patch.  We're not using dts, so where does 
this file come from?

Re: [meta-fsl-arm-extra][PATCH 6/6] wandboard-solo: Add machine configuration

[Otavio Salvador]

[ Adding mailing list and Fabio ]

On Tue, Apr 9, 2013 at 2:37 PM, John Weber <rjohnweber@gmail.com> wrote:
> Hi Otavio - thanks for the doing this!  Some comments below.

You're welcome.

This patch is indeed not yet ready for merging ... read bellow ...

> On Tue Apr  9 12:04:53 2013, Otavio Salvador wrote:
>>
>> The kernel configuration is the same for Dual and Solo variants; to
>> fix it, we move the Dual defconfig to common directory avoiding
>> duplication.
>>
>> Change-Id: I5d4b304c9980115318fdda75a6dc623783cb5cf7
>> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>> ---
>>   conf/machine/wandboard-solo.conf                       | 18
>> ++++++++++++++++++
>>   .../{wandboard-dual => }/defconfig                     |  0
>>   2 files changed, 18 insertions(+)
>>   create mode 100644 conf/machine/wandboard-solo.conf
>>   rename recipes-kernel/linux/linux-wandboard-3.0.35/{wandboard-dual =>
>> }/defconfig (100%)
>>
>> diff --git a/conf/machine/wandboard-solo.conf
>> b/conf/machine/wandboard-solo.conf
>> new file mode 100644
>> index 0000000..0816b59
>> --- /dev/null
>> +++ b/conf/machine/wandboard-solo.conf
>> @@ -0,0 +1,18 @@
>> +#@TYPE: Machine
>> +#@NAME: i.MX6 Wandboard Solo
>> +#@DESCRIPTION: Machine configuration for i.MX6 Wandboard Solo
>> +
>> +include conf/machine/include/imx-base.inc
>> +include conf/machine/include/tune-cortexa9.inc
>> +
>> +SOC_FAMILY = "wandboard:mx6s:mx6"
>> +
>> +KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx6s-wandboard.dts"
>
>
> This is just for my information.  I don't think the 3.0.35 kernel makes use
> of device trees and there isn't a dts directory in arch/arm/boot.  So, what
> is the purpose of this line?

For linux-mainline. This is the format being used so it should match
when it is add. As we had it for the dual variant, I did the same for
solo.

Fabio, what do you think? Should we add it now or later?

>> +
>> +PREFERRED_PROVIDER_virtual/kernel = "linux-wandboard"
>> +
>> +UBOOT_MACHINE = "wandboard_solo_config"
>> +
>> +SERIAL_CONSOLE = "115200 ttymxc0"
>> +
>> +MACHINE_FEATURES += " pci wifi bluetooth"
>
>
> The solo module does not include a wifi/bt chip.  If we include wifi, pci,
> and bluetooth then all of the utilities to support them are there, when they
> don't have to be.  Users should probably include them as part of their image
> instead of being part of the machine.

Good catch, I dropped the firmware but forgot about the feature.

>> diff --git
>> a/recipes-kernel/linux/linux-wandboard-3.0.35/wandboard-dual/defconfig
>> b/recipes-kernel/linux/linux-wandboard-3.0.35/defconfig
>> similarity index 100%
>> rename from
>> recipes-kernel/linux/linux-wandboard-3.0.35/wandboard-dual/defconfig
>> rename to recipes-kernel/linux/linux-wandboard-3.0.35/defconfig

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

Re: [meta-fsl-arm-extra][PATCH 5/6] wandboard-dual: Use U-Boot mainline

[Otavio Salvador]

On Tue, Apr 9, 2013 at 2:39 PM, John Weber <rjohnweber@gmail.com> wrote:
>> diff --git a/conf/machine/wandboard-dual.conf
>> b/conf/machine/wandboard-dual.conf
>> index 02d63b7..f19b1a4 100644
>> --- a/conf/machine/wandboard-dual.conf
>> +++ b/conf/machine/wandboard-dual.conf
>> @@ -9,12 +9,9 @@ SOC_FAMILY = "wandboard:mx6dl:mx6"
>>
>>   KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx6dl-wandboard.dts"
>
>
> Same question as in the solo recipe patch.  We're not using dts, so where
> does this file come from?
>

This will be used by mainline kernel; however I did not add it for the
dual and it came on first board patch. I think it does not hurt
anyway.

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

Re: [meta-fsl-arm-extra][PATCH 5/6] wandboard-dual: Use U-Boot mainline

[Daiane Angolini]

On 04/09/2013 02:53 PM, Otavio Salvador wrote:
> On Tue, Apr 9, 2013 at 2:39 PM, John Weber <rjohnweber@gmail.com> wrote:
>>> diff --git a/conf/machine/wandboard-dual.conf
>>> b/conf/machine/wandboard-dual.conf
>>> index 02d63b7..f19b1a4 100644
>>> --- a/conf/machine/wandboard-dual.conf
>>> +++ b/conf/machine/wandboard-dual.conf
>>> @@ -9,12 +9,9 @@ SOC_FAMILY = "wandboard:mx6dl:mx6"
>>>
>>>    KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx6dl-wandboard.dts"
>>
>>
>> Same question as in the solo recipe patch.  We're not using dts, so where
>> does this file come from?
>>
>
> This will be used by mainline kernel; however I did not add it for the
> dual and it came on first board patch. I think it does not hurt
> anyway.

It did not hurt, but I decided to not include this "useless" source code 
when I created the imx6dlsabresd and imx6slevk.

It may lead user to an error.

Daiane

Re: [meta-fsl-arm-extra][PATCH 5/6] wandboard-dual: Use U-Boot mainline

[Otavio Salvador]

On Tue, Apr 9, 2013 at 2:56 PM, Daiane Angolini
<daiane.angolini@freescale.com> wrote:
> On 04/09/2013 02:53 PM, Otavio Salvador wrote:
>>
>> On Tue, Apr 9, 2013 at 2:39 PM, John Weber <rjohnweber@gmail.com> wrote:
>>>>
>>>> diff --git a/conf/machine/wandboard-dual.conf
>>>> b/conf/machine/wandboard-dual.conf
>>>> index 02d63b7..f19b1a4 100644
>>>> --- a/conf/machine/wandboard-dual.conf
>>>> +++ b/conf/machine/wandboard-dual.conf
>>>> @@ -9,12 +9,9 @@ SOC_FAMILY = "wandboard:mx6dl:mx6"
>>>>
>>>>    KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx6dl-wandboard.dts"
>>>
>>>
>>>
>>> Same question as in the solo recipe patch.  We're not using dts, so where
>>> does this file come from?
>>>
>>
>> This will be used by mainline kernel; however I did not add it for the
>> dual and it came on first board patch. I think it does not hurt
>> anyway.
>
>
> It did not hurt, but I decided to not include this "useless" source code
> when I created the imx6dlsabresd and imx6slevk.
>
> It may lead user to an error.

I can remove this from solo addition, and add a patch to drop the dual one.

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

Re: [meta-fsl-arm-extra][PATCH 6/6] wandboard-solo: Add machine configuration

[Fabio Estevam]

On Tue, Apr 9, 2013 at 2:52 PM, Otavio Salvador <otavio@ossystems.com.br> wrote:

> For linux-mainline. This is the format being used so it should match
> when it is add. As we had it for the dual variant, I did the same for
> solo.
>
> Fabio, what do you think? Should we add it now or later?

imx6dl support will appear in kernel 3.10. Initial patch was already
sent and it is available in the imx arm maintainer's tree.

imx6solo support is not ready yet. It still needs pinctrl support in
the kernel, so it will take a bit of time.

I think we should add dt support for wandboard-dual when kernel 3.10 shows up.