wandboard: Use a single machine file for Quad, Dual and Solo

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 <otavio@ossystems.com.br>
Tested-by: Fabio Estevam <fabio.estevam@freescale.com>
This commit is contained in:
Otavio Salvador 2015-07-14 15:27:13 -03:00
parent 60398d3a0b
commit ba9a5943ea
7 changed files with 31 additions and 68 deletions

View File

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

View File

@ -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 <alfonso@tames.com>
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 \
"

View File

@ -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 <alfonso@tames.com>
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 \
"

View File

@ -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 <alfonso@tames.com>
include include/wandboard.inc
SOC_FAMILY = "mx6:mx6dl:wandboard"
UBOOT_MACHINE = "wandboard_solo_config"
KERNEL_DEVICETREE = "imx6dl-wandboard.dtb"

View File

@ -0,0 +1,29 @@
#@TYPE: Machine
#@NAME: Wandboard i.MX6 Wandboard Quad/Dual/Solo
#@SOC: i.MX6Q/DL
#@DESCRIPTION: Machine configuration for i.MX6 Wandboard Quad
#@MAINTAINER: Alfonso Tames <alfonso@tames.com>
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"

View File

@ -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)"

View File

@ -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)"