Patchwork [meta-fsl-arm-extra] Stop using mx6s SoC family

login
register
mail settings
Submitter Otavio Salvador
Date April 23, 2014, 2:24 p.m.
Message ID <1398263047-30456-1-git-send-email-otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/70807/
State Accepted
Delegated to: Otavio Salvador
Headers show

Comments

Otavio Salvador - April 23, 2014, 2:24 p.m.
The i.MX6 Solo is internally a i.MX6 Dual Lite but single core. This
uses the mx6dl as the SoC family as it is already being done in the
Kernel, U-Boot and Barebox.

Change-Id: If587097d9e3be35eadca27e67c11415a4fb0f1c1
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 conf/machine/cubox-i.conf         | 4 ++--
 conf/machine/nitrogen6x-lite.conf | 2 +-
 conf/machine/wandboard-solo.conf  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
Fabio Estevam - April 23, 2014, 3:39 p.m.
On Wed, Apr 23, 2014 at 11:24 AM, Otavio Salvador
<otavio@ossystems.com.br> wrote:

> --- a/conf/machine/nitrogen6x-lite.conf
> +++ b/conf/machine/nitrogen6x-lite.conf
> @@ -7,7 +7,7 @@
>  include conf/machine/include/imx-base.inc
>  include conf/machine/include/tune-cortexa9.inc
>
> -SOC_FAMILY = "mx6:mx6s"
> +SOC_FAMILY = "mx6:mx6dl"
>
>  KERNEL_DEVICETREE = "imx6dl-nit6xlite.dtb"

Patch looks fine, but I am wondering if we should use
"imx6dl-nitrogen6x.dtb" here in order to align with the mainline
kernel?
Fabio Estevam - April 23, 2014, 3:40 p.m.
On Wed, Apr 23, 2014 at 12:39 PM, Fabio Estevam <festevam@gmail.com> wrote:
> On Wed, Apr 23, 2014 at 11:24 AM, Otavio Salvador
> <otavio@ossystems.com.br> wrote:
>
>> --- a/conf/machine/nitrogen6x-lite.conf
>> +++ b/conf/machine/nitrogen6x-lite.conf
>> @@ -7,7 +7,7 @@
>>  include conf/machine/include/imx-base.inc
>>  include conf/machine/include/tune-cortexa9.inc
>>
>> -SOC_FAMILY = "mx6:mx6s"
>> +SOC_FAMILY = "mx6:mx6dl"
>>
>>  KERNEL_DEVICETREE = "imx6dl-nit6xlite.dtb"
>
> Patch looks fine, but I am wondering if we should use
> "imx6dl-nitrogen6x.dtb" here in order to align with the mainline
> kernel?

Ah, it seems that it is a different board.
Eric Nelson - April 23, 2014, 3:45 p.m.
On 04/23/2014 08:40 AM, Fabio Estevam wrote:
> On Wed, Apr 23, 2014 at 12:39 PM, Fabio Estevam <festevam@gmail.com> wrote:
>> On Wed, Apr 23, 2014 at 11:24 AM, Otavio Salvador
>> <otavio@ossystems.com.br> wrote:
>>
>>> --- a/conf/machine/nitrogen6x-lite.conf
>>> +++ b/conf/machine/nitrogen6x-lite.conf
>>> @@ -7,7 +7,7 @@
>>>   include conf/machine/include/imx-base.inc
>>>   include conf/machine/include/tune-cortexa9.inc
>>>
>>> -SOC_FAMILY = "mx6:mx6s"
>>> +SOC_FAMILY = "mx6:mx6dl"
>>>
>>>   KERNEL_DEVICETREE = "imx6dl-nit6xlite.dtb"
>>
>> Patch looks fine, but I am wondering if we should use
>> "imx6dl-nitrogen6x.dtb" here in order to align with the mainline
>> kernel?
>
> Ah, it seems that it is a different board.
>

It is.

Patch

diff --git a/conf/machine/cubox-i.conf b/conf/machine/cubox-i.conf
index 49bee7d..897c0ea 100644
--- a/conf/machine/cubox-i.conf
+++ b/conf/machine/cubox-i.conf
@@ -1,6 +1,6 @@ 
 #@TYPE: Machine
 #@NAME: SolidRun CuBox-i
-#@SOC: i.MX6 Q/DL/S
+#@SOC: i.MX6 Q/DL
 #@DESCRIPTION: Machine configuration for SolidRun CuBox-i and HummingBoard machines
 #@MAINTAINER: Carlos Rafael Giani <dv@pseudoterminal.org>
 
@@ -12,7 +12,7 @@ 
 require conf/machine/include/imx-base.inc
 require conf/machine/include/tune-cortexa9.inc
 
-SOC_FAMILY = "mx6:mx6s:mx6dl:mx6q"
+SOC_FAMILY = "mx6::mx6dl:mx6q"
 
 PREFERRED_PROVIDER_u-boot = "u-boot-cubox-i"
 PREFERRED_PROVIDER_virtual/kernel = "linux-cubox-i"
diff --git a/conf/machine/nitrogen6x-lite.conf b/conf/machine/nitrogen6x-lite.conf
index fc495f7..5e441c2 100644
--- a/conf/machine/nitrogen6x-lite.conf
+++ b/conf/machine/nitrogen6x-lite.conf
@@ -7,7 +7,7 @@ 
 include conf/machine/include/imx-base.inc
 include conf/machine/include/tune-cortexa9.inc
 
-SOC_FAMILY = "mx6:mx6s"
+SOC_FAMILY = "mx6:mx6dl"
 
 KERNEL_DEVICETREE = "imx6dl-nit6xlite.dtb"
 
diff --git a/conf/machine/wandboard-solo.conf b/conf/machine/wandboard-solo.conf
index 02428c1..c2780bf 100644
--- a/conf/machine/wandboard-solo.conf
+++ b/conf/machine/wandboard-solo.conf
@@ -6,7 +6,7 @@ 
 
 include include/wandboard.inc
 
-SOC_FAMILY = "mx6:mx6s:wandboard"
+SOC_FAMILY = "mx6:mx6dl:wandboard"
 
 UBOOT_MACHINE = "wandboard_solo_config"