Stop using mx6s SoC family

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: Ifefdce9d2f261352c409e7137c7566060e3915be
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

diff --git a/meta-fsl-arm/conf/machine/imx6solosabreauto.conf b/meta-fsl-arm/conf/machine/imx6solosabreauto.conf
index 71dd1d22a1f0a01d6fa699a3cddc692c170fb1d8..255c189edb027dd53beec0be68345a22f1895920 100644 (file)
--- a/meta-fsl-arm/conf/machine/imx6solosabreauto.conf
+++ b/meta-fsl-arm/conf/machine/imx6solosabreauto.conf
@@ -5,7 +5,7 @@
 
 require conf/machine/include/imx6sabresd-common.inc
 
-SOC_FAMILY = "mx6:mx6s"
+SOC_FAMILY = "mx6:mx6dl"
 
 KERNEL_DEVICETREE = "imx6dl-sabreauto.dtb"
 

diff --git a/meta-fsl-arm/conf/machine/imx6solosabresd.conf b/meta-fsl-arm/conf/machine/imx6solosabresd.conf
index 2f084eea3ec7d8ab5716fbe5c981292193b86b7e..f670ed389131d6b1b2ea97d0aa3c04fef5f1d2ea 100644 (file)
--- a/meta-fsl-arm/conf/machine/imx6solosabresd.conf
+++ b/meta-fsl-arm/conf/machine/imx6solosabresd.conf
@@ -6,7 +6,7 @@
 
 require conf/machine/include/imx6sabresd-common.inc
 
-SOC_FAMILY = "mx6:mx6s"
+SOC_FAMILY = "mx6:mx6dl"
 
 KERNEL_DEVICETREE = "imx6dl-sabresd.dtb imx6dl-sabresd-ldo.dtb"
 

diff --git a/meta-fsl-arm/conf/machine/include/imx-base.inc b/meta-fsl-arm/conf/machine/include/imx-base.inc
index ea3a723a2f091a0895392e2fcd9de2ee54b8ca3a..c16da31e09512230b6d450d2b9db5bcd84b63152 100644 (file)
--- a/meta-fsl-arm/conf/machine/include/imx-base.inc
+++ b/meta-fsl-arm/conf/machine/include/imx-base.inc
@@ -57,7 +57,6 @@ MACHINE_FIRMWARE ?= ""
 MACHINE_FIRMWARE_append_mx6q = " firmware-imx-vpu-imx6q"
 MACHINE_FIRMWARE_append_mx6d = " firmware-imx-vpu-imx6d"
 MACHINE_FIRMWARE_append_mx6dl = " firmware-imx-vpu-imx6d"
-MACHINE_FIRMWARE_append_mx6s = " firmware-imx-vpu-imx6d"
 MACHINE_FIRMWARE_append_mx53 = " firmware-imx-vpu-imx53 firmware-imx-sdma-imx53"
 MACHINE_FIRMWARE_append_mx51 = " firmware-imx-vpu-imx51 firmware-imx-sdma-imx51"
 

diff --git a/meta-fsl-arm/recipes-bsp/imx-test/imx-test.inc b/meta-fsl-arm/recipes-bsp/imx-test/imx-test.inc
index 5dce806683e61cd4f3ae66a3acff2eb63c6053ef..94dbdc39dbe49f50670a32e7579ab597e4abd937 100644 (file)
--- a/meta-fsl-arm/recipes-bsp/imx-test/imx-test.inc
+++ b/meta-fsl-arm/recipes-bsp/imx-test/imx-test.inc
@@ -4,7 +4,6 @@ SECTION = "base"
 DEPENDS_mx5   = "virtual/kernel imx-lib imx-vpu"
 DEPENDS_mx6q  = "virtual/kernel imx-lib imx-vpu"
 DEPENDS_mx6dl = "virtual/kernel imx-lib imx-vpu"
-DEPENDS_mx6s  = "virtual/kernel imx-lib imx-vpu"
 DEPENDS_mx6sl = "virtual/kernel imx-lib"
 DEPENDS_mxs   = "virtual/kernel"
 

diff --git a/meta-fsl-arm/recipes-multimedia/libfslvpuwrap/libfslvpuwrap_1.0.45.bb b/meta-fsl-arm/recipes-multimedia/libfslvpuwrap/libfslvpuwrap_1.0.45.bb
index 41a0ee39ea1c47ffd1e047f11d21a169a9da0b11..160b91af88cf4a86b03ccbf523f072317eca8d03 100644 (file)
--- a/meta-fsl-arm/recipes-multimedia/libfslvpuwrap/libfslvpuwrap_1.0.45.bb
+++ b/meta-fsl-arm/recipes-multimedia/libfslvpuwrap/libfslvpuwrap_1.0.45.bb
@@ -18,4 +18,4 @@ do_install_append() {
 }
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(mx6q|mx6dl|mx6s)"
+COMPATIBLE_MACHINE = "(mx6q|mx6dl)"