Patchwork [meta-fsl-arm-extra,2/3] wandboard.inc: add

login
register
mail settings
Submitter Mario Domenech Goulart
Date Nov. 11, 2013, 4:44 p.m.
Message ID <1384188262-7571-2-git-send-email-mario@ossystems.com.br>
Download mbox | patch
Permalink /patch/61447/
State Changes Requested
Delegated to: Otavio Salvador
Headers show

Comments

Mario Domenech Goulart - Nov. 11, 2013, 4:44 p.m.
Common settings for wandboard-quad, wandboard-dual and wandboard-solo.

Signed-off-by: Mario Domenech Goulart <mario@ossystems.com.br>
---
 conf/machine/include/wandboard.inc |   10 ++++++++++
 conf/machine/wandboard-dual.conf   |    9 ++-------
 conf/machine/wandboard-quad.conf   |    9 ++-------
 conf/machine/wandboard-solo.conf   |    9 +--------
 4 files changed, 15 insertions(+), 22 deletions(-)
 create mode 100644 conf/machine/include/wandboard.inc
Daiane Angolini - Nov. 12, 2013, 11:21 a.m.
On Mon, Nov 11, 2013 at 2:44 PM, Mario Domenech Goulart
<mario@ossystems.com.br> wrote:
> Common settings for wandboard-quad, wandboard-dual and wandboard-solo.

What?

I like you patch, but I think you can improve this commit log/subject.


Daiane

>
> Signed-off-by: Mario Domenech Goulart <mario@ossystems.com.br>
> ---
>  conf/machine/include/wandboard.inc |   10 ++++++++++
>  conf/machine/wandboard-dual.conf   |    9 ++-------
>  conf/machine/wandboard-quad.conf   |    9 ++-------
>  conf/machine/wandboard-solo.conf   |    9 +--------
>  4 files changed, 15 insertions(+), 22 deletions(-)
>  create mode 100644 conf/machine/include/wandboard.inc
>
> diff --git a/conf/machine/include/wandboard.inc b/conf/machine/include/wandboard.inc
> new file mode 100644
> index 0000000..a304b11
> --- /dev/null
> +++ b/conf/machine/include/wandboard.inc
> @@ -0,0 +1,10 @@
> +# Common settings for wandboard boards
> +
> +include conf/machine/include/imx-base.inc
> +include conf/machine/include/tune-cortexa9.inc
> +
> +PREFERRED_PROVIDER_virtual/kernel = "linux-wandboard"
> +
> +SERIAL_CONSOLE = "115200 ttymxc0"
> +
> +MACHINE_FEATURES += "pci wifi"
> diff --git a/conf/machine/wandboard-dual.conf b/conf/machine/wandboard-dual.conf
> index eaee17b..1821192 100644
> --- a/conf/machine/wandboard-dual.conf
> +++ b/conf/machine/wandboard-dual.conf
> @@ -3,19 +3,14 @@
>  #@SOC: i.MX6DL
>  #@DESCRIPTION: Machine configuration for i.MX6 Wandboard Duallite
>
> -include conf/machine/include/imx-base.inc
> -include conf/machine/include/tune-cortexa9.inc
> +include include/wandboard.inc
>
>  SOC_FAMILY = "mx6:mx6dl:wandboard"
>
> -PREFERRED_PROVIDER_virtual/kernel = "linux-wandboard"
> -
>  UBOOT_MACHINE = "wandboard_dl_config"
>
>  KERNEL_DEVICETREE = "imx6dl-wandboard.dtb"
>
> -SERIAL_CONSOLE = "115200 ttymxc0"
> -
> -MACHINE_FEATURES += " pci wifi bluetooth"
> +MACHINE_FEATURES += "bluetooth"
>
>  MACHINE_EXTRA_RRECOMMENDS += " broadcom-nvram-config"
> diff --git a/conf/machine/wandboard-quad.conf b/conf/machine/wandboard-quad.conf
> index 4f32590..195a69f 100644
> --- a/conf/machine/wandboard-quad.conf
> +++ b/conf/machine/wandboard-quad.conf
> @@ -3,19 +3,14 @@
>  #@SOC: i.MX6Q
>  #@DESCRIPTION: Machine configuration for i.MX6 Wandboard Quad
>
> -include conf/machine/include/imx-base.inc
> -include conf/machine/include/tune-cortexa9.inc
> +include include/wandboard.inc
>
>  SOC_FAMILY = "mx6:mx6q:wandboard"
>
> -PREFERRED_PROVIDER_virtual/kernel = "linux-wandboard"
> -
>  UBOOT_MACHINE = "wandboard_quad_config"
>
>  KERNEL_DEVICETREE = "imx6q-wandboard.dtb"
>
> -SERIAL_CONSOLE = "115200 ttymxc0"
> -
> -MACHINE_FEATURES += " pci wifi bluetooth"
> +MACHINE_FEATURES += "bluetooth"
>
>  MACHINE_EXTRA_RRECOMMENDS += " broadcom-nvram-config"
> diff --git a/conf/machine/wandboard-solo.conf b/conf/machine/wandboard-solo.conf
> index 970e650..9696aeb 100644
> --- a/conf/machine/wandboard-solo.conf
> +++ b/conf/machine/wandboard-solo.conf
> @@ -3,17 +3,10 @@
>  #@SOC: i.MX6S
>  #@DESCRIPTION: Machine configuration for i.MX6 Wandboard Solo
>
> -include conf/machine/include/imx-base.inc
> -include conf/machine/include/tune-cortexa9.inc
> +include include/wandboard.inc
>
>  SOC_FAMILY = "mx6:mx6s:wandboard"
>
> -PREFERRED_PROVIDER_virtual/kernel = "linux-wandboard"
> -
>  UBOOT_MACHINE = "wandboard_solo_config"
>
>  KERNEL_DEVICETREE = "imx6dl-wandboard.dtb"
> -
> -SERIAL_CONSOLE = "115200 ttymxc0"
> -
> -MACHINE_FEATURES += " pci wifi"
> --
> 1.7.10.4
>
> _______________________________________________
> meta-freescale mailing list
> meta-freescale@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-freescale
Mario Domenech Goulart - Nov. 12, 2013, 11:32 a.m.
Hi Daiane,

