On Wed, Jul 15, 2015 at 10:03 AM, Otavio Salvador <[email protected]> wrote: > The new U-Boot 2015.07-based release offers support for SPL for > Wandboard. This allows the same image to run in every Wandboard > variant available. > > This consolidates the Quad, Dual and Solo variants into a single > Wandboard machine definition. > > Change-Id: Icf87301431b48ef857670e1f3a941706a7bfc50d > Signed-off-by: Otavio Salvador <[email protected]> > --- > conf/machine/include/wandboard.inc | 13 ---------- > conf/machine/wandboard-dual.conf | 20 --------------- > conf/machine/wandboard-quad.conf | 20 --------------- > conf/machine/wandboard-solo.conf | 13 ---------- > conf/machine/wandboard.conf | 29 > ++++++++++++++++++++++ > .../broadcom-nvram-config/bcm4329-nvram-config.bb | 2 +- > .../broadcom-nvram-config/bcm4330-nvram-config.bb | 2 +- > 7 files changed, 31 insertions(+), 68 deletions(-) > delete mode 100644 conf/machine/include/wandboard.inc > delete mode 100644 conf/machine/wandboard-dual.conf > delete mode 100644 conf/machine/wandboard-quad.conf > delete mode 100644 conf/machine/wandboard-solo.conf > create mode 100644 conf/machine/wandboard.conf > > diff --git a/conf/machine/include/wandboard.inc > b/conf/machine/include/wandboard.inc > deleted file mode 100644 > index a6d6fe0..0000000 > --- a/conf/machine/include/wandboard.inc > +++ /dev/null > @@ -1,13 +0,0 @@ > -# 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" > -PREFERRED_VERSION_linux-wandboard ?= "3.14.28" > - > -SERIAL_CONSOLE = "115200 ttymxc0" > - > -MACHINE_FEATURES += "pci touchscreen" > - > -KERNEL_IMAGETYPE = "zImage" > diff --git a/conf/machine/wandboard-dual.conf > b/conf/machine/wandboard-dual.conf > deleted file mode 100644 > index 05a98b2..0000000 > --- a/conf/machine/wandboard-dual.conf > +++ /dev/null > @@ -1,20 +0,0 @@ > -#@TYPE: Machine > -#@NAME: Wandboard i.MX6 Wandboard Duallite > -#@SOC: i.MX6DL > -#@DESCRIPTION: Machine configuration for i.MX6 Wandboard Duallite > -#@MAINTAINER: Alfonso Tames <[email protected]> > - > -include include/wandboard.inc > - > -SOC_FAMILY = "mx6:mx6dl:wandboard" > - > -UBOOT_MACHINE = "wandboard_dl_config" > - > -KERNEL_DEVICETREE = "imx6dl-wandboard.dtb" > - > -MACHINE_FEATURES += "bluetooth wifi" > - > -MACHINE_EXTRA_RRECOMMENDS += " \ > - bcm4329-nvram-config \ > - bcm4330-nvram-config \ > -" > diff --git a/conf/machine/wandboard-quad.conf > b/conf/machine/wandboard-quad.conf > deleted file mode 100644 > index 26a88a6..0000000 > --- a/conf/machine/wandboard-quad.conf > +++ /dev/null > @@ -1,20 +0,0 @@ > -#@TYPE: Machine > -#@NAME: Wandboard i.MX6 Wandboard Quad > -#@SOC: i.MX6Q > -#@DESCRIPTION: Machine configuration for i.MX6 Wandboard Quad > -#@MAINTAINER: Alfonso Tames <[email protected]> > - > -include include/wandboard.inc > - > -SOC_FAMILY = "mx6:mx6q:wandboard" > - > -UBOOT_MACHINE = "wandboard_quad_config" > - > -KERNEL_DEVICETREE = "imx6q-wandboard.dtb" > - > -MACHINE_FEATURES += "bluetooth wifi" > - > -MACHINE_EXTRA_RRECOMMENDS += " \ > - bcm4329-nvram-config \ > - bcm4330-nvram-config \ > -" > diff --git a/conf/machine/wandboard-solo.conf > b/conf/machine/wandboard-solo.conf > deleted file mode 100644 > index cae56ab..0000000 > --- a/conf/machine/wandboard-solo.conf > +++ /dev/null > @@ -1,13 +0,0 @@ > -#@TYPE: Machine > -#@NAME: Wandboard i.MX6 Wandboard Solo > -#@SOC: i.MX6S > -#@DESCRIPTION: Machine configuration for i.MX6 Wandboard Solo > -#@MAINTAINER: Alfonso Tames <[email protected]> > - > -include include/wandboard.inc > - > -SOC_FAMILY = "mx6:mx6dl:wandboard" > - > -UBOOT_MACHINE = "wandboard_solo_config" > - > -KERNEL_DEVICETREE = "imx6dl-wandboard.dtb" > diff --git a/conf/machine/wandboard.conf b/conf/machine/wandboard.conf > new file mode 100644 > index 0000000..ba1f8cd > --- /dev/null > +++ b/conf/machine/wandboard.conf > @@ -0,0 +1,29 @@ > +#@TYPE: Machine > +#@NAME: Wandboard i.MX6 Wandboard Quad/Dual/Solo > +#@SOC: i.MX6Q/DL
Wouldn't be better to use SOC: i.MX6Q/DL/S only because it was a merge of 3 board in one only? I really don't know... > +#@DESCRIPTION: Machine configuration for i.MX6 Wandboard Quad > +#@MAINTAINER: Alfonso Tames <[email protected]> In addition, I would like to have a clear Acked-by or Tested-by from Alfonso in this patch. Daiane > + > +include conf/machine/include/imx-base.inc > +include conf/machine/include/tune-cortexa9.inc > + > +SOC_FAMILY = "mx6:mx6dl:mx6q" > + > +UBOOT_MAKE_TARGET = "" > +UBOOT_SUFFIX = "img" > +SPL_BINARY = "SPL" > +UBOOT_MACHINE = "wandboard_config" > + > +PREFERRED_PROVIDER_virtual/kernel ?= "linux-wandboard" > +KERNEL_DEVICETREE = "imx6q-wandboard.dtb \ > + imx6dl-wandboard.dtb" > +KERNEL_IMAGETYPE = "zImage" > + > +MACHINE_FEATURES += "bluetooth pci wifi touchscreen" > + > +MACHINE_EXTRA_RRECOMMENDS += " \ > + bcm4329-nvram-config \ > + bcm4330-nvram-config \ > +" > + > +SERIAL_CONSOLE = "115200 ttymxc0" > diff --git a/recipes-bsp/broadcom-nvram-config/bcm4329-nvram-config.bb > b/recipes-bsp/broadcom-nvram-config/bcm4329-nvram-config.bb > index 09f6eb7..b03b565 100644 > --- a/recipes-bsp/broadcom-nvram-config/bcm4329-nvram-config.bb > +++ b/recipes-bsp/broadcom-nvram-config/bcm4329-nvram-config.bb > @@ -5,4 +5,4 @@ include broadcom-nvram-config.inc > > CHIP_MODEL = "4329" > > -COMPATIBLE_MACHINE = "(wandboard-dual|wandboard-quad|cubox-i)" > +COMPATIBLE_MACHINE = "(wandboard|cubox-i)" > diff --git a/recipes-bsp/broadcom-nvram-config/bcm4330-nvram-config.bb > b/recipes-bsp/broadcom-nvram-config/bcm4330-nvram-config.bb > index 5512b2d..f812d5f 100644 > --- a/recipes-bsp/broadcom-nvram-config/bcm4330-nvram-config.bb > +++ b/recipes-bsp/broadcom-nvram-config/bcm4330-nvram-config.bb > @@ -5,4 +5,4 @@ include broadcom-nvram-config.inc > > CHIP_MODEL = "4330" > > -COMPATIBLE_MACHINE = > "(cubox-i|nitrogen6x-lite|wandboard-dual|wandboard-quad|imx6sl-warp)" > +COMPATIBLE_MACHINE = "(cubox-i|nitrogen6x-lite|wandboard|imx6sl-warp)" > -- > 2.4.5 > > -- > _______________________________________________ > meta-freescale mailing list > [email protected] > https://lists.yoctoproject.org/listinfo/meta-freescale -- _______________________________________________ meta-freescale mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-freescale
