Drop i.MX31 and i.MX35 support

The i.MX31 and i.MX35 has been barely used and without much community
coverage since its inclusion making them untested boards.

There is no reason to keep the support for those SoCs in the BSP layer
as those are virtually not tested and unkown to be working or not.

The metadata related to the i.MX3 SoC family has been removed in this
commit so if someone ever wants to bring it back it is easy to find
out all the necessary changes.

Change-Id: I808bf7d1cfa97eb7d444fba711a93b1e074d5f4d
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

6 files changed, 3 insertions, 57 deletions

diff --git a/conf/machine/imx31pdk.conf b/conf/machine/imx31pdk.conf
deleted file mode 100644
index cf368eb8..00000000
--- a/conf/machine/imx31pdk.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-#@TYPE: Machine
-#@NAME: Freescale i.MX31 Platform Development Kit
-#@SOC: i.MX31
-#@DESCRIPTION: Machine configuration for Freescale i.MX31 Platform Development Kit
-
-include conf/machine/include/imx-base.inc
-require conf/machine/include/tune-arm1136jf-s.inc
-
-SOC_FAMILY = "mx3:mx31"
-
-GUI_MACHINE_CLASS = "smallscreen"
-
-UBOOT_MAKE_TARGET = "u-boot-with-spl.bin"
-UBOOT_SUFFIX = "bin"
-UBOOT_MACHINE = "mx31pdk_config"
-UBOOT_BINARY = "u-boot-with-spl.bin"
-KERNEL_IMAGETYPE = "uImage"
-
-IMAGE_FSTYPES = "ubi jffs2 tar.bz2"
-MKUBIFS_ARGS = "-m 2048 -e 129024 -c 2030"
-UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512"
-
-MACHINE_FEATURES += "ext3 bluetooth ext2 screen"
-
diff --git a/conf/machine/imx35pdk.conf b/conf/machine/imx35pdk.conf
deleted file mode 100644
index a3fc60cb..00000000
--- a/conf/machine/imx35pdk.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-#@TYPE: Machine
-#@NAME: Freescale i.MX35 Platform Development Kit
-#@SOC: i.MX35
-#@DESCRIPTION: Machine configuration for Freescale i.MX35 Platform Development Kit
-
-include conf/machine/include/imx-base.inc
-require conf/machine/include/tune-arm1136jf-s.inc
-
-SOC_FAMILY = "mx3:mx35"
-
-UBOOT_MACHINE = "mx35pdk_config"
-UBOOT_SUFFIX = "bin"
-UBOOT_BINARY = "u-boot.bin"
-UBOOT_MAKE_TARGET = "u-boot.bin"
-KERNEL_IMAGETYPE = "uImage"
-
-GUI_MACHINE_CLASS = "bigscreen"
-
-ROOT_FLASH_SIZE = "256"
-
-JFFS2_ERASEBLOCK = "0x20000"
-
-IMAGE_FSTYPES += "jffs2 tar.bz2"
-
-MACHINE_FEATURES += "ext2 ext3 screen"
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index ecb2f772..fba594dd 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -11,7 +11,6 @@ PREFERRED_PROVIDER_virtual/bootloader ??= "u-boot-fslc"
 UBOOT_MAKE_TARGET = "u-boot.imx"
 UBOOT_SUFFIX ?= "imx"
 
-UBOOT_ENTRYPOINT_mx3 = "0x80008000"
 UBOOT_ENTRYPOINT_mx51  = "0x90008000"
 UBOOT_ENTRYPOINT_mx53  = "0x70008000"
 UBOOT_ENTRYPOINT_mx6  = "0x10008000"
@@ -43,7 +42,6 @@ DEFAULTTUNE_mx6 ?= "cortexa9thf-neon"
 
 # Sub-architecture support
 MACHINE_SOCARCH_SUFFIX ?= ""
-MACHINE_SOCARCH_SUFFIX_mx3 = "-mx3"
 MACHINE_SOCARCH_SUFFIX_mx5 = "-mx5"
 MACHINE_SOCARCH_SUFFIX_mx6q = "-mx6qdl"
 MACHINE_SOCARCH_SUFFIX_mx6dl = "-mx6qdl"
@@ -67,8 +65,6 @@ MACHINE_FIRMWARE_append_mx53 = " firmware-imx-vpu-imx53 firmware-imx-sdma-imx53"
 MACHINE_FIRMWARE_append_mx51 = " firmware-imx-vpu-imx51 firmware-imx-sdma-imx51"
 
 # FIXME: Needs addition of firmware-imx of official BSPs
-#MACHINE_FIRMWARE_append_mx35 = " firmware-imx-sdma-imx35"
-#MACHINE_FIRMWARE_append_mx31 = " firmware-imx-sdma-imx31"
 #MACHINE_FIRMWARE_append_mx27 = " firmware-imx-vpu-imx27"
 #MACHINE_FIRMWARE_append_mx25 = " firmware-imx-sdma-imx25"
 
@@ -111,7 +107,6 @@ PREFERRED_PROVIDER_virtual/libg2d_mx6 ?= "imx-gpu-viv"
 
 # Handle default kernel
 IMX_DEFAULT_KERNEL = "linux-imx"
-IMX_DEFAULT_KERNEL_mx3 = "linux-fslc"
 IMX_DEFAULT_KERNEL_mx6 = "linux-fslc-mx6"
 PREFERRED_PROVIDER_virtual/kernel ??= "${IMX_DEFAULT_KERNEL}"
 
diff --git a/recipes-bsp/imx-test/imx-test_00.00.00.bb b/recipes-bsp/imx-test/imx-test_00.00.00.bb
index f38dc67f..c29e6a62 100644
--- a/recipes-bsp/imx-test/imx-test_00.00.00.bb
+++ b/recipes-bsp/imx-test/imx-test_00.00.00.bb
@@ -7,4 +7,4 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ad
 ALLOW_EMPTY_${PN} = "1"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6|vf50|vf60)"
+COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf50|vf60)"
diff --git a/recipes-bsp/u-boot/u-boot-fslc.inc b/recipes-bsp/u-boot/u-boot-fslc.inc
index 07fb5074..a9b35a64 100644
--- a/recipes-bsp/u-boot/u-boot-fslc.inc
+++ b/recipes-bsp/u-boot/u-boot-fslc.inc
@@ -11,7 +11,7 @@ was submitted for revision and it takes some time to become part of a stable \
 version, or because it is not applicable for upstreaming."
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919"
-COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6|vf)"
+COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf)"
 
 DEPENDS_mxs += "elftosb-native openssl-native"
 
diff --git a/recipes-kernel/linux/linux-fslc_4.1.bb b/recipes-kernel/linux/linux-fslc_4.1.bb
index 84edf118..60e68ab6 100644
--- a/recipes-kernel/linux/linux-fslc_4.1.bb
+++ b/recipes-kernel/linux/linux-fslc_4.1.bb
@@ -14,4 +14,4 @@ PV = "4.1+git${SRCPV}"
 SRCBRANCH = "patches-4.1"
 SRCREV = "665a389b8e62c444969ac65e3e0eda5d8c13ea24"
 
-COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6)"
+COMPATIBLE_MACHINE = "(mxs|mx5|mx6)"