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>

3 files changed, 2 insertions, 3 deletions

diff --git a/conf/machine/imx6solosabreauto.conf b/conf/machine/imx6solosabreauto.conf
index 71dd1d2..255c189 100644
--- a/conf/machine/imx6solosabreauto.conf
+++ b/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/conf/machine/imx6solosabresd.conf b/conf/machine/imx6solosabresd.conf
index 2f084ee..f670ed3 100644
--- a/conf/machine/imx6solosabresd.conf
+++ b/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/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index ea3a723..c16da31 100644
--- a/conf/machine/include/imx-base.inc
+++ b/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"