Consolidate common configurations among iMX5 and iMX6 SoCs

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

6 files changed, 15 insertions, 34 deletions

diff --git a/conf/machine/imx51evk.conf b/conf/machine/imx51evk.conf
index abf6740..2e27ed7 100644
--- a/conf/machine/imx51evk.conf
+++ b/conf/machine/imx51evk.conf
@@ -2,7 +2,6 @@
 #@NAME: i.MX51 evaluation kit
 #@DESCRIPTION: Machine configuration for Freescale i.MX51 Evaluation Kit
 
-include conf/machine/include/soc-family.inc
 include conf/machine/include/imx-base.inc
 include conf/machine/include/tune-cortexa8.inc
 
@@ -10,6 +9,4 @@ SOC_FAMILY = "mx51:mx5"
 
 KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx51-babbage.dts"
 
-UBOOT_ENTRYPOINT = "0xa0000000"
-UBOOT_LOADADDRESS = "0xa0000000"
 UBOOT_MACHINE = "mx51evk_config"
diff --git a/conf/machine/imx53ard.conf b/conf/machine/imx53ard.conf
index b8a121e..4f15493 100644
--- a/conf/machine/imx53ard.conf
+++ b/conf/machine/imx53ard.conf
@@ -2,7 +2,6 @@
 #@NAME: i.MX53 SABRE Automotive board
 #@DESCRIPTION: Machine configuration for Freescale i.MX53 SABRE Automotive board
 
-include conf/machine/include/soc-family.inc
 include conf/machine/include/imx-base.inc
 include conf/machine/include/tune-cortexa8.inc
 
@@ -10,8 +9,6 @@ SOC_FAMILY = "mx53:mx5"
 
 KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx53-ard.dts"
 
-UBOOT_ENTRYPOINT = "0x70800000"
-UBOOT_LOADADDRESS = "0x70800000"
 UBOOT_MACHINE = "mx53ard_config"
 
 MACHINE_FIRMWARE += "firmware-imx-ar3k \
diff --git a/conf/machine/imx53qsb.conf b/conf/machine/imx53qsb.conf
index 274eb53..9aec913 100644
--- a/conf/machine/imx53qsb.conf
+++ b/conf/machine/imx53qsb.conf
@@ -2,7 +2,6 @@
 #@NAME: i.MX53 Quick Start Board
 #@DESCRIPTION: Machine configuration for Freescale i.MX53 Quick Start Board
 
-include conf/machine/include/soc-family.inc
 include conf/machine/include/imx-base.inc
 include conf/machine/include/tune-cortexa8.inc
 
@@ -10,8 +9,6 @@ SOC_FAMILY = "mx53:mx5"
 
 KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx53-qsb.dts"
 
-UBOOT_ENTRYPOINT = "0x70800000"
-UBOOT_LOADADDRESS = "0x70800000"
 UBOOT_MACHINE = "mx53loco_config"
 
 MACHINE_FIRMWARE += "firmware-imx-ar3k \
diff --git a/conf/machine/imx6qsabrelite.conf b/conf/machine/imx6qsabrelite.conf
index 0d96953..6a0cef9 100644
--- a/conf/machine/imx6qsabrelite.conf
+++ b/conf/machine/imx6qsabrelite.conf
@@ -2,7 +2,6 @@
 #@NAME: i.MX6Q SABRE Lite
 #@DESCRIPTION: Machine configuration for Freescale i.MX6Q SABRE Lite
 
-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-sabrelite.dts"
 
-UBOOT_ENTRYPOINT =  "0x10800000"
-UBOOT_LOADADDRESS = "0x10800000"
 UBOOT_MACHINE = "mx6qsabrelite_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 ttymxc1"
 
 MACHINE_FEATURES += " pci wifi bluetooth"
diff --git a/conf/machine/imx6qsabresd.conf b/conf/machine/imx6qsabresd.conf
index a1d150a..d5a5192 100644
--- a/conf/machine/imx6qsabresd.conf
+++ b/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"
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 658df52..5658f28 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -4,6 +4,8 @@ include conf/machine/include/fsl-default-settings.inc
 include conf/machine/include/fsl-default-versions.inc
 include conf/machine/include/fsl-default-providers.inc
 
+include conf/machine/include/soc-family.inc
+
 # Disable perf features as 2.6.35.3 fail to build otherwise
 PERF_FEATURES_ENABLE = ""
 
@@ -11,9 +13,20 @@ PERF_FEATURES_ENABLE = ""
 UBOOT_MAKE_TARGET = "u-boot.imx"
 UBOOT_SUFFIX = "imx"
 
+UBOOT_ENTRYPOINT_mx51  = "0xa0000000"
+UBOOT_LOADADDRESS_mx51 = "0xa0000000"
+
+UBOOT_ENTRYPOINT_mx53  = "0x70800000"
+UBOOT_LOADADDRESS_mx53 = "0x70800000"
+
+UBOOT_ENTRYPOINT_mx6  = "0x10800000"
+UBOOT_LOADADDRESS_mx6 = "0x10800000"
+
+XSERVER_DRIVER = "xf86-video-fbdev"
+XSERVER_DRIVER_mx5 = "xf86-video-imxfb"
 XSERVER = "xserver-xorg \
            xf86-input-evdev \
-           xf86-video-imxfb"
+           ${XSERVER_DRIVER}"
 
 # Ship kernel modules
 MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
@@ -36,6 +49,7 @@ MACHINE_EXTRA_RRECOMMENDS += "imx-audio \
 
 # Gstreamer plugin
 MACHINE_GSTREAMER_PLUGIN ?= "gst-fsl-plugin"
+MACHINE_GSTREAMER_PLUGIN_mx6 = ""
 
 PREFERRED_PROVIDER_virtual/egl_mx5 ?= "amd-gpu-x11-bin-mx51"
 PREFERRED_PROVIDER_virtual/libgles1_mx5 ?= "amd-gpu-x11-bin-mx51"