diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2014-04-23 11:05:29 -0300 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2014-04-23 11:22:52 -0300 |
commit | 0226b55c00cd53c64aa6f6c80a28dd8b03cf9b1c (patch) | |
tree | 04285c71deb2be0ddd47afe947f2ef7ac7742785 | |
parent | fc8bcfae0658375b1c241b6b9633b0c2dce6ac88 (diff) | |
download | meta-fsl-arm-0226b55c00cd53c64aa6f6c80a28dd8b03cf9b1c.tar.gz |
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>
-rw-r--r-- | conf/machine/imx6solosabreauto.conf | 2 | ||||
-rw-r--r-- | conf/machine/imx6solosabresd.conf | 2 | ||||
-rw-r--r-- | conf/machine/include/imx-base.inc | 1 | ||||
-rw-r--r-- | recipes-bsp/imx-test/imx-test.inc | 1 | ||||
-rw-r--r-- | recipes-multimedia/libfslvpuwrap/libfslvpuwrap_1.0.45.bb | 2 |
5 files changed, 3 insertions, 5 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 @@ | |||
5 | 5 | ||
6 | require conf/machine/include/imx6sabresd-common.inc | 6 | require conf/machine/include/imx6sabresd-common.inc |
7 | 7 | ||
8 | SOC_FAMILY = "mx6:mx6s" | 8 | SOC_FAMILY = "mx6:mx6dl" |
9 | 9 | ||
10 | KERNEL_DEVICETREE = "imx6dl-sabreauto.dtb" | 10 | KERNEL_DEVICETREE = "imx6dl-sabreauto.dtb" |
11 | 11 | ||
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 @@ | |||
6 | 6 | ||
7 | require conf/machine/include/imx6sabresd-common.inc | 7 | require conf/machine/include/imx6sabresd-common.inc |
8 | 8 | ||
9 | SOC_FAMILY = "mx6:mx6s" | 9 | SOC_FAMILY = "mx6:mx6dl" |
10 | 10 | ||
11 | KERNEL_DEVICETREE = "imx6dl-sabresd.dtb imx6dl-sabresd-ldo.dtb" | 11 | KERNEL_DEVICETREE = "imx6dl-sabresd.dtb imx6dl-sabresd-ldo.dtb" |
12 | 12 | ||
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 ?= "" | |||
57 | MACHINE_FIRMWARE_append_mx6q = " firmware-imx-vpu-imx6q" | 57 | MACHINE_FIRMWARE_append_mx6q = " firmware-imx-vpu-imx6q" |
58 | MACHINE_FIRMWARE_append_mx6d = " firmware-imx-vpu-imx6d" | 58 | MACHINE_FIRMWARE_append_mx6d = " firmware-imx-vpu-imx6d" |
59 | MACHINE_FIRMWARE_append_mx6dl = " firmware-imx-vpu-imx6d" | 59 | MACHINE_FIRMWARE_append_mx6dl = " firmware-imx-vpu-imx6d" |
60 | MACHINE_FIRMWARE_append_mx6s = " firmware-imx-vpu-imx6d" | ||
61 | MACHINE_FIRMWARE_append_mx53 = " firmware-imx-vpu-imx53 firmware-imx-sdma-imx53" | 60 | MACHINE_FIRMWARE_append_mx53 = " firmware-imx-vpu-imx53 firmware-imx-sdma-imx53" |
62 | MACHINE_FIRMWARE_append_mx51 = " firmware-imx-vpu-imx51 firmware-imx-sdma-imx51" | 61 | MACHINE_FIRMWARE_append_mx51 = " firmware-imx-vpu-imx51 firmware-imx-sdma-imx51" |
63 | 62 | ||
diff --git a/recipes-bsp/imx-test/imx-test.inc b/recipes-bsp/imx-test/imx-test.inc index 5dce806..94dbdc3 100644 --- a/recipes-bsp/imx-test/imx-test.inc +++ b/recipes-bsp/imx-test/imx-test.inc | |||
@@ -4,7 +4,6 @@ SECTION = "base" | |||
4 | DEPENDS_mx5 = "virtual/kernel imx-lib imx-vpu" | 4 | DEPENDS_mx5 = "virtual/kernel imx-lib imx-vpu" |
5 | DEPENDS_mx6q = "virtual/kernel imx-lib imx-vpu" | 5 | DEPENDS_mx6q = "virtual/kernel imx-lib imx-vpu" |
6 | DEPENDS_mx6dl = "virtual/kernel imx-lib imx-vpu" | 6 | DEPENDS_mx6dl = "virtual/kernel imx-lib imx-vpu" |
7 | DEPENDS_mx6s = "virtual/kernel imx-lib imx-vpu" | ||
8 | DEPENDS_mx6sl = "virtual/kernel imx-lib" | 7 | DEPENDS_mx6sl = "virtual/kernel imx-lib" |
9 | DEPENDS_mxs = "virtual/kernel" | 8 | DEPENDS_mxs = "virtual/kernel" |
10 | 9 | ||
diff --git a/recipes-multimedia/libfslvpuwrap/libfslvpuwrap_1.0.45.bb b/recipes-multimedia/libfslvpuwrap/libfslvpuwrap_1.0.45.bb index 41a0ee3..160b91a 100644 --- a/recipes-multimedia/libfslvpuwrap/libfslvpuwrap_1.0.45.bb +++ b/recipes-multimedia/libfslvpuwrap/libfslvpuwrap_1.0.45.bb | |||
@@ -18,4 +18,4 @@ do_install_append() { | |||
18 | } | 18 | } |
19 | 19 | ||
20 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 20 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
21 | COMPATIBLE_MACHINE = "(mx6q|mx6dl|mx6s)" | 21 | COMPATIBLE_MACHINE = "(mx6q|mx6dl)" |