Consolidate common configurations among iMX5 and iMX6 SoCs

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

1 files changed, 0 insertions, 12 deletions

diff --git a/meta-fsl-arm/conf/machine/imx6qsabresd.conf b/meta-fsl-arm/conf/machine/imx6qsabresd.conf
index a1d150adf..d5a5192da 100644
--- a/meta-fsl-arm/conf/machine/imx6qsabresd.conf
+++ b/meta-fsl-arm/conf/machine/imx6qsabresd.conf
@@ -2,7 +2,6 @@
 #@NAME: i.MX6Q SABRE SD
 #@DESCRIPTION: Machine configuration for Freescale i.MX6Q SABRE SD
 
-include conf/machine/include/soc-family.inc
 include conf/machine/include/imx-base.inc
 include conf/machine/include/tune-cortexa9.inc
 
@@ -10,19 +9,8 @@ SOC_FAMILY = "mx6q:mx6"
 
 KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx6q-sabresd.dts"
 
-UBOOT_ENTRYPOINT =  "0x10800000"
-UBOOT_LOADADDRESS = "0x10800000"
 UBOOT_MACHINE = "mx6qsabresd_config"
 
-# Needs to override until all BSP is public
-MACHINE_GSTREAMER_PLUGIN = ""
-XSERVER = "xserver-xorg \
-           xf86-input-evdev \
-           xf86-video-fbdev"
-MACHINE_EXTRA_RRECOMMENDS = "kernel-modules \
-                             imx-audio \
-                             udev-extraconf"
-
 SERIAL_CONSOLE = "115200 ttymxc0"
 
 MACHINE_FEATURES += " pci wifi bluetooth"