On Tue, 12 Nov 2013 09:21:26 -0200 Daiane Angolini <daiane.list@gmail.com> wrote:

> On Mon, Nov 11, 2013 at 2:44 PM, Mario Domenech Goulart <mario@ossystems.com.br> wrote:
>> Common settings for wandboard-quad, wandboard-dual and wandboard-solo.
>
> What?
>
> I like you patch, but I think you can improve this commit log/subject.

I'm gonna submit the patches again, since I created them against dora by
mistake.  While at it, I'll improve the commit message.

Best wishes.
Mario


>
>
> Daiane
>
>>
>> Signed-off-by: Mario Domenech Goulart <mario@ossystems.com.br>
>> ---
>>  conf/machine/include/wandboard.inc |   10 ++++++++++
>>  conf/machine/wandboard-dual.conf   |    9 ++-------
>>  conf/machine/wandboard-quad.conf   |    9 ++-------
>>  conf/machine/wandboard-solo.conf   |    9 +--------
>>  4 files changed, 15 insertions(+), 22 deletions(-)
>>  create mode 100644 conf/machine/include/wandboard.inc
>>
>> diff --git a/conf/machine/include/wandboard.inc b/conf/machine/include/wandboard.inc
>> new file mode 100644
>> index 0000000..a304b11
>> --- /dev/null
>> +++ b/conf/machine/include/wandboard.inc
>> @@ -0,0 +1,10 @@
>> +# Common settings for wandboard boards
>> +
>> +include conf/machine/include/imx-base.inc
>> +include conf/machine/include/tune-cortexa9.inc
>> +
>> +PREFERRED_PROVIDER_virtual/kernel = "linux-wandboard"
>> +
>> +SERIAL_CONSOLE = "115200 ttymxc0"
>> +
>> +MACHINE_FEATURES += "pci wifi"
>> diff --git a/conf/machine/wandboard-dual.conf b/conf/machine/wandboard-dual.conf
>> index eaee17b..1821192 100644
>> --- a/conf/machine/wandboard-dual.conf
>> +++ b/conf/machine/wandboard-dual.conf
>> @@ -3,19 +3,14 @@
>>  #@SOC: i.MX6DL
>>  #@DESCRIPTION: Machine configuration for i.MX6 Wandboard Duallite
>>
>> -include conf/machine/include/imx-base.inc
>> -include conf/machine/include/tune-cortexa9.inc
>> +include include/wandboard.inc
>>
>>  SOC_FAMILY = "mx6:mx6dl:wandboard"
>>
>> -PREFERRED_PROVIDER_virtual/kernel = "linux-wandboard"
>> -
>>  UBOOT_MACHINE = "wandboard_dl_config"
>>
>>  KERNEL_DEVICETREE = "imx6dl-wandboard.dtb"
>>
>> -SERIAL_CONSOLE = "115200 ttymxc0"
>> -
>> -MACHINE_FEATURES += " pci wifi bluetooth"
>> +MACHINE_FEATURES += "bluetooth"
>>
>>  MACHINE_EXTRA_RRECOMMENDS += " broadcom-nvram-config"
>> diff --git a/conf/machine/wandboard-quad.conf b/conf/machine/wandboard-quad.conf
>> index 4f32590..195a69f 100644
>> --- a/conf/machine/wandboard-quad.conf
>> +++ b/conf/machine/wandboard-quad.conf
>> @@ -3,19 +3,14 @@
>>  #@SOC: i.MX6Q
>>  #@DESCRIPTION: Machine configuration for i.MX6 Wandboard Quad
>>
>> -include conf/machine/include/imx-base.inc
>> -include conf/machine/include/tune-cortexa9.inc
>> +include include/wandboard.inc
>>
>>  SOC_FAMILY = "mx6:mx6q:wandboard"
>>
>> -PREFERRED_PROVIDER_virtual/kernel = "linux-wandboard"
>> -
>>  UBOOT_MACHINE = "wandboard_quad_config"
>>
>>  KERNEL_DEVICETREE = "imx6q-wandboard.dtb"
>>
>> -SERIAL_CONSOLE = "115200 ttymxc0"
>> -
>> -MACHINE_FEATURES += " pci wifi bluetooth"
>> +MACHINE_FEATURES += "bluetooth"
>>
>>  MACHINE_EXTRA_RRECOMMENDS += " broadcom-nvram-config"
>> diff --git a/conf/machine/wandboard-solo.conf b/conf/machine/wandboard-solo.conf
>> index 970e650..9696aeb 100644
>> --- a/conf/machine/wandboard-solo.conf
>> +++ b/conf/machine/wandboard-solo.conf
>> @@ -3,17 +3,10 @@
>>  #@SOC: i.MX6S
>>  #@DESCRIPTION: Machine configuration for i.MX6 Wandboard Solo
>>
>> -include conf/machine/include/imx-base.inc
>> -include conf/machine/include/tune-cortexa9.inc
>> +include include/wandboard.inc
>>
>>  SOC_FAMILY = "mx6:mx6s:wandboard"
>>
>> -PREFERRED_PROVIDER_virtual/kernel = "linux-wandboard"
>> -
>>  UBOOT_MACHINE = "wandboard_solo_config"
>>
>>  KERNEL_DEVICETREE = "imx6dl-wandboard.dtb"
>> -
>> -SERIAL_CONSOLE = "115200 ttymxc0"
>> -
>> -MACHINE_FEATURES += " pci wifi"
>> --
>> 1.7.10.4
>>
>> _______________________________________________
>> meta-freescale mailing list
>> meta-freescale@yoctoproject.org
>> https://lists.yoctoproject.org/listinfo/meta-freescale
>
Eric BENARD - Nov. 12, 2013, 11:51 a.m.
Hi Mario,

Le Mon, 11 Nov 2013 14:44:21 -0200,
Mario Domenech Goulart <mario@ossystems.com.br> a écrit :
> diff --git a/conf/machine/include/wandboard.inc b/conf/machine/include/wandboard.inc
> new file mode 100644
> index 0000000..a304b11
> --- /dev/null
> +++ b/conf/machine/include/wandboard.inc
> @@ -0,0 +1,10 @@
> +# Common settings for wandboard boards
> +
> +include conf/machine/include/imx-base.inc
> +include conf/machine/include/tune-cortexa9.inc
> +
> +PREFERRED_PROVIDER_virtual/kernel = "linux-wandboard"
> +
> +SERIAL_CONSOLE = "115200 ttymxc0"
> +
> +MACHINE_FEATURES += "pci wifi"

table on the right of : http://www.wandboard.org/
states that Solo hasn't Wifi : isn't that defautl setting wrong ?

Eric
Otavio Salvador - Nov. 12, 2013, 11:54 a.m.
On Tue, Nov 12, 2013 at 9:51 AM, Eric Bénard <eric@eukrea.com> wrote:
> Hi Mario,
>
> Le Mon, 11 Nov 2013 14:44:21 -0200,
> Mario Domenech Goulart <mario@ossystems.com.br> a écrit :
>> diff --git a/conf/machine/include/wandboard.inc b/conf/machine/include/wandboard.inc
>> new file mode 100644
>> index 0000000..a304b11
>> --- /dev/null
>> +++ b/conf/machine/include/wandboard.inc
>> @@ -0,0 +1,10 @@
>> +# Common settings for wandboard boards
>> +
>> +include conf/machine/include/imx-base.inc
>> +include conf/machine/include/tune-cortexa9.inc
>> +
>> +PREFERRED_PROVIDER_virtual/kernel = "linux-wandboard"
>> +
>> +SERIAL_CONSOLE = "115200 ttymxc0"
>> +
>> +MACHINE_FEATURES += "pci wifi"
>
> table on the right of : http://www.wandboard.org/
> states that Solo hasn't Wifi : isn't that defautl setting wrong ?

It does not have the wifi module but it can be used (and is commonly
seen doing it) a usb dongle for it. So I think it is good to have the
wifi support in.
Fabio Estevam - Nov. 12, 2013, 11:56 a.m.
Hi Mario,

On Mon, Nov 11, 2013 at 2:44 PM, Mario Domenech Goulart
<mario@ossystems.com.br> wrote:
> Common settings for wandboard-quad, wandboard-dual and wandboard-solo.

On mx6 series we have mx6 dual and mx6 dual-lite.

Please use wandboard-duallite here.

> Signed-off-by: Mario Domenech Goulart <mario@ossystems.com.br>
> ---
>  conf/machine/include/wandboard.inc |   10 ++++++++++
>  conf/machine/wandboard-dual.conf   |    9 ++-------

Shouldn't we rename it to wandboard-duallite.conf ?

Regards,

Fabio Estevam
Otavio Salvador - Nov. 12, 2013, 11:59 a.m.
On Tue, Nov 12, 2013 at 9:56 AM, Fabio Estevam <festevam@gmail.com> wrote:
> Hi Mario,
>
> On Mon, Nov 11, 2013 at 2:44 PM, Mario Domenech Goulart
> <mario@ossystems.com.br> wrote:
>> Common settings for wandboard-quad, wandboard-dual and wandboard-solo.
>
> On mx6 series we have mx6 dual and mx6 dual-lite.
>
> Please use wandboard-duallite here.
>
>> Signed-off-by: Mario Domenech Goulart <mario@ossystems.com.br>
>> ---
>>  conf/machine/include/wandboard.inc |   10 ++++++++++
>>  conf/machine/wandboard-dual.conf   |    9 ++-------
>
> Shouldn't we rename it to wandboard-duallite.conf ?

I don't think so; in Wandboard site it is stated as Wandboard Dual so
this ought to be the name of the board file. I know, in fact, it has a
DualLite processor, but the board name is not this one.
Fabio Estevam - Nov. 12, 2013, 12:03 p.m.
On Tue, Nov 12, 2013 at 9:59 AM, Otavio Salvador
<otavio@ossystems.com.br> wrote:

> I don't think so; in Wandboard site it is stated as Wandboard Dual so
> this ought to be the name of the board file. I know, in fact, it has a
> DualLite processor, but the board name is not this one.

The 'dual' name that the site shows is misleading, don't you think?

We use 'duallite' as the name of the board in U-boot and in the kernel.

So I don't see why we shouldn't call it dual-lite in meta-fsl-arm as well.

dual and dual-lite are different mx6 processors, with different features.

No need to use the wrong name of the website in our layer.

Regards,

Fabio Estevm
Eric BENARD - Nov. 12, 2013, 12:05 p.m.
Hi Otavio,

Le Tue, 12 Nov 2013 09:54:16 -0200,
Otavio Salvador <otavio@ossystems.com.br> a écrit :
> It does not have the wifi module but it can be used (and is commonly
> seen doing it) a usb dongle for it. So I think it is good to have the
> wifi support in.
> 
with this argument you can also keep bluetooth (or anything else which
can be hotplug) as this also _can_ be plugged into an USB port ;-)

Eric
Otavio Salvador - Nov. 12, 2013, 12:07 p.m.
On Tue, Nov 12, 2013 at 10:05 AM, Eric Bénard <eric@eukrea.com> wrote:
> Hi Otavio,
>
> Le Tue, 12 Nov 2013 09:54:16 -0200,
> Otavio Salvador <otavio@ossystems.com.br> a écrit :
>> It does not have the wifi module but it can be used (and is commonly
>> seen doing it) a usb dongle for it. So I think it is good to have the
>> wifi support in.
>>
> with this argument you can also keep bluetooth (or anything else which
> can be hotplug) as this also _can_ be plugged into an USB port ;-)

What you'd expect? Do you prefer to drop it?

I am fine with both ways.
Eric BENARD - Nov. 12, 2013, 1:21 p.m.
Hi Otavio,

Le Tue, 12 Nov 2013 10:07:11 -0200,
Otavio Salvador <otavio@ossystems.com.br> a écrit :

> On Tue, Nov 12, 2013 at 10:05 AM, Eric Bénard <eric@eukrea.com> wrote:
> > Hi Otavio,
> >
> > Le Tue, 12 Nov 2013 09:54:16 -0200,
> > Otavio Salvador <otavio@ossystems.com.br> a écrit :
> >> It does not have the wifi module but it can be used (and is commonly
> >> seen doing it) a usb dongle for it. So I think it is good to have the
> >> wifi support in.
> >>
> > with this argument you can also keep bluetooth (or anything else which
> > can be hotplug) as this also _can_ be plugged into an USB port ;-)
> 
> What you'd expect? Do you prefer to drop it?
> 
> I am fine with both ways.
> 
I think MACHINE_FEATURES must represent what the machine really have
and not what it can have (IMHO, defining if an image must support wifi
if the machine doesn't have it by default is more a DISTRO policy or an
image level choice).

in the wifi case I think this doesn't prevent wifi tools to be
installed as packagegroup-base has :
    ${@base_contains('COMBINED_FEATURES', 'wifi',
    'packagegroup-base-wifi', '',d)} \
-> wifi not installed in packagegroup-base if not present in both
MACHINE & DISTRO features.

but packagegroup-base also have :
packagegroup-base-extended :
    if "wifi" in distro_features and not "wifi" in machine_features and
("pcmcia" in machine_features or "pci" in machine_features or "usbhost"
in machine_features): d.setVar("ADD_WIFI", "packagegroup-base-wifi")

So as we have usbhost (and pci) packagegroup-base-extended will get
wifi tools even if MACHINE_FEATURES doesn't have it.

in core-image.bbclass we have :
CORE_IMAGE_BASE_INSTALL = '\
    packagegroup-core-boot \
    packagegroup-base-extended \
..."

so if I'm not wrong, even if MACHINE_FEATURES doesn't have wifi we will
get wifi tools in the image if DISTRO_FEATURES contains wifi.

Eric
Eric BENARD - Nov. 12, 2013, 1:23 p.m.
Hi Fabio,

Le Tue, 12 Nov 2013 10:03:55 -0200,
Fabio Estevam <festevam@gmail.com> a écrit :

> On Tue, Nov 12, 2013 at 9:59 AM, Otavio Salvador
> <otavio@ossystems.com.br> wrote:
> 
> > I don't think so; in Wandboard site it is stated as Wandboard Dual so
> > this ought to be the name of the board file. I know, in fact, it has a
> > DualLite processor, but the board name is not this one.
> 
> The 'dual' name that the site shows is misleading, don't you think?
> 
> We use 'duallite' as the name of the board in U-boot and in the kernel.
> 
> So I don't see why we shouldn't call it dual-lite in meta-fsl-arm as well.
> 
that's the official board name so it's consistent with the product's
name :
http://www.wandboard.org/index.php/details

Eric
Fabio Estevam - Nov. 12, 2013, 2:06 p.m.
Hi Eric,

On Tue, Nov 12, 2013 at 11:23 AM, Eric Bénard <eric@eukrea.com> wrote:

> that's the official board name so it's consistent with the product's
> name :
> http://www.wandboard.org/index.php/details

Consistently wrong then :-)
Eric BENARD - Nov. 12, 2013, 2:14 p.m.
Le Tue, 12 Nov 2013 12:06:54 -0200,
Fabio Estevam <festevam@gmail.com> a écrit :

> Hi Eric,
> 
> On Tue, Nov 12, 2013 at 11:23 AM, Eric Bénard <eric@eukrea.com> wrote:
> 
> > that's the official board name so it's consistent with the product's
> > name :
> > http://www.wandboard.org/index.php/details
> 
> Consistently wrong then :-)

marketing vs technical ;-)

Eric
Otavio Salvador - Nov. 12, 2013, 2:22 p.m.
On Tue, Nov 12, 2013 at 12:06 PM, Fabio Estevam <festevam@gmail.com> wrote:
> Hi Eric,
>
> On Tue, Nov 12, 2013 at 11:23 AM, Eric Bénard <eric@eukrea.com> wrote:
>
>> that's the official board name so it's consistent with the product's
>> name :
>> http://www.wandboard.org/index.php/details
>
> Consistently wrong then :-)

I agree with Eric here and I prefer to keep the 'commercial' name of
it; also because it is already included in past versions of Yocto BSP
and people are already used to it. I think it is not worth changing
it.

Patch

diff --git a/conf/machine/include/wandboard.inc b/conf/machine/include/wandboard.inc
new file mode 100644
index 0000000..a304b11
--- /dev/null
+++ b/conf/machine/include/wandboard.inc
@@ -0,0 +1,10 @@ 
+# Common settings for wandboard boards
+
+include conf/machine/include/imx-base.inc
+include conf/machine/include/tune-cortexa9.inc
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-wandboard"
+
+SERIAL_CONSOLE = "115200 ttymxc0"
+
+MACHINE_FEATURES += "pci wifi"
diff --git a/conf/machine/wandboard-dual.conf b/conf/machine/wandboard-dual.conf
index eaee17b..1821192 100644
--- a/conf/machine/wandboard-dual.conf
+++ b/conf/machine/wandboard-dual.conf
@@ -3,19 +3,14 @@ 
 #@SOC: i.MX6DL
 #@DESCRIPTION: Machine configuration for i.MX6 Wandboard Duallite
 
-include conf/machine/include/imx-base.inc
-include conf/machine/include/tune-cortexa9.inc
+include include/wandboard.inc
 
 SOC_FAMILY = "mx6:mx6dl:wandboard"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-wandboard"
-
 UBOOT_MACHINE = "wandboard_dl_config"
 
 KERNEL_DEVICETREE = "imx6dl-wandboard.dtb"
 
-SERIAL_CONSOLE = "115200 ttymxc0"
-
-MACHINE_FEATURES += " pci wifi bluetooth"
+MACHINE_FEATURES += "bluetooth"
 
 MACHINE_EXTRA_RRECOMMENDS += " broadcom-nvram-config"
diff --git a/conf/machine/wandboard-quad.conf b/conf/machine/wandboard-quad.conf
index 4f32590..195a69f 100644
--- a/conf/machine/wandboard-quad.conf
+++ b/conf/machine/wandboard-quad.conf
@@ -3,19 +3,14 @@ 
 #@SOC: i.MX6Q
 #@DESCRIPTION: Machine configuration for i.MX6 Wandboard Quad
 
-include conf/machine/include/imx-base.inc
-include conf/machine/include/tune-cortexa9.inc
+include include/wandboard.inc
 
 SOC_FAMILY = "mx6:mx6q:wandboard"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-wandboard"
-
 UBOOT_MACHINE = "wandboard_quad_config"
 
 KERNEL_DEVICETREE = "imx6q-wandboard.dtb"
 
-SERIAL_CONSOLE = "115200 ttymxc0"
-
-MACHINE_FEATURES += " pci wifi bluetooth"
+MACHINE_FEATURES += "bluetooth"
 
 MACHINE_EXTRA_RRECOMMENDS += " broadcom-nvram-config"
diff --git a/conf/machine/wandboard-solo.conf b/conf/machine/wandboard-solo.conf
index 970e650..9696aeb 100644
--- a/conf/machine/wandboard-solo.conf
+++ b/conf/machine/wandboard-solo.conf
@@ -3,17 +3,10 @@ 
 #@SOC: i.MX6S
 #@DESCRIPTION: Machine configuration for i.MX6 Wandboard Solo
 
-include conf/machine/include/imx-base.inc
-include conf/machine/include/tune-cortexa9.inc
+include include/wandboard.inc
 
 SOC_FAMILY = "mx6:mx6s:wandboard"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-wandboard"
-
 UBOOT_MACHINE = "wandboard_solo_config"
 
 KERNEL_DEVICETREE = "imx6dl-wandboard.dtb"
-
-SERIAL_CONSOLE = "115200 ttymxc0"
-
-MACHINE_FEATURES += " pci wifi